Skip to content

Commit e5453ec

Browse files
authored
Merge pull request #2087 from bcgov/feature/ALCS-2484
Change Condition Index from Letter to Number
2 parents 611ea62 + 0d3a9eb commit e5453ec

File tree

1 file changed

+10
-8
lines changed

1 file changed

+10
-8
lines changed

alcs-frontend/src/app/features/board/dialogs/application-decision-condition-dialog/application-decision-condition-dialog.component.ts

+10-8
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ export class ApplicationDecisionConditionDialogComponent extends CardDialogCompo
4545
isReconsideration: boolean = false;
4646

4747
@ViewChild(MatSort) sort!: MatSort;
48-
dataSource: MatTableDataSource<{ condition: ApplicationDecisionConditionDto; index: string; selected: boolean }> =
48+
dataSource: MatTableDataSource<{ condition: ApplicationDecisionConditionDto; index: number; selected: boolean }> =
4949
new MatTableDataSource();
5050

5151
editColumns: string[] = ['select', 'condition', 'date', 'status'];
@@ -98,13 +98,15 @@ export class ApplicationDecisionConditionDialogComponent extends CardDialogCompo
9898
}
9999

100100
loadTableData(filterSelected: boolean = false) {
101-
const data = this.decision.conditions.map((condition, index) => ({
102-
condition,
103-
index: countToString(index + 1),
104-
selected: this.isConditionSelected(condition),
105-
}));
106-
107-
filterSelected ? (this.dataSource.data = data.filter((item) => item.selected)) : (this.dataSource.data = data);
101+
const data = this.decision.conditions
102+
.filter((condition) => !filterSelected || this.isConditionSelected(condition))
103+
.map((condition, index) => ({
104+
condition,
105+
index: index + 1,
106+
selected: this.isConditionSelected(condition),
107+
}));
108+
109+
this.dataSource.data = data;
108110
}
109111

110112
isConditionSelected(condition: ApplicationDecisionConditionDto): boolean {

0 commit comments

Comments
 (0)