@olenbetong/synergi-react 5.4.0 → 5.6.0

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 (133) hide show
  1. package/dist/styles/styles.css +1 -1
  2. package/dist/styles/styles.css.map +1 -1
  3. package/es/charts/CallOffDeliveries/TicketScanDialog.d.ts +7 -0
  4. package/es/charts/CallOffDeliveries/TicketScanDialog.js +47 -0
  5. package/es/charts/CallOffDeliveries/chartOptions.d.ts +8 -0
  6. package/es/charts/CallOffDeliveries/chartOptions.js +138 -0
  7. package/es/charts/CallOffDeliveries/data.d.ts +35 -0
  8. package/es/charts/CallOffDeliveries/data.js +30 -0
  9. package/es/charts/CallOffDeliveries/index.css +1 -0
  10. package/es/charts/CallOffDeliveries/index.d.ts +24 -0
  11. package/es/charts/CallOffDeliveries/index.js +115 -0
  12. package/es/charts/CallOffDeliveries/model.d.ts +37 -0
  13. package/es/charts/CallOffDeliveries/model.js +59 -0
  14. package/es/charts/ProductionPlan/PlanValueDialog.d.ts +14 -0
  15. package/es/charts/ProductionPlan/PlanValueDialog.js +47 -0
  16. package/es/charts/ProductionPlan/chartOptions.d.ts +20 -0
  17. package/es/charts/ProductionPlan/chartOptions.js +353 -0
  18. package/es/charts/ProductionPlan/data.d.ts +105 -0
  19. package/es/charts/ProductionPlan/data.js +61 -0
  20. package/es/charts/ProductionPlan/index.css +1 -0
  21. package/es/charts/ProductionPlan/index.d.ts +31 -0
  22. package/es/charts/ProductionPlan/index.js +203 -0
  23. package/es/charts/ProductionPlan/model.d.ts +29 -0
  24. package/es/charts/ProductionPlan/model.js +65 -0
  25. package/es/charts/Pumping/chartOptions.d.ts +12 -0
  26. package/es/charts/Pumping/chartOptions.js +197 -0
  27. package/es/charts/Pumping/data.d.ts +65 -0
  28. package/es/charts/Pumping/data.js +20 -0
  29. package/es/charts/Pumping/index.css +1 -0
  30. package/es/charts/Pumping/index.d.ts +27 -0
  31. package/es/charts/Pumping/index.js +124 -0
  32. package/es/charts/Pumping/model.d.ts +34 -0
  33. package/es/charts/Pumping/model.js +88 -0
  34. package/es/charts/UnboundPreview/chartOptions.d.ts +3 -0
  35. package/es/charts/UnboundPreview/chartOptions.js +126 -0
  36. package/es/charts/UnboundPreview/index.css +1 -0
  37. package/es/charts/UnboundPreview/index.d.ts +20 -0
  38. package/es/charts/UnboundPreview/index.js +55 -0
  39. package/es/charts/UnboundPreview/model.d.ts +49 -0
  40. package/es/charts/UnboundPreview/model.js +67 -0
  41. package/es/charts/VehicleDeliveries/chartOptions.d.ts +13 -0
  42. package/es/charts/VehicleDeliveries/chartOptions.js +270 -0
  43. package/es/charts/VehicleDeliveries/data.d.ts +71 -0
  44. package/es/charts/VehicleDeliveries/data.js +20 -0
  45. package/es/charts/VehicleDeliveries/deliveryXRange.d.ts +4 -0
  46. package/es/charts/VehicleDeliveries/deliveryXRange.js +62 -0
  47. package/es/charts/VehicleDeliveries/index.css +1 -0
  48. package/es/charts/VehicleDeliveries/index.d.ts +24 -0
  49. package/es/charts/VehicleDeliveries/index.js +129 -0
  50. package/es/charts/VehicleDeliveries/model.d.ts +24 -0
  51. package/es/charts/VehicleDeliveries/model.js +106 -0
  52. package/es/charts/format.d.ts +12 -0
  53. package/es/charts/format.js +34 -0
  54. package/es/charts/index.d.ts +5 -0
  55. package/es/charts/index.js +5 -0
  56. package/es/charts/storage.d.ts +5 -0
  57. package/es/charts/storage.js +35 -0
  58. package/es/chrome/assistant.d.ts +75 -0
  59. package/es/chrome/assistant.js +116 -0
  60. package/es/components/ColorCard/index.css +8 -8
  61. package/es/index.css +1 -1
  62. package/es/index.d.ts +1 -0
  63. package/es/index.js +1 -0
  64. package/es/vehicles/VehicleInfoDialog/OutOfServiceForm.d.ts +4 -0
  65. package/es/vehicles/VehicleInfoDialog/OutOfServiceForm.js +51 -0
  66. package/es/vehicles/VehicleInfoDialog/data/dsDeliveryTickets.d.ts +99 -0
  67. package/es/vehicles/VehicleInfoDialog/data/dsDeliveryTickets.js +499 -0
  68. package/es/vehicles/VehicleInfoDialog/data/dsDriverStatus.d.ts +13 -0
  69. package/es/vehicles/VehicleInfoDialog/data/dsDriverStatus.js +69 -0
  70. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfo.d.ts +33 -0
  71. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfo.js +164 -0
  72. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfoLog.d.ts +15 -0
  73. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfoLog.js +80 -0
  74. package/es/vehicles/VehicleInfoDialog/formatting.d.ts +13 -0
  75. package/es/vehicles/VehicleInfoDialog/formatting.js +48 -0
  76. package/es/vehicles/VehicleInfoDialog/index.css +1 -0
  77. package/es/vehicles/VehicleInfoDialog/index.d.ts +11 -0
  78. package/es/vehicles/VehicleInfoDialog/index.js +46 -0
  79. package/es/vehicles/VehicleInfoDialog/tabs.d.ts +6 -0
  80. package/es/vehicles/VehicleInfoDialog/tabs.js +85 -0
  81. package/es/vehicles/index.d.ts +1 -0
  82. package/es/vehicles/index.js +1 -0
  83. package/package.json +17 -8
  84. package/src/charts/CallOffDeliveries/TicketScanDialog.tsx +79 -0
  85. package/src/charts/CallOffDeliveries/chartOptions.ts +160 -0
  86. package/src/charts/CallOffDeliveries/data.ts +67 -0
  87. package/src/charts/CallOffDeliveries/index.scss +51 -0
  88. package/src/charts/CallOffDeliveries/index.tsx +217 -0
  89. package/src/charts/CallOffDeliveries/model.test.ts +90 -0
  90. package/src/charts/CallOffDeliveries/model.ts +87 -0
  91. package/src/charts/ProductionPlan/PlanValueDialog.tsx +107 -0
  92. package/src/charts/ProductionPlan/chartOptions.ts +406 -0
  93. package/src/charts/ProductionPlan/data.ts +170 -0
  94. package/src/charts/ProductionPlan/index.scss +148 -0
  95. package/src/charts/ProductionPlan/index.tsx +432 -0
  96. package/src/charts/ProductionPlan/model.test.ts +132 -0
  97. package/src/charts/ProductionPlan/model.ts +102 -0
  98. package/src/charts/Pumping/chartOptions.ts +224 -0
  99. package/src/charts/Pumping/data.ts +91 -0
  100. package/src/charts/Pumping/index.scss +42 -0
  101. package/src/charts/Pumping/index.tsx +222 -0
  102. package/src/charts/Pumping/model.test.ts +122 -0
  103. package/src/charts/Pumping/model.ts +104 -0
  104. package/src/charts/UnboundPreview/chartOptions.ts +137 -0
  105. package/src/charts/UnboundPreview/index.scss +17 -0
  106. package/src/charts/UnboundPreview/index.tsx +100 -0
  107. package/src/charts/UnboundPreview/model.test.ts +129 -0
  108. package/src/charts/UnboundPreview/model.ts +110 -0
  109. package/src/charts/VehicleDeliveries/chartOptions.ts +311 -0
  110. package/src/charts/VehicleDeliveries/data.ts +98 -0
  111. package/src/charts/VehicleDeliveries/deliveryXRange.ts +80 -0
  112. package/src/charts/VehicleDeliveries/index.scss +43 -0
  113. package/src/charts/VehicleDeliveries/index.tsx +262 -0
  114. package/src/charts/VehicleDeliveries/model.test.ts +117 -0
  115. package/src/charts/VehicleDeliveries/model.ts +139 -0
  116. package/src/charts/format.ts +38 -0
  117. package/src/charts/index.ts +20 -0
  118. package/src/charts/storage.ts +36 -0
  119. package/src/chrome/assistant.test.tsx +106 -0
  120. package/src/chrome/assistant.ts +178 -0
  121. package/src/components/ColorCard/index.css +8 -8
  122. package/src/index.ts +9 -0
  123. package/src/vehicles/VehicleInfoDialog/OutOfServiceForm.tsx +127 -0
  124. package/src/vehicles/VehicleInfoDialog/data/dsDeliveryTickets.ts +600 -0
  125. package/src/vehicles/VehicleInfoDialog/data/dsDriverStatus.ts +84 -0
  126. package/src/vehicles/VehicleInfoDialog/data/dsVehicleInfo.ts +198 -0
  127. package/src/vehicles/VehicleInfoDialog/data/dsVehicleInfoLog.ts +97 -0
  128. package/src/vehicles/VehicleInfoDialog/formatting.test.ts +57 -0
  129. package/src/vehicles/VehicleInfoDialog/formatting.ts +58 -0
  130. package/src/vehicles/VehicleInfoDialog/index.scss +131 -0
  131. package/src/vehicles/VehicleInfoDialog/index.tsx +106 -0
  132. package/src/vehicles/VehicleInfoDialog/tabs.tsx +188 -0
  133. package/src/vehicles/index.ts +1 -0
