@annalib/anna-core 5.2.0 → 5.2.2
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 +6 -6
- package/esm2020/lib/anna-generic-table-lib/components/anna-non-editable-generic-table/anna-non-editable-generic-table.component.mjs +4 -2
- package/fesm2015/annalib-anna-core.mjs +8 -6
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +8 -6
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1281,7 +1281,7 @@ class AnnaFilterService {
|
|
|
1281
1281
|
"userMG"
|
|
1282
1282
|
];
|
|
1283
1283
|
const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date", "startDate", "endDate", "revisionStartDate"];
|
|
1284
|
-
const timeArr = ["StartTimeForFilter", "EndTimeForFilter",
|
|
1284
|
+
const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time",
|
|
1285
1285
|
"start_time_for_filter", "end_time_for_filter", "startEndTimeMulti", "startEndTime"];
|
|
1286
1286
|
this.sliderSet = new Set(sliderArr);
|
|
1287
1287
|
this.calendarSet = new Set(calendarArr);
|
|
@@ -1303,7 +1303,7 @@ class AnnaFilterService {
|
|
|
1303
1303
|
isTooltipActive(header, sortMap) {
|
|
1304
1304
|
let set = new Set(this.appliedFiltersArray);
|
|
1305
1305
|
if (header.length == 1) {
|
|
1306
|
-
return ((sortMap.size > 0 && sortMap.get(header[0]) != "DEFAULT") || set.has(header[0]));
|
|
1306
|
+
return ((sortMap.size > 0 && sortMap.has(header[0]) && sortMap.get(header[0]) != "DEFAULT") || set.has(header[0]));
|
|
1307
1307
|
}
|
|
1308
1308
|
// return ( (sortMap.size > 0 && sortMap.get(header[0]) != "DEFAULT") || (sortMap.size > 0 && sortMap.get(header[1]) != "DEFAULT") || set.has(header[0]) || set.has(header[1]));
|
|
1309
1309
|
return ((sortMap.size > 0 && sortMap.has(header[0]) && sortMap.get(header[0]) != "DEFAULT") || (sortMap.size > 0 && sortMap.has(header[1]) && sortMap.get(header[1]) != "DEFAULT") || set.has(header[0]) || set.has(header[1]));
|
|
@@ -1344,7 +1344,7 @@ class AnnaFilterService {
|
|
|
1344
1344
|
if (this.selectedRadio == "user" && !this.tooltipMap.has("user")) {
|
|
1345
1345
|
isFiltered = cloneDeep(isHierarchialUserFiltered);
|
|
1346
1346
|
}
|
|
1347
|
-
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter"
|
|
1347
|
+
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter" || this.selectedRadio == "time"
|
|
1348
1348
|
|| this.selectedRadio == "start_time_for_filter" || this.selectedRadio == "end_time_for_filter" || this.selectedRadio == "startEndTimeMulti") {
|
|
1349
1349
|
isFiltered = !isEqual(this.initialValueMap.get(this.selectedRadio), this.tooltipSelectedMap.get(this.selectedRadio)) || !this.includeZeroTime || !this.includeMultiTime;
|
|
1350
1350
|
}
|
|
@@ -1410,7 +1410,7 @@ class AnnaFilterService {
|
|
|
1410
1410
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1411
1411
|
}
|
|
1412
1412
|
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter"
|
|
1413
|
-
|| key === "start_time_for_filter" || key === "end_time_for_filter") {
|
|
1413
|
+
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1414
1414
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1415
1415
|
}
|
|
1416
1416
|
else if (key === "startEndTimeMulti" || key == "startEndTime" || key === "TimeBand") {
|
|
@@ -1583,7 +1583,7 @@ class AnnaFilterService {
|
|
|
1583
1583
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1584
1584
|
}
|
|
1585
1585
|
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter"
|
|
1586
|
-
|| key === "start_time_for_filter" || key === "end_time_for_filter") {
|
|
1586
|
+
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1587
1587
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1588
1588
|
}
|
|
1589
1589
|
else if (key === "startEndTimeMulti" || key == "startEndTime" || key === "TimeBand") {
|
|
@@ -2806,7 +2806,9 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2806
2806
|
if (this.startTimeHourErr || this.startTimeMinErr || this.endTimeHourErr || this.endTimeMinErr) {
|
|
2807
2807
|
return false;
|
|
2808
2808
|
}
|
|
2809
|
-
if (
|
|
2809
|
+
if ((this.showMultiTimeCheckbox && !this.multiTimeCheckboxChecked) &&
|
|
2810
|
+
(this.showZeroTimeCheckbox && !this.zeroTimeCheckboxChecked) &&
|
|
2811
|
+
(this.showEnterTimeCheckbox && !this.enterTimeCheckboxChecked)) {
|
|
2810
2812
|
return false;
|
|
2811
2813
|
}
|
|
2812
2814
|
let timeFormat = "HH:mm:ss";
|