Skip to content

pull request for paginator control buttons #31

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

Merged
MuralitharanK merged 3 commits into from
May 29, 2026
Merged

pull request for paginator control buttons #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
045ef3a
Updated UI for pagination and pages handle
Vishal05-dev May 28, 2026
40efe08
Updated paginator control buttons
Vishal05-dev May 29, 2026
18fe7ff
Merge branch 'iiitb-pilot:mec-dev-1.2.0.1' into mec-dev-1.2.0.1
Vishal05-dev May 29, 2026
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 admin-ui/src/app/core/services/data-storage.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ export class DataStorageService {

getlostridDetails(request: RequestModel): Observable<any> {
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);
Expand Down
182 changes: 61 additions & 121 deletions admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,148 +1,83 @@
<ng-container>
<span
><h3 class="header">{{ "lostRID.titleTxt" | translate }}</h3></span
>
<span>
<h3 class="header">{{ "lostRID.titleTxt" | translate }}</h3>
</span>
<div id="flex-single-view" style="padding-top: 12px; padding-bottom: 10px">
<div id="flex-container">
<div
id="myDiv"
class="flex-body"
*ngIf="displayedColumns && actionEllipsis"
>
<div id="myDiv" class="flex-body" *ngIf="displayedColumns && actionEllipsis">
<mat-card *ngIf="filterColumns">
<div class="example-container">
<span
><h3 class="header">
<span>
<h3 class="header">
{{ "lostRID.subtitleenrollment" | translate }}
</h3></span
>
<div
*ngFor="let field of filterColumns; let i = index"
style="display: inline-flex"
>
<mat-form-field
*ngIf="
</h3>
</span>
<div *ngFor="let field of filterColumns; let i = index" style="display: inline-flex">
<mat-form-field *ngIf="
field.dropdown === 'false' && field.datePicker !== 'true'
"
style="padding: 10px; width: 255px"
>
<input
#{{field.filtername}}
id="{{ field.filtername }}"
(blur)="captureValue($event, field.filtername)"
matInput
placeholder="{{ field.filterlabel[primaryLang] | translate }}"
required="{{ field.ismandatory }}"
[value]="fieldNameList[field.filtername]"
/>
" style="padding: 10px; width: 255px">
<input #{{field.filtername}} id="{{ field.filtername }}" (blur)="captureValue($event, field.filtername)"
matInput placeholder="{{ field.filterlabel[primaryLang] | translate }}"
required="{{ field.ismandatory }}" [value]="fieldNameList[field.filtername]" />
</mat-form-field>

<mat-form-field
*ngIf="field.dropdown !== 'true' && field.datePicker === 'true'"
style="padding: 10px; width: 255px"
>
<input
matInput
[matDatepicker]="picker"
placeholder="{{ field.filterlabel[primaryLang] | translate }}"
id="{{ field.filtername }}"
(dateChange)="
<mat-form-field *ngIf="field.dropdown !== 'true' && field.datePicker === 'true'"
style="padding: 10px; width: 255px">
<input matInput [matDatepicker]="picker" placeholder="{{ field.filterlabel[primaryLang] | translate }}"
id="{{ field.filtername }}" (dateChange)="
captureDatePickerValue($event, field.filtername)
"
required="{{ field.ismandatory }}"
[value]="fieldNameList[field.filtername]"
/>
<mat-datepicker-toggle
matSuffix
[for]="picker"
></mat-datepicker-toggle>
" required="{{ field.ismandatory }}" [value]="fieldNameList[field.filtername]" />
<mat-datepicker-toggle matSuffix [for]="picker"></mat-datepicker-toggle>
<mat-datepicker #picker></mat-datepicker>
</mat-form-field>
</div>
<span
><h3 class="header">
<span>
<h3 class="header">
{{ "lostRID.subtitlelocation" | translate }}
</h3></span
>
<div
*ngFor="let field of filterColumns; let i = index"
style="display: inline-flex"
>
<mat-form-field
*ngIf="
</h3>
</span>
<div *ngFor="let field of filterColumns; let i = index" style="display: inline-flex">
<mat-form-field *ngIf="
field.dropdown === 'true' &&
field.datePicker !== 'true' &&
dynamicDropDown[field.filtername] &&
field.filtername !== 'centerId'
"
style="padding: 10px; width: 255px"
>
<mat-select
id="{{ field.filtername }}"
required="{{ field.ismandatory }}"
" style="padding: 10px; width: 255px">
<mat-select id="{{ field.filtername }}" required="{{ field.ismandatory }}"
placeholder="{{ field.filterlabel[primaryLang] | translate }}"
[value]="fieldNameList[field.filtername]"
>
<mat-option
*ngFor="let data of dynamicDropDown[field.filtername]"
(onSelectionChange)="
[value]="fieldNameList[field.filtername]">
<mat-option *ngFor="let data of dynamicDropDown[field.filtername]" (onSelectionChange)="
captureDropDownValue($event, field.filtername)
"
[value]="data.fieldValue"
>
" [value]="data.fieldValue">
{{ data.fieldValue }}
</mat-option>
</mat-select>
</mat-form-field>
<mat-form-field
*ngIf="
<mat-form-field *ngIf="
field.dropdown === 'true' &&
field.datePicker !== 'true' &&
field.filtername === 'centerId'
"
style="padding: 10px; width: 255px"
>
<mat-select
id="{{ field.filtername }}"
required="{{ field.ismandatory }}"
" style="padding: 10px; width: 255px">
<mat-select id="{{ field.filtername }}" required="{{ field.ismandatory }}"
placeholder="{{ field.filterlabel[primaryLang] | translate }}"
[value]="fieldNameList[field.filtername]"
>
<mat-option
*ngFor="let data of dynamicDropDown[field.filtername]"
(onSelectionChange)="
[value]="fieldNameList[field.filtername]">
<mat-option *ngFor="let data of dynamicDropDown[field.filtername]" (onSelectionChange)="
captureDropDownValue($event, field.filtername)
"
[value]="data.fieldCode"
>
" [value]="data.fieldCode">
{{ data.fieldValue }} ({{ data.fieldCode }})
</mat-option>
</mat-select>
</mat-form-field>
</div>

<button
mat-raised-button
class="footer-button"
(click)="resetForm()"
style="color: #ff4081; background-color: white"
id="reset"
>
{{ "lostRID.clearbtn" | translate }}</button
>&nbsp;&nbsp;&nbsp;&nbsp;
<button
mat-raised-button
type="submit"
mat-button
class="footer-button"
(click)="submit()"
style="
<button mat-raised-button class="footer-button" (click)="resetForm()"
style="color: #ff4081; background-color: white" id="reset">
{{ "lostRID.clearbtn" | translate }}</button>&nbsp;&nbsp;&nbsp;&nbsp;
<button mat-raised-button type="submit" mat-button class="footer-button" (click)="submit()" style="
background-color: #ff4081;
color: white;
width: 90px !important;
"
id="applyTxt"
>
" id="applyTxt">
{{ "lostRID.searchbtn" | translate }}
</button>
</div>
Expand All @@ -151,7 +86,7 @@
</div>
</div>
<ng-container>
<mat-card class="mat-elevation-z5" *ngIf="dataSource.length > 0">
<mat-card class="mat-elevation-z5" *ngIf="paginatedData.length > 0">
<!-- <app-table
*ngIf="datas && displayedColumns && actionButtons"
[data]="datas"
Expand All @@ -162,12 +97,7 @@
(sort)="getSortColumn($event)"
></app-table> -->

<table
mat-table
*ngIf="dataSource.length > 0"
[dataSource]="dataSource"
class="tableMain"
>
<table mat-table *ngIf="paginatedData.length > 0" [dataSource]="paginatedData" class="tableMain">
<!-- ID Column -->
<ng-container matColumnDef="id">
<th mat-header-cell *matHeaderCellDef>AID</th>
Expand All @@ -187,12 +117,7 @@
<ng-container matColumnDef="action">
<th mat-header-cell *matHeaderCellDef>Action</th>
<td mat-cell *matCellDef="let element; let i = index">
<button
mat-icon-button
color="primary"
[disabled]="actionButton"
(click)="fetchLostRidDetails(element, i)"
>
<button mat-icon-button color="primary" [disabled]="actionButton" (click)="fetchLostRidDetails(element, i)">
<mat-icon>remove_red_eye</mat-icon>
</button>
</td>
Expand All @@ -201,6 +126,21 @@
<tr mat-header-row *matHeaderRowDef="displayedColumns1"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns1"></tr>
</table>

<!-- Pagination -->

<div class="paginator-wrapper">
<span style="flex: 1 1 auto;"></span>
<span class="paginator-custom-label">Items per page</span>
<mat-paginator
[length]="totalRecords"
[pageSize]="pageSize"
[pageSizeOptions]="[5, 10, 25, 50]"
showFirstLastButtons="true"
[pageIndex]="pageIndex"
(page)="handlePageEvent($event)">
</mat-paginator>
</div>
<!-- <table *ngFor="let data of datas; let i = index">
<tr>
<td>{{data.registrationId}}</td>
Expand All @@ -209,4 +149,4 @@
</table> -->
</mat-card>
</ng-container>
</ng-container>
</ng-container>
74 changes: 74 additions & 0 deletions admin-ui/src/app/features/lost-rid-status/lost-rid-status/lost-rid-status.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,3 +141,77 @@ h3 {
.padding{
padding-left: 16px !important;
}

.paginator-wrapper {
display: flex;
align-items: center;
flex-wrap: wrap;
background: white;
height: 4.5em;
border: 1px solid rgba(0,0,0,0.12);
border-top: none;
padding: 0 8px;
}

.paginator-custom-label {
margin: 0 10px;
font-size: 9.5px;
color: #3b4141;
white-space: nowrap;
}

:host ::ng-deep .paginator-wrapper .mat-paginator-container {
min-height: 50px;
padding: 0 8px;
justify-content: flex-start;
flex-wrap: nowrap;
}

:host ::ng-deep .paginator-wrapper .mat-paginator-page-size-label {
display: none;
}

:host ::ng-deep .paginator-wrapper .mat-paginator-range-label {
margin: 0 20px;
font-size: 10px !important;
color: #3b4141;
white-space: nowrap;
}

:host ::ng-deep .paginator-wrapper .mat-paginator-page-size {
align-items: center;
}

:host ::ng-deep .paginator-wrapper .mat-form-field-appearance-legacy .mat-form-field-infix {
border: 0.9px solid #b5b7b7;
height: 25px;
padding: 0.3em 0;
}

:host ::ng-deep .paginator-wrapper .mat-form-field-appearance-legacy .mat-form-field-underline {
background-color: transparent;
}

:host ::ng-deep .paginator-wrapper .mat-paginator-page-size-select {
width: 50px !important;
}

:host ::ng-deep .paginator-wrapper .mat-select-value {
font-size: 9.5px !important;
color: #3b4141;
padding-left: 10px;
}

:host ::ng-deep .paginator-wrapper .mat-icon-button {
height: 25px !important;
width: 28px !important;
border-radius: 0 !important;
line-height: 25px;
border: 0.9px solid #b5b7b7 !important;
padding: 0 !important;
}

:host ::ng-deep .paginator-wrapper .mat-paginator-icon {
width: 18px;
fill: #3b4141;
}
Loading
Loading