@flowselections/floriday-afhandeling-module 1.0.41 → 1.0.43

package/dist-lib/hooks/usePickAgenda.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"usePickAgenda.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickAgenda.ts"],"names":[],"mappings":"AAIA,kDAAkD;AAClD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AA4BD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;;;;;EAyDnE"}
+{"version":3,"file":"usePickAgenda.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickAgenda.ts"],"names":[],"mappings":"AAOA,kDAAkD;AAClD,MAAM,WAAW,eAAe;IAC9B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,KAAK,EAAE,MAAM,CAAC;IACd,MAAM,EAAE,MAAM,CAAC;IACf,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,gDAAgD;AAChD,MAAM,WAAW,aAAa;IAC5B,QAAQ,EAAE,MAAM,CAAC;IACjB,UAAU,EAAE,MAAM,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE,eAAe,EAAE,CAAC;CAC3B;AAuCD,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,EAAE,EAAE,EAAE,MAAM,GAAG,IAAI;;;;;EAuGnE"}

package/dist-lib/hooks/usePickAgenda.js

@@ -1,6 +1,8 @@
-import { useEffect } from "react";
+import { useEffect, useMemo } from "react";
 import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { supabase } from "../integrations/supabase/moduleClient";
+import { useKnownOrders } from "./useKnownOrders";
+import { useOrderPickDates } from "./useOrderPickDates";
 function toOrders(value) {
     if (!Array.isArray(value))
         return [];
@@ -21,20 +23,29 @@ function toOrders(value) {
  * berekent zelf geen pickdagen meer en doet geen datum- of tijdzonelogica.
  * Dagen zonder rij tonen simpelweg nullen.
  */
+function shiftDay(day, delta) {
+    const d = new Date(`${day}T12:00:00Z`);
+    d.setUTCDate(d.getUTCDate() + delta);
+    return d.toISOString().slice(0, 10);
+}
 export function usePickAgenda(from, to) {
     const queryClient = useQueryClient();
-    const queryKey = ["logistics-pick-agenda", from, to];
+    // Ruimer ophalen dan gevraagd: de Engine schuift oude taken naar vandaag, wij
+    // zetten ze terug op hun oorspronkelijke dag en dat kan buiten de week vallen.
+    const wideFrom = from ? shiftDay(from, -180) : null;
+    const wideTo = to ? shiftDay(to, 30) : null;
+    const queryKey = ["logistics-pick-agenda", wideFrom, wideTo];
     const query = useQuery({
         queryKey,
-        enabled: !!from && !!to,
+        enabled: !!wideFrom && !!wideTo,
         staleTime: 30000,
         retry: false,
         refetchInterval: 60000,
         refetchOnWindowFocus: true,
         queryFn: async () => {
             const { data, error } = await supabase.rpc("logistics_pick_agenda", {
-                p_from: from,
-                p_to: to,
+                p_from: wideFrom,
+                p_to: wideTo,
             });
             if (error)
                 throw new Error(error.message);
@@ -51,10 +62,12 @@ export function usePickAgenda(from, to) {
             }));
         },
     });
-    // Ververs zodra de Engine taken wijzigt.
+    // Ververs zodra de Engine taken wijzigt. Elke hook-instantie krijgt een eigen
+    // kanaalnaam; hergebruik van dezelfde naam laat Supabase een al-geabonneerd
+    // kanaal terugvinden en gooit "cannot add postgres_changes after subscribe()".
     useEffect(() => {
         const channel = supabase
-            .channel("pick-agenda-logistics-tasks")
+            .channel(`pick-agenda-logistics-tasks-${Math.random().toString(36).slice(2)}`)
             .on("postgres_changes", { event: "*", schema: "public", table: "logistics_tasks" }, () => {
             queryClient.invalidateQueries({ queryKey: ["logistics-pick-agenda"] });
         })
@@ -63,11 +76,51 @@ export function usePickAgenda(from, to) {
             supabase.removeChannel(channel);
         };
     }, [queryClient]);
+    // Orders die de Verkoop-module niet kent horen hier niet te staan, en orders
+    // die de Engine ná hun leverdatum plant gaan terug naar hun eigen dag. De
+    // dagtotalen worden opnieuw opgeteld uit wat overblijft.
+    const { isKnownRef } = useKnownOrders();
+    const { correctPickDate } = useOrderPickDates();
+    const days = useMemo(() => {
+        const perDay = new Map();
+        for (const d of query.data ?? []) {
+            if (!perDay.has(d.pickDate))
+                perDay.set(d.pickDate, []);
+            for (const o of d.orders) {
+                if (!isKnownRef(o.orderRef))
+                    continue;
+                const dag = correctPickDate(o.orderRef, d.pickDate);
+                const list = perDay.get(dag) ?? [];
+                list.push(o);
+                perDay.set(dag, list);
+            }
+        }
+        const out = [];
+        for (const [pickDate, orders] of perDay) {
+            if (from && pickDate < from)
+                continue;
+            if (to && pickDate > to)
+                continue;
+            const ready = orders.filter((o) => o.status === "ready" || o.status === "done").length;
+            out.push({
+                pickDate,
+                orders,
+                orderCount: orders.length,
+                cartCount: orders.reduce((s, o) => s + (o.carts || 0), 0),
+                plantCount: orders.reduce((s, o) => s + (o.plants || 0), 0),
+                ready,
+                inPreparation: Math.max(0, orders.length - ready),
+                shiftedCount: orders.filter((o) => o.shifted).length,
+            });
+        }
+        out.sort((a, b) => a.pickDate.localeCompare(b.pickDate));
+        return out;
+    }, [query.data, isKnownRef, correctPickDate, from, to]);
     const byDate = new Map();
-    for (const d of query.data ?? [])
+    for (const d of days)
         byDate.set(d.pickDate, d);
     return {
-        days: query.data ?? [],
+        days,
         byDate,
         isLoading: query.isLoading,
         error: query.error instanceof Error ? query.error.message : null,

package/dist-lib/hooks/usePickMode.d.ts

@@ -0,0 +1,10 @@
+/**
+ * De Engine bepaalt de actieve pickmethode. Alleen bij "picken per kar"
+ * bestaat er een karcontrolestap. Zonder antwoord blijft die verborgen.
+ */
+export declare function usePickMode(): {
+    pickMode: "order" | "buffer" | "cart" | "smallest" | null;
+    showCartControl: boolean;
+    isLoading: boolean;
+};
+//# sourceMappingURL=usePickMode.d.ts.map

package/dist-lib/hooks/usePickMode.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"usePickMode.d.ts","sourceRoot":"","sources":["../../src/hooks/usePickMode.ts"],"names":[],"mappings":"AASA;;;GAGG;AACH,wBAAgB,WAAW;;;;EA0B1B"}

package/dist-lib/hooks/usePickMode.js

@@ -0,0 +1,31 @@
+import { useEffect } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { fetchPickMode, startPickModeWatch, subscribePickMode, } from "../lib/pickMode";
+/**
+ * De Engine bepaalt de actieve pickmethode. Alleen bij "picken per kar"
+ * bestaat er een karcontrolestap. Zonder antwoord blijft die verborgen.
+ */
+export function usePickMode() {
+    const queryClient = useQueryClient();
+    const query = useQuery({
+        queryKey: ["logistics-pick-mode"],
+        staleTime: 5000,
+        refetchInterval: 30000,
+        refetchOnWindowFocus: true,
+        refetchOnMount: "always",
+        retry: false,
+        queryFn: fetchPickMode,
+    });
+    // Live meelopen met wijzigingen in de instellingen van de Engine.
+    useEffect(() => {
+        startPickModeWatch();
+        return subscribePickMode(() => {
+            queryClient.invalidateQueries({ queryKey: ["logistics-pick-mode"] });
+        });
+    }, [queryClient]);
+    return {
+        pickMode: query.data?.pickMode ?? null,
+        showCartControl: query.data?.showCartControl === true,
+        isLoading: query.isLoading,
+    };
+}

package/dist-lib/index.d.ts

@@ -14,5 +14,7 @@ export { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettin
 export { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
 export { calculateEarliestDeliveryDate, calculateOrderPlanning, DEFAULT_PICKUP_MOMENT, type EarliestDeliveryRules, type OrderPlanning, type PickupMoment, } from "./lib/planning";
 export { carrierLeadDaysFromMoments, normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget, type CarrierOrderTarget, type CarrierPlanningInfo, } from "./lib/carrierPlanning";
+export { ensurePickMode, fetchPickMode, getPickMode, refreshPickMode, startPickModeWatch, subscribePickMode, type PickMode, type PickModeInfo } from "./lib/pickMode";
+export { usePickMode } from "./hooks/usePickMode";
 export declare const floridayAfhandelingModule: FlowModule;
 //# sourceMappingURL=index.d.ts.map

package/dist-lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAExF,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACzB,MAAM,uBAAuB,CAAC;AAK/B,eAAO,MAAM,yBAAyB,EAAE,UAkBvC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAEvD,cAAc,kBAAkB,CAAC;AACjC,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,eAAe,EAAE,MAAM,0CAA0C,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,sBAAsB,EAAE,MAAM,iDAAiD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,+CAA+C,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,MAAM,yCAAyC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,kBAAkB,EAAE,MAAM,6CAA6C,CAAC;AACjF,OAAO,EAAE,YAAY,EAAE,MAAM,uCAAuC,CAAC;AACrE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAExF,OAAO,EACL,6BAA6B,EAC7B,sBAAsB,EACtB,qBAAqB,EACrB,KAAK,qBAAqB,EAC1B,KAAK,aAAa,EAClB,KAAK,YAAY,GAClB,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,0BAA0B,EAC1B,sBAAsB,EACtB,gBAAgB,EAChB,sBAAsB,EACtB,KAAK,kBAAkB,EACvB,KAAK,mBAAmB,GACzB,MAAM,uBAAuB,CAAC;AAM/B,OAAO,EAAE,cAAc,EAAE,aAAa,EAAE,WAAW,EAAE,eAAe,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,KAAK,QAAQ,EAAE,KAAK,YAAY,EAAE,MAAM,gBAAgB,CAAC;AACtK,OAAO,EAAE,WAAW,EAAE,MAAM,qBAAqB,CAAC;AAalD,eAAO,MAAM,yBAAyB,EAAE,UAmBvC,CAAC"}

package/dist-lib/index.js

@@ -16,19 +16,32 @@ export { calculateEarliestDeliveryDate, calculateOrderPlanning, DEFAULT_PICKUP_M
 export { carrierLeadDaysFromMoments, normalizePickupMoments, sanitizeWeekdays, selectCarrierForTarget, } from "./lib/carrierPlanning";
 import { AfhandelingSettingsCard } from "./components/settings/AfhandelingSettingsCard";
 import { VervoerdersSettingsCard } from "./components/settings/VervoerdersSettingsCard";
+import { ensurePickMode, getPickMode } from "./lib/pickMode";
+export { ensurePickMode, fetchPickMode, getPickMode, refreshPickMode, startPickModeWatch, subscribePickMode } from "./lib/pickMode";
+export { usePickMode } from "./hooks/usePickMode";
+const baseChildren = [
+    { label: "Pick Agenda", href: "/afhandeling/picking", icon: CalendarCheck },
+    { label: "Planning en leveringen", href: "/afhandeling/leveringen", icon: CalendarRange },
+];
+const cartControlChild = {
+    label: "Controle karren",
+    href: "/afhandeling/controle",
+    icon: ClipboardCheck,
+};
 export const floridayAfhandelingModule = {
     id: "afhandeling",
     name: "Afhandeling",
-    version: "1.3.0",
+    version: "1.4.0",
     nav: {
         label: "Afhandeling",
         href: "/afhandeling/picking",
         icon: PackageCheck,
-        children: [
-            { label: "Pick Agenda", href: "/afhandeling/picking", icon: CalendarCheck },
-            { label: "Planning en leveringen", href: "/afhandeling/leveringen", icon: CalendarRange },
-            { label: "Controle karren", href: "/afhandeling/controle", icon: ClipboardCheck },
-        ],
+        // De Engine beslist: karcontrole hoort alleen bij "picken per kar".
+        // Zonder antwoord blijft het item verborgen (fail closed).
+        get children() {
+            void ensurePickMode();
+            return getPickMode().showCartControl ? [...baseChildren, cartControlChild] : baseChildren;
+        },
     },
     settingsCards: [
         { component: VervoerdersSettingsCard, order: 80 },