@flowselections/floriday-afhandeling-module 1.0.46 → 1.0.47

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

@@ -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;AAyEjE,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;AAQD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,sCAG1D"}
+{"version":3,"file":"DagDetailDialog.d.ts","sourceRoot":"","sources":["../../../src/components/afhandeling/DagDetailDialog.tsx"],"names":[],"mappings":"AAyBA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AA+EjE,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;AAQD,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,sCAG1D"}

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

@@ -8,7 +8,7 @@ import { ResponsiveDialogBody, ResponsiveDialogContent, ResponsiveDialogFooter,
 import { usePickAgenda } from "../../hooks/usePickAgenda";
 import { useOrderBuffers } from "../../hooks/useOrderBuffers";
 import { isSameDay } from "../../lib/pickDate";
-import { getOrderLines, } from "../../lib/cartAssignments.functions";
+import { getOrderLines, getDayCartContents, } from "../../lib/cartAssignments.functions";
 import { printLayoutDocument, printPdfDocument, printFoutMelding } from "../../lib/printing";
 import { AutoProcessStatus } from "./AutoProcessStatus";
 import { CapacityWarning } from "./CapacityWarning";
@@ -82,23 +82,44 @@ function DagDetailContent({ open, date, planned, onOpenChange, }) {
             planned: p,
         });
     }
+    // Echte karindeling per order ophalen.
+    const fetchCartContents = useServerFn(getDayCartContents);
+    const refsForQuery = ordersOnDay.map((o) => o.ref).sort();
+    const contentsQuery = useQuery({
+        queryKey: ["day-cart-contents", dayKey, refsForQuery],
+        queryFn: () => fetchCartContents({ data: { orderRefs: refsForQuery } }),
+        enabled: open && refsForQuery.length > 0,
+    });
+    const contentsByRef = new Map();
+    for (const c of contentsQuery.data?.carts ?? []) {
+        const k = refKey(c.orderRef);
+        const list = contentsByRef.get(k) ?? [];
+        list.push(c);
+        contentsByRef.set(k, list);
+    }
     // Eén rij per kar die op deze dag valt.
     const cartRows = [];
     for (const o of ordersOnDay) {
         const total = Math.max(0, o.carts);
-        const plantsPerCart = total > 0 ? Math.round(o.plants / total) : 0;
+        const real = contentsByRef.get(refKey(o.ref)) ?? [];
         for (let idx = 0; idx < total; idx++) {
+            const rc = real[idx] ?? null;
+            const nr = rc?.cartNumber ?? idx + 1;
             cartRows.push({
                 key: `${o.ref}-${idx}`,
                 orderRef: o.ref,
                 customerName: o.planned?.order.customerName ?? "—",
                 cartIndex: idx,
-                cartNumber: `${o.ref}-${String(idx + 1).padStart(2, "0")}`,
+                cartNumber: `${o.ref}-${String(nr).padStart(2, "0")}`,
                 order: o.planned,
-                layers: 4,
-                crates: 0,
-                plants: plantsPerCart,
-                occupancy: 100,
+                layers: rc?.layersUsed ?? null,
+                maxLayers: rc?.maxLayers ?? null,
+                crates: rc?.crates ?? null,
+                plants: rc?.plants ?? null,
+                occupancy: rc?.occupancy ?? null,
+                layerUtilization: rc?.layerUtilization ?? null,
+                hasContent: !!rc,
+                contentLoading: contentsQuery.isLoading,
                 status: o.status,
             });
         }
@@ -601,7 +622,9 @@ function KarRow({ cart: c, cartTotal, selected, onToggle, }) {
             setBezig(null);
         }
     };
