@@ -180,13 +398,12 @@ const Reporting = () => {
@@ -200,4 +417,17 @@ const Reporting = () => {
)
}
-export default Reporting
\ No newline at end of file
+export default Reporting
+
+/**
+ * Get the ISO week number of a date.
+ * @param {Date} date - The date to get the week number for.
+ * @returns {number} The ISO week number.
+ */
+const getWeekNumber = (date) => {
+ const tempDate = new Date(date.getTime());
+ tempDate.setHours(0, 0, 0, 0);
+ tempDate.setDate(tempDate.getDate() + 3 - ((tempDate.getDay() + 6) % 7));
+ const week1 = new Date(tempDate.getFullYear(), 0, 4);
+ return 1 + Math.round(((tempDate.getTime() - week1.getTime()) / 86400000 - 3 + ((week1.getDay() + 6) % 7)) / 7);
+};
diff --git a/src/app/lib/DateHelper.js b/src/app/lib/DateHelper.js
index f4aac7651c2645bb2c14673c40a1bfa538c50039..a056401f635a4d48bcc3a3baec2a57c99ec4be23 100644
--- a/src/app/lib/DateHelper.js
+++ b/src/app/lib/DateHelper.js
@@ -1,32 +1,120 @@
-export const subtractDays = (date, numberOfDays) => {
- const result = new Date(date);
- result.setDate(result.getDate() - numberOfDays);
- return result;
+// export const subtractDays = (date, numberOfDays) => {
+// const result = new Date(date);
+// result.setDate(result.getDate() - numberOfDays);
+// return result;
+// };
+
+// /**
+// * date {Date}
+// * @return 2024-10-12
+// */
+// export const extractDate = (date) => {
+// if (date instanceof Date)
+// return date.toJSON().split("T")[0]
+// else throw new Error("date isn't instance of Date in extractDate Util function")
+// }
+
+
+// export const getDateRange = (fromDate, toDate) => {
+// const startDate = new Date(fromDate);
+// const endDate = new Date(toDate);
+
+// const dateArray = [];
+
+// let currentDate = startDate;
+// while (currentDate <= endDate) {
+// dateArray.push(currentDate.toISOString().split('T')[0].split("-").reverse().join("-"));
+
+// currentDate.setDate(currentDate.getDate() + 1);
+// }
+
+// return dateArray;
+// }
+
+/**
+ * Convert a week string (YYYY-W##) to a date object representing the first day of that week.
+ * @param {string} weekString - The week string in format 'YYYY-W##'.
+ * @returns {Date} The date object representing the first day of the week.
+ */
+const getFirstDayOfWeek = (weekString) => {
+ const [year, week] = weekString.split('-W').map(Number);
+ const simple = new Date(year, 0, 1 + (week - 1) * 7);
+ const dow = simple.getDay();
+ let ISOweekStart = new Date(simple);
+
+ if (dow <= 4) {
+ ISOweekStart.setDate(simple.getDate() - simple.getDay() + 1);
+ } else {
+ ISOweekStart.setDate(simple.getDate() + 8 - simple.getDay());
+ }
+
+ // Adjust for time zone offset to ensure consistency
+ ISOweekStart.setHours(0, 0, 0, 0);
+
+ return ISOweekStart;
+};
+/**
+ * Get the start and end dates of the week given a week string (YYYY-W##).
+ * @param {string} weekString - The week string in format 'YYYY-W##'.
+ * @returns {Object} An object with `weekStart` and `weekEnd` dates.
+ */
+export const getWeekRange = (weekString) => {
+ const startDate = getFirstDayOfWeek(weekString);
+ const endDate = new Date(startDate);
+ endDate.setDate(startDate.getDate() + 6);
+
+ // Adjust for time zone offset to ensure consistency
+ endDate.setHours(23, 59, 59, 999);
+
+ return {
+ weekStart: extractDate(startDate),
+ weekEnd: extractDate(endDate)
+ };
};
/**
- * date {Date}
- * @return 2024-10-12
+ * Extract the date in 'YYYY-MM-DD' format.
+ * @param {Date} date - The date to format.
+ * @returns {string} The formatted date string.
+ * @throws {Error} If the input is not an instance of Date.
*/
export const extractDate = (date) => {
- if (date instanceof Date)
- return date.toJSON().split("T")[0]
- else throw new Error("date isn't instance of Date in extractDate Util function")
-}
+ if (date instanceof Date) {
+ return date.toJSON().split("T")[0];
+ } else {
+ throw new Error("date isn't instance of Date in extractDate Util function");
+ }
+};
+/**
+ * Get the weeks between two week strings (YYYY-W##).
+ * @param {string} fromWeek - The start week string in format 'YYYY-W##'.
+ * @param {string} toWeek - The end week string in format 'YYYY-W##'.
+ * @returns {Array} An array of objects containing the start and end dates of each week.
+ */
+export const getWeeksBetween = (fromWeek, toWeek) => {
+ const fromDate = getFirstDayOfWeek(fromWeek);
+ const toDate = getFirstDayOfWeek(toWeek);
+ const weeks = [];
-export const getDateRange = (fromDate, toDate) => {
- const startDate = new Date(fromDate);
- const endDate = new Date(toDate);
+ let currentDate = fromDate;
+ while (currentDate <= toDate) {
+ const weekEnd = new Date(currentDate);
+ weekEnd.setDate(currentDate.getDate() + 6);
- const dateArray = [];
+ // Adjust for time zone offset to ensure consistency
+ weekEnd.setHours(23, 59, 59, 999);
- let currentDate = startDate;
- while (currentDate <= endDate) {
- dateArray.push(currentDate.toISOString().split('T')[0].split("-").reverse().join("-"));
+ const adjustedStartDate = new Date(currentDate);
+ adjustedStartDate.setDate(currentDate.getDate() + 1);
+ weeks.push({
+ axisX: `${extractDate(adjustedStartDate)} -- ${extractDate(weekEnd)}`,
+ weekStart: extractDate(currentDate),
+ weekEnd: extractDate(weekEnd)
+ });
- currentDate.setDate(currentDate.getDate() + 1);
+ currentDate.setDate(currentDate.getDate() + 7);
}
- return dateArray;
-}
\ No newline at end of file
+ return weeks;
+};
\ No newline at end of file