@annalib/anna-core 14.6.5 → 14.6.6
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.
|
@@ -1353,7 +1353,7 @@ class AnnaFilterService {
|
|
|
1353
1353
|
];
|
|
1354
1354
|
const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date",
|
|
1355
1355
|
"startDate", "endDate", "revisionStartDate", "GeneratedOn", "Week", "timeoutDate"];
|
|
1356
|
-
const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time",
|
|
1356
|
+
const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time", "startTimeForFilter", "endTimeForFilter",
|
|
1357
1357
|
"start_time_for_filter", "end_time_for_filter", "startEndTimeMulti", "startEndTime", "timeoutTime"];
|
|
1358
1358
|
this.sliderSet = new Set(sliderArr);
|
|
1359
1359
|
this.calendarSet = new Set(calendarArr);
|
|
@@ -1417,7 +1417,9 @@ class AnnaFilterService {
|
|
|
1417
1417
|
if (this.selectedRadio == "user" && !this.tooltipMap.has("user")) {
|
|
1418
1418
|
isFiltered = cloneDeep(isHierarchialUserFiltered);
|
|
1419
1419
|
}
|
|
1420
|
-
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter" ||
|
|
1420
|
+
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter" ||
|
|
1421
|
+
this.selectedRadio == "startTimeForFilter" || this.selectedRadio == "endTimeForFilter" ||
|
|
1422
|
+
this.selectedRadio == "time" || this.selectedRadio == "timeoutTime"
|
|
1421
1423
|
|| this.selectedRadio == "start_time_for_filter" || this.selectedRadio == "end_time_for_filter" || this.selectedRadio == "startEndTimeMulti") {
|
|
1422
1424
|
isFiltered = !isEqual(this.initialValueMap.get(this.selectedRadio), this.tooltipSelectedMap.get(this.selectedRadio)) || !this.includeZeroTime || !this.includeMultiTime;
|
|
1423
1425
|
}
|
|
@@ -1485,7 +1487,8 @@ class AnnaFilterService {
|
|
|
1485
1487
|
else if (key === "period") {
|
|
1486
1488
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1487
1489
|
}
|
|
1488
|
-
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime"
|
|
1490
|
+
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime" ||
|
|
1491
|
+
key === "startTimeForFilter" || key === "endTimeForFilter"
|
|
1489
1492
|
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1490
1493
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1491
1494
|
}
|
|
@@ -1659,7 +1662,7 @@ class AnnaFilterService {
|
|
|
1659
1662
|
else if (key === "period") {
|
|
1660
1663
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1661
1664
|
}
|
|
1662
|
-
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime"
|
|
1665
|
+
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime" || key === "startTimeForFilter" || key === "endTimeForFilter"
|
|
1663
1666
|
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1664
1667
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1665
1668
|
}
|