Changeset e15e8d9 for my-react-app/src/components/ReservationEdit.js

Timestamp:

04/30/25 18:24:41 (3 weeks ago)

Author:

Aleksandar Panovski <apano77@…>

Branches:

main

Children:

2518b3a

Parents:

deea3c4

Message:

menu feature done

File:

• my-react-app/src/components/ReservationEdit.js (modified) (3 diffs)

my-react-app/src/components/ReservationEdit.js

@@ -65 +65 @@
     }, [table]);
 
-    const generateTimeSlots = (operatingHours, interval) => {
-        const slots = [];
-        const [startTimeStr, endTimeStr] = operatingHours.split('-');
-        const [startHours, startMinutes] = startTimeStr.split(':').map(Number);
-        const [endHours, endMinutes] = endTimeStr.split(':').map(Number);
-
-        const startTime = new Date();
-        startTime.setHours(startHours, startMinutes, 0, 0);
-
-        const endTime = new Date();
-        endTime.setHours(endHours, endMinutes, 0, 0);
-
-        let currentTime = startTime;
-        while (currentTime <= endTime) {
-            slots.push(new Date(currentTime).toISOString());
-            currentTime = new Date(currentTime.getTime() + interval * 60000);
-        }
-
-        return slots;
-    };
-
     const generateTimeOptions = (operatingHours) => {
-        const { startTime, endTime } = parseOperatingHours(operatingHours);
         const now = new Date();
-
         const selectedDateObj = new Date(selectedDate);
+
+        const { startTime, endTime } = parseOperatingHours(operatingHours, selectedDateObj);
+
         const isToday = selectedDateObj.toDateString() === now.toDateString();
-        const isTomorrow = selectedDateObj > now && selectedDateObj.getDate() === now.getDate() + 1;
 
         let currentTime;
 
         if (isToday) {
-            currentTime = roundToNext15Minutes(new Date());
+            const roundedNow = roundToNext15Minutes(now);
+
+            if (roundedNow < startTime) {
+                currentTime = startTime;
+            } else if (roundedNow > endTime) {
+                return [];
+            } else {
+                currentTime = roundedNow;
+            }
         } else {
-            currentTime = new Date(startTime);
+            currentTime = startTime;
         }
 
@@ -111 +98 @@
     };
 
-    useEffect(() => {
-        const operatingHours = table?.restaurant?.operatingHours || "09:00-00:00";
-        const allTimeSlots = generateTimeSlots(operatingHours, timeSlotInterval);
-
-        const availableSlots = allTimeSlots.filter((slot) =>
-            !tableReservations.includes(slot)
-        );
-
-        setFilteredTimeSlots(availableSlots);
-    }, [tableReservations, table]);
+    const roundToNext15Minutes = (date) => {
+        const ms = 1000 * 60 * 15;
+        return new Date(Math.ceil(date.getTime() / ms) * ms);
+    };
+
+    useEffect(() => {
+        if (table?.restaurant?.operatingHours && selectedDate) {
+            const options = generateTimeOptions(table.restaurant.operatingHours);
+            setTimeOptions(options);
+        }
+    }, [table, selectedDate]);
+
 
     const handleInputChange = (e) => {
@@ -189 +178 @@
     const formattedDate = `${year}-${month}-${day}`;
 
-    const parseOperatingHours = (operatingHours) => {
+    const parseOperatingHours = (operatingHours, forDate) => {
         const [start, end] = operatingHours.split('-');
-        return {
-            startTime: new Date(`1970-01-01T${start}:00`),
-            endTime: new Date(`1970-01-01T${end}:00`)
-        };
+
+        const [startHour, startMinute] = start.split(':').map(Number);
+        const [endHour, endMinute] = end.split(':').map(Number);
+
+        const startTime = new Date(forDate);
+        startTime.setHours(startHour, startMinute, 0, 0);
+
+        const endTime = new Date(forDate);
+        endTime.setHours(endHour, endMinute, 0, 0);
+
+        return { startTime, endTime };
     };