@annalib/anna-core 5.2.0 → 5.2.1
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 +5 -5
- 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 +7 -5
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +7 -5
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/package.json +1 -1
|
@@ -1283,7 +1283,7 @@ class AnnaFilterService {
|
|
|
1283
1283
|
"userMG"
|
|
1284
1284
|
];
|
|
1285
1285
|
const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date", "startDate", "endDate", "revisionStartDate"];
|
|
1286
|
-
const timeArr = ["StartTimeForFilter", "EndTimeForFilter",
|
|
1286
|
+
const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time",
|
|
1287
1287
|
"start_time_for_filter", "end_time_for_filter", "startEndTimeMulti", "startEndTime"];
|
|
1288
1288
|
this.sliderSet = new Set(sliderArr);
|
|
1289
1289
|
this.calendarSet = new Set(calendarArr);
|
|
@@ -1346,7 +1346,7 @@ class AnnaFilterService {
|
|
|
1346
1346
|
if (this.selectedRadio == "user" && !this.tooltipMap.has("user")) {
|
|
1347
1347
|
isFiltered = cloneDeep(isHierarchialUserFiltered);
|
|
1348
1348
|
}
|
|
1349
|
-
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter"
|
|
1349
|
+
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter" || this.selectedRadio == "time"
|
|
1350
1350
|
|| this.selectedRadio == "start_time_for_filter" || this.selectedRadio == "end_time_for_filter" || this.selectedRadio == "startEndTimeMulti") {
|
|
1351
1351
|
isFiltered = !isEqual(this.initialValueMap.get(this.selectedRadio), this.tooltipSelectedMap.get(this.selectedRadio)) || !this.includeZeroTime || !this.includeMultiTime;
|
|
1352
1352
|
}
|
|
@@ -1412,7 +1412,7 @@ class AnnaFilterService {
|
|
|
1412
1412
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1413
1413
|
}
|
|
1414
1414
|
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter"
|
|
1415
|
-
|| key === "start_time_for_filter" || key === "end_time_for_filter") {
|
|
1415
|
+
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1416
1416
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1417
1417
|
}
|
|
1418
1418
|
else if (key === "startEndTimeMulti" || key == "startEndTime" || key === "TimeBand") {
|
|
@@ -1585,7 +1585,7 @@ class AnnaFilterService {
|
|
|
1585
1585
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1586
1586
|
}
|
|
1587
1587
|
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter"
|
|
1588
|
-
|| key === "start_time_for_filter" || key === "end_time_for_filter") {
|
|
1588
|
+
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1589
1589
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1590
1590
|
}
|
|
1591
1591
|
else if (key === "startEndTimeMulti" || key == "startEndTime" || key === "TimeBand") {
|
|
@@ -2808,7 +2808,9 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
2808
2808
|
if (this.startTimeHourErr || this.startTimeMinErr || this.endTimeHourErr || this.endTimeMinErr) {
|
|
2809
2809
|
return false;
|
|
2810
2810
|
}
|
|
2811
|
-
if (
|
|
2811
|
+
if ((this.showMultiTimeCheckbox && !this.multiTimeCheckboxChecked) &&
|
|
2812
|
+
(this.showZeroTimeCheckbox && !this.zeroTimeCheckboxChecked) &&
|
|
2813
|
+
(this.showEnterTimeCheckbox && !this.enterTimeCheckboxChecked)) {
|
|
2812
2814
|
return false;
|
|
2813
2815
|
}
|
|
2814
2816
|
let timeFormat = "HH:mm:ss";
|