@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
|
@@ -1486,8 +1486,25 @@ class AnnaFilterService {
|
|
|
1486
1486
|
}
|
|
1487
1487
|
this.appliedFiltersArray = [...set];
|
|
1488
1488
|
}
|
|
1489
|
-
|
|
1489
|
+
checkIfSortingIsAppliedThenSortTheData(originalData) {
|
|
1490
|
+
var _a;
|
|
1491
|
+
if (!((_a = this.annaSortService) === null || _a === void 0 ? void 0 : _a.columnSortState))
|
|
1492
|
+
return originalData;
|
|
1493
|
+
for (let [key, value] of this.annaSortService.columnSortState.entries()) {
|
|
1494
|
+
if (value == "ASC") {
|
|
1495
|
+
originalData = cloneDeep(this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(true, originalData, key));
|
|
1496
|
+
}
|
|
1497
|
+
else if (value == "DESC") {
|
|
1498
|
+
originalData = cloneDeep(this.annaSortService.sortDataForComponentOtherThanLurAndCsrPage(false, originalData, key));
|
|
1499
|
+
}
|
|
1500
|
+
}
|
|
1501
|
+
return originalData;
|
|
1502
|
+
}
|
|
1503
|
+
filterData(originalData, keyToSkip, isLurCsrPage = false) {
|
|
1490
1504
|
let filteredData = [...originalData];
|
|
1505
|
+
if (!isLurCsrPage) {
|
|
1506
|
+
filteredData = this.checkIfSortingIsAppliedThenSortTheData(originalData);
|
|
1507
|
+
}
|
|
1491
1508
|
this.tooltipSelectedMap.forEach((value, key) => {
|
|
1492
1509
|
if (key != keyToSkip) {
|
|
1493
1510
|
if (this.sliderSet.has(key)) {
|
|
@@ -2083,6 +2100,8 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2083
2100
|
this.tooltipRadioTextMap.set("role", "role");
|
|
2084
2101
|
this.tooltipRadioTextMap.set("stationCount", "stationCount");
|
|
2085
2102
|
this.tooltipRadioTextMap.set("stationList", "stationList");
|
|
2103
|
+
this.tooltipRadioTextMap.set("approvedOn", "Approved On");
|
|
2104
|
+
this.tooltipRadioTextMap.set("approvedBy", "Approved By");
|
|
2086
2105
|
this.tooltipRadioTextMap.set("ODImps", "OD IMPS");
|
|
2087
2106
|
this.tooltipRadioTextMap.set("UDImps", "UD IMPS");
|
|
2088
2107
|
this.tooltipRadioTextMap.set("ODGrp", "OD GRP");
|