@annalib/anna-core 24.0.58 → 24.0.59
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.
|
@@ -880,13 +880,13 @@ class AnnaDateTimeFormatService {
|
|
|
880
880
|
return converted;
|
|
881
881
|
}
|
|
882
882
|
getBroadcastWeek(startDate, format = "MM/DD/YYYY") {
|
|
883
|
-
|
|
884
|
-
|
|
885
|
-
|
|
883
|
+
const dayjsDate = dayjs(startDate, format);
|
|
884
|
+
const date = dayjsDate.clone();
|
|
885
|
+
const day = date.day();
|
|
886
886
|
// Find the closest Monday <= the date
|
|
887
|
-
|
|
887
|
+
const start = dayjs(date).subtract((day + 6) % 7, "day");
|
|
888
888
|
// Find the closest Sunday >= the date
|
|
889
|
-
|
|
889
|
+
const end = dayjs(date).add((7 - day) % 7, "day");
|
|
890
890
|
// console.log({weekStart: start , weekEnd: end})
|
|
891
891
|
return { start, end };
|
|
892
892
|
}
|
|
@@ -2136,7 +2136,7 @@ class AnnaFilterService {
|
|
|
2136
2136
|
key === "revisionStartDate" ||
|
|
2137
2137
|
key === "GeneratedOn" ||
|
|
2138
2138
|
key === "Week" ||
|
|
2139
|
-
key
|
|
2139
|
+
key === "ActualWeekStartDate" ||
|
|
2140
2140
|
key === "ViolatedSpotDate" ||
|
|
2141
2141
|
key === "ViolatingSpotDate") {
|
|
2142
2142
|
filteredData = filteredData.filter((obj) => this.isObjectInTheRange(obj, value, key));
|
|
@@ -2150,7 +2150,7 @@ class AnnaFilterService {
|
|
|
2150
2150
|
key === "startTimeForFilter" ||
|
|
2151
2151
|
key === "endTimeForFilter" ||
|
|
2152
2152
|
key === "StartTime" ||
|
|
2153
|
-
key
|
|
2153
|
+
key === "EndTime" ||
|
|
2154
2154
|
key === "start_time_for_filter" ||
|
|
2155
2155
|
key === "end_time_for_filter" ||
|
|
2156
2156
|
key === "time") {
|