From 045ef3a8467d4f0db46617c21bf4b679ed572291 Mon Sep 17 00:00:00 2001 From: Vishal05-dev Date: Thu, 28 May 2026 11:47:08 +0530 Subject: [PATCH 1/2] Updated UI for pagination and pages handle --- .../app/core/services/data-storage.service.ts | 2 +- .../lost-rid-status.component.html | 170 ++++++------------ .../lost-rid-status.component.scss | 64 +++++++ .../lost-rid-status.component.ts | 66 ++++--- 4 files changed, 152 insertions(+), 150 deletions(-) diff --git a/admin-ui/src/app/core/services/data-storage.service.ts b/admin-ui/src/app/core/services/data-storage.service.ts index 12b7dba3..f8c50b31 100644 --- a/admin-ui/src/app/core/services/data-storage.service.ts +++ b/admin-ui/src/app/core/services/data-storage.service.ts @@ -192,7 +192,7 @@ export class DataStorageService { getlostridDetails(request: RequestModel): Observable { delete request['request']['languageCode']; - delete request['request']['pagination']; + // delete request['request']['pagination']; //request['request']['filters'].push({"columnName": "registrationDate", "fromValue": "2021-11-01", "toValue": "2021-11-17", "type": "between", "value": ""}); //request['request']['filters'].push({"columnName": "name", "type": "equals", "value": "MOSIP-17076"}); return this.http.post(this.BASE_URL + appConstants.URL["lost-rid-status"], request); diff --git a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html index bf6d8e7c..4e75d439 100644 --- a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html +++ b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html @@ -1,148 +1,83 @@ -

{{ "lostRID.titleTxt" | translate }}

+ +

{{ "lostRID.titleTxt" | translate }}

+
-
+
-

+ +

{{ "lostRID.subtitleenrollment" | translate }} -

-
- + - + " style="padding: 10px; width: 255px"> + - - + - + " required="{{ field.ismandatory }}" [value]="fieldNameList[field.filtername]" /> +
-

+ +

{{ "lostRID.subtitlelocation" | translate }} -

-
- + - + - + + " [value]="data.fieldValue"> {{ data.fieldValue }} - - + - + + " [value]="data.fieldCode"> {{ data.fieldValue }} ({{ data.fieldCode }})
-      -      +

@@ -162,12 +97,7 @@ (sort)="getSortColumn($event)" > --> - +
@@ -187,12 +117,7 @@ @@ -201,6 +126,11 @@
AIDAction -
+ + + +
- + \ No newline at end of file diff --git a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.scss b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.scss index 3dfd3a25..0f43a807 100644 --- a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.scss +++ b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.scss @@ -141,3 +141,67 @@ h3 { .padding{ padding-left: 16px !important; } + +$paginator-accent: #ff4081; +$paginator-disabled-bg: #e0e0e0; +$paginator-disabled-icon: #9e9e9e; +$paginator-border: #e0e0e0; +$paginator-text: #444; +$paginator-btn-size: 28px; +$paginator-icon-size: 18px; + +@mixin nav-btn-state($bg, $icon-fill, $opacity: 1) { + background-color: $bg !important; + opacity: $opacity !important; + + .mat-paginator-icon { + fill: $icon-fill !important; + } +} + +::ng-deep { + .mat-paginator { + background: #fff; + border-top: 1px solid $paginator-border; + padding: 8px 12px; + border-radius: 6px; + } + + .mat-paginator-navigation-first, + .mat-paginator-navigation-previous, + .mat-paginator-navigation-next, + .mat-paginator-navigation-last { + width: $paginator-btn-size !important; + height: $paginator-btn-size !important; + line-height: $paginator-btn-size !important; + min-width: $paginator-btn-size !important; + padding: 0 !important; + border-radius: 4px !important; + margin: 0 2px; + + .mat-paginator-icon { + width: $paginator-icon-size !important; + } + + &:not([disabled]) { + @include nav-btn-state($paginator-accent, white); + } + + &[disabled] { + @include nav-btn-state($paginator-disabled-bg, $paginator-disabled-icon, 0.5); + } + } + + .mat-paginator-range-label { + margin: 0 16px; + font-size: 14px; + font-weight: 500; + color: $paginator-text; + min-width: 95px; + text-align: center; + } + + .mat-paginator-page-size-select { + margin: 0 8px; + } +} \ No newline at end of file diff --git a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.ts b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.ts index 2e4f1f72..37f5f839 100644 --- a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.ts +++ b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.ts @@ -67,8 +67,13 @@ export class LostRidStatusComponent implements OnInit { locCode = 0; displayedColumns1: string[] = ["id", "registrationDate", "action"]; isTableMain = true; - lostRidRoles=[]; - actionButton =true; + lostRidRoles = []; + actionButton = true; + + pageSize = 10; + pageIndex = 0; + totalRecords = 0; + paginatedData = []; constructor( @@ -265,18 +270,18 @@ export class LostRidStatusComponent implements OnInit { } submit() { - let count=0; - this.lostRidRoles =this.headerService.getRoles().split(',') - for(let i=0;i 0) this.dataStroageService @@ -381,13 +386,12 @@ export class LostRidStatusComponent implements OnInit { this.paginatorOptions.pageIndex = 0; this.paginatorOptions.pageSize = 0; if (response.data.length) { - this.dataSource = [...response.data]; - console.log("dataSource",this.dataSource); - - this.datas = [...response.data]; - this.datas.forEach((element, index) => { - this.datas[index]["name"] = element.additionalInfo.name; - }); + this.totalRecords = response.totalRecord; + this.paginatedData = response.data.map((element) => ({ + ...element, + registrationDate: element.registartionDate, + name: element.additionalInfo && element.additionalInfo.name ? element.additionalInfo.name : '', + })); this.showTable = true; } else { this.noData = true; @@ -433,7 +437,7 @@ export class LostRidStatusComponent implements OnInit { .subscribe( (response: any) => { const lostData = response.response.lostRidDataMap; - this.openDialog(lostData, this.dataSource, index); + this.openDialog(lostData, this.paginatedData, index); }, (error: any) => { console.error("Error fetching details", error); @@ -450,7 +454,11 @@ export class LostRidStatusComponent implements OnInit { }); } - + handlePageEvent(event: PageEvent) { + this.pageSize = event.pageSize; + this.pageIndex = event.pageIndex; + this.getlostridDetails(); + } ngOnDestroy() { this.subscribed.unsubscribe(); From 40efe083379207858d7f1f9e1ab8ed10dc6c89d9 Mon Sep 17 00:00:00 2001 From: Vishal05-dev Date: Fri, 29 May 2026 12:38:07 +0530 Subject: [PATCH 2/2] Updated paginator control buttons --- .../lost-rid-status.component.html | 16 ++- .../lost-rid-status.component.scss | 124 ++++++++++-------- 2 files changed, 80 insertions(+), 60 deletions(-) diff --git a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html index 4e75d439..adc08c27 100644 --- a/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html +++ b/admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html @@ -86,7 +86,7 @@

- + - +
+ + Items per page + + +