Fix incorrect TimeTable's day of week calculation

oddestdan · Dec 4, 2023 · 61d5369 · 61d5369
1 parent e3cdb99
commit 61d5369
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/app/components/TimePickerTable/TimePickerTable.tsx b/app/components/TimePickerTable/TimePickerTable.tsx
@@ -83,7 +83,12 @@ const TimePickerTable: React.FC<TimePickerTableProps> = ({
   );
 
   useEffect(() => {
-    if (!timeSlots[start] || !timeSlots[end]) {
+    if (
+      !timeSlots ||
+      timeSlots.length === 0 ||
+      !timeSlots[start] ||
+      !timeSlots[end]
+    ) {
       return;
     }
 

diff --git a/app/utils/date.ts b/app/utils/date.ts
@@ -65,26 +65,33 @@ export const getDayOfWeek = (date: Date = new Date()) => {
   return date.toLocaleDateString("en-US", { weekday: "long" });
 };
 
-export const daysIntoYear = (date: Date = new Date()) => {
-  return (
-    (Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()) -
-      Date.UTC(date.getFullYear(), 0, 0)) /
-    24 /
-    60 /
-    60 /
-    1000
-  );
-};
+// export const daysIntoYear = (date: Date = new Date()) => {
+//   return (
+//     (Date.UTC(date.getFullYear(), date.getMonth(), date.getDate()) -
+//       Date.UTC(date.getFullYear(), 0, 0)) /
+//     24 /
+//     60 /
+//     60 /
+//     1000
+//   );
+// };
 
 export const getDayOfWeekNumbered = (date: Date = new Date()) => {
   if (START_FROM_MONDAY) {
     return (date.getDay() - 1 + 7) % 7;
   }
 
-  const xInYear = daysIntoYear(date);
-  const todayInYear = daysIntoYear(new Date());
+  const today = new Date();
+  const todayIndex = today.getDay();
+  const passedDateIndex = date.getDay();
+
+  let diff = passedDateIndex - todayIndex;
+
+  if (diff < 0) {
+    diff += 7;
+  }
 
-  return (xInYear - todayInYear) % 7;
+  return diff;
 };
 
 export const getWeekDates = (dateString: string): Date[] => {