@flowselections/pick-schermen-kwekers 1.0.64 → 1.0.68

package/dist-lib/components/pick/PickScherm.d.ts

@@ -3,10 +3,12 @@ interface Props {
     station: PickStation;
     onBack?: () => void;
 }
+/** Taal per station op dit apparaat. */
+export declare const langStorageKey: (stationId: string) => string;
 /**
  * Pickscherm. De Logistiek Engine bepaalt welke documenten zichtbaar zijn en
  * in welke volgorde; dit scherm toont uitsluitend wat de wachtrij teruggeeft.
  */
-export declare function PickScherm({ station, onBack }: Props): import("react").JSX.Element;
+export declare function PickScherm({ station, onBack }: Props): import("react").JSX.Element | null;
 export {};
 //# sourceMappingURL=PickScherm.d.ts.map

package/dist-lib/components/pick/PickScherm.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PickScherm.d.ts","sourceRoot":"","sources":["../../../src/components/pick/PickScherm.tsx"],"names":[],"mappings":"AA0DA,OAAO,EAaL,KAAK,WAAW,EACjB,MAAM,qBAAqB,CAAC;AA6D7B,UAAU,KAAK;IACb,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAwBD;;;GAGG;AACH,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,+BA0rEpD"}
+{"version":3,"file":"PickScherm.d.ts","sourceRoot":"","sources":["../../../src/components/pick/PickScherm.tsx"],"names":[],"mappings":"AA0DA,OAAO,EAaL,KAAK,WAAW,EACjB,MAAM,qBAAqB,CAAC;AA8D7B,UAAU,KAAK;IACb,OAAO,EAAE,WAAW,CAAC;IACrB,MAAM,CAAC,EAAE,MAAM,IAAI,CAAC;CACrB;AAGD,wCAAwC;AACxC,eAAO,MAAM,cAAc,GAAI,WAAW,MAAM,WAAuC,CAAC;AAsBxF;;;GAGG;AACH,wBAAgB,UAAU,CAAC,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,KAAK,sCAosEpD"}

package/dist-lib/components/pick/PickScherm.js

@@ -22,6 +22,7 @@ import { friendlyPickError, getPickUiTexts } from "../../lib/pickUiText.js";
 import { getPrintJobTexts } from "../../lib/pickPrintJobText.js";
 import { defaultFilters, usePickDays, usePickHeartbeat, usePickQueue, } from "../../hooks/usePickQueue.js";
 import { usePickPrintStatus } from "../../hooks/usePickPrintStatus.js";
+import { useCartStickerStates } from "../../hooks/useCartStickerStates.js";
 import { activeDeviceKey } from "../../lib/pick159.js";
 import { usePickDocumentTypes, usePickStatuses, useStationPrintPlek, } from "../../hooks/usePickConfig.js";
 import { usePrintBatch, usePrintJob } from "../../hooks/usePrintJob.js";
@@ -35,6 +36,8 @@ import { isPrintBlocked } from "../../lib/pick156.js";
 import { DocumentChoiceMelding, useDocumentChoice } from "./DocumentChoiceMelding.js";
 import { isWaitingShippingNote, shippingNoteMessage, shippingNoteSourceLabel, } from "../../lib/shippingNoteStatus.js";
 const LANG_STORAGE_KEY = "pick.language";
+/** Taal per station op dit apparaat. */
+export const langStorageKey = (stationId) => `${LANG_STORAGE_KEY}.${stationId}`;
 /** Melding als de planning voor deze order geen karren heeft vastgelegd. */
 /** Papier is geprint, maar de PDF-kopie op de werkplek is niet opgeslagen. */
 const PDF_SAVE_NOTICE = "De pakbon is geprint, maar de PDF is niet op de werkplek opgeslagen. Geef de PDF-map in Layout maker opnieuw vrij.";
