npm - @flowselections/floriday-afhandeling-module - Versions diffs - 1.0.40 → 1.0.41 - Mend

@flowselections/floriday-afhandeling-module 1.0.40 → 1.0.41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (40) hide show

package/dist-lib/components/afhandeling/ControleLijstPrint.js CHANGED Viewed

@@ -70,62 +70,62 @@ export function renderControleLijstHtml(carts, lang = "nl") {
     });
     const rows = sorted.length
         ? sorted
-            .map(({ cart: c, klaarzet }) => `
-          <tr>
-            <td class="mono bold">${esc(c.cartNumber ?? "—")}</td>
-            <td class="right">${esc(c.cratesOnCart ?? "—")}</td>
-            <td class="bold">${esc(countryCode(c.country) ?? c.country ?? "—")}</td>
-            <td class="bold">${esc(klaarzet.label)}</td>
-            <td>${esc(statusLabel(c.status, c.printedCount))}</td>
+            .map(({ cart: c, klaarzet }) => `
+          <tr>
+            <td class="mono bold">${esc(c.cartNumber ?? "—")}</td>
+            <td class="right">${esc(c.cratesOnCart ?? "—")}</td>
+            <td class="bold">${esc(countryCode(c.country) ?? c.country ?? "—")}</td>
+            <td class="bold">${esc(klaarzet.label)}</td>
+            <td>${esc(statusLabel(c.status, c.printedCount))}</td>
           </tr>`)
             .join("")
         : `<tr><td colspan="5" class="empty">${esc(t.noCartsToday)}</td></tr>`;
-    return `<!DOCTYPE html>
-<html lang="${esc(lang)}">
-<head>
-<meta charset="utf-8" />
-<title>${esc(t.checklistTitle)}</title>
-<style>
-  @page { size: A4 portrait; margin: 12mm; }
-  body { font-family: Arial, Helvetica, sans-serif; color: #000; margin: 0; }
-  h1 { font-size: 20px; margin: 0; }
-  .head { display: flex; align-items: baseline; justify-content: space-between;
-          border-bottom: 1px solid #000; padding-bottom: 6px; margin-bottom: 12px; }
-  .total { font-size: 12px; margin-bottom: 10px; }
-  table { width: 100%; border-collapse: collapse; font-size: 11px; }
-  th { text-align: left; border-bottom: 1px solid #000; padding: 3px 6px 3px 0; }
-  td { border-bottom: 1px solid #ccc; padding: 6px 6px 6px 0; white-space: nowrap; }
-  td.right, th.right { text-align: right; }
-  .mono { font-family: "Courier New", monospace; }
-  .bold { font-weight: 700; }
-  .empty { text-align: center; color: #666; padding: 24px 0; border: none; }
-  .sign { margin-top: 24px; font-size: 11px; }
-  .sign div { margin-top: 8px; }
-  .line { display: inline-block; border-bottom: 1px solid #000; width: 220px; }
-  tr { page-break-inside: avoid; }
-  thead { display: table-header-group; }
-</style>
-</head>
-<body>
-  <div class="head"><h1>${esc(t.checklistTitle)}</h1><div>${esc(today)}</div></div>
-  <div class="total">${esc(t.totalCarts)}: <strong>${carts.length}</strong></div>
-  <table>
-    <thead>
-      <tr>
-        <th>${esc(t.colKarnr)}</th>
-        <th class="right">${esc(t.colFusten)}</th>
-        <th>${esc(t.colLand)}</th>
-        <th>${esc(t.colKlaarzetten)}</th>
-        <th>${esc(t.colStatus)}</th>
-      </tr>
-    </thead>
-    <tbody>${rows}</tbody>
-  </table>
-  <div class="sign">
-    <div>${esc(t.checkedBy)}: <span class="line"></span></div>
-    <div>${esc(t.dateTime)}: <span class="line"></span></div>
-    <div>${esc(t.signature)}: <span class="line"></span></div>
-  </div>
-</body>
+    return `<!DOCTYPE html>
+<html lang="${esc(lang)}">
+<head>
+<meta charset="utf-8" />
+<title>${esc(t.checklistTitle)}</title>
+<style>
+  @page { size: A4 portrait; margin: 12mm; }
+  body { font-family: Arial, Helvetica, sans-serif; color: #000; margin: 0; }
+  h1 { font-size: 20px; margin: 0; }
+  .head { display: flex; align-items: baseline; justify-content: space-between;
+          border-bottom: 1px solid #000; padding-bottom: 6px; margin-bottom: 12px; }
+  .total { font-size: 12px; margin-bottom: 10px; }
+  table { width: 100%; border-collapse: collapse; font-size: 11px; }
+  th { text-align: left; border-bottom: 1px solid #000; padding: 3px 6px 3px 0; }
+  td { border-bottom: 1px solid #ccc; padding: 6px 6px 6px 0; white-space: nowrap; }
+  td.right, th.right { text-align: right; }
+  .mono { font-family: "Courier New", monospace; }
+  .bold { font-weight: 700; }
+  .empty { text-align: center; color: #666; padding: 24px 0; border: none; }
+  .sign { margin-top: 24px; font-size: 11px; }
+  .sign div { margin-top: 8px; }
+  .line { display: inline-block; border-bottom: 1px solid #000; width: 220px; }
+  tr { page-break-inside: avoid; }
+  thead { display: table-header-group; }
+</style>
+</head>
+<body>
+  <div class="head"><h1>${esc(t.checklistTitle)}</h1><div>${esc(today)}</div></div>
+  <div class="total">${esc(t.totalCarts)}: <strong>${carts.length}</strong></div>
+  <table>
+    <thead>
+      <tr>
+        <th>${esc(t.colKarnr)}</th>
+        <th class="right">${esc(t.colFusten)}</th>
+        <th>${esc(t.colLand)}</th>
+        <th>${esc(t.colKlaarzetten)}</th>
+        <th>${esc(t.colStatus)}</th>
+      </tr>
+    </thead>
+    <tbody>${rows}</tbody>
+  </table>
+  <div class="sign">
+    <div>${esc(t.checkedBy)}: <span class="line"></span></div>
+    <div>${esc(t.dateTime)}: <span class="line"></span></div>
+    <div>${esc(t.signature)}: <span class="line"></span></div>
+  </div>
+</body>
 </html>`;
 }

package/dist-lib/components/afhandeling/ControlePage.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"ControlePage.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/ControlePage.tsx"],"names":[],"mappings":"~~AAmHA~~,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;CAAO,+~~BAyzBpE~~"}
1	+ {"version":3,"file":"ControlePage.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/ControlePage.tsx"],"names":[],"mappings":"AA6HA,wBAAgB,YAAY,CAAC,EAAE,MAAM,EAAE,GAAE;IAAE,MAAM,CAAC,EAAE,MAAM,IAAI,CAAA;CAAO,+BAo1BpE"}

package/dist-lib/components/afhandeling/ControlePage.js CHANGED Viewed

@@ -38,6 +38,10 @@ function blockedKey(b) {
     return `${b.orderSource}#${b.orderId}#${b.cartIndex}`;
 }
 function controlCartKey(c) {
+    return c.cartNumberId ?? `${c.orderSource}#${c.orderId}#${c.cartIndex}`;
+}
+/** Oude concept-sleutels (`bron#order#index`) omzetten naar de nieuwe kar-sleutel. */
+function legacyCartKey(c) {
     return `${c.orderSource}#${c.orderId}#${c.cartIndex}`;
 }
 function stableStringifyDraft(input) {
@@ -162,6 +166,31 @@ export function ControlePage({ onExit } = {}) {
         draftLoadedRef.current = true;
         setDraftHydrated(true);
     }, [draftQ.data, draftQ.isError, draftQ.isFetching, draftQ.isLoading]);
+    // Migreer concept-sleutels van het oude formaat naar de nieuwe kar-sleutel.
+    const keysMigratedRef = useRef(false);
+    useEffect(() => {
+        if (keysMigratedRef.current)
+            return;
+        if (!draftHydrated || carts.length === 0)
+            return;
+        const mapping = new Map();
+        for (const cart of carts) {
+            const legacy = legacyCartKey(cart);
+            const next = controlCartKey(cart);
+            if (legacy !== next)
+                mapping.set(legacy, next);
+        }
+        keysMigratedRef.current = true;
+        if (mapping.size === 0)
+            return;
+        setChecked((prev) => new Set([...prev].map((k) => mapping.get(k) ?? k)));
+        setCartStates((prev) => {
+            const next = {};
+            for (const [k, v] of Object.entries(prev))
+                next[mapping.get(k) ?? k] = v;
+            return next;
+        });
+    }, [carts, draftHydrated]);
     // Debounced autosave of the complete draft state.
     const [savingState, setSavingState] = useState("idle");
     const autosaveTimer = useRef(null);
@@ -365,7 +394,7 @@ export function ControlePage({ onExit } = {}) {
     };
     const stats = useMemo(() => {
         const total = carts.length;
-        const printed = carts.filter((c) => c.printedCount > 0).length;
+        const printed = carts.filter((c) => c.printedToday ?? c.printedCount > 0).length;
         const checkedCount = carts.filter((c) => checked.has(controlCartKey(c))).length;
         return { total, printed, checked: checkedCount };
     }, [carts, checked]);
@@ -402,6 +431,11 @@ export function ControlePage({ onExit } = {}) {
             "orders",
             "floriday_salesorders_cache",
             "dashboard_critical_alerts",
+            "logistics_tasks",
+            "pick_queue",
+            "print_jobs",
+            "order_carts",
+            "order_cart_items",
         ];
         const channel = supabase.channel("controle-page-realtime");
         for (const table of tables) {
@@ -437,7 +471,7 @@ export function ControlePage({ onExit } = {}) {
                                                                 ? "indeterminate"
                                                                 : false, onCheckedChange: (v) => toggleAll(!!v) }) }), _jsx(TableHead, { children: "Ordernummer" }), _jsx(TableHead, { children: "Ophaaldatum" }), _jsx(TableHead, { children: "Uitgeprint" })] }) }), _jsxs(TableBody, { children: [cartsQ.isLoading && (_jsx(TableRow, { children: _jsx(TableCell, { colSpan: 4, className: "text-center text-muted-foreground py-8", children: "Laden\u2026" }) })), !cartsQ.isLoading && carts.length === 0 && (_jsx(TableRow, { children: _jsx(TableCell, { colSpan: 4, className: "text-center text-muted-foreground py-8", children: "Geen karren om vandaag te controleren." }) })), pagedCarts.map((c) => {
                                                 const k = controlCartKey(c);
-                                                return (_jsxs(TableRow, { children: [_jsx(TableCell, { children: _jsx(Checkbox, { checked: checked.has(k), onCheckedChange: (v) => toggle(k, !!v) }) }), _jsx(TableCell, { className: "font-mono font-semibold", children: (c.orderNumbers?.length ?? 0) > 0 ? (_jsx("div", { className: "flex flex-col gap-0.5", children: c.orderNumbers.map((n) => (_jsx("span", { children: n }, n))) })) : (c.orderNumber || "—") }), _jsx(TableCell, { children: fmtDate(c.pickupDate) }), _jsx(TableCell, { children: (c.printedCount ?? 0) > 0 ? (_jsx(Badge, { variant: "secondary", children: "Ja" })) : (_jsx(Badge, { variant: "outline", children: "Nee" })) })] }, k));
+                                                return (_jsxs(TableRow, { children: [_jsx(TableCell, { children: _jsx(Checkbox, { checked: checked.has(k), onCheckedChange: (v) => toggle(k, !!v) }) }), _jsx(TableCell, { className: "font-mono font-semibold", children: (c.orderNumbers?.length ?? 0) > 0 ? (_jsx("div", { className: "flex flex-col gap-0.5", children: c.orderNumbers.map((n) => (_jsx("span", { children: n }, n))) })) : (c.orderNumber || "—") }), _jsx(TableCell, { children: fmtDate(c.pickupDate) }), _jsx(TableCell, { children: (c.printedToday ?? (c.printedCount ?? 0) > 0) ? (_jsx(Badge, { variant: "secondary", children: "Ja" })) : (_jsx(Badge, { variant: "outline", children: "Nee" })) })] }, k));
                                             })] })] }), carts.length > 0 && (_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-3 border-t bg-muted/20 px-4 py-3 text-sm", children: [_jsxs("span", { className: "text-muted-foreground", children: [carts.length, " resultaten"] }), _jsxs("div", { className: "flex items-center gap-3", children: [_jsx("span", { className: "text-muted-foreground", children: "Resultaten per pagina" }), _jsxs(Select, { value: String(pageSize), onValueChange: (v) => {
                                                     setPageSize(Number(v));
                                                     setPage(1);

package/dist-lib/components/afhandeling/DagDetailDialog.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"DagDetailDialog.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/DagDetailDialog.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAsCjE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACvC;AAID,wBAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,oBAAoB,~~sCAgF1F~~"}
1	+ {"version":3,"file":"DagDetailDialog.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/DagDetailDialog.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAsCjE,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,OAAO,CAAC;IACd,IAAI,EAAE,IAAI,GAAG,IAAI,CAAC;IAClB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,YAAY,EAAE,CAAC,IAAI,EAAE,OAAO,KAAK,IAAI,CAAC;CACvC;AAID,wBAAgB,eAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,YAAY,EAAE,EAAE,oBAAoB,sCAiF1F"}

