@happychef/algorithm 1.2.26 → 1.2.28

package/.github/workflows/ci-cd.yml

@@ -47,7 +47,7 @@ jobs:
       - name: Publish to NPM
         if: steps.version-check.outputs.version_changed == 'true'
         run: |
-          npm publish
+          npm publish --access public
           echo "## 📦 NPM Package Published" >> $GITHUB_STEP_SUMMARY
           echo "" >> $GITHUB_STEP_SUMMARY
           echo "✅ Successfully published @happychef/algorithm@$(node -p "require('./package.json').version")" >> $GITHUB_STEP_SUMMARY

package/changes/2026/January/PR14_add__change.md

@@ -0,0 +1,20 @@
+# PR 14 - Fix cross-browser date parsing inconsistency
+
+**Actions:** 
+
+## Changes Summary
+ADDED:
+- New function `parseDateString(dateString)` added to handle cross-browser date parsing inconsistencies for YYYY-MM-DD formatted strings.
+- New import of `parseDateString` function into the main module for consistent date handling across different browser environments.
+
+NO_REMOVALS
+
+CHANGED:
+- Modified the `getDayOfWeek` function in the codebase to replace direct `new Date(dateString)` construction with a call to a new `parseDateString` function for consistent cross-browser date parsing.
+- Updated the date parsing logic to handle YYYY-MM-DD format strings uniformly, addressing the inconsistency where Chrome interprets them as local midnight and Firefox as UTC.
+
+---
+
+**Author:** thibaultvandesompele2
+**Date:** 2026-01-26
+**PR Link:** https://github.com/thibaultvandesompele2/15-happy-algorithm/pull/14

package/getAvailableTimeblocks.js

@@ -3,42 +3,6 @@
 const { timeblocksAvailable } = require('./processing/timeblocksAvailable');
 const { parseTime, getMealTypeByTime } = require('./tableHelpers');
 
