Skip to content

Commit

Permalink
Merge pull request mosip#714 from MadhuMosip/develop
Browse files Browse the repository at this point in the history 
MOSIP-32892 MOSIP-32855 MOSIP-32809
  • Loading branch information
@aranaravi
aranaravi authored Jun 12, 2024
2 parents 58441b6 + 53f3962 commit 4ae1b8e
Show file tree
Hide file tree
Showing 6 changed files with 55 additions and 45 deletions.
1 change: 1 addition & 0 deletions resident-ui/src/app/feature/booking/center-selection/center-selection.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,6 +332,7 @@ input[type="radio"] {
margin-top: 38px !important;
min-width: 100% !important;
margin-left: 15px;
margin-right: 18px;
}

.pagination{
Expand Down
7 changes: 7 additions & 0 deletions ...dent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ input {

td{
width: 30%;
word-break: break-word;
}

table {
Expand Down Expand Up @@ -100,6 +101,12 @@ td {
width: 100% !important;
}

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

@media screen and (max-width:600px){
.mat-card{
padding: 8px;
Expand Down
1 change: 1 addition & 0 deletions ...ent-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
(blur)="captureValue($event)"
(focus)="captureVirtualKeyboard(search, 0)"
#keyboardRef
type="number"
placeholder="{{'trackservicerequest.searchPlaceholder' | translate}}" />
<i style="float: right; color: grey; cursor: pointer;" matSuffix class="material-icons" (click)="openKeyboard()">keyboard</i>
</span>
Expand Down
10 changes: 3 additions & 7 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,11 @@ input.readonly{
width: 85%;
}

label{
font-size: 15px;
}

.mat-tab-group{
margin-top: -20px;
}



.mat-card-header .mat-card-title {
font-size: 13px !important;
margin-left: -12px !important;
Expand Down Expand Up @@ -512,7 +507,8 @@ label{
margin-right: 12px;
}
.contact-update-each-btn-card{
width: 15%;
width: 13%;
margin-right: 12px;
}

.contact-lable{
Expand Down Expand Up @@ -669,7 +665,7 @@ label{
width: 100%;
}
.contact-update-each-sub-card{
width: 100%;
width: 98%;
margin-right: 12px;
margin-bottom: 12px;
}
Expand Down
72 changes: 36 additions & 36 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<!-- number of attems mobile and tab code -->
<tr>
<td class="width-of-input">
<label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label>
<label style="margin: 0 5px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label>
</td>
<td width="3%" class="ele-for-lap-tab-card"></td>
<td class="width-of-input ele-for-lap-tab-card">
<label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}</label>
<label style="margin: 0 5px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}</label>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -104,7 +104,7 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
</tr>
<!-- input field for mobile view -->
<tr>
<td class="ele-for-mob-card"><span [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}</span>
<td class="ele-for-mob-card"><span style="margin: 0 5px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}</span>
</td>
</tr>
<tr>
Expand Down Expand Up @@ -155,17 +155,17 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<!-- number of attems mobile and tab code -->
<tr>
<td class="width-of-input">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 3px 0 2px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][0]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
<td width="3%" class="ele-for-lap-tab-card"></td>
<td class="width-of-input ele-for-lap-tab-card">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 3px 0 -2px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr *ngFor="let item of buildJSONData[field.attributeName], let i = index">
Expand Down Expand Up @@ -225,11 +225,11 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
</tr>
<!-- input field for mobile view -->
<tr>
<td class=" ele-for-mob-card">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<td class="ele-for-mob-card">
<div style="margin: 0 3px 0 -2px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr *ngFor="let item of buildJSONData[field.attributeName]">
Expand Down Expand Up @@ -280,17 +280,17 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<!-- number of attems mobile and tab code -->
<tr>
<td class="width-of-input">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][0]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
<td width="3%" class="ele-for-lap-tab-card"></td>
<td [style.font-size]="fontSize.paragraph" class="width-of-input ele-for-lap-tab-card">
<p style="display: inline;" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr *ngFor="let item of buildJSONData[field.attributeName], let i = index">
Expand Down Expand Up @@ -353,10 +353,10 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<!-- input field for mobile view -->
<tr>
<td class="ele-for-mob-card">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr *ngFor="let item of buildJSONData[field.attributeName]">
Expand Down Expand Up @@ -394,13 +394,13 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<td class="main-table-data">
<table class="file-Upload-card">
<tr>
<td width="100%" colspan="3"><label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label></td>
<td width="100%" colspan="3"><label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label></td>
</tr>
<tr>
<td class="width-of-input"><label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}<span
<td class="width-of-input"><label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}<span
style="color: red;">*</span></label></td>
<td width="3%"></td>
<td class="width-of-input"><label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][2]}}</label></td>
<td class="width-of-input"><label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][2]}}</label></td>
</tr>
<tr>
<td class="width-of-input">
Expand Down Expand Up @@ -547,17 +547,17 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<table width="100%">
<tr>
<td class="width-of-input" >
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][0]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
<td width="3%" class="ele-for-lap-tab-card"></td>
<td class="width-of-input ele-for-lap-tab-card">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr *ngFor="let item of buildJSONData[field.attributeName] let i = index"
Expand Down Expand Up @@ -593,10 +593,10 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<!-- input field for mobile view -->
<tr class="ele-for-mob-card">
<td class="width-of-input">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr class="ele-for-mob-card" *ngFor="let item of buildJSONData[field.attributeName]">
Expand Down Expand Up @@ -630,22 +630,22 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<table width="100%">
<tr *ngIf="typeOf(userInfo[field.attributeName]) !== 'string'">
<td class="width-of-input">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][0]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
<td width="3%" class="ele-for-lap-tab-card"></td>
<td class="width-of-input ele-for-lap-tab-card">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
</tr>
<tr *ngIf="typeOf(userInfo[field.attributeName]) === 'string'">
<td class="width-of-input">
<label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label>
<label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label>
</td>