package/dist-lib/components/afhandeling/DagDetailDialog.js CHANGED Viewed

@@ -29,7 +29,8 @@ export function DagDetailDialog({ open, date, planned, onOpenChange }) {
     const cartRows = [];
     for (const p of ordersOnDay) {
         const assigns = p.planning.pickAssignments ?? [];
-        const totalCarts = p.order.cartCount ?? 0;
+        // Karren komen uit de Engine-planning (gedeelde karindex), niet uit payloads.
+        const totalCarts = assigns.reduce((sum, a) => sum + a.cartCount, 0);
         if (totalCarts <= 0)
             continue;
         let runningIdx = 0;
@@ -169,7 +170,7 @@ function OrderRow({ planned: p, cartsToday }) {
                     /* doorgaan met lege regels */
                 }
             }
-            const cartTotal = Math.max(1, p.order.cartCount ?? 1);
+            const cartTotal = Math.max(1, (p.planning?.pickAssignments ?? []).reduce((sum, a) => sum + a.cartCount, 0));
             const pickDateIso = p.planning?.pickAssignments?.[0]?.date?.toISOString?.().slice(0, 10) ??
                 new Date().toISOString().slice(0, 10);
             const pakbonLines = lines.map((l) => ({

package/dist-lib/components/afhandeling/WeekAgendaView.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"WeekAgendaView.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/WeekAgendaView.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;~~AAKjE~~,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAEnF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,KAAK,IAAI,CAAC;IACxD,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;~~AA+DD~~,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,UAAU,EACV,KAAK,EACL,YAAY,EACZ,UAAU,GACX,EAAE,mBAAmB,+~~BAwJrB~~"}
1	+ {"version":3,"file":"WeekAgendaView.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/WeekAgendaView.tsx"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,8BAA8B,CAAC;AAElE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAOjE,MAAM,MAAM,cAAc,GAAG,UAAU,GAAG,QAAQ,GAAG,oBAAoB,GAAG,MAAM,CAAC;AAEnF,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,IAAI,EAAE,cAAc,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,YAAY,CAAC,EAAE,CAAC,KAAK,EAAE,aAAa,KAAK,IAAI,CAAC;IAC9C,UAAU,CAAC,EAAE,CAAC,IAAI,EAAE,IAAI,KAAK,IAAI,CAAC;IAClC,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,yEAAyE;IACzE,YAAY,CAAC,EAAE,CAAC,SAAS,EAAE,IAAI,EAAE,OAAO,EAAE,IAAI,KAAK,IAAI,CAAC;IACxD,4EAA4E;IAC5E,UAAU,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5B;AA4DD,wBAAgB,cAAc,CAAC,EAC7B,OAAO,EACP,IAAI,EACJ,SAAS,EACT,YAAY,EACZ,UAAU,EACV,KAAK,EACL,YAAY,EACZ,UAAU,GACX,EAAE,mBAAmB,+BA8JrB"}

package/dist-lib/components/afhandeling/WeekAgendaView.js CHANGED Viewed

@@ -4,6 +4,8 @@ import { Button, Badge } from "@flowselections/core";
 import { ChevronLeft, ChevronRight, Package, Truck, Sprout, Clock, CheckCircle2, Scale } from "lucide-react";
 import { isSameDay, startOfWeek, addDays } from "../../lib/pickDate";
 import { useCapacityCheck } from "../../hooks/useCapacityCheck";
+import { usePickAgenda } from "../../hooks/usePickAgenda";
+import { useConsistencyCheck } from "../../hooks/useConsistencyCheck";
 import { CapacityWarning } from "./CapacityWarning";
 import { toDayKey } from "../../lib/logisticsEngine/capacity";
 const WEEKDAY_LABELS = ["MAANDAG", "DINSDAG", "WOENSDAG", "DONDERDAG", "VRIJDAG", "ZATERDAG", "ZONDAG"];
@@ -29,11 +31,6 @@ function dateForPlanned(p, mode) {
         case "pick": return p.planning.scheduledPickDate ?? p.planning.pickStartDate;
     }
 }
-function isMovedEarlier(p, mode) {
-    if (mode !== "pick" || !p.planning)
-        return false;
-    return Boolean(p.planning.movedEarlier);
-}
 const MODE_LABELS = {
     delivery: { summary: "Leveringen deze week" },
     pickup: { summary: "Ophalingen deze week" },
@@ -58,6 +55,8 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
     // de dichtstbijzijnde week met orders.
     const jumpedToRef = useRef(null);
     useEffect(() => {
+        if (mode === "pick")
+            return; // pickagenda komt uit de Engine-RPC
         if (isLoading || planned.length > 0 || !jumpToDate)
             return;
         if (jumpedToRef.current === jumpToDate)
@@ -67,58 +66,51 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
             return;
         jumpedToRef.current = jumpToDate;
         setCursor(startOfWeek(target));
-    }, [jumpToDate, planned.length, isLoading]);
+    }, [jumpToDate, planned.length, isLoading, mode]);
+    // Pickagenda komt volledig uit de Engine-RPC; deze module rekent zelf geen
+    // pickdagen meer uit en doet geen datum-, werkdagen- of tijdzonelogica.
+    const pickAgenda = usePickAgenda(mode === "pick" ? toDayKey(weekStart) : null, mode === "pick" ? toDayKey(weekEnd) : null);
     const days = useMemo(() => {
         return Array.from({ length: 7 }, (_, i) => {
             const date = addDays(weekStart, i);
+            if (mode === "pick") {
+                // Dagen zonder rij tonen simpelweg nullen.
+                const row = pickAgenda.byDate.get(toDayKey(date));
+                return {
+                    date,
+                    entries: [],
+                    shiftedCount: row?.shiftedCount ?? 0,
+                    bestellingen: row?.orderCount ?? 0,
+                    karren: row?.cartCount ?? 0,
+                    planten: row?.plantCount ?? 0,
+                    verzendklaar: row?.ready ?? 0,
+                    voorbereiding: row?.inPreparation ?? 0,
+                };
+            }
             const entries = [];
             for (const p of planned) {
                 if (!p.planning)
                     continue;
-                if (mode === "pick") {
-                    const assigns = p.planning.pickAssignments ?? [
-                        { date: p.planning.scheduledPickDate ?? p.planning.pickStartDate, cartCount: p.order.cartCount ?? 0 },
-                    ];
-                    const total = assigns.length;
-                    assigns.forEach((a, idx) => {
-                        if (!isSameDay(a.date, date))
-                            return;
-                        const totalCarts = p.order.cartCount ?? 0;
-                        const ratio = totalCarts > 0 ? a.cartCount / totalCarts : 1 / Math.max(total, 1);
-                        entries.push({
-                            order: p.order,
-                            cartCount: a.cartCount,
-                            plantCount: Math.round((p.order.plantCount ?? 0) * ratio),
-                            movedEarlier: a.date.getTime() !== p.planning.pickStartDate.getTime(),
-                            splitPart: total > 1 ? { index: idx + 1, total } : undefined,
-                            reason: p.planning.reason,
-                            carrierName: p.planning.carrierName,
-                        });
-                    });
-                }
-                else {
-                    const d = dateForPlanned(p, mode);
-                    if (!d || !isSameDay(d, date))
-                        continue;
-                    entries.push({
-                        order: p.order,
-                        cartCount: p.order.cartCount ?? 0,
-                        plantCount: p.order.plantCount ?? 0,
-                        movedEarlier: false,
-                        reason: p.planning.reason,
-                        carrierName: p.planning.carrierName,
-                    });
-                }
+                const d = dateForPlanned(p, mode);
+                if (!d || !isSameDay(d, date))
+                    continue;
+                entries.push({
+                    order: p.order,
+                    cartCount: (p.planning.pickAssignments ?? []).reduce((sum, a) => sum + a.cartCount, 0),
+                    plantCount: p.order.plantCount ?? 0,
+                    movedEarlier: false,
+                    reason: p.planning.reason,
+                    carrierName: p.planning.carrierName,
+                });
             }
             const karren = entries.reduce((s, e) => s + e.cartCount, 0);
             const planten = entries.reduce((s, e) => s + e.plantCount, 0);
             const verzendklaar = entries.filter((e) => isOrderReady(e.order)).length;
             const voorbereiding = entries.length - verzendklaar;
-            const movedEarlierOrderIds = new Set(entries.filter((e) => e.movedEarlier).map((e) => e.order.id));
             return {
                 date,
                 entries,
-                movedEarlierOrderIds,
+                shiftedCount: 0,
                 bestellingen: entries.length,
                 karren,
                 planten,
@@ -126,7 +118,7 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
                 voorbereiding,
             };
         });
-    }, [planned, weekStart, mode]);
+    }, [planned, weekStart, mode, pickAgenda.byDate]);
     const totals = useMemo(() => {
         const leveringen = days.reduce((s, d) => s + d.bestellingen, 0);
         const verzendklaar = days.reduce((s, d) => s + d.verzendklaar, 0);
@@ -134,6 +126,7 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
         const totaalStuks = days.reduce((s, d) => s + d.planten, 0);
         return { leveringen, verzendklaar, voorbereiding, totaalStuks };
     }, [days]);