@@ -56,6 +59,7 @@ const NOT_READY_NOTICE = "Deze pakbon is nog niet printklaar. Klik op \"Pakbon o
 export function PickScherm({ station, onBack }) {
     const sessionId = getSessionId();
     const [lang, setLang] = useState(null);
+    const [langLoaded, setLangLoaded] = useState(false);
     const [filters, setFilters] = useState(defaultFilters);
     const [chosenDay, setChosenDay] = useState(null);
     const [loadingDay, setLoadingDay] = useState(false);
@@ -204,15 +208,16 @@ export function PickScherm({ station, onBack }) {
     useEffect(() => {
         if (typeof window === "undefined")
             return;
-        const stored = window.localStorage.getItem(LANG_STORAGE_KEY);
+        const stored = window.localStorage.getItem(langStorageKey(station.id)) ?? window.localStorage.getItem(LANG_STORAGE_KEY);
         if (stored)
             setLang(stored);
-    }, []);
+        setLangLoaded(true);
+    }, [station.id]);
     const chooseLang = useCallback((code) => {
         setLang(code);
         if (typeof window !== "undefined")
-            window.localStorage.setItem(LANG_STORAGE_KEY, code);
-    }, []);
+            window.localStorage.setItem(langStorageKey(station.id), code);
+    }, [station.id]);
     /** Zoeken pas na een korte pauze, zodat typen geen query per toets afvuurt. */
     useEffect(() => {
         const timer = setTimeout(() => {
@@ -232,6 +237,9 @@ export function PickScherm({ station, onBack }) {
     const { result: printStatus, loading: printStatusLoading, inPrint, } = usePickPrintStatus(printStatusIds, activeDeviceKey() ? station.slug ?? null : null, lang !== null);
     const inPrintRef = useRef(inPrint);
     inPrintRef.current = inPrint;
+    // 1.0.65: stickerstand van alle karren van de order in één aanroep (openbaar station).
+    const stickerCartIds = useMemo(() => (Array.isArray(cartPlan?.carts) ? cartPlan.carts.map((c) => c.cartId).filter((x) => !!x) : []), [cartPlan]);
+    useCartStickerStates(stickerCartIds, station.slug ?? null);
     /** Geprint maar nog niet gescand, van een eerdere pickdag (blijft open tot de scan). */
     const viewDay = chosenDay ?? pickDay ?? null;
     const { data: earlierRaw, refetch: refetchEarlier } = useQuery({
@@ -951,16 +959,16 @@ export function PickScherm({ station, onBack }) {
                 targets.push(item);
             }
             if (targets.length === 0) {
-                toast.warning("Er is geen enkele kar printklaar.");
+                toast.warning("Er is geen enkele kar printklaar.", { id: "pick-none-ready" });
                 for (const s of skipped.slice(0, 5))
-                    toast.warning(`${s.title}: ${s.reason}`);
+                    toast.warning(`${s.title}: ${s.reason}`, { id: `pick-skip-${s.title}` });
                 return;
             }
             if (targets.length < cartsPerPrint) {
-                toast.info(`Er zijn maar ${targets.length} van de ${cartsPerPrint} karren printklaar; alleen die worden geprint.`);
+                toast.info(`Er zijn maar ${targets.length} van de ${cartsPerPrint} karren printklaar; alleen die worden geprint.`, { id: "pick-some-ready" });
             }
             for (const s of skipped.slice(0, 5))
-                toast.warning(`${s.title}: ${s.reason}`);
+                toast.warning(`${s.title}: ${s.reason}`, { id: `pick-skip-${s.title}` });
             const doneUnits = new Set();
             for (const item of targets) {
                 const unitKey = `${item.document_type_id ?? "-"}|${unitRefOf(item)}`;
@@ -1352,6 +1360,8 @@ export function PickScherm({ station, onBack }) {
             autoFetched.current = false;
     }, [pendingCount]);
     // Stap 1 — taalselectie
+    if (!langLoaded)
+        return null;
     if (lang === null) {
         return (_jsxs("div", { className: "space-y-6", children: [_jsxs("div", { className: "grid grid-cols-[minmax(0,1fr)_auto] items-center gap-3 sm:flex sm:flex-wrap sm:justify-between", children: [_jsxs("div", { className: "min-w-0", children: [_jsx("h2", { className: "truncate text-xl font-bold text-foreground sm:text-2xl", children: station.name }), _jsx("p", { className: "text-sm text-muted-foreground", children: t("chooseLanguageHint") })] }), onBack && (_jsxs(Button, { variant: "outline", className: "shrink-0", onClick: onBack, children: [_jsx(ArrowLeft, { className: "mr-2 h-4 w-4" }), " ", t("back")] }))] }), _jsx(LanguageTiles, { onSelect: chooseLang })] }));
     }

package/dist-lib/components/pick/StickerReprintButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StickerReprintButton.d.ts","sourceRoot":"","sources":["../../../src/components/pick/StickerReprintButton.tsx"],"names":[],"mappings":"AAMA,2EAA2E;AAC3E,wBAAgB,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAqE7F"}
+{"version":3,"file":"StickerReprintButton.d.ts","sourceRoot":"","sources":["../../../src/components/pick/StickerReprintButton.tsx"],"names":[],"mappings":"AAMA,2EAA2E;AAC3E,wBAAgB,oBAAoB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAsE7F"}

package/dist-lib/components/pick/StickerReprintButton.js

@@ -17,7 +17,7 @@ export function StickerReprintButton({ cartId, slug }) {
         refetchInterval: 15000,
         placeholderData: (prev) => prev,
         retry: 1,
-        enabled: !!slug,
+        enabled: false, // gevuld door useCartStickerStates
     });
     if (!slug || !hasPrintedSticker(q.data))
         return null;
@@ -41,6 +41,7 @@ export function StickerReprintButton({ cartId, slug }) {
         finally {
             setBusy(false);
             qc.invalidateQueries({ queryKey: ["pick", "sticker-state", cartId] });
+            qc.invalidateQueries({ queryKey: ["pick", "sticker-bundle"] });
         }
     };
     return (_jsxs("div", { className: "mt-3", children: [_jsx("button", { type: "button", onClick: () => setOpen(true), className: "rounded-md border bg-background px-3 py-2 text-sm font-medium text-foreground hover:bg-muted", children: "Stickers opnieuw printen" }), open && (_jsx("div", { role: "dialog", "aria-modal": "true", className: "fixed inset-0 z-50 flex items-center justify-center bg-foreground/40 p-4", children: _jsxs("div", { className: "w-full max-w-sm rounded-lg border bg-background p-4 shadow-lg", children: [_jsx("p", { className: "font-medium text-foreground", children: "Stickers van deze kar opnieuw printen?" }), _jsxs("label", { className: "mt-3 block text-sm text-muted-foreground", children: ["Reden (optioneel)", _jsx("input", { value: reden, onChange: (e) => setReden(e.target.value), disabled: busy, className: "mt-1 w-full rounded-md border bg-background px-2 py-1.5 text-sm text-foreground" })] }), detail && (_jsxs("details", { className: "mt-2 text-xs text-muted-foreground", children: [_jsx("summary", { className: "cursor-pointer", children: "Details voor beheer" }), _jsx("p", { children: detail })] })), _jsxs("div", { className: "mt-4 flex justify-end gap-2", children: [_jsx("button", { type: "button", disabled: busy, onClick: () => setOpen(false), className: "rounded-md border px-3 py-1.5 text-sm text-foreground", children: "Annuleren" }), _jsx("button", { type: "button", disabled: busy, onClick: run, className: "rounded-md bg-primary px-3 py-1.5 text-sm font-medium text-primary-foreground disabled:opacity-60", children: busy ? "Bezig…" : "Opnieuw printen" })] })] }) }))] }));

package/dist-lib/components/pick/StickerState.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"StickerState.d.ts","sourceRoot":"","sources":["../../../src/components/pick/StickerState.tsx"],"names":[],"mappings":"AAcA,+EAA+E;AAC/E,wBAAgB,mBAAmB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAuC5F;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAoBvG;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCA8CzF;AAED,6HAA6H;AAC7H,wBAAgB,yBAAyB,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAiBpF"}
+{"version":3,"file":"StickerState.d.ts","sourceRoot":"","sources":["../../../src/components/pick/StickerState.tsx"],"names":[],"mappings":"AAcA,+EAA+E;AAC/E,wBAAgB,mBAAmB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAwC5F;AAED,6EAA6E;AAC7E,wBAAgB,qBAAqB,CAAC,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE;IAAE,OAAO,EAAE,MAAM,GAAG,IAAI,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAoBvG;AAED,sEAAsE;AACtE,wBAAgB,gBAAgB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAuDzF;AAED,6HAA6H;AAC7H,wBAAgB,yBAAyB,CAAC,EAAE,SAAS,EAAE,EAAE;IAAE,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,sCAiBpF"}

package/dist-lib/components/pick/StickerState.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useQuery } from "@tanstack/react-query";
 import { fetchCartStickerState, fetchOrderStickerMeldingen, STICKER_UNKNOWN, stickerStatusLabel, } from "../../lib/pickStickers.js";
-import { stickerLine } from "../../lib/pick161.js";
+import { stickerLineWithJobs } from "../../lib/pick161.js";
 import { fetchUitwijk, fetchVroegeWaarschuwing, vroegeWaarschuwingText } from "../../lib/pickUitwijk.js";
 import { fetchStickerFit, STICKER_FIT_UNKNOWN, stickerFitTone } from "../../lib/pick150.js";
 const POLL = 15000;
@@ -10,11 +10,12 @@ export function StickerFitMeldingen({ cartId, slug }) {
     const q = useQuery({
         queryKey: ["pick", "sticker-fit", cartId, slug],
         queryFn: () => fetchStickerFit(cartId, slug),
+        enabled: !slug, // openbaar station: gevuld door useCartStickerStates
         refetchInterval: POLL,
         placeholderData: (prev) => prev,
         retry: 1,
     });
-    if (q.isLoading)
+    if (q.data === undefined && !q.isError)
         return null;
     if (q.isError || q.data == null) {
         return _jsx("p", { className: "mt-3 text-xs text-muted-foreground", children: STICKER_FIT_UNKNOWN });
@@ -37,12 +38,12 @@ export function OrderStickerMeldingen({ orderId, slug }) {
     const q = useQuery({
         queryKey: ["pick", "sticker-meldingen", orderId, slug],
         queryFn: () => fetchOrderStickerMeldingen(orderId, slug),
-        enabled: !!orderId,
+        enabled: !!orderId && !slug,
         refetchInterval: POLL,
         placeholderData: (prev) => prev,
         retry: 1,
     });
-    if (!orderId || q.isLoading)
+    if (!orderId || (q.data === undefined && !q.isError))
         return null;
     if (q.isError || q.data == null) {
         return _jsxs("p", { className: "mb-3 text-xs text-muted-foreground", children: ["Stickermeldingen: ", STICKER_UNKNOWN] });
@@ -57,6 +58,7 @@ export function CartStickerState({ cartId, slug }) {
     const q = useQuery({
         queryKey: ["pick", "sticker-state", cartId, slug],
         queryFn: () => fetchCartStickerState(cartId, slug),
+        enabled: !slug,
         refetchInterval: POLL,
         placeholderData: (prev) => prev,
         retry: 1,
@@ -65,20 +67,29 @@ export function CartStickerState({ cartId, slug }) {
     const u = useQuery({
         queryKey: ["pick", "uitwijk", jobIds.join(",")],
         queryFn: () => fetchUitwijk(jobIds),
-        enabled: jobIds.length > 0,
+        enabled: !slug && jobIds.length > 0,
         refetchInterval: POLL,
         placeholderData: (prev) => prev,
         retry: 1,
     });
-    if (q.isLoading)
+    const jobs = useQuery({
+        queryKey: ["pick", "sticker-jobs", cartId, slug],
+        queryFn: () => null,
+        enabled: false, // gevuld door useCartStickerStates
+    });
+    const opdrachten = jobs.data?.opdrachten ?? null;
+    const hasJobs = Array.isArray(opdrachten) && opdrachten.length > 0;
+    if (q.data === undefined && !q.isError && !hasJobs)
         return null;
-    if (q.isError || !q.data) {
+    if ((q.isError || !q.data) && !hasJobs) {
         return _jsx("p", { className: "mt-3 text-xs text-muted-foreground", children: STICKER_UNKNOWN });
     }
-    const s = q.data;
-    const line = stickerLine(s, u.data);
+    const s = q.data ?? null;
+    const line = stickerLineWithJobs(s, opdrachten, jobs.data?.tijdzone ?? null, u.data);
+    if (!s)
+        return _jsx("p", { className: "mt-3 text-sm text-foreground", children: line });
     const regels = Array.isArray(s.regels) ? s.regels : [];
-    if (s.totaal === 0)
+    if (s.totaal === 0 || hasJobs)
         return _jsx("p", { className: "mt-3 text-sm text-muted-foreground", children: line });
     return (_jsxs("details", { className: "mt-3 rounded-md border bg-background p-3 text-sm", children: [_jsxs("summary", { className: "cursor-pointer font-medium text-foreground", children: ["Stickers: ", line] }), _jsx("p", { className: "mt-1 text-xs text-muted-foreground", children: "In de printwachtrij betekent nog niet fysiek geprint." }), _jsx("ul", { className: "mt-2 divide-y", children: regels.map((r, i) => (_jsxs("li", { className: "flex flex-wrap justify-between gap-2 py-1.5 text-xs", children: [_jsxs("span", { className: "text-foreground", children: [r.soort ?? "sticker", " \u00B7 ", r.kopieen ?? "—", "x", r.breedteMm && r.hoogteMm ? ` · ${r.breedteMm}x${r.hoogteMm} mm` : ""] }), _jsxs("span", { className: "text-muted-foreground", children: [stickerStatusLabel(r.status), r.reden ? ` — ${r.reden}` : ""] })] }, r.stickerId ?? i))) })] }));
 }

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

@@ -0,0 +1,8 @@
+export declare const STICKER_POLL = 15000;
+/**
+ * Openbaar pickstation: stickerstand, controle, meldingen en uitwijk voor alle
+ * karren van de order in één aanroep. Vult de cache van de losse onderdelen,
+ * die met een slug zelf niet meer opvragen.
+ */
+export declare function useCartStickerStates(cartIds: string[], slug: string | null): import("@tanstack/react-query").UseQueryResult<import("../lib/pickStickerBundle.js").CartStickerBundleItem[], Error>;
+//# sourceMappingURL=useCartStickerStates.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"useCartStickerStates.d.ts","sourceRoot":"","sources":["../../src/hooks/useCartStickerStates.ts"],"names":[],"mappings":"AAUA,eAAO,MAAM,YAAY,QAAS,CAAC;AAEnC;;;;GAIG;AACH,wBAAgB,oBAAoB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE,IAAI,EAAE,MAAM,GAAG,IAAI,qHA2B1E"}

package/dist-lib/hooks/useCartStickerStates.js

@@ -0,0 +1,42 @@
+import { useEffect, useMemo } from "react";
+import { useQuery, useQueryClient } from "@tanstack/react-query";
+import { supabase } from "@flowselections/core";
+import { keyedRpc } from "../lib/pick159.js";
+import { parseCartStickerBundle } from "../lib/pickStickerBundle.js";
+import { pickMeasure } from "../lib/pickPerf.js";
+const db = keyedRpc(supabase);
+export const STICKER_POLL = 15000;
+/**
+ * Openbaar pickstation: stickerstand, controle, meldingen en uitwijk voor alle
+ * karren van de order in één aanroep. Vult de cache van de losse onderdelen,
+ * die met een slug zelf niet meer opvragen.
+ */
+export function useCartStickerStates(cartIds, slug) {
+    const qc = useQueryClient();
+    const ids = useMemo(() => Array.from(new Set(cartIds.filter(Boolean))).sort(), [cartIds]);
+    const q = useQuery({
+        queryKey: ["pick", "sticker-bundle", slug, ids.join(",")],
+        enabled: !!slug && ids.length > 0,
+        refetchInterval: STICKER_POLL,
+        retry: 1,
+        queryFn: async () => {
+            const { data, error } = await pickMeasure("stickerstand", () => db.rpc("pickstation_cart_sticker_states", { p_slug: slug, p_cart_ids: ids }));
+            if (error)
+                throw new Error(error.message);
+            return parseCartStickerBundle(data);
+        },
+    });
+    useEffect(() => {
+        if (!q.data)
+            return;
+        for (const k of q.data) {
+            qc.setQueryData(["pick", "sticker-state", k.cartId, slug], k.stand);
+            qc.setQueryData(["pick", "sticker-fit", k.cartId, slug], k.controle);
+            if (k.orderId)
+                qc.setQueryData(["pick", "sticker-meldingen", k.orderId, slug], k.meldingen);
+            qc.setQueryData(["pick", "uitwijk", k.jobIds.join(",")], k.uitwijk);
+            qc.setQueryData(["pick", "sticker-jobs", k.cartId, slug], { opdrachten: k.opdrachten, tijdzone: k.tijdzone });
+        }
+    }, [q.data, qc, slug]);
+    return q;
+}