-/**
- * Gets the current date/time components in the specified timezone.
- * Uses Intl.DateTimeFormat for reliable cross-browser timezone conversion.
- * @param {Date} date - The date to convert.
- * @param {string} timeZone - The IANA timezone identifier.
- * @returns {Object} Object with year, month, day, hour, minute, second components.
- */
-function getDatePartsInTimeZone(date, timeZone) {
-  const formatter = new Intl.DateTimeFormat('en-US', {
-    timeZone,
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    hourCycle: 'h23', // Use 'h23' instead of hour12:false for consistent 0-23 range
-  });
-  const parts = formatter.formatToParts(date);
-  const values = {};
-  for (const part of parts) {
-    values[part.type] = part.value;
-  }
-  // Handle edge case: Chrome may return "24" for midnight with some hourCycle settings
-  let hour = parseInt(values.hour, 10);
-  if (hour === 24) hour = 0;
-  return {
-    year: parseInt(values.year, 10),
-    month: parseInt(values.month, 10),
-    day: parseInt(values.day, 10),
-    hour: hour,
-    minute: parseInt(values.minute, 10),
-    second: parseInt(values.second, 10),
-  };
-}
-
 /**
  * Parses a time string in "HH:MM" format into a Date object on a specific date.
  * @param {string} dateStr - The date string in "YYYY-MM-DD" format.
@@ -90,13 +54,10 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
   // Time zone for CEST/CET (Europe/Amsterdam)
   const timeZone = 'Europe/Amsterdam';
 
-  // Get current time in target timezone using reliable cross-browser method
+  // Current date/time in local timezone (system time)
+  // Note: We assume the server is running in the correct timezone
   const now = new Date();
-  const nowParts = getDatePartsInTimeZone(now, timeZone);
-  const currentTimeInTimeZone = new Date(
-    nowParts.year, nowParts.month - 1, nowParts.day,
-    nowParts.hour, nowParts.minute, nowParts.second
-  );
+  const currentTimeInTimeZone = now;
 
   // Calculate the maximum allowed date
   const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
@@ -114,9 +75,8 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
   }
 
   // Check if the target date is today in the specified time zone
-  // Compare year, month, day components to determine if it's today
   const isToday =
-    nowParts.year === year && nowParts.month === month && nowParts.day === day;
+    currentTimeInTimeZone.toDateString() === targetDateInTimeZone.toDateString();
 
   // Get available time blocks or shifts
   const availableTimeblocks = timeblocksAvailable(data, dateStr, reservations, guests, blockedSlots, giftcard, isAdmin, duration);
@@ -155,14 +115,11 @@ function getAvailableTimeblocks(data, dateStr, reservations, guests, blockedSlot
         timeZone: 'Europe/Brussels',
         hour: '2-digit',
         minute: '2-digit',
-        hourCycle: 'h23', // Use 'h23' for consistent 0-23 hour range across browsers
+        hour12: false,
       });
       const parts = formatter.formatToParts(now);
       const timeParts = Object.fromEntries(parts.map(p => [p.type, p.value]));
-      // Handle edge case: some browsers may return "24" for midnight
-      let hourValue = parseInt(timeParts.hour, 10);
-      if (hourValue === 24) hourValue = 0;
-      const currentTimeMinutes = hourValue * 60 + parseInt(timeParts.minute, 10);
+      const currentTimeMinutes = parseInt(timeParts.hour, 10) * 60 + parseInt(timeParts.minute, 10);
 
       // Check if current time has passed any stop times
       const breakfastStopMinutes = breakfastStop ? parseTime(breakfastStop) : null;

package/isDateAvailable.js

@@ -12,42 +12,6 @@ function parseTime(timeStr) {
   return hours * 60 + minutes;
 }
 
-/**
- * Gets the current date/time components in the specified timezone.
- * Uses Intl.DateTimeFormat for reliable cross-browser timezone conversion.
- * @param {Date} date - The date to convert.
- * @param {string} timeZone - The IANA timezone identifier.
- * @returns {Object} Object with year, month, day, hour, minute, second components.
- */
-function getDatePartsInTimeZone(date, timeZone) {
-  const formatter = new Intl.DateTimeFormat('en-US', {
-    timeZone,
-    year: 'numeric',
-    month: '2-digit',
-    day: '2-digit',
-    hour: '2-digit',
-    minute: '2-digit',
-    second: '2-digit',
-    hourCycle: 'h23', // Use 'h23' instead of hour12:false for consistent 0-23 range
-  });
-  const parts = formatter.formatToParts(date);
-  const values = {};
-  for (const part of parts) {
-    values[part.type] = part.value;
-  }
-  // Handle edge case: Chrome may return "24" for midnight with some hourCycle settings
-  let hour = parseInt(values.hour, 10);
-  if (hour === 24) hour = 0;
-  return {
-    year: parseInt(values.year, 10),
-    month: parseInt(values.month, 10),
-    day: parseInt(values.day, 10),
-    hour: hour,
-    minute: parseInt(values.minute, 10),
-    second: parseInt(values.second, 10),
-  };
-}
-
 /**
  * Checks if a date is within the allowed future range defined by dagenInToekomst.
  * @param {Object} data - The main data object (to access general settings).
@@ -67,21 +31,20 @@ function isDateWithinAllowedRange(data, dateStr) {
 
   const timeZone = 'Europe/Amsterdam';
 
-  // Get current time in the target timezone using reliable cross-browser method
   const now = new Date();
-  const nowParts = getDatePartsInTimeZone(now, timeZone);
   const currentTimeInTimeZone = new Date(
-    nowParts.year, nowParts.month - 1, nowParts.day,
-    nowParts.hour, nowParts.minute, nowParts.second
+    now.toLocaleString('en-US', { timeZone: timeZone })
   );
 
   const maxAllowedDate = new Date(currentTimeInTimeZone.getTime());
   maxAllowedDate.setDate(maxAllowedDate.getDate() + dagenInToekomst);
   maxAllowedDate.setHours(23, 59, 59, 999);
 
-  // Parse target date - already in local date format, no timezone conversion needed
   const [year, month, day] = dateStr.split('-').map(Number);
-  const targetDateInTimeZone = new Date(year, month - 1, day);
+  const targetDate = new Date(Date.UTC(year, month - 1, day));
+  const targetDateInTimeZone = new Date(
+    targetDate.toLocaleString('en-US', { timeZone: timeZone })
+  );
 
   return targetDateInTimeZone <= maxAllowedDate;
 }

package/isDateAvailableWithTableCheck.js

@@ -74,7 +74,7 @@ function timeHasGiftcard(data, dateStr, timeStr, giftcard) {
  * @param {boolean} isAdmin - Optional flag to bypass time restrictions for admin users.
  * @returns {boolean} - Returns true if the date passes all checks to be available.
  */