@@ -0,0 +1,160 @@
1
+ import Highcharts from "highcharts";
2
+
3
+ import { getLocalizedString } from "../../i18n.js";
4
+ import type { CallOffDeliveryRecord } from "./data.js";
5
+ import { type ChartData, getChartHeight, getReturnTime, getStatusMarks } from "./model.js";
6
+ import { formatTime, escapeHtml } from "../format.js";
7
+
8
+ const HOUR = 3600000;
9
+
10
+ // The colour the chart has always had (the first of Highcharts' old default palette).
11
+ const BAR_COLOR = "#7cb5ec";
12
+
13
+ export type ChartSettings = {
14
+ date: Date;
15
+ minOffset: number;
16
+ maxOffset: number;
17
+ };
18
+
19
+ function categoryLabelHtml(data: ChartData, index: number) {
20
+ let category = data.categories[index];
21
+ if (!category) return "";
22
+
23
+ let vehicle = category.vehicleId === null ? "N/A" : String(category.vehicleId);
24
+
25
+ if (data.byVehicle) {
26
+ let text = `${getLocalizedString("Vehicle")} ${vehicle}`;
27
+ let label = category.vehicleId === null ? `<span>${text}</span>` : `<a href="#vehicle-${vehicle}">${text}</a>`;
28
+ return `<div style="min-width:65px">${label}</div>`;
29
+ }
30
+
31
+ let title = category.deliveryTicketId
32
+ ? `<a href="#ticket-${category.deliveryTicketId}">${category.deliveryTicketId}</a>`
33
+ : `<span>${getLocalizedString("Planned")}</span>`;
34
+
35
+ // Inline-block, so the two lines count as one for the line clamp Highcharts puts on a label.
36
+ return `<span style="display:inline-block;min-width:65px;line-height:1.2">${title}<br>${getLocalizedString("Vehicle")}: ${vehicle}</span>`;
37
+ }
38
+
39
+ function deliveryTooltip(row: CallOffDeliveryRecord) {
40
+ let title = `${row.DeliveryTicketID ?? getLocalizedString("Planned")} (${getLocalizedString("Vehicle")} ${row.VehicleID ?? "N/A"}${
41
+ row.DriverID ? `, ${getLocalizedString("Driver")}: ${escapeHtml(row.DriverID)}` : ""
42
+ })`;
43
+
44
+ return `<div style="font-size:10px">
45
+ <div style="color:var(--ds-color-info-text-subtle)">${title}</div>
46
+ <div>${escapeHtml(row.CustomerAdr1)}</div>
47
+ <div style="color:var(--ds-color-neutral-text-subtle)">${escapeHtml(row.BuildSiteAdr1)}</div>
48
+ <br>
49
+ <div>${getLocalizedString("Production at")} ${formatTime(row.ProdTime)}</div>
50
+ <div>${getLocalizedString("Arrival at")} ${formatTime(row.Arrival)}</div>
51
+ <div>${getLocalizedString("Unloading starts at")} ${formatTime(row.UnloadStart)}</div>
52
+ <div>${getLocalizedString("Unloading complete at")} ${formatTime(row.UnloadComplete)}</div>
53
+ </div>`;
54
+ }
55
+
56
+ export function getChartOptions(data: ChartData, settings: ChartSettings): Highcharts.Options {
57
+ let { date, minOffset, maxOffset } = settings;
58
+ let midnight = date.getTime();
59
+ let min = midnight + minOffset * HOUR;
60
+ let max = midnight + maxOffset * HOUR;
61
+ let rowsByKey = new Map(data.rows.map((row) => [row.PrimKey, row]));
62
+
63
+ let deliveries = data.rows.map((row) => ({
64
+ y: row.categoryIndex,
65
+ x: row.ProdTime.getTime(),
66
+ x2: getReturnTime(row).getTime(),
67
+ ...getStatusMarks(row),
68
+ primKey: row.PrimKey,
69
+ color: Highcharts.color(BAR_COLOR)
70
+ .setOpacity(row.IsPlanned ? 0.2 : 0.6)
71
+ .get("rgba") as string,
72
+ }));
73
+
74
+ let band = (from: number, to: number) => ({ color: "var(--ds-color-neutral-background-tinted)", from, to });
75
+ let hourLabels = { hour: "%H", day: "%d.%m" };
76
+
77
+ return {
78
+ chart: {
79
+ type: "deliveryxrange",
80
+ backgroundColor: "transparent",
81
+ zooming: { type: "x" },
82
+ height: getChartHeight(data.categories.length),
83
+ marginTop: 70,
84
+ marginBottom: 40,
85
+ },
86
+ accessibility: { enabled: false },
87
+ credits: { enabled: false },
88
+ title: { text: undefined },
89
+ xAxis: [
90
+ {
91
+ type: "datetime",
92
+ min,
93
+ max,
94
+ dateTimeLabelFormats: hourLabels,
95
+ tickInterval: HOUR,
96
+ minorTickInterval: 0.5 * HOUR,
97
+ plotBands: [band(min - 24 * HOUR, midnight + 6 * HOUR), band(midnight + 18 * HOUR, max + 24 * HOUR)],
98
+ plotLines: [
99
+ {
100
+ color: "var(--ds-color-neutral-border-default)",
101
+ width: 2,
102
+ dashStyle: "Dot",
103
+ // The bars are wall clock times carried as UTC, so "now" has to be as well.
104
+ value: Date.now() - new Date().getTimezoneOffset() * 60000,
105
+ },
106
+ ],
107
+ },
108
+ { type: "datetime", linkedTo: 0, opposite: true, dateTimeLabelFormats: hourLabels },
109
+ ],
110
+ yAxis: {
111
+ categories: data.categories.map((category) => category.key),
112
+ reversed: true,
113
+ min: 0,
114
+ max: Math.max(data.categories.length - 1, 0),
115
+ title: { text: "" },
116
+ tickInterval: 1,
117
+ gridLineColor: "var(--ds-color-neutral-border-subtle)",
118
+ labels: {
119
+ useHTML: true,
120
+ formatter(this: any) {
121
+ return categoryLabelHtml(data, this.pos);
122
+ },
123
+ },
124
+ },
125
+ tooltip: {
126
+ useHTML: true,
127
+ formatter(this: any) {
128
+ let row = rowsByKey.get(this.point.primKey);
129
+ return row ? deliveryTooltip(row) : false;
130
+ },
131
+ },
132
+ plotOptions: {
133
+ deliveryxrange: {
134
+ animation: false,
135
+ grouping: false,
136
+ groupPadding: 0.065,
137
+ colorByPoint: false,
138
+ borderWidth: 1,
139
+ borderColor: "#888",
140
+ borderRadius: 0,
141
+ dataLabels: {
142
+ enabled: true,
143
+ useHTML: false,
144
+ color: "var(--ds-color-neutral-text-default)",
145
+ align: "left",
146
+ y: 2,
147
+ style: { fontWeight: "normal", fontSize: "10px", textOutline: "none" },
148
+ formatter(this: any) {
149
+ return formatTime(rowsByKey.get(this.point.primKey)?.ProdTime);
150
+ },
151
+ },
152
+ },
153
+ series: { states: { inactive: { opacity: 1 } } },
154
+ } as Highcharts.PlotOptions,
155
+ legend: { enabled: false },
156
+ series: [
157
+ { type: "deliveryxrange", name: "Deliveries", data: deliveries },
158
+ ] as unknown as Highcharts.SeriesOptionsType[],
159
+ };
160
+ }
@@ -0,0 +1,67 @@
1
+ import { generateApiDataObject, ProcedureAPI, SortOrder } from "@olenbetong/appframe-data";
2
+
3
+ export type CallOffDeliveryRecord = {
4
+ IsPlanned: boolean;
5
+ PlantID: number;
6
+ CallOffID: number;
7
+ VehicleID: number | null;
8
+ DriverID: string | null;
9
+ DeliveryTicketID: number | null;
10
+ CustomerAdr1: string | null;
11
+ BuildSiteAdr1: string | null;
12
+ ProdTime: Date;
13
+ Arrival: Date | null;
14
+ UnloadStart: Date | null;
15
+ UnloadComplete: Date | null;
16
+ ReturnTime: Date | null;
17
+ PrimKey: string;
18
+ };
19
+
20
+ export type CallOffDeliveriesParams = {
21
+ CallOffID: number;
22
+ Date: Date;
23
+ IncludeAllPlanned: boolean;
24
+ };
25
+
26
+ export type CallOffDeliveriesResult = {
27
+ Table: CallOffDeliveryRecord[];
28
+ };
29
+
30
+ export const procDeliveriesByCallOff = new ProcedureAPI<CallOffDeliveriesParams, CallOffDeliveriesResult>({
31
+ procedureId: "astp_Plant_CallOffs_DeliveriesByCallOff",
32
+ parameters: [
33
+ { name: "CallOffID", type: "number", hasDefault: false, required: true },
34
+ { name: "Date", type: "date", hasDefault: false, required: true },
35
+ { name: "IncludeAllPlanned", type: "boolean", hasDefault: true, required: false },
36
+ ],
37
+ timeout: 30000,
38
+ });
39
+
40
+ export type TicketScanRecord = {
41
+ PrimKey: string;
42
+ Updated: Date;
43
+ Extension: string | null;
44
+ DeliveryTicketID: number | null;
45
+ SortOrder: Date;
46
+ };
47
+
48
+ /** The newest scan of a delivery ticket. Loaded by hand with a where clause. */
49
+ export const dsTicketScan = generateApiDataObject<TicketScanRecord>({
50
+ resource: "atbv_Fleet_DeliveryTicketsScan",
51
+ id: "dsCallOffDeliveriesTicketScan",
52
+ allowUpdate: false,
53
+ allowInsert: false,
54
+ allowDelete: false,
55
+ dynamicLoading: true,
56
+ fields: [
57
+ { name: "PrimKey", type: "string", nullable: false },
58
+ { name: "Updated", type: "datetime", nullable: false },
59
+ { name: "Extension", type: "string", nullable: true },
60
+ { name: "DeliveryTicketID", type: "number", nullable: true },
61
+ { name: "SortOrder", type: "datetime", nullable: false },
62
+ ],
63
+ parameters: {
64
+ maxRecords: 1,
65
+ sortOrder: [{ SortOrder: SortOrder.Desc }],
66
+ },
67
+ });
@@ -0,0 +1,51 @@
1
+ .ObCallOffDeliveries {
2
+ padding-block: 0.5rem;
3
+ }
4
+
5
+ .ObCallOffDeliveries-options {
6
+ display: flex;
7
+ gap: 0.5rem 1rem;
8
+ justify-content: flex-end;
9
+ position: sticky;
10
+ top: 0;
11
+ z-index: 1;
12
+ padding: 5px;
13
+ padding-inline-start: 2.5rem;
14
+ background-color: var(--ds-color-neutral-background-default);
15
+ }
16
+
17
+ // Out of the flow, so the spinner never changes the height of the bar while it loads.
18
+ .ObCallOffDeliveries-status {
19
+ position: absolute;
20
+ inset-block: 0;
21
+ inset-inline-start: 5px;
22
+ display: flex;
23
+ align-items: center;
24
+ pointer-events: none;
25
+ }
26
+
27
+ // Highcharts sets `light dark` here, which follows the OS instead of the colour scheme of the site.
28
+ .ObCallOffDeliveries-chart .highcharts-container {
29
+ color-scheme: inherit;
30
+ }
31
+
32
+ .ObCallOffDeliveries-chart a {
33
+ color: var(--ds-color-info-text-subtle);
34
+ }
35
+
36
+ .ObCallOffDeliveries-scan {
37
+ display: flex;
38
+ justify-content: center;
39
+
40
+ img {
41
+ max-width: 100%;
42
+ max-height: 75vh;
43
+ object-fit: contain;
44
+ }
45
+
46
+ iframe {
47
+ width: 100%;
48
+ height: 75vh;
49
+ border: 0;
50
+ }
51
+ }
@@ -0,0 +1,217 @@
1
+ import { Alert, Checkbox, Spinner } from "@digdir/designsystemet-react";
2
+ import Highcharts from "highcharts";
3
+ import {
4
+ useCallback,
5
+ useDeferredValue,
6
+ useEffect,
7
+ useImperativeHandle,
8
+ useLayoutEffect,
9
+ useMemo,
10
+ useRef,
11
+ useState,
12
+ } from "react";
13
+ import type { Ref } from "react";
14
+
15
+ import { getLocalizedString } from "../../i18n.js";
16
+ import { VehicleInfoDialog } from "../../vehicles/VehicleInfoDialog/index.js";
17
+ import { registerDeliveryXRange } from "../VehicleDeliveries/deliveryXRange.js";
18
+ import { type ChartSettings, getChartOptions } from "./chartOptions.js";
19
+ import { type CallOffDeliveriesResult, procDeliveriesByCallOff } from "./data.js";
20
+ import { type ChartData, getChartData, getChartHeight } from "./model.js";
21
+ import { TicketScanDialog } from "./TicketScanDialog.js";
22
+
23
+ import "./index.scss";
24
+ import { writeStored, useStoredFlag, readOffset } from "../storage.js";
25
+
26
+ registerDeliveryXRange();
27
+
28
+ export type CallOffDeliveriesHandle = {
29
+ /** Fetches the data again, keeping the zoom. */
30
+ reload: () => void;
31
+ /** Sets the hours shown around the day. An undefined offset forgets the stored one. */
32
+ setOffsets: (min?: number, max?: number) => void;
33
+ };
34
+
35
+ export type CallOffDeliveriesProps = {
36
+ /** The call-off to show the loads of. Nothing is fetched while it is null. */
37
+ callOffId: number | null;
38
+ /** Midnight UTC of the day to show. */
39
+ date: Date;
40
+ /** Prefix of the settings in localStorage. */
41
+ storageKey: string;
42
+ /** Called after the chart has drawn, when the height of the page may have changed. */
43
+ onRendered?: () => void;
44
+ ref?: Ref<CallOffDeliveriesHandle>;
45
+ };
46
+
47
+ function DeliveriesChart({
48
+ data,
49
+ settings,
50
+ onShowVehicle,
51
+ onShowTicket,
52
+ onRendered,
53
+ }: {
54
+ data: ChartData;
55
+ settings: ChartSettings;
56
+ onShowVehicle: (vehicleId: number) => void;
57
+ onShowTicket: (deliveryTicketId: number) => void;
58
+ onRendered?: () => void;
59
+ }) {
60
+ let container = useRef<HTMLDivElement>(null);
61
+ let zoom = useRef<{ min: number; max: number } | null>(null);
62
+ let options = useMemo(() => getChartOptions(data, settings), [data, settings]);
63
+
64
+ useLayoutEffect(() => {
65
+ let chart = new Highcharts.Chart(container.current as HTMLElement, options);
66
+
67
+ if (zoom.current) {
68
+ chart.xAxis[0].setExtremes(zoom.current.min, zoom.current.max, true, false);
69
+ chart.showResetZoom();
70
+ }
71
+
72
+ onRendered?.();
73
+
74
+ return () => {
75
+ let { userMin, userMax } = chart.xAxis[0].getExtremes();
76
+ zoom.current = userMin !== undefined && userMax !== undefined ? { min: userMin, max: userMax } : null;
77
+ chart.destroy();
78
+ };
79
+ }, [options, onRendered]);
80
+
81
+ return (
82
+ <div
83
+ ref={container}
84
+ className="ObCallOffDeliveries-chart"
85
+ // Reserved up front, so the page keeps its scroll position while the chart is replaced.
86
+ style={{ minHeight: getChartHeight(data.categories.length) }}
87
+ onClick={(event) => {
88
+ let link = (event.target as Element).closest<HTMLAnchorElement>('a[href^="#vehicle-"], a[href^="#ticket-"]');
89
+ if (!link) return;
90
+
91
+ event.preventDefault();
92
+ let [kind, id] = link.hash.slice(1).split("-");
93
+ if (kind === "vehicle") onShowVehicle(Number(id));
94
+ else onShowTicket(Number(id));
95
+ }}
96
+ />
97
+ );
98
+ }
99
+
100
+ /**
101
+ * The delivered and planned loads of one call-off through a day, a line per load or per vehicle.
102
+ * Click a ticket number for the scan of the delivery ticket, or a vehicle for the vehicle info.
103
+ */
104
+ export function CallOffDeliveries({ callOffId, date, storageKey, onRendered, ref }: CallOffDeliveriesProps) {
105
+ let [byVehicle, setByVehicle] = useStoredFlag(`${storageKey}_showbyvehicle`);
106
+ let [includeAllPlanned, setIncludeAllPlanned] = useStoredFlag(`${storageKey}_includeallplanned`);
107
+ let [minOffset, setMinOffset] = useState(() => readOffset(`${storageKey}_minoffset`, -2));
108
+ let [maxOffset, setMaxOffset] = useState(() => readOffset(`${storageKey}_maxoffset`, 28));
109
+ let [result, setResult] = useState<CallOffDeliveriesResult | null>(null);
110
+ let [error, setError] = useState<string | null>(null);
111
+ let [reloadCount, setReloadCount] = useState(0);
112
+ let [vehicleId, setVehicleId] = useState<number | null>(null);
113
+ let [ticketId, setTicketId] = useState<number | null>(null);
114
+ let [loadedKey, setLoadedKey] = useState<string | null>(null);
115
+
116
+ let reload = useCallback(() => setReloadCount((count) => count + 1), []);
117
+ let dateKey = date.getTime();
118
+ let requestKey = `${callOffId}|${dateKey}|${includeAllPlanned}|${reloadCount}`;
119
+
120
+ useEffect(() => {
121
+ if (callOffId === null) return;
122
+
123
+ let controller = new AbortController();
124
+ // The windows app sends the call-off and the date as separate messages.
125
+ let timeout = setTimeout(async () => {
126
+ try {
127
+ let data = await procDeliveriesByCallOff.execute({
128
+ CallOffID: callOffId,
129
+ Date: new Date(dateKey),
130
+ IncludeAllPlanned: includeAllPlanned,
131
+ });
132
+ if (!controller.signal.aborted) {
133
+ setResult(data);
134
+ setError(null);
135
+ }
136
+ } catch (reason) {
137
+ if (!controller.signal.aborted) setError(reason instanceof Error ? reason.message : String(reason));
138
+ }
139
+ if (!controller.signal.aborted) setLoadedKey(requestKey);
140
+ }, 100);
141
+
142
+ return () => {
143
+ controller.abort();
144
+ clearTimeout(timeout);
145
+ };
146
+ }, [callOffId, dateKey, includeAllPlanned, reloadCount, requestKey]);
147
+
148
+ useImperativeHandle(
149
+ ref,
150
+ () => ({
151
+ reload,
152
+ setOffsets(min, max) {
153
+ writeStored(`${storageKey}_minoffset`, min === undefined ? null : String(min));
154
+ writeStored(`${storageKey}_maxoffset`, max === undefined ? null : String(max));
155
+ if (min !== undefined) setMinOffset(min);
156
+ if (max !== undefined) setMaxOffset(max);
157
+ },
158
+ }),
159
+ [reload, storageKey],
160
+ );
161
+
162
+ // Redrawing the chart blocks the page for a moment; deferring it lets the checkbox and the
163
+ // spinner paint first.
164
+ let deferredByVehicle = useDeferredValue(byVehicle);
165
+ let drawing = deferredByVehicle !== byVehicle;
166
+ let loading = callOffId !== null && loadedKey !== requestKey;
167
+
168
+ let chart = useMemo(
169
+ () => (result && result.Table.length > 0 ? getChartData(result.Table, deferredByVehicle) : null),
170
+ [result, deferredByVehicle],
171
+ );
172
+ let settings = useMemo(() => ({ date: new Date(dateKey), minOffset, maxOffset }), [dateKey, minOffset, maxOffset]);
173
+
174
+ if (callOffId === null) {
175
+ return <Alert data-color="warning">{getLocalizedString("No call-off specified")}</Alert>;
176
+ }
177
+
178
+ return (
179
+ <div className="ObCallOffDeliveries">
180
+ <div className="ObCallOffDeliveries-options">
181
+ <div className="ObCallOffDeliveries-status">
182
+ {(loading || drawing) && <Spinner data-size="sm" aria-label={getLocalizedString("Loading")} />}
183
+ </div>
184
+ <Checkbox
185
+ data-size="sm"
186
+ label={getLocalizedString("Show by vehicle")}
187
+ checked={byVehicle}
188
+ onChange={(event) => setByVehicle(event.target.checked)}
189
+ />
190
+ <Checkbox
191
+ data-size="sm"
192
+ label={getLocalizedString("Show all planned")}
193
+ checked={includeAllPlanned}
194
+ onChange={(event) => setIncludeAllPlanned(event.target.checked)}
195
+ />
196
+ </div>
197
+ {error && <Alert data-color="danger">{error}</Alert>}
198
+ {chart && (
199
+ <DeliveriesChart
200
+ key={`${dateKey}-${chart.byVehicle}`}
201
+ data={chart}
202
+ settings={settings}
203
+ onShowVehicle={setVehicleId}
204
+ onShowTicket={setTicketId}
205
+ onRendered={onRendered}
206
+ />
207
+ )}
208
+ <VehicleInfoDialog
209
+ vehicleId={vehicleId}
210
+ date={settings.date}
211
+ onClose={() => setVehicleId(null)}
212
+ onOutOfServiceChanged={reload}
213
+ />
214
+ <TicketScanDialog deliveryTicketId={ticketId} onClose={() => setTicketId(null)} />
215
+ </div>
216
+ );
217
+ }
@@ -0,0 +1,90 @@
1
+ import { describe, expect, it } from "vitest";
2
+
3
+ import type { CallOffDeliveryRecord } from "./data.js";
4
+ import { getChartData, getReturnTime, getStatusMarks } from "./model.js";
5
+
6
+ const day = Date.UTC(2026, 10, 9);
7
+
8
+ function at(hours: number, minutes = 0) {
9
+ return new Date(day + hours * 3600000 + minutes * 60000);
10
+ }
11
+
12
+ function row(
13
+ PrimKey: string,
14
+ IsPlanned: boolean,
15
+ DeliveryTicketID: number | null,
16
+ VehicleID: number | null,
17
+ hour: number,
18
+ ): CallOffDeliveryRecord {
19
+ return {
20
+ PrimKey,
21
+ IsPlanned,
22
+ PlantID: 10,
23
+ CallOffID: 1,
24
+ VehicleID,
25
+ DriverID: null,
26
+ DeliveryTicketID,
27
+ CustomerAdr1: null,
28
+ BuildSiteAdr1: null,
29
+ ProdTime: at(hour),
30
+ Arrival: at(hour, 20),
31
+ UnloadStart: at(hour, 30),
32
+ UnloadComplete: at(hour, 50),
33
+ ReturnTime: at(hour, 70),
34
+ };
35
+ }
36
+
37
+ describe("getChartData", () => {
38
+ let rows = [
39
+ row("a", true, null, 1102, 9),
40
+ row("b", false, 500, 1101, 8),
41
+ row("c", true, 500, 1101, 8),
42
+ row("d", false, 501, 1102, 7),
43
+ row("e", true, null, null, 10),
44
+ ];
45
+
46
+ it("puts delivered loads first and planned after, in production order", () => {
47
+ let data = getChartData(rows, false);
48
+
49
+ expect(data.categories.map((category) => category.key)).toEqual(["501", "500", "a", "e"]);
50
+ expect(data.categories.map((category) => category.deliveryTicketId)).toEqual([501, 500, null, null]);
51
+ });
52
+
53
+ it("draws a planned load that has its ticket on the line of the delivered one", () => {
54
+ let data = getChartData(rows, false);
55
+
56
+ expect(data.rows.find((candidate) => candidate.PrimKey === "c")?.categoryIndex).toBe(1);
57
+ });
58
+
59
+ it("gives each vehicle one line, with loads without a vehicle last", () => {
60
+ let data = getChartData(rows, true);
61
+
62
+ expect(data.categories.map((category) => category.key)).toEqual(["1101", "1102", "N/A"]);
63
+ expect(data.rows.filter((candidate) => candidate.categoryIndex === 0)).toHaveLength(2);
64
+ });
65
+
66
+ it("does not reorder the rows it was given", () => {
67
+ getChartData(rows, true);
68
+ expect(rows.map((candidate) => candidate.PrimKey)).toEqual(["a", "b", "c", "d", "e"]);
69
+ });
70
+ });
71
+
72
+ describe("getStatusMarks", () => {
73
+ it("marks ten minutes of loading, then the arrival and the end of unloading", () => {
74
+ expect(getStatusMarks(row("a", false, 1, 1, 8))).toEqual({
75
+ m1: at(8, 10).getTime(),
76
+ m2: at(8, 20).getTime(),
77
+ m3: at(8, 50).getTime(),
78
+ });
79
+ });
80
+
81
+ it("draws no strip before the arrival is known", () => {
82
+ expect(getStatusMarks({ ...row("a", false, 1, 1, 8), Arrival: null })).toEqual({ m1: null, m2: null, m3: null });
83
+ });
84
+ });
85
+
86
+ describe("getReturnTime", () => {
87
+ it("guesses forty minutes when the return time is missing", () => {
88
+ expect(getReturnTime({ ...row("a", true, null, 1, 8), ReturnTime: null })).toEqual(at(8, 40));
89
+ });
90
+ });
@@ -0,0 +1,87 @@
1
+ import type { CallOffDeliveryRecord } from "./data.js";
2
+
3
+ const MINUTE = 60000;
4
+
5
+ /** One line of the chart: a delivery ticket or planned load, or a vehicle. */
6
+ export type Category = {
7
+ key: string;
8
+ /** The ticket on the line, for a line per delivery that was delivered. */
9
+ deliveryTicketId: number | null;
10
+ vehicleId: number | null;
11
+ };
12
+
13
+ export type ChartData = {
14
+ byVehicle: boolean;
15
+ categories: Category[];
16
+ rows: Array<CallOffDeliveryRecord & { categoryIndex: number }>;
17
+ };
18
+
19
+ function compareByDelivery(a: CallOffDeliveryRecord, z: CallOffDeliveryRecord) {
20
+ return Number(a.IsPlanned) - Number(z.IsPlanned) || a.ProdTime.getTime() - z.ProdTime.getTime();
21
+ }
22
+
23
+ function compareByVehicle(a: CallOffDeliveryRecord, z: CallOffDeliveryRecord) {
24
+ return (a.VehicleID ?? Number.MAX_SAFE_INTEGER) - (z.VehicleID ?? Number.MAX_SAFE_INTEGER);
25
+ }
26
+
27
+ function deliveryKey(row: CallOffDeliveryRecord) {
28
+ return row.DeliveryTicketID ? String(row.DeliveryTicketID) : row.PrimKey;
29
+ }
30
+
31
+ function vehicleKey(row: CallOffDeliveryRecord) {
32
+ return row.VehicleID ? String(row.VehicleID) : "N/A";
33
+ }
34
+
35
+ /**
36
+ * Delivered loads come first and planned ones after, each in production order, one line each. A
37
+ * planned load that already has its ticket shares the line of the delivered one. By vehicle, the
38
+ * loads of one vehicle share a line.
39
+ */
40
+ export function getChartData(deliveries: CallOffDeliveryRecord[], byVehicle: boolean): ChartData {
41
+ let sorted = deliveries.toSorted(byVehicle ? compareByVehicle : compareByDelivery);
42
+ let keyOf = byVehicle ? vehicleKey : deliveryKey;
43
+ let categories: Category[] = [];
44
+ let indexByKey = new Map<string, number>();
45
+
46
+ let rows = sorted.map((row) => {
47
+ let key = keyOf(row);
48
+ let categoryIndex = indexByKey.get(key);
49
+
50
+ if (categoryIndex === undefined) {
51
+ categoryIndex = categories.length;
52
+ indexByKey.set(key, categoryIndex);
53
+ categories.push({
54
+ key,
55
+ deliveryTicketId: !byVehicle && !row.IsPlanned ? row.DeliveryTicketID : null,
56
+ vehicleId: row.VehicleID,
57
+ });
58
+ }
59
+
60
+ return { ...row, categoryIndex };
61
+ });
62
+
63
+ return { byVehicle, categories, rows };
64
+ }
65
+
66
+ /** The end of the bar. A planned load without a return time is drawn as long as the procedure guesses for a ticket. */
67
+ export function getReturnTime(row: CallOffDeliveryRecord) {
68
+ return row.ReturnTime ?? new Date(row.ProdTime.getTime() + 40 * MINUTE);
69
+ }
70
+
71
+ /**
72
+ * The status strip along the top of a bar: loading for the first ten minutes, driving to the site,
73
+ * unloading, driving back. It is only drawn when the arrival is known.
74
+ */
75
+ export function getStatusMarks(row: CallOffDeliveryRecord) {
76
+ if (!row.Arrival) return { m1: null, m2: null, m3: null };
77
+
78
+ return {
79
+ m1: row.ProdTime.getTime() + 10 * MINUTE,
80
+ m2: row.Arrival.getTime(),
81
+ m3: row.UnloadComplete?.getTime() ?? null,
82
+ };
83
+ }
84
+
85
+ export function getChartHeight(categoryCount: number) {
86
+ return categoryCount * 26 + 45 + 70;
87
+ }