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-19814] Fixed the issue when user clicks on column sort icon holiday date & status replicates and flickers. #282

Merged
merged 1 commit into from
Feb 20, 2024
Merged

[MOSIP-19814] Fixed the issue when user clicks on column sort icon holiday date & status replicates and flickers. #282

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions admin-ui/src/app/features/masterdata/list-view/list-view.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
[sortData]="sortFilter"
[noDataFlag]="noData"
(sort)="getSortColumn($event)"
class="master-data"
></app-table>
</mat-card>
</ng-container>
Expand Down
1 change: 1 addition & 0 deletions admin-ui/src/app/shared/table/table.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<th
*ngFor="let columnName of displayedColumns; let i = index"
class="mat-header-cell table-header sticky-header"
[ngStyle]="{'width': columnName?.styles?.width ? columnName.styles.width : auto}"
>
<span class="columnName-sort-span"
><span
Expand Down
4 changes: 2 additions & 2 deletions admin-ui/src/app/shared/table/table.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ td.mat-footer-cell:first-child {
padding-left: 20px;
}

th:last-child {
width: 0px;
.master-data th:last-child {
width: 5%;
}

th.mat-header-cell:last-child,
Expand Down
4 changes: 2 additions & 2 deletions admin-ui/src/app/shared/toolbar/toolbar.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
'filter-button-style': button.buttonName.eng === 'Filter'
}"
>
<img [src]="button.imagePath" alt="Button Icon" height="14px" width="14px"/>
<span>{{ button.buttonName[lang]}}</span>
<img [src]="button.imagePath" alt="Button Icon"/>
<span class="button-name">{{ button.buttonName[lang]}}</span>
<span class="filter-placer" *ngIf="button.buttonName.eng === 'Filter' && filtersAppliedFlag">
<i style="font-size: 16px;" class="material-icons">fiber_manual_record</i>
</span>
Expand Down
10 changes: 10 additions & 0 deletions admin-ui/src/app/shared/toolbar/toolbar.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,16 @@
display: flex;
align-items: center;
flex-wrap: wrap;

img {
height: 14px;
width: 14px;
}

.button-name {
display: inline-block;
padding-left: 3px;
}
}
.container {
overflow: auto;
Expand Down
15 changes: 12 additions & 3 deletions admin-ui/src/assets/entity-spec/holiday-data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@
"linkType": "",
"LinkURL": "",
"inputType": "text",
"ismandatory": "true"
"ismandatory": "true",
"styles": {
"width": "55%"
}
},
{
"name": "holidayDesc",
Expand All @@ -158,7 +161,10 @@
"linkType": "",
"LinkURL": "",
"inputType": "calendar",
"ismandatory": "true"
"ismandatory": "true",
"styles": {
"width": "20%"
}
},
{
"name": "locationCode",
Expand Down Expand Up @@ -216,7 +222,10 @@
"linkType": "",
"LinkURL": "",
"inputType": "dropdown",
"ismandatory": "false"
"ismandatory": "false",
"styles": {
"width": "20%"
}
}
],
"paginator": {
Expand Down
Loading