Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

MOSIP-32777 MOSIP-32855 MOSIP-34247 MOSIP-34327 #733

Merged
merged 4 commits into from
Jul 16, 2024
Merged

MOSIP-32777 MOSIP-32855 MOSIP-34247 MOSIP-34327 #733

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b50e902
MOSIP-32777 Avoiding special characters in update my data name field
MadhuMosip Jul 15, 2024
493e5f0
MOSIP-32855 view my history eid input field only accepts numbers
MadhuMosip Jul 15, 2024
f9cdd37
MOSIP-34247 resolved file upload button alignmnet issue
MadhuMosip Jul 15, 2024
590ebeb
MOSIP-34327 resolved info popup alignment issue
MadhuMosip Jul 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/getuin/getuin/getuin.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<div class="uin-login-title-card">
<mat-card-subtitle [style.font-size]="fontSize.paragraph" class="login-Input-heading">{{getUinData.title |
translate}}</mat-card-subtitle>
<button class="info-icon-button" #tooltip="matTooltip" [matTooltip]="infoText" matTooltipPosition="below" matTooltipHideDelay="5000" matTooltipClass="left">
<button class="info-icon-button" #tooltip="matTooltip" [matTooltip]="infoText" matTooltipPosition="below" matTooltipClass="left">
<img alt="info-icon" class="info-icon" src="./assets/images/info_black_24dp (1).png" />
</button>
</div>
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/lockunlockauth/lockunlockauth.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="main-heading">{{'lockunloc
<mat-card-title><span>
<img src="assets\{{authInfo.label.icon}}.png" alt="">
</span>&nbsp;&nbsp;&nbsp;<span class="auth-type-text" [style.font-size]="fontSize.subHeading">{{authInfo.label.label}}</span></mat-card-title>
<mat-icon #tooltip="matTooltip" [matTooltip]="infoMsg[authInfo.label.icon]" matTooltipPosition="below" matTooltipHideDelay="5000" matTooltipClass="below" class="info-icon">info</mat-icon>
<mat-icon #tooltip="matTooltip" [matTooltip]="infoMsg[authInfo.label.icon]" matTooltipPosition="below" matTooltipClass="below" class="info-icon">info</mat-icon>
</mat-card-header>
<mat-card-content>
<p *ngIf="authInfo.locked"><img mat-card-sm-image src="assets\images\lock.png" alt=""></p>
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/revokevid/revokevid.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" style="color: #505050;">{{'manage
<span class="vid-type-card">
<h4 [style.font-size]="fontSize.subHeading" style="color: #000000;">{{langJSON[policy.vidType].vidType}}</h4>
<span>
<mat-icon [matTooltip]="infoText[policy.vidType].replace('$instancesVID', policy.vidPolicy.instancesAllowed).replace('$expiryTime', policy.vidPolicy.validForInMinutes).replace('$transactionLimit', policy.vidPolicy.transactionsAllowed).replace('$VID', policy.vidPolicy.instancesAllowed > 1 ? 'VID\'s' : 'VID')" matTooltipPosition="below" matTooltipHideDelay="5000" matTooltipClass="below" class="user-icon" >info</mat-icon>
<mat-icon [matTooltip]="infoText[policy.vidType].replace('$instancesVID', policy.vidPolicy.instancesAllowed).replace('$expiryTime', policy.vidPolicy.validForInMinutes).replace('$transactionLimit', policy.vidPolicy.transactionsAllowed).replace('$VID', policy.vidPolicy.instancesAllowed > 1 ? 'VID\'s' : 'VID')" matTooltipPosition="below" matTooltipClass="below" class="user-icon" >info</mat-icon>
</span>
</span>
<button [id]="policy.vidType" mat-raised-button color="primary" class="create-btn" (click)="generateVIDBtn(policy.vidType)"><img style="margin-right: 5px; margin-bottom: 2px;" src="./assets/icons/iconfont/add_circle_black_24dp (1).svg" alt=""/>{{'managemyvid.create' | translate}}</button>
Expand Down
10 changes: 0 additions & 10 deletions ...dent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,16 +101,6 @@ td {
width: 100% !important;
}

input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}

input[type=number] {
-moz-appearance: textfield;
}

@media screen and (max-width:600px){
.mat-card{
padding: 8px;
Expand Down
2 changes: 1 addition & 1 deletion ...ent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<td style="padding: 10px;">
<label [style.font-size]="fontSize.breadcrumb" class="label-card">{{'trackservicerequest.searchLabel' | translate}}<span
style="color: #FF0000; margin-bottom:8px;">*</span>
<mat-icon #tooltip="matTooltip" [matTooltip]="infoText" matTooltipPosition="below" matTooltipHideDelay="5000" matTooltipClass="below" class="info-icon">info</mat-icon>
<mat-icon #tooltip="matTooltip" [matTooltip]="infoText" matTooltipPosition="below" matTooltipClass="below" class="info-icon">info</mat-icon>
</label>
<div class="event-id-search-main-card">
<span class="event-id-search-card">
Expand Down
6 changes: 3 additions & 3 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<span [style.font-size]="fontSize.lableText"
style="margin-top: 4px;padding-left: 5px; font-weight: 600;">{{langJson.uploadImage}}</span>
</label>
<h3 [style.font-size]="fontSize.lableText">{{langJson.or}}</h3>
<h3 style="margin-right: 8px;" [style.font-size]="fontSize.lableText">{{langJson.or}}</h3>
&nbsp;
<h3 [style.font-size]="fontSize.lableText">{{langJson.dropImage}}</h3>
</div>
Expand Down Expand Up @@ -529,7 +529,7 @@ <h4 class="name">
</tr>
</table>
<div class="submit-btn-card">
<button [style.font-size]="fontSize.subHeading" [disabled]="previewDisabled" (click)="previewBtn('identity')" mat-raised-button color="primary"
<button [style.font-size]="fontSize.subHeading" [disabled]="previewDisabled || enteredOnlyNumbers" (click)="previewBtn('identity')" mat-raised-button color="primary"
id="previewBtn">{{langJson.preview}}</button>
</div>
</mat-tab>
Expand Down Expand Up @@ -840,7 +840,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<span [style.font-size]="fontSize.lableText"
style="margin-top: 4px;padding-left: 5px; font-weight: 600;">{{langJson.uploadImage}}</span>
</label>
<h3 [style.font-size]="fontSize.lableText">{{langJson.or}}</h3>
<h3 style="margin-right: 5px;" [style.font-size]="fontSize.lableText">{{langJson.or}}</h3>
&nbsp;
<h3 [style.font-size]="fontSize.lableText">{{langJson.dropImage}}</h3>
</div>
Expand Down
5 changes: 3 additions & 2 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
let userNewData = event.target.value.trim();
let self = this;
if (userNewData === "") {
this.enteredOnlyNumbers = false;
if (this.userInfoClone[formControlName]) {
delete this.userInfoClone[formControlName]
}
Expand All @@ -625,7 +626,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
})
} else {
if (formControlName !== "proofOfIdentity") {
if (userNewData.toLowerCase() !== currentValue.toLowerCase() && !/\d/.test(userNewData) && userNewData !== this.userInputValues[formControlName][language] ) {
if (userNewData.toLowerCase() !== currentValue.toLowerCase() && /^[A-Za-z]+$/.test(userNewData) && userNewData !== this.userInputValues[formControlName][language] ) {
this.isSameData[formControlName] = false;
this.enteredOnlyNumbers = false;
this.userInfoClone[formControlName] = []
Expand All @@ -646,7 +647,7 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
}
if(userNewData.toLowerCase() === currentValue.toLowerCase()){
this.isSameData[formControlName] = true;
}else if(/\d/.test(userNewData)){
}else if(!/^[A-Za-z]+$/.test(userNewData)){
this.enteredOnlyNumbers = true;
}

Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/uinservices/viewhistory/viewhistory.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="main-heading">{{'viewhisto
<div class="mini-card">
<p class="search-input-label"><span [style.font-size]="fontSize.paragraph" class="label" >{{'viewhistory.inputsearch' |translate}}</span></p>
<span class="input event-id-search-card" >
<input [style.font-size]="fontSize.breadcrumb" dir="{{sitealignment}}" [value]="searchText" type="text" id="appIdValue" name="appIdValue" (blur)="captureValue($event, '', 'searchText', 'textbox')"
<input [style.font-size]="fontSize.breadcrumb" dir="{{sitealignment}}" [value]="searchText" type="number" id="appIdValue" name="appIdValue" (blur)="captureValue($event, '', 'searchText', 'textbox')"
placeholder="{{'viewhistory.inputAppId' | translate}}" class="service-input-card" (focus)="captureVirtualKeyboard(search, 0)" #keyboardRef/>
<i matSuffix class="material-icons mat-keyboard-icon" (click)="openKeyboard()">keyboard</i>
</span>
Expand Down
2 changes: 1 addition & 1 deletion resident-ui/src/app/feature/verify/verify/verify.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</mat-button-toggle>
</div>
<div class="uin-login-title-card" for="uin" [style.font-size]="fontSize.paragraph">{{verifyChannelData.uid | translate }}
<mat-icon class="info-icon" #tooltip="matTooltip" [matTooltip]="infoText" matTooltipPosition="below" matTooltipHideDelay="5000" matTooltipClass="left">info</mat-icon>
<mat-icon class="info-icon" #tooltip="matTooltip" [matTooltip]="infoText" matTooltipPosition="below" matTooltipClass="left">info</mat-icon>
</div>
<input [style.font-size]="fontSize.paragraph" id="uidValue" type="text" id="uin" name="uin" (input)="captureValue($event, 'individualId')" (keypress)="isNumberKey($event)"
value={{individualId}} placeholder="{{verifyChannelData.uid | translate}}" style="padding: 6px 10px;"/>
Expand Down
14 changes: 12 additions & 2 deletions resident-ui/src/styles.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,10 +471,20 @@ button{
height: auto;
}

.cdk-global-overlay-wrapper, .cdk-overlay-container{
/*overflow-y: auto;*/
input::-webkit-outer-spin-button,
input::-webkit-inner-spin-button {
-webkit-appearance: none;
margin: 0;
}

input[type=number] {
-moz-appearance: textfield;
}

/* .cdk-global-overlay-wrapper, .cdk-overlay-container{ */
/*overflow-y: auto;*/
/* } */

/* @-moz-document url-prefix() {
.cdk-global-overlay-wrapper {
align-items: baseline !important;
Expand Down
Loading