+    const { misaligned } = useConsistencyCheck();
     const capacity = useCapacityCheck(toDayKey(weekStart), toDayKey(weekEnd));
     const headerLabel = `Week ${weekNumber} - ${weekStart.getDate()} ${MONTHS_NL_SHORT[weekStart.getMonth()]}. t/m ${weekEnd.getDate()} ${MONTHS_NL_SHORT[weekEnd.getMonth()]}. ${weekEnd.getFullYear()}`;
     const goPrev = () => setCursor((c) => addDays(c, -7));
@@ -143,7 +136,7 @@ export function WeekAgendaView({ planned, mode, isLoading, onOrderClick, onDayCl
         d.setHours(0, 0, 0, 0);
         setCursor(startOfWeek(d));
     };
-    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-3", children: [_jsx("h2", { className: "text-xl font-semibold tracking-tight", children: title ?? headerLabel }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsxs(Button, { variant: "outline", size: "sm", onClick: goPrev, children: [_jsx(ChevronLeft, { className: "mr-1 h-4 w-4" }), " Vorige week"] }), _jsx(Button, { variant: "outline", size: "sm", onClick: goToday, children: "Deze week" }), _jsxs(Button, { variant: "outline", size: "sm", onClick: goNext, children: ["Volgende week ", _jsx(ChevronRight, { className: "ml-1 h-4 w-4" })] })] })] }), _jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-4", children: [_jsx(SummaryCard, { label: MODE_LABELS[mode].summary, value: totals.leveringen, tone: "default" }), _jsx(SummaryCard, { label: "Verzendklaar", value: totals.verzendklaar, tone: "success" }), _jsx(SummaryCard, { label: "In voorbereiding", value: totals.voorbereiding, tone: "muted" }), _jsx(SummaryCard, { label: "Totaal stuks", value: totals.totaalStuks, tone: "default" })] }), _jsx("div", { className: "max-h-[520px] space-y-2 overflow-y-auto rounded-lg border bg-muted/20 p-2", children: isLoading ? (_jsx("div", { className: "rounded-lg border bg-card p-10 text-center text-sm text-muted-foreground", children: "Laden\u2026" })) : (days.map((day) => (_jsx(DayRow, { day: day, onOrderClick: onOrderClick, onDayClick: onDayClick, capacity: mode === "delivery" ? undefined : capacity.byDate.get(toDayKey(day.date)) }, day.date.toISOString())))) })] }));
+    return (_jsxs("div", { className: "space-y-4", children: [_jsxs("div", { className: "flex flex-wrap items-center justify-between gap-3", children: [_jsx("h2", { className: "text-xl font-semibold tracking-tight", children: title ?? headerLabel }), _jsxs("div", { className: "flex items-center gap-2", children: [_jsxs(Button, { variant: "outline", size: "sm", onClick: goPrev, children: [_jsx(ChevronLeft, { className: "mr-1 h-4 w-4" }), " Vorige week"] }), _jsx(Button, { variant: "outline", size: "sm", onClick: goToday, children: "Deze week" }), _jsxs(Button, { variant: "outline", size: "sm", onClick: goNext, children: ["Volgende week ", _jsx(ChevronRight, { className: "ml-1 h-4 w-4" })] })] })] }), misaligned && (_jsx("div", { className: "rounded-md border bg-muted/40 px-3 py-2 text-xs text-muted-foreground", children: "Aantallen worden opnieuw uitgelijnd." })), _jsxs("div", { className: "grid grid-cols-1 gap-3 sm:grid-cols-2 lg:grid-cols-4", children: [_jsx(SummaryCard, { label: MODE_LABELS[mode].summary, value: totals.leveringen, tone: "default" }), _jsx(SummaryCard, { label: "Verzendklaar", value: totals.verzendklaar, tone: "success" }), _jsx(SummaryCard, { label: "In voorbereiding", value: totals.voorbereiding, tone: "muted" }), _jsx(SummaryCard, { label: "Totaal stuks", value: totals.totaalStuks, tone: "default" })] }), _jsx("div", { className: "max-h-[520px] space-y-2 overflow-y-auto rounded-lg border bg-muted/20 p-2", children: isLoading || (mode === "pick" && pickAgenda.isLoading) ? (_jsx("div", { className: "rounded-lg border bg-card p-10 text-center text-sm text-muted-foreground", children: "Laden\u2026" })) : (days.map((day) => (_jsx(DayRow, { day: day, onOrderClick: onOrderClick, onDayClick: onDayClick, capacity: mode === "delivery" ? undefined : capacity.byDate.get(toDayKey(day.date)) }, day.date.toISOString())))) })] }));
 }
 function SummaryCard({ label, value, tone, }) {
     const valueClass = tone === "success" ? "text-green-600" : "text-foreground";
@@ -154,7 +147,7 @@ function DayRow({ day, onOrderClick, onDayClick, capacity, }) {
     const today = new Date();
     today.setHours(0, 0, 0, 0);
     const isToday = isSameDay(day.date, today);
-    return (_jsxs("div", { className: `rounded-lg border bg-card ${isToday ? "ring-1 ring-primary" : ""}`, children: [_jsxs("div", { className: "flex flex-wrap items-center gap-6 px-4 py-4 sm:px-6", children: [_jsxs("div", { className: "w-20 shrink-0", children: [_jsx("div", { className: "text-xs font-medium tracking-wider text-muted-foreground", children: WEEKDAY_LABELS[weekdayIdx] }), _jsx("div", { className: "mt-1 text-3xl font-bold leading-none", children: day.date.getDate() }), _jsxs("div", { className: "text-sm text-muted-foreground", children: [MONTHS_NL_SHORT[day.date.getMonth()], "."] })] }), _jsxs("div", { className: "flex flex-1 flex-wrap items-center gap-6", children: [_jsx(Stat, { icon: _jsx(Package, { className: "h-4 w-4 text-slate-500" }), bg: "bg-slate-100", value: day.bestellingen, label: "bestellingen" }), _jsx(Stat, { icon: _jsx(Truck, { className: "h-4 w-4 text-amber-600" }), bg: "bg-amber-100", value: day.karren, label: "karren" }), _jsx(Stat, { icon: _jsx(Sprout, { className: "h-4 w-4 text-green-600" }), bg: "bg-green-100", value: day.planten, label: "planten" })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [day.movedEarlierOrderIds.size > 0 && (_jsxs(Badge, { className: "bg-purple-500/10 text-purple-700 hover:bg-purple-500/10", variant: "secondary", title: "Aantal orders dat vervroegd is ingepland door Pickverdeling.", children: [_jsx(Scale, { className: "mr-1 h-3.5 w-3.5" }), day.movedEarlierOrderIds.size, " vervroegd"] })), day.verzendklaar > 0 && (_jsxs(Badge, { className: "bg-green-500/15 text-green-700 hover:bg-green-500/15", variant: "secondary", children: [_jsx(CheckCircle2, { className: "mr-1 h-3.5 w-3.5" }), day.verzendklaar, " verzendklaar"] })), day.voorbereiding > 0 && (_jsxs(Badge, { className: "bg-blue-500/10 text-blue-700 hover:bg-blue-500/10", variant: "secondary", children: [_jsx(Clock, { className: "mr-1 h-3.5 w-3.5" }), day.voorbereiding, " in voorbereiding"] })), onDayClick && day.bestellingen > 0 && (_jsx(Button, { size: "sm", variant: "outline", onClick: () => onDayClick(day.date), children: "Dagdetails" }))] })] }), _jsx(CapacityWarning, { day: capacity, className: "mx-4 mb-4 sm:mx-6" })] }));
+    return (_jsxs("div", { className: `rounded-lg border bg-card ${isToday ? "ring-1 ring-primary" : ""}`, children: [_jsxs("div", { className: "flex flex-wrap items-center gap-6 px-4 py-4 sm:px-6", children: [_jsxs("div", { className: "w-20 shrink-0", children: [_jsx("div", { className: "text-xs font-medium tracking-wider text-muted-foreground", children: WEEKDAY_LABELS[weekdayIdx] }), _jsx("div", { className: "mt-1 text-3xl font-bold leading-none", children: day.date.getDate() }), _jsxs("div", { className: "text-sm text-muted-foreground", children: [MONTHS_NL_SHORT[day.date.getMonth()], "."] })] }), _jsxs("div", { className: "flex flex-1 flex-wrap items-center gap-6", children: [_jsx(Stat, { icon: _jsx(Package, { className: "h-4 w-4 text-slate-500" }), bg: "bg-slate-100", value: day.bestellingen, label: "bestellingen" }), _jsx(Stat, { icon: _jsx(Truck, { className: "h-4 w-4 text-amber-600" }), bg: "bg-amber-100", value: day.karren, label: "karren" }), _jsx(Stat, { icon: _jsx(Sprout, { className: "h-4 w-4 text-green-600" }), bg: "bg-green-100", value: day.planten, label: "planten" })] }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [day.shiftedCount > 0 && (_jsxs(Badge, { className: "bg-purple-500/10 text-purple-700 hover:bg-purple-500/10", variant: "secondary", title: "Aantal orders dat te laat is aangemeld en door de Engine is verschoven.", children: [_jsx(Scale, { className: "mr-1 h-3.5 w-3.5" }), day.shiftedCount, " te laat aangemeld"] })), day.verzendklaar > 0 && (_jsxs(Badge, { className: "bg-green-500/15 text-green-700 hover:bg-green-500/15", variant: "secondary", children: [_jsx(CheckCircle2, { className: "mr-1 h-3.5 w-3.5" }), day.verzendklaar, " verzendklaar"] })), day.voorbereiding > 0 && (_jsxs(Badge, { className: "bg-blue-500/10 text-blue-700 hover:bg-blue-500/10", variant: "secondary", children: [_jsx(Clock, { className: "mr-1 h-3.5 w-3.5" }), day.voorbereiding, " in voorbereiding"] })), onDayClick && day.bestellingen > 0 && (_jsx(Button, { size: "sm", variant: "outline", onClick: () => onDayClick(day.date), children: "Dagdetails" }))] })] }), _jsx(CapacityWarning, { day: capacity, className: "mx-4 mb-4 sm:mx-6" })] }));
 }
 function Stat({ icon, bg, value, label, }) {
     return (_jsxs("div", { className: "flex items-center gap-2", children: [_jsx("div", { className: `grid h-8 w-8 place-items-center rounded-full ${bg}`, children: icon }), _jsxs("div", { children: [_jsx("div", { className: "text-lg font-bold leading-none", children: value }), _jsx("div", { className: "text-xs text-muted-foreground", children: label })] })] }));

package/dist-lib/components/pickstation/PakbonTemplate.js CHANGED Viewed

@@ -14,82 +14,82 @@ export function renderPakbonHtml(order, lang = "nl") {
     };
     const rows = order.lines.length
         ? order.lines
-            .map((l) => `
-        <tr>
-          <td>${escapeHtml(l.description)}</td>
-          <td style="text-align:right">${l.crates ?? ""}</td>
-          <td>${escapeHtml(l.unit ?? "")}</td>
+            .map((l) => `
+        <tr>
+          <td>${escapeHtml(l.description)}</td>
+          <td style="text-align:right">${l.crates ?? ""}</td>
+          <td>${escapeHtml(l.unit ?? "")}</td>
         </tr>`)
             .join("")
         : `<tr><td colspan="3" style="text-align:center;color:#666">${escapeHtml(t.noLines)}</td></tr>`;
     const cartLabel = t.cartOf(order.cartIndex, order.cartTotal);
     const fustenLabel = order.cratesOnCart != null ? `${order.cratesOnCart}` : "—";
     const cartNumber = order.cartNumber ?? `${order.orderNumber}-${order.cartIndex}`;
-    return `<!doctype html>
-<html lang="${escapeHtml(htmlLang)}">
-<head>
-  <meta charset="utf-8">
-  <title>${escapeHtml(t.packingSlip)} ${escapeHtml(order.orderNumber)} · ${escapeHtml(cartNumber)}</title>
-  <style>
-    @page {
-      size: A4;
-      margin: 16mm;
-      @top-center { content: element(cartno); }
-    }
-    body { font-family: -apple-system, "Segoe UI", Helvetica, Arial, sans-serif; color:#111; }
-    h1 { margin: 0 0 4px; font-size: 26px; }
-    .sub { color:#444; margin-bottom: 8px; }
-    .cart-number-hero {
-      position: running(cartno);
-      font-size: 88px;
-      font-weight: 900;
-      letter-spacing: 4px;
-      line-height: 1;
-      color: #000;
-      background: #fff;
-      border: 4px solid #000;
-      padding: 12px 20px;
-      display: inline-block;
-      margin: 6px 0 20px;
-      font-family: "Arial Black", "Helvetica Neue", Helvetica, Arial, sans-serif;
-    }
-    .grid { display: grid; grid-template-columns: 1fr 1fr; gap: 12px 24px; margin: 8px 0 22px; }
-    .grid div { font-size: 14px; }
-    .label { color:#666; font-size: 11px; text-transform: uppercase; letter-spacing: .04em; }
-    .value { font-size: 16px; font-weight: 600; }
-    table { width:100%; border-collapse: collapse; font-size: 14px; }
-    th, td { padding: 8px 6px; border-bottom: 1px solid #ddd; vertical-align: top; }
-    th { text-align: left; background:#f5f5f5; }
-    .barcode-fallback { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 18px; letter-spacing: 4px; padding: 8px 12px; border: 2px solid #111; display: inline-block; margin-top: 18px; }
-    .footer { margin-top: 28px; font-size: 11px; color:#666; }
-  </style>
-</head>
-<body>
-  <h1>${escapeHtml(t.packingSlip)}</h1>
-  <div class="sub">${escapeHtml(t.order)} ${escapeHtml(order.orderNumber)} · ${escapeHtml(cartLabel)}</div>
-  <div class="cart-number-hero">${escapeHtml(cartNumber)}</div>
-  <div class="grid">
-    <div><div class="label">${escapeHtml(t.customer)}</div><div class="value">${escapeHtml(order.customerName)}</div></div>
-    <div><div class="label">${escapeHtml(t.country)}</div><div class="value">${escapeHtml(order.country ?? "—")}</div></div>
-    <div><div class="label">${escapeHtml(t.deliveryDate)}</div><div class="value">${fmt(order.deliveryDate)}</div></div>
-    <div><div class="label">${escapeHtml(t.pickDate)}</div><div class="value">${fmt(order.pickDate)}</div></div>
-    <div><div class="label">${escapeHtml(t.cart)}</div><div class="value">${escapeHtml(cartLabel)}</div></div>
-    <div><div class="label">${escapeHtml(t.cratesOnThisCart)}</div><div class="value">${escapeHtml(fustenLabel)}</div></div>
-  </div>
-  <table>
-    <thead><tr><th>${escapeHtml(t.description)}</th><th style="text-align:right;width:90px">${escapeHtml(t.crates)}</th><th style="width:90px">${escapeHtml(t.unit)}</th></tr></thead>
-    <tbody>${rows}</tbody>
-  </table>
-  <div class="barcode-fallback">*${escapeHtml(order.orderNumber)}*</div>
-  <div class="footer">${escapeHtml(t.printedVia)} · ${new Date().toLocaleString(locale)}</div>
-</body>
+    return `<!doctype html>
+<html lang="${escapeHtml(htmlLang)}">
+<head>
+  <meta charset="utf-8">
+  <title>${escapeHtml(t.packingSlip)} ${escapeHtml(order.orderNumber)} · ${escapeHtml(cartNumber)}</title>
+  <style>
+    @page {
+      size: A4;
+      margin: 16mm;
+      @top-center { content: element(cartno); }
+    }
+    body { font-family: -apple-system, "Segoe UI", Helvetica, Arial, sans-serif; color:#111; }
+    h1 { margin: 0 0 4px; font-size: 26px; }
+    .sub { color:#444; margin-bottom: 8px; }
+    .cart-number-hero {
+      position: running(cartno);
+      font-size: 88px;
+      font-weight: 900;
+      letter-spacing: 4px;
+      line-height: 1;
+      color: #000;
+      background: #fff;
+      border: 4px solid #000;
+      padding: 12px 20px;
+      display: inline-block;
+      margin: 6px 0 20px;
+      font-family: "Arial Black", "Helvetica Neue", Helvetica, Arial, sans-serif;
+    }
+    .grid { display: grid; grid-template-columns: 1fr 1fr; gap: 12px 24px; margin: 8px 0 22px; }
+    .grid div { font-size: 14px; }
+    .label { color:#666; font-size: 11px; text-transform: uppercase; letter-spacing: .04em; }
+    .value { font-size: 16px; font-weight: 600; }
+    table { width:100%; border-collapse: collapse; font-size: 14px; }
+    th, td { padding: 8px 6px; border-bottom: 1px solid #ddd; vertical-align: top; }
+    th { text-align: left; background:#f5f5f5; }
+    .barcode-fallback { font-family: ui-monospace, SFMono-Regular, Menlo, monospace; font-size: 18px; letter-spacing: 4px; padding: 8px 12px; border: 2px solid #111; display: inline-block; margin-top: 18px; }
+    .footer { margin-top: 28px; font-size: 11px; color:#666; }
+  </style>
+</head>
+<body>
+  <h1>${escapeHtml(t.packingSlip)}</h1>
+  <div class="sub">${escapeHtml(t.order)} ${escapeHtml(order.orderNumber)} · ${escapeHtml(cartLabel)}</div>
+  <div class="cart-number-hero">${escapeHtml(cartNumber)}</div>
+  <div class="grid">
+    <div><div class="label">${escapeHtml(t.customer)}</div><div class="value">${escapeHtml(order.customerName)}</div></div>
+    <div><div class="label">${escapeHtml(t.country)}</div><div class="value">${escapeHtml(order.country ?? "—")}</div></div>
+    <div><div class="label">${escapeHtml(t.deliveryDate)}</div><div class="value">${fmt(order.deliveryDate)}</div></div>
+    <div><div class="label">${escapeHtml(t.pickDate)}</div><div class="value">${fmt(order.pickDate)}</div></div>
+    <div><div class="label">${escapeHtml(t.cart)}</div><div class="value">${escapeHtml(cartLabel)}</div></div>
+    <div><div class="label">${escapeHtml(t.cratesOnThisCart)}</div><div class="value">${escapeHtml(fustenLabel)}</div></div>
+  </div>
+  <table>
+    <thead><tr><th>${escapeHtml(t.description)}</th><th style="text-align:right;width:90px">${escapeHtml(t.crates)}</th><th style="width:90px">${escapeHtml(t.unit)}</th></tr></thead>
+    <tbody>${rows}</tbody>
+  </table>
+  <div class="barcode-fallback">*${escapeHtml(order.orderNumber)}*</div>
+  <div class="footer">${escapeHtml(t.printedVia)} · ${new Date().toLocaleString(locale)}</div>
+</body>
 </html>`;
 }
 function escapeHtml(s) {

package/dist-lib/hooks/useCartIndex.d.ts ADDED Viewed

@@ -0,0 +1,11 @@
+/**
+ * Gedeelde karindex van de Engine. Dit is de enige bron voor karrentellingen:
+ * taak-payloads (cartCount) en eigen tellingen op order_carts zijn niet meer
+ * toegestaan. Een gedeelde kar telt bij elke order waar hij in zit.
+ */
+export declare function useCartIndex(from: string | null, to: string | null): {
+    cartsForOrder: (...refs: (string | null | undefined)[]) => number | null;
+    isLoading: boolean;
+    error: string | null;
+};
+//# sourceMappingURL=useCartIndex.d.ts.map

package/dist-lib/hooks/useCartIndex.d.ts.map ADDED Viewed

	@@ -0,0 +1 @@
1	+ {"version":3,"file":"useCartIndex.d.ts","sourceRoot":"","sources":["../../src/hooks/useCartIndex.ts"],"names":[],"mappings":"AAWA;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;6BAoBrB,CAAC,MAAM,GAAG,IAAI,GAAG,SAAS,CAAC,EAAE,KAAG,MAAM,GAAG,IAAI;;;EA0B1F"}

package/dist-lib/hooks/useCartIndex.js ADDED Viewed

@@ -0,0 +1,56 @@
+import { useCallback } from "react";
+import { useQuery } from "@tanstack/react-query";
+import { supabase } from "../integrations/supabase/moduleClient";
+/**
+ * Gedeelde karindex van de Engine. Dit is de enige bron voor karrentellingen:
+ * taak-payloads (cartCount) en eigen tellingen op order_carts zijn niet meer
+ * toegestaan. Een gedeelde kar telt bij elke order waar hij in zit.
+ */
+export function useCartIndex(from, to) {
+    const query = useQuery({
+        queryKey: ["logistics-cart-index", from, to],
+        enabled: !!from && !!to,
+        staleTime: 30000,
+        retry: false,
+        refetchInterval: 60000,
+        queryFn: async () => {
+            const { data, error } = await supabase.rpc("logistics_cart_index", {
+                p_from: from,
+                p_to: to,
+            });
+            if (error)
+                throw new Error(error.message);
+            return Array.isArray(data) ? data : [];
+        },
+    });
+    const rows = query.data;
+    // Per orderreferentie de unieke karren tellen.
+    const cartsForOrder = useCallback((...refs) => {
+        const perOrder = new Map();
+        for (const r of rows ?? []) {
+            const cart = r.cart_id ?? "";
+            if (!cart)
+                continue;
+            for (const ref of [r.order_number, r.order_uuid]) {
+                if (!ref)
+                    continue;
+                const set = perOrder.get(ref) ?? new Set();
+                set.add(cart);
+                perOrder.set(ref, set);
+            }
+        }
+        for (const ref of refs) {
+            if (!ref)
+                continue;
+            const set = perOrder.get(ref);
+            if (set)
+                return set.size;
+        }
+        return null;
+    }, [rows]);
+    return {
+        cartsForOrder,
+        isLoading: query.isLoading,
+        error: query.error instanceof Error ? query.error.message : null,
+    };
+}