-    return (_jsxs("div", { className: `rounded-md border p-3 ${selected ? "border-primary bg-primary/5" : ""}`, children: [_jsxs("div", { className: "flex items-start gap-3", children: [_jsx(Checkbox, { checked: selected, onCheckedChange: onToggle, className: "mt-1" }), _jsxs("div", { className: "grid flex-1 gap-3 lg:grid-cols-[1fr_1.4fr_1fr_auto] lg:items-center", children: [_jsx(Field, { label: "Karnummer", value: c.cartNumber }), _jsx(Field, { label: "Klant", value: c.customerName }), _jsx(Field, { label: "Bestelling", value: c.orderRef }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx(Badge, { variant: voortgang(c.status).variant, children: voortgang(c.status).label }), _jsxs(Badge, { variant: "outline", children: [c.occupancy, "%"] }), _jsxs(Badge, { variant: "outline", children: [c.layers, " lagen"] }), _jsxs(Badge, { variant: "outline", children: [c.plants, " planten"] }), _jsxs(Button, { size: "sm", variant: "outline", disabled: bezig !== null, onClick: printPakbon, title: "Pakbon van deze kar opnieuw printen", children: [_jsx(Printer, { className: "mr-1 h-3.5 w-3.5" }), bezig === "pakbon" ? "Bezig…" : "Pakbon"] }), _jsxs(Button, { size: "sm", variant: "outline", disabled: bezig !== null, onClick: printVerzendbrief, title: "Verzendbrief van deze bestelling printen", children: [_jsx(Printer, { className: "mr-1 h-3.5 w-3.5" }), bezig === "brief" ? "Bezig…" : "Verzendbrief"] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: () => setVerzetOpen(true), title: "Ophaaldag of ophaaltijd van de bestelling van deze kar wijzigen", children: [_jsx(CalendarClock, { className: "mr-1 h-3.5 w-3.5" }), "Verzetten"] })] })] })] }), _jsx(VerzetOrderDialog, { open: verzetOpen, orderRef: c.orderRef, carrierTarget: {
+    return (_jsxs("div", { className: `rounded-md border p-3 ${selected ? "border-primary bg-primary/5" : ""}`, children: [_jsxs("div", { className: "flex items-start gap-3", children: [_jsx(Checkbox, { checked: selected, onCheckedChange: onToggle, className: "mt-1" }), _jsxs("div", { className: "grid flex-1 gap-3 lg:grid-cols-[1fr_1.4fr_1fr_auto] lg:items-center", children: [_jsx(Field, { label: "Karnummer", value: c.cartNumber }), _jsx(Field, { label: "Klant", value: c.customerName }), _jsx(Field, { label: "Bestelling", value: c.orderRef }), _jsxs("div", { className: "flex flex-wrap items-center gap-2", children: [_jsx(Badge, { variant: voortgang(c.status).variant, children: voortgang(c.status).label }), c.hasContent ? (_jsxs(_Fragment, { children: [_jsxs(Badge, { variant: "outline", children: [c.occupancy ?? "—", "%", c.layerUtilization != null
+                                                        ? ` · ${Number(c.layerUtilization.toFixed(1)).toLocaleString("nl-NL")}% van de kar`
+                                                        : ""] }), _jsxs(Badge, { variant: "outline", children: [c.layers ?? "—", c.maxLayers != null ? ` / ${c.maxLayers}` : "", " lagen"] }), _jsxs(Badge, { variant: "outline", children: [c.crates ?? "—", " fusten"] }), _jsxs(Badge, { variant: "outline", children: [c.plants ?? "—", " planten"] })] })) : (_jsx(Badge, { variant: "outline", className: "text-muted-foreground", children: c.contentLoading ? "Karinhoud laden…" : "Nog geen karindeling" })), _jsxs(Button, { size: "sm", variant: "outline", disabled: bezig !== null, onClick: printPakbon, title: "Pakbon van deze kar opnieuw printen", children: [_jsx(Printer, { className: "mr-1 h-3.5 w-3.5" }), bezig === "pakbon" ? "Bezig…" : "Pakbon"] }), _jsxs(Button, { size: "sm", variant: "outline", disabled: bezig !== null, onClick: printVerzendbrief, title: "Verzendbrief van deze bestelling printen", children: [_jsx(Printer, { className: "mr-1 h-3.5 w-3.5" }), bezig === "brief" ? "Bezig…" : "Verzendbrief"] }), _jsxs(Button, { size: "sm", variant: "outline", onClick: () => setVerzetOpen(true), title: "Ophaaldag of ophaaltijd van de bestelling van deze kar wijzigen", children: [_jsx(CalendarClock, { className: "mr-1 h-3.5 w-3.5" }), "Verzetten"] })] })] })] }), _jsx(VerzetOrderDialog, { open: verzetOpen, orderRef: c.orderRef, carrierTarget: {
                     carrierId: c.order?.order.carrierId ?? null,
                     country: c.order?.order.country ?? null,
                     province: c.order?.order.province ?? null,