@annalib/anna-core 14.6.19 → 14.6.21
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/lib/anna-core-shared-lib/services/anna-filter.service.mjs +18 -2
- package/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +3 -1
- package/fesm2015/annalib-anna-core.mjs +20 -1
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +19 -1
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/lib/anna-core-shared-lib/services/anna-filter.service.d.ts +2 -1
- package/package.json +1 -1
- package/src/lib/anna-common-scss/_business-rule-common.scss +6 -0
|
@@ -1476,8 +1476,24 @@ class AnnaFilterService {
|
|
|
1476
1476
|
}
|
|
1477
1477
|
this.appliedFiltersArray = [...set];
|
|
1478
1478
|
}
|
|
1479
|
-
|
|
1479
|
+
checkIfSortingIsAppliedThenSortTheData(originalData) {
|
|
1480
|
+
if (!this.annaSortService?.columnSortState)
|
|
1481
|
+
return originalData;
|
|
1482
|
+
for (let [key, value] of this.annaSortService.columnSortState.entries()) {
|
|
1483
|
+
if (value == "ASC") {
|
|
1484
|
+
originalData = cloneDeep(this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(true, originalData, key));
|
|
1485
|
+
}
|
|
1486
|
+
else if (value == "DESC") {
|
|
1487
|
+
originalData = cloneDeep(this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(false, originalData, key));
|
|
1488
|
+
}
|
|
1489
|
+
}
|
|
1490
|
+
return originalData;
|
|
1491
|
+
}
|
|
1492
|
+
filterData(originalData, keyToSkip, isLurCsrPage = false) {
|
|
1480
1493
|
let filteredData = [...originalData];
|
|
1494
|
+
if (!isLurCsrPage) {
|
|
1495
|
+
filteredData = this.checkIfSortingIsAppliedThenSortTheData(originalData);
|
|
1496
|
+
}
|
|
1481
1497
|
this.tooltipSelectedMap.forEach((value, key) => {
|
|
1482
1498
|
if (key != keyToSkip) {
|
|
1483
1499
|
if (this.sliderSet.has(key)) {
|
|
@@ -2081,6 +2097,8 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2081
2097
|
this.tooltipRadioTextMap.set("role", "role");
|
|
2082
2098
|
this.tooltipRadioTextMap.set("stationCount", "stationCount");
|
|
2083
2099
|
this.tooltipRadioTextMap.set("stationList", "stationList");
|
|
2100
|
+
this.tooltipRadioTextMap.set("approvedOn", "Approved On");
|
|
2101
|
+
this.tooltipRadioTextMap.set("approvedBy", "Approved By");
|
|
2084
2102
|
this.tooltipRadioTextMap.set("ODImps", "OD IMPS");
|
|
2085
2103
|
this.tooltipRadioTextMap.set("UDImps", "UD IMPS");
|
|
2086
2104
|
this.tooltipRadioTextMap.set("ODGrp", "OD GRP");
|