@annalib/anna-core 14.6.4 → 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.
- package/esm2020/lib/anna-core-shared-lib/models/anna-global-dropdown-config.model.mjs +1 -1
- package/esm2020/lib/anna-core-shared-lib/services/anna-filter.service.mjs +8 -5
- 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 +9 -4
- package/fesm2015/annalib-anna-core.mjs.map +1 -1
- package/fesm2020/annalib-anna-core.mjs +9 -4
- package/fesm2020/annalib-anna-core.mjs.map +1 -1
- package/lib/anna-core-shared-lib/models/anna-global-dropdown-config.model.d.ts +1 -0
- package/package.json +1 -1
|
@@ -1363,7 +1363,7 @@ class AnnaFilterService {
|
|
|
1363
1363
|
];
|
|
1364
1364
|
const calendarArr = ["period", "AirDate", "flightStartDate", "flightEndDate", "date",
|
|
1365
1365
|
"startDate", "endDate", "revisionStartDate", "GeneratedOn", "Week", "timeoutDate"];
|
|
1366
|
-
const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time",
|
|
1366
|
+
const timeArr = ["StartTimeForFilter", "EndTimeForFilter", "time", "startTimeForFilter", "endTimeForFilter",
|
|
1367
1367
|
"start_time_for_filter", "end_time_for_filter", "startEndTimeMulti", "startEndTime", "timeoutTime"];
|
|
1368
1368
|
this.sliderSet = new Set(sliderArr);
|
|
1369
1369
|
this.calendarSet = new Set(calendarArr);
|
|
@@ -1427,7 +1427,9 @@ class AnnaFilterService {
|
|
|
1427
1427
|
if (this.selectedRadio == "user" && !this.tooltipMap.has("user")) {
|
|
1428
1428
|
isFiltered = cloneDeep(isHierarchialUserFiltered);
|
|
1429
1429
|
}
|
|
1430
|
-
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter" ||
|
|
1430
|
+
else if (this.selectedRadio == "StartTimeForFilter" || this.selectedRadio == "EndTimeForFilter" ||
|
|
1431
|
+
this.selectedRadio == "startTimeForFilter" || this.selectedRadio == "endTimeForFilter" ||
|
|
1432
|
+
this.selectedRadio == "time" || this.selectedRadio == "timeoutTime"
|
|
1431
1433
|
|| this.selectedRadio == "start_time_for_filter" || this.selectedRadio == "end_time_for_filter" || this.selectedRadio == "startEndTimeMulti") {
|
|
1432
1434
|
isFiltered = !isEqual(this.initialValueMap.get(this.selectedRadio), this.tooltipSelectedMap.get(this.selectedRadio)) || !this.includeZeroTime || !this.includeMultiTime;
|
|
1433
1435
|
}
|
|
@@ -1495,7 +1497,8 @@ class AnnaFilterService {
|
|
|
1495
1497
|
else if (key === "period") {
|
|
1496
1498
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1497
1499
|
}
|
|
1498
|
-
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime"
|
|
1500
|
+
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime" ||
|
|
1501
|
+
key === "startTimeForFilter" || key === "endTimeForFilter"
|
|
1499
1502
|
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1500
1503
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1501
1504
|
}
|
|
@@ -1669,7 +1672,7 @@ class AnnaFilterService {
|
|
|
1669
1672
|
else if (key === "period") {
|
|
1670
1673
|
filteredData = filteredData.filter((obj) => this.getDataInTheDateRange(obj, value, key));
|
|
1671
1674
|
}
|
|
1672
|
-
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime"
|
|
1675
|
+
else if (key === "StartTimeForFilter" || key === "EndTimeForFilter" || key == "timeoutTime" || key === "startTimeForFilter" || key === "endTimeForFilter"
|
|
1673
1676
|
|| key === "start_time_for_filter" || key === "end_time_for_filter" || key == "time") {
|
|
1674
1677
|
filteredData = filteredData.filter((obj) => this.returnDataForFromAndToTimeRange(obj, value, key));
|
|
1675
1678
|
}
|
|
@@ -1981,6 +1984,8 @@ class AnnaNonEditableGenericTableComponent {
|
|
|
1981
1984
|
this.tooltipRadioTextMap = new Map();
|
|
1982
1985
|
this.tooltipRadioTextMap.set("StartTimeForFilter", "Start Time");
|
|
1983
1986
|
this.tooltipRadioTextMap.set("EndTimeForFilter", "End Time");
|
|
1987
|
+
this.tooltipRadioTextMap.set("startTimeForFilter", "Start Time");
|
|
1988
|
+
this.tooltipRadioTextMap.set("endTimeForFilter", "End Time");
|
|
1984
1989
|
this.tooltipRadioTextMap.set("start_time_for_filter", "Start Time");
|
|
1985
1990
|
this.tooltipRadioTextMap.set("end_time_for_filter", "End Time");
|
|
1986
1991
|
this.tooltipRadioTextMap.set("primaryAEName", "Primary AE");
|