-function isDateAvailableWithTableCheck(data, dateStr, reservations, guests, blockedSlots = [], selectedGiftcard = null, isAdmin = false, duration = null) {
+function isDateAvailableWithTableCheck(data, dateStr, reservations, guests, blockedSlots = [], selectedGiftcard = null, isAdmin = false, duration = null, selectedZitplaats = null) {
   // 0) Optionally filter by selected menu item's date range (only when normalOpeningTimes = false)
   const currentItem = typeof window !== 'undefined' ? window.currentReservationTicketItem : null;
   if (
@@ -153,8 +153,8 @@ function isDateAvailableWithTableCheck(data, dateStr, reservations, guests, bloc
     }
 
     console.log(`Checking table availability for ${time} on ${dateStr} for ${guests} guests`);
-    // Pass null for selectedZitplaats, then duration
-    if (isTimeAvailableSync(data, dateStr, time, guests, reservations, null, duration)) {
+    // Pass selectedZitplaats so floor link constraints are respected
+    if (isTimeAvailableSync(data, dateStr, time, guests, reservations, selectedZitplaats, duration)) {
       console.log(`Found available time ${time} with table assignment!`);
       atLeastOneAvailable = true;
       break;

package/nul

@@ -1,13 +0,0 @@
-
-Envoi d'une requ�te 'Ping'  127.0.0.1 avec 32 octets de donn�es�:
-R�ponse de 127.0.0.1�: octets=32 temps<1ms TTL=128
-R�ponse de 127.0.0.1�: octets=32 temps<1ms TTL=128
-R�ponse de 127.0.0.1�: octets=32 temps<1ms TTL=128
-R�ponse de 127.0.0.1�: octets=32 temps<1ms TTL=128
-R�ponse de 127.0.0.1�: octets=32 temps<1ms TTL=128
-R�ponse de 127.0.0.1�: octets=32 temps<1ms TTL=128
-
-Statistiques Ping pour 127.0.0.1:
-    Paquets�: envoy�s = 6, re�us = 6, perdus = 0 (perte 0%),
-Dur�e approximative des boucles en millisecondes :
-    Minimum = 0ms, Maximum = 0ms, Moyenne = 0ms

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@happychef/algorithm",
-  "version": "1.2.26",
+  "version": "1.2.28",
   "description": "Restaurant and reservation algorithm utilities",
   "main": "index.js",
   "scripts": {

package/simulateTableAssignment.js

@@ -503,7 +503,7 @@ function isTimeAvailableSync(restaurantData, date, time, guests, reservations, s
             } else {
                 // ... simulation log ...
                 console.log(`[isTimeAvailableSync] No actual table data, simulating assignment for reservation`);
-                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, null, rDuration); // Simulation
+                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, r.zitplaats || null, rDuration); // Simulation - use reservation's own zitplaats
             }
 
             // Update the occupancy map based on the actual or simulated assignment
@@ -679,9 +679,9 @@ function getAvailableTablesForTime(restaurantData, date, time, guests, reservati
             if (actualTables.length > 0) {
                 assignedTables = actualTables;
             } else {
-                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, null, rDuration);
+                assignedTables = assignTablesForGivenTime(restaurantData, r.date, r.time, r.guests, tableOccupiedSlots, r.zitplaats || null, rDuration);
             }
-            
+
             if (assignedTables.length > 0) {
                 const rSlots = computeRequiredSlots(r.time, rDuration, intervalReservatie);
                  if (!rSlots || rSlots.length === 0) continue;

package/tableHelpers.js

@@ -49,16 +49,46 @@ function getMealTypeByTime(timeStr) {
 
 // --- Table Fetching ---
 
+/**
+ * Gets the floor ID linked to a seat place from seatAreaFloorLinks.
+ * Mirrors the server-side getFloorIdForSeatPlace in assignTables.js.
+ * @param {Object} restaurantData - The restaurant data object.
+ * @param {string} seatPlace - The seat place identifier (zitplaats).
+ * @returns {string|null} The floor ID or null if not found.
+ */
+function getFloorIdForSeatPlace(restaurantData, seatPlace) {
+    if (!seatPlace || !restaurantData) return null;
+    const seatAreaFloorLinks = restaurantData["general-settings"]?.seatAreaFloorLinks;
+    if (!seatAreaFloorLinks || typeof seatAreaFloorLinks !== 'object') return null;
+    return seatAreaFloorLinks[seatPlace] || null;
+}
+
 /**
  * Extracts and processes table data from the restaurantData object.
  * Includes temporary table properties and sorts tables.
+ * When selectedZitplaats is provided and has a linked floor via seatAreaFloorLinks,
+ * only tables from that linked floor are returned (matching server-side behavior).
  * @param {Object} restaurantData - The main restaurant data object.
+ * @param {string|null} selectedZitplaats - Optional seat place to filter by linked floor.
  * @returns {Array} An array of processed table objects.
  */
-function getAllTables(restaurantData) {
+function getAllTables(restaurantData, selectedZitplaats) {
     let allTables = [];
     if (restaurantData?.floors && Array.isArray(restaurantData.floors)) {
-        restaurantData.floors.forEach(floor => {
+        // If a zitplaats is specified and has a floor link, only use that floor
+        let floorsToUse = restaurantData.floors;
+        if (selectedZitplaats) {
+            const linkedFloorId = getFloorIdForSeatPlace(restaurantData, selectedZitplaats);
+            if (linkedFloorId) {
+                const linkedFloor = restaurantData.floors.find(f => f.id === linkedFloorId);
+                if (linkedFloor) {
+                    floorsToUse = [linkedFloor];
+                    console.log(`[getAllTables] Floor link found: zitplaats '${selectedZitplaats}' -> floor '${linkedFloorId}'`);
+                }
+            }
+        }
+
+        floorsToUse.forEach(floor => {
             if (floor?.tables && Array.isArray(floor.tables)) {
                 floor.tables.forEach(tbl => {
                     // Ensure table number, capacities, priority exist before parsing
@@ -174,5 +204,6 @@ module.exports = {
     parseTime,
     getMealTypeByTime,
     getAllTables,
+    getFloorIdForSeatPlace,
     isTemporaryTableValid
 };