<td width="3%" class="ele-for-lap-tab-card"></td>
Expand Down Expand Up @@ -715,13 +715,13 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<!-- input field for mobile view -->
<tr class="ele-for-mob-card">
<td class="width-of-input" *ngIf="typeOf(userInfo[field.attributeName]) !== 'string'">
<p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
<div style="margin: 0 2px 0 3px;"><p style="display: inline;" [style.font-size]="fontSize.paragraph" *ngFor="let eachLang of getUserPerfLang; let langI = index">
{{field.labelName[eachLang][1]}}
<span style="margin-left: -3px;" *ngIf="langI < getUserPerfLang?.length - 1">/</span>
</p>
</p></div>
</td>
<td class="width-of-input" *ngIf="typeOf(userInfo[field.attributeName]) === 'string'">
<label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}</label>
<label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}</label>
</td>
</tr>
<tr *ngIf="typeOf(userInfo[field.attributeName]) !== 'string'">
Expand Down Expand Up @@ -778,13 +778,13 @@ <h3 [style.font-size]="fontSize.headingForUIN" class="tab-headings">{{'updatedem
<td class="main-table-data" width="100%">
<table>
<tr>
<td width="100%" colspan="3"><label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label></td>
<td width="100%" colspan="3"><label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][0]}}</label></td>
</tr>
<tr>
<td class="width-of-input"><label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}<span
<td class="width-of-input"><label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][1]}}<span
style="color: red;">*</span></label></td>
<td width="3%"></td>
<td class="width-of-input"><label [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][2]}}</label></td>
<td class="width-of-input"><label style="margin: 0 2px 0 3px;" [style.font-size]="fontSize.paragraph">{{field.labelName[langCode][2]}}</label></td>
</tr>
<tr>
<td class="width-of-input">
Expand Down
9 changes: 7 additions & 2 deletions resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,10 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
this.autoLogout.continueWatching();
}

this.getPendingDrafts();
};

getPendingDrafts(){
this.dataStorageService.getPendingDrafts(this.langCode).subscribe((response) =>{
this.getUpdateMyDataSchema();
if(response['response']){
Expand All @@ -200,12 +204,11 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
this.cancellable = true;
this.draftsDetails = response['response'].drafts;
}

}else{
this.showErrorPopup(response['errors']);
};
})
};
}

isUpdatedataInProgress(event, fieldType) {
if(this.cancellable){
Expand Down Expand Up @@ -1179,6 +1182,8 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy {
this.showErrorPopup(response['errors'])
}
})
}else{
this.getPendingDrafts();
}
})
return dialogRef;
Expand Down

0 comments on commit 4ae1b8e

Please sign in to comment.