From 53f3962feeabe39a8c47e075b0dc4abb7a25d667 Mon Sep 17 00:00:00 2001 From: MadhuMosip Date: Wed, 12 Jun 2024 18:01:18 +0530 Subject: [PATCH] MOSIP-32892 MOSIP-32855 MOSIP-32809 Signed-off-by: MadhuMosip --- .../center-selection.component.css | 1 + .../trackservicerequest.component.css | 7 ++ .../trackservicerequest.component.html | 1 + .../updatedemographic.component.css | 10 +-- .../updatedemographic.component.html | 72 +++++++++---------- .../updatedemographic.component.ts | 9 ++- 6 files changed, 55 insertions(+), 45 deletions(-) diff --git a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css index e014748f..323a2449 100644 --- a/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css +++ b/resident-ui/src/app/feature/booking/center-selection/center-selection.component.css @@ -332,6 +332,7 @@ input[type="radio"] { margin-top: 38px !important; min-width: 100% !important; margin-left: 15px; + margin-right: 18px; } .pagination{ diff --git a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.css b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.css index 29272e0e..3aae3fb9 100644 --- a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.css +++ b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.css @@ -25,6 +25,7 @@ input { td{ width: 30%; + word-break: break-word; } table { @@ -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; diff --git a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html index 82fad93a..8d57c1e6 100644 --- a/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html +++ b/resident-ui/src/app/feature/uinservices/trackservicerequest/trackservicerequest.component.html @@ -28,6 +28,7 @@ (blur)="captureValue($event)" (focus)="captureVirtualKeyboard(search, 0)" #keyboardRef + type="number" placeholder="{{'trackservicerequest.searchPlaceholder' | translate}}" /> keyboard diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css index e6567202..fe6bc334 100644 --- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css +++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.css @@ -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; @@ -512,7 +507,8 @@ label{ margin-right: 12px; } .contact-update-each-btn-card{ - width: 15%; + width: 13%; + margin-right: 12px; } .contact-lable{ @@ -669,7 +665,7 @@ label{ width: 100%; } .contact-update-each-sub-card{ - width: 100%; + width: 98%; margin-right: 12px; margin-bottom: 12px; } diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html index e07153c6..cb59fa7b 100644 --- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html +++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.html @@ -44,11 +44,11 @@

{{'updatedem - + - + @@ -104,7 +104,7 @@

{{'updatedem - {{field.labelName[langCode][1]}} + {{field.labelName[langCode][1]}} @@ -155,17 +155,17 @@

{{'updatedem -

+

{{field.labelName[eachLang][0]}} / -

+

-

+

{{field.labelName[eachLang][1]}} / -

+

@@ -225,11 +225,11 @@

{{'updatedem - -

+ +

{{field.labelName[eachLang][1]}} / -

+

@@ -280,17 +280,17 @@

{{'updatedem -

+

{{field.labelName[eachLang][0]}} / -

+

-

+

{{field.labelName[eachLang][1]}} / -

+

@@ -353,10 +353,10 @@

{{'updatedem -

+

{{field.labelName[eachLang][1]}} / -

+

@@ -394,13 +394,13 @@

{{'updatedem - + - - +
@@ -547,17 +547,17 @@

{{'updatedem {{'updatedem @@ -630,22 +630,22 @@

{{'updatedem

-

+

{{field.labelName[eachLang][0]}} / -

+

-

+

{{field.labelName[eachLang][1]}} / -

+

-

+

{{field.labelName[eachLang][1]}} / -

+

@@ -715,13 +715,13 @@

{{'updatedem

@@ -778,13 +778,13 @@

{{'updatedem

-

+

{{field.labelName[eachLang][0]}} / -

+

-

+

{{field.labelName[eachLang][1]}} / -

+

- +
-

+

{{field.labelName[eachLang][1]}} / -

+

- +
- + - - +
diff --git a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts index ea3af8ac..bc3d1d7b 100644 --- a/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts +++ b/resident-ui/src/app/feature/uinservices/updatedemographic/updatedemographic.component.ts @@ -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']){ @@ -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){ @@ -1179,6 +1182,8 @@ export class UpdatedemographicComponent implements OnInit, OnDestroy { this.showErrorPopup(response['errors']) } }) + }else{ + this.getPendingDrafts(); } }) return dialogRef;