@flowselections/floriday-afhandeling-module 1.0.8 → 1.0.10

package/dist-lib/lib/planning.js

@@ -0,0 +1,243 @@
+/**
+ * Centrale planningsmodule — werkdagen-rekenkern, ophaalmomenten,
+ * order-planning en pickverdeling. Eén bron van waarheid voor alle agenda-views.
+ *
+ * Model — bezorgdag = dag 0. Elk ophaalmoment definieert per stap (aanmelden,
+ * ophalen, bezorgen) hoeveel werkdagen vóór de bezorgdag de stap plaatsvindt
+ * en op welk tijdstip.
+ */
+export const DEFAULT_PICKUP_MOMENT = {
+    signup_days: 2,
+    signup_time: "16:00",
+    pickup_days: 1,
+    pickup_time: "17:30",
+    delivery_days: 0,
+    delivery_time: "08:00",
+};
+function sameDay(a, b) {
+    return (a.getFullYear() === b.getFullYear() &&
+        a.getMonth() === b.getMonth() &&
+        a.getDate() === b.getDate());
+}
+export function isWorkday(d, holidays) {
+    const day = d.getDay();
+    if (day === 0 || day === 6)
+        return false;
+    if (holidays && holidays.some((h) => sameDay(h, d)))
+        return false;
+    return true;
+}
+function normalize(d) {
+    const out = new Date(d);
+    out.setHours(0, 0, 0, 0);
+    return out;
+}
+export function subtractWorkdays(date, n, holidays) {
+    const out = normalize(date);
+    let remaining = Math.max(0, Math.floor(n));
+    while (remaining > 0) {
+        out.setDate(out.getDate() - 1);
+        if (isWorkday(out, holidays))
+            remaining--;
+    }
+    return out;
+}
+export function addWorkdays(date, n, holidays) {
+    const out = normalize(date);
+    let remaining = Math.max(0, Math.floor(n));
+    while (remaining > 0) {
+        out.setDate(out.getDate() + 1);
+        if (isWorkday(out, holidays))
+            remaining--;
+    }
+    return out;
+}
+function parseHHMM(time) {
+    const [h = "0", m = "0"] = (time ?? "").split(":");
+    return { h: Number(h) || 0, m: Number(m) || 0 };
+}
+function atTime(date, time) {
+    const { h, m } = parseHHMM(time);
+    const out = new Date(date);
+    out.setHours(h, m, 0, 0);
+    return out;
+}
+/**
+ * Bepaal de aanmelddeadline van een moment voor een gegeven bezorgdag.
+ */
+export function getSignupDeadline(deliveryDate, moment, holidays) {
+    const day = subtractWorkdays(deliveryDate, moment.signup_days, holidays);
+    return atTime(day, moment.signup_time);
+}
+/**
+ * Kies het juiste ophaalmoment op basis van het ordertijdstip.
+ * - Voorkeursvolgorde: vroegst gesorteerd op aanmelddeadline.
+ * - Eerste moment waarvan deadline nog niet is verstreken wint.
+ * - Als alle deadlines verstreken zijn → laatste moment (best effort).
+ */
+export function selectPickupMoment(deliveryDate, orderCreatedAt, moments, holidays) {
+    if (moments.length === 0)
+        return DEFAULT_PICKUP_MOMENT;
+    if (moments.length === 1)
+        return moments[0];
+    const now = orderCreatedAt ?? new Date();
+    const sorted = [...moments].sort((a, b) => {
+        const da = getSignupDeadline(deliveryDate, a, holidays).getTime();
+        const db = getSignupDeadline(deliveryDate, b, holidays).getTime();
+        return da - db;
+    });
+    for (const m of sorted) {
+        const deadline = getSignupDeadline(deliveryDate, m, holidays);
+        if (now.getTime() <= deadline.getTime())
+            return m;
+    }
+    return sorted[sorted.length - 1];
+}
+export function calculateOrderPlanning(deliveryDate, rules) {
+    if (!deliveryDate)
+        return null;
+    const d = typeof deliveryDate === "string" ? new Date(deliveryDate) : deliveryDate;
+    if (Number.isNaN(d.getTime()))
+        return null;
+    const delivery = normalize(d);
+    const moments = rules.pickupMoments.length > 0 ? rules.pickupMoments : [DEFAULT_PICKUP_MOMENT];
+    const orderCreated = rules.orderCreatedAt == null
+        ? null
+        : rules.orderCreatedAt instanceof Date
+            ? rules.orderCreatedAt
+            : new Date(rules.orderCreatedAt);
+    const moment = selectPickupMoment(delivery, orderCreated, moments, rules.holidays);
+    const pickup = subtractWorkdays(delivery, moment.pickup_days, rules.holidays);
+    const transportRegister = subtractWorkdays(delivery, moment.signup_days, rules.holidays);
+    const pickStart = subtractWorkdays(pickup, rules.pickDurationWorkdays, rules.holidays);
+    return {
+        deliveryDate: delivery,
+        pickupDate: pickup,
+        transportRegisterDate: transportRegister,
+        pickStartDate: pickStart,
+        scheduledPickDate: pickStart,
+        pickAssignments: [{ date: pickStart, cartCount: 0 }],
+        movedEarlier: false,
+        selectedMoment: moment,
+    };
+}
+export function distributePickDates(items, options) {
+    const getCarts = (it) => {
+        const n = options.getCartCount?.(it);
+        return Number.isFinite(n) && n > 0 ? Math.floor(n) : 1;
+    };
+    const getOverride = (it, idx) => {
+        const raw = options.getCartOverride?.(it, idx);
+        if (!raw)
+            return null;
+        const date = raw instanceof Date ? raw : raw.date;
+        const out = new Date(date);
+        out.setHours(0, 0, 0, 0);
+        const movedFrom = raw instanceof Date ? null : raw.movedFromDate;
+        const movedFromDate = movedFrom ? new Date(movedFrom) : null;
+        if (movedFromDate)
+            movedFromDate.setHours(0, 0, 0, 0);
+        return { date: out, movedFromDate };
+    };
+    const key = (d) => `${d.getFullYear()}-${d.getMonth()}-${d.getDate()}`;
+    const load = new Map();
+    const result = new Map();
+    const distribute = options.enabled && options.maxWorkdaysEarlier > 0;
+    const sorted = [...items].sort((a, b) => {
+        const ad = a.planning?.pickStartDate.getTime() ?? Infinity;
+        const bd = b.planning?.pickStartDate.getTime() ?? Infinity;
+        return ad - bd;
+    });
+    const baseTargets = new Map();
+    // Stap 1: bepaal eerst de volledige automatische verdeling, zonder
+    // handmatige overrides. Daardoor blijft de automatische balans stabiel en
+    // kan een latere handmatige verplaatsing niet door volgende orders worden
+    // "teruggevuld".
+    for (const item of sorted) {
+        if (!item.planning) {
+            result.set(item, item);
+            continue;
+        }
+        const deadline = item.planning.pickStartDate;
+        const carts = getCarts(item);
+        // Kandidaten in chronologische volgorde
+        const candidates = [];
+        if (distribute) {
+            let cursor = deadline;
+            for (let i = 0; i < options.maxWorkdaysEarlier; i++) {
+                cursor = subtractWorkdays(cursor, 1, options.holidays);
+                candidates.unshift(cursor);
+            }
+        }
+        candidates.push(deadline);
+        const targets = [];
+        for (let c = 0; c < carts; c++) {
+            let target;
+            if (!distribute) {
+                target = deadline;
+                load.set(key(target), (load.get(key(target)) ?? 0) + 1);
+            }
+            else {
+                let best = candidates[candidates.length - 1];
+                let bestLoad = load.get(key(best)) ?? 0;
+                for (let i = candidates.length - 2; i >= 0; i--) {
+                    const cand = candidates[i];
+                    const l = load.get(key(cand)) ?? 0;
+                    if (l < bestLoad) {
+                        best = cand;
+                        bestLoad = l;
+                    }
+                }
+                target = best;
+                load.set(key(target), bestLoad + 1);
+            }
+            targets[c] = target;
+        }
+        baseTargets.set(item, targets);
+    }
+    // Stap 2: pas overrides pas toe nadat alle automatische doelen vaststaan.
+    // Dit maakt een verplaatsing absoluut: 10/10 wordt na één kar verplaatsen
+    // echt 9/11, niet opnieuw 10/10 door load-balancing.
+    for (const item of sorted) {
+        if (!item.planning)
+            continue;
+        const deadline = item.planning.pickStartDate;
+        const carts = getCarts(item);
+        const targets = [...(baseTargets.get(item) ?? [])];
+        const perDay = new Map();
+        for (let c = 0; c < carts; c++) {
+            const override = getOverride(item, c);
+            if (override) {
+                // Handmatige verplaatsingen gelden altijd voor de concrete kar-index
+                // die de gebruiker aanklikt. Niet ruilen met een andere kar op dezelfde
+                // brondag, want dan blijft de aangeklikte kar visueel staan.
+                targets[c] = override.date;
+            }
+        }
+        for (let c = 0; c < carts; c++) {
+            const target = targets[c];
+            const k = key(target);
+            const existing = perDay.get(k);
+            if (existing) {
+                existing.cartCount += 1;
+                existing.cartIndexes.push(c);
+            }
+            else {
+                perDay.set(k, { date: target, cartCount: 1, cartIndexes: [c] });
+            }
+        }
+        const assignments = Array.from(perDay.values()).sort((a, b) => a.date.getTime() - b.date.getTime());
+        const earliest = assignments[0]?.date ?? deadline;
+        const moved = assignments.some((a) => a.date.getTime() !== deadline.getTime());
+        result.set(item, {
+            ...item,
+            planning: {
+                ...item.planning,
+                scheduledPickDate: earliest,
+                pickAssignments: assignments,
+                movedEarlier: moved,
+            },
+        });
+    }
+    return items.map((it) => result.get(it) ?? it);
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@flowselections/floriday-afhandeling-module",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "private": false,
   "sideEffects": false,
   "type": "module",
@@ -41,7 +41,7 @@
     "@cloudflare/vite-plugin": "^1.25.5",
     "@eslint/js": "^9.32.0",
     "@flowselections/core": "^1.0.11",
-    "@lovable.dev/vite-tanstack-config": "2.5.3",
+    "@lovable.dev/vite-tanstack-config": "2.6.4",
     "@rsbuild/core": "^1.0.0",
     "@tailwindcss/vite": "^4.2.1",
     "@tanstack/react-query": "^5.83.0",
@@ -71,12 +71,18 @@
       {
         "export": "LeveringenPage",
         "route": "afhandeling/leveringen",
-        "title": "Leveringen"
+        "title": "Planning en Leveringen"
       },
       {
-        "export": "VervoerdersPage",
-        "route": "afhandeling/vervoerders",
-        "title": "Vervoerders"
+        "export": "NieuweLeveringPage",
+        "route": "afhandeling/leveringen/nieuw",
+        "title": "Levering aanmaken",
+        "nav": false
+      },
+      {
+        "export": "PickingPage",
+        "route": "afhandeling/picking",
+        "title": "Pick Agenda"
       }
     ]
   }