@olenbetong/synergi-react 5.3.1 → 5.5.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 (141) 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/components/ColorCard/index.css +8 -8
  59. package/es/components/ImageEditor/ImageEditor.d.ts +6 -0
  60. package/es/components/ImageEditor/ImageEditor.js +6 -2
  61. package/es/components/ImageEditor/ResponsiveButton.d.ts +2 -1
  62. package/es/components/ImageEditor/ResponsiveButton.js +3 -3
  63. package/es/components/ImageEditor/plugins/cropPlugin/CropContext.d.ts +2 -1
  64. package/es/components/ImageEditor/plugins/cropPlugin/CropContext.js +2 -2
  65. package/es/components/ImageEditor/plugins/cropPlugin/CropToolbar.js +27 -7
  66. package/es/components/ImageEditor/types.d.ts +5 -0
  67. package/es/index.css +1 -1
  68. package/es/vehicles/VehicleInfoDialog/OutOfServiceForm.d.ts +4 -0
  69. package/es/vehicles/VehicleInfoDialog/OutOfServiceForm.js +51 -0
  70. package/es/vehicles/VehicleInfoDialog/data/dsDeliveryTickets.d.ts +99 -0
  71. package/es/vehicles/VehicleInfoDialog/data/dsDeliveryTickets.js +499 -0
  72. package/es/vehicles/VehicleInfoDialog/data/dsDriverStatus.d.ts +13 -0
  73. package/es/vehicles/VehicleInfoDialog/data/dsDriverStatus.js +69 -0
  74. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfo.d.ts +33 -0
  75. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfo.js +164 -0
  76. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfoLog.d.ts +15 -0
  77. package/es/vehicles/VehicleInfoDialog/data/dsVehicleInfoLog.js +80 -0
  78. package/es/vehicles/VehicleInfoDialog/formatting.d.ts +13 -0
  79. package/es/vehicles/VehicleInfoDialog/formatting.js +48 -0
  80. package/es/vehicles/VehicleInfoDialog/index.css +1 -0
  81. package/es/vehicles/VehicleInfoDialog/index.d.ts +11 -0
  82. package/es/vehicles/VehicleInfoDialog/index.js +46 -0
  83. package/es/vehicles/VehicleInfoDialog/tabs.d.ts +6 -0
  84. package/es/vehicles/VehicleInfoDialog/tabs.js +85 -0
  85. package/es/vehicles/index.d.ts +1 -0
  86. package/es/vehicles/index.js +1 -0
  87. package/package.json +19 -10
  88. package/src/charts/CallOffDeliveries/TicketScanDialog.tsx +79 -0
  89. package/src/charts/CallOffDeliveries/chartOptions.ts +160 -0
  90. package/src/charts/CallOffDeliveries/data.ts +67 -0
  91. package/src/charts/CallOffDeliveries/index.scss +51 -0
  92. package/src/charts/CallOffDeliveries/index.tsx +217 -0
  93. package/src/charts/CallOffDeliveries/model.test.ts +90 -0
  94. package/src/charts/CallOffDeliveries/model.ts +87 -0
  95. package/src/charts/ProductionPlan/PlanValueDialog.tsx +107 -0
  96. package/src/charts/ProductionPlan/chartOptions.ts +406 -0
  97. package/src/charts/ProductionPlan/data.ts +170 -0
  98. package/src/charts/ProductionPlan/index.scss +148 -0
  99. package/src/charts/ProductionPlan/index.tsx +432 -0
  100. package/src/charts/ProductionPlan/model.test.ts +132 -0
  101. package/src/charts/ProductionPlan/model.ts +102 -0
  102. package/src/charts/Pumping/chartOptions.ts +224 -0
  103. package/src/charts/Pumping/data.ts +91 -0
  104. package/src/charts/Pumping/index.scss +42 -0
  105. package/src/charts/Pumping/index.tsx +222 -0
  106. package/src/charts/Pumping/model.test.ts +122 -0
  107. package/src/charts/Pumping/model.ts +104 -0
  108. package/src/charts/UnboundPreview/chartOptions.ts +137 -0
  109. package/src/charts/UnboundPreview/index.scss +17 -0
  110. package/src/charts/UnboundPreview/index.tsx +100 -0
  111. package/src/charts/UnboundPreview/model.test.ts +129 -0
  112. package/src/charts/UnboundPreview/model.ts +110 -0
  113. package/src/charts/VehicleDeliveries/chartOptions.ts +311 -0
  114. package/src/charts/VehicleDeliveries/data.ts +98 -0
  115. package/src/charts/VehicleDeliveries/deliveryXRange.ts +80 -0
  116. package/src/charts/VehicleDeliveries/index.scss +43 -0
  117. package/src/charts/VehicleDeliveries/index.tsx +262 -0
  118. package/src/charts/VehicleDeliveries/model.test.ts +117 -0
  119. package/src/charts/VehicleDeliveries/model.ts +139 -0
  120. package/src/charts/format.ts +38 -0
  121. package/src/charts/index.ts +20 -0
  122. package/src/charts/storage.ts +36 -0
  123. package/src/components/ColorCard/index.css +8 -8
  124. package/src/components/ImageEditor/ImageEditor.test.tsx +103 -0
  125. package/src/components/ImageEditor/ImageEditor.tsx +18 -2
  126. package/src/components/ImageEditor/ResponsiveButton.tsx +4 -3
  127. package/src/components/ImageEditor/plugins/cropPlugin/CropContext.tsx +5 -2
  128. package/src/components/ImageEditor/plugins/cropPlugin/CropToolbar.test.tsx +118 -0
  129. package/src/components/ImageEditor/plugins/cropPlugin/CropToolbar.tsx +52 -18
  130. package/src/components/ImageEditor/types.ts +5 -0
  131. package/src/vehicles/VehicleInfoDialog/OutOfServiceForm.tsx +127 -0
  132. package/src/vehicles/VehicleInfoDialog/data/dsDeliveryTickets.ts +600 -0
  133. package/src/vehicles/VehicleInfoDialog/data/dsDriverStatus.ts +84 -0
  134. package/src/vehicles/VehicleInfoDialog/data/dsVehicleInfo.ts +198 -0
  135. package/src/vehicles/VehicleInfoDialog/data/dsVehicleInfoLog.ts +97 -0
  136. package/src/vehicles/VehicleInfoDialog/formatting.test.ts +57 -0
  137. package/src/vehicles/VehicleInfoDialog/formatting.ts +58 -0
  138. package/src/vehicles/VehicleInfoDialog/index.scss +131 -0
  139. package/src/vehicles/VehicleInfoDialog/index.tsx +106 -0
  140. package/src/vehicles/VehicleInfoDialog/tabs.tsx +188 -0
  141. package/src/vehicles/index.ts +1 -0
@@ -0,0 +1,262 @@
1
+ import { Alert, Checkbox, Paragraph, 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 { getChartOptions, type ChartSettings, type MoveDelivery } from "./chartOptions.js";
18
+ import { type DeliveriesResult, procDeliveriesByVehicle, procMovePlannedDelivery } from "./data.js";
19
+ import { registerDeliveryXRange } from "./deliveryXRange.js";
20
+ import { type ChartData, getChartData, getChartHeight } from "./model.js";
21
+
22
+ import "./index.scss";
23
+ import { writeStored, useStoredFlag, readOffset } from "../storage.js";
24
+
25
+ registerDeliveryXRange();
26
+
27
+ export type VehicleDeliveriesHandle = {
28
+ /** Fetches the data again, keeping the zoom. */
29
+ reload: () => void;
30
+ /** Sets the hours shown around the day. An undefined offset forgets the stored one. */
31
+ setOffsets: (min?: number, max?: number) => void;
32
+ };
33
+
34
+ export type VehicleDeliveriesProps = {
35
+ plants: number[];
36
+ /** Midnight UTC of the day to show. */
37
+ date: Date;
38
+ readOnly?: boolean;
39
+ /** Prefix of the settings in localStorage. */
40
+ storageKey: string;
41
+ /** Called after the charts have drawn, when the height of the page may have changed. */
42
+ onRendered?: () => void;
43
+ ref?: Ref<VehicleDeliveriesHandle>;
44
+ };
45
+
46
+ function DeliveriesChart({
47
+ data,
48
+ settings,
49
+ onShowVehicle,
50
+ onRendered,
51
+ }: {
52
+ data: ChartData;
53
+ settings: ChartSettings;
54
+ onShowVehicle?: (vehicleId: number) => void;
55
+ onRendered?: () => void;
56
+ }) {
57
+ let container = useRef<HTMLDivElement>(null);
58
+ let zoom = useRef<{ min: number; max: number } | null>(null);
59
+ let options = useMemo(() => getChartOptions(data, settings), [data, settings]);
60
+
61
+ useLayoutEffect(() => {
62
+ let chart = new Highcharts.Chart(container.current as HTMLElement, options);
63
+
64
+ if (zoom.current) {
65
+ chart.xAxis[0].setExtremes(zoom.current.min, zoom.current.max, true, false);
66
+ chart.showResetZoom();
67
+ }
68
+
69
+ onRendered?.();
70
+
71
+ return () => {
72
+ let { userMin, userMax } = chart.xAxis[0].getExtremes();
73
+ zoom.current = userMin !== undefined && userMax !== undefined ? { min: userMin, max: userMax } : null;
74
+ chart.destroy();
75
+ };
76
+ }, [options, onRendered]);
77
+
78
+ // Reserved up front, so the page keeps its scroll position while a chart is replaced.
79
+ let height = getChartHeight(data.vehicles.length, settings.thickBars, data.merged);
80
+
81
+ return (
82
+ <div
83
+ ref={container}
84
+ className="ObVehicleDeliveries-chart"
85
+ style={{ minHeight: height }}
86
+ onClick={(event) => {
87
+ let link = (event.target as Element).closest<HTMLAnchorElement>('a[href^="#vehicle-"]');
88
+ if (link) {
89
+ event.preventDefault();
90
+ onShowVehicle?.(Number(link.hash.replace("#vehicle-", "")));
91
+ }
92
+ }}
93
+ />
94
+ );
95
+ }
96
+
97
+ /**
98
+ * The planned and delivered loads per vehicle through a day, one chart per plant or one for all of
99
+ * them. Planned loads can be dragged to another time or vehicle unless `readOnly` is set.
100
+ */
101
+ export function VehicleDeliveries({
102
+ plants,
103
+ date,
104
+ readOnly = false,
105
+ storageKey,
106
+ onRendered,
107
+ ref,
108
+ }: VehicleDeliveriesProps) {
109
+ let [merged, setMerged] = useStoredFlag(`${storageKey}_showmerged`);
110
+ let [thickBars, setThickBars] = useStoredFlag(`${storageKey}_showfatbars`);
111
+ let [includePumps, setIncludePumps] = useStoredFlag(`${storageKey}_includepumps`);
112
+ let [includeAllPlanned, setIncludeAllPlanned] = useStoredFlag(`${storageKey}_includeallplanned`);
113
+ let [minOffset, setMinOffset] = useState(() => readOffset(`${storageKey}_minoffset`, -2));
114
+ let [maxOffset, setMaxOffset] = useState(() => readOffset(`${storageKey}_maxoffset`, 28));
115
+ let [result, setResult] = useState<DeliveriesResult | null>(null);
116
+ let [error, setError] = useState<string | null>(null);
117
+ let [reloadCount, setReloadCount] = useState(0);
118
+ let [vehicleId, setVehicleId] = useState<number | null>(null);
119
+
120
+ let [loadedKey, setLoadedKey] = useState<string | null>(null);
121
+
122
+ let reload = useCallback(() => setReloadCount((count) => count + 1), []);
123
+ let plantsKey = plants.join(",");
124
+ let dateKey = date.getTime();
125
+ let requestKey = `${plantsKey}|${dateKey}|${includePumps}|${includeAllPlanned}|${reloadCount}`;
126
+
127
+ useEffect(() => {
128
+ if (!plantsKey) return;
129
+
130
+ let controller = new AbortController();
131
+ // The windows app sends the plants and the date as separate messages.
132
+ let timeout = setTimeout(async () => {
133
+ try {
134
+ let data = await procDeliveriesByVehicle.execute({
135
+ PlantIDs: plantsKey.split(",").map((plant) => [Number(plant)]),
136
+ Date: new Date(dateKey),
137
+ IncludePumpBookings: includePumps,
138
+ IncludeAllPlanned: includeAllPlanned,
139
+ });
140
+ if (!controller.signal.aborted) {
141
+ setResult(data);
142
+ setError(null);
143
+ }
144
+ } catch (reason) {
145
+ if (!controller.signal.aborted) setError(reason instanceof Error ? reason.message : String(reason));
146
+ }
147
+ if (!controller.signal.aborted) setLoadedKey(requestKey);
148
+ }, 100);
149
+
150
+ return () => {
151
+ controller.abort();
152
+ clearTimeout(timeout);
153
+ };
154
+ }, [plantsKey, dateKey, includePumps, includeAllPlanned, reloadCount, requestKey]);
155
+
156
+ useImperativeHandle(
157
+ ref,
158
+ () => ({
159
+ reload,
160
+ setOffsets(min, max) {
161
+ writeStored(`${storageKey}_minoffset`, min === undefined ? null : String(min));
162
+ writeStored(`${storageKey}_maxoffset`, max === undefined ? null : String(max));
163
+ if (min !== undefined) setMinOffset(min);
164
+ if (max !== undefined) setMaxOffset(max);
165
+ },
166
+ }),
167
+ [reload, storageKey],
168
+ );
169
+
170
+ let onMove = useCallback<MoveDelivery>(
171
+ async (delivery, prodTime, vehicleId) => {
172
+ try {
173
+ await procMovePlannedDelivery.execute({
174
+ PrimKey: delivery.PrimKey,
175
+ ProdDateTime: prodTime,
176
+ VehicleID: vehicleId,
177
+ });
178
+ setError(null);
179
+ } catch (reason) {
180
+ setError(reason instanceof Error ? reason.message : String(reason));
181
+ }
182
+ // After a refused move as well, or the bar would stay where it was dropped.
183
+ reload();
184
+ },
185
+ [reload],
186
+ );
187
+
188
+ // Redrawing every chart blocks the page for a moment; deferring it lets the checkbox and the
189
+ // spinner paint first.
190
+ let deferredMerged = useDeferredValue(merged);
191
+ let deferredThickBars = useDeferredValue(thickBars);
192
+ let drawing = deferredMerged !== merged || deferredThickBars !== thickBars;
193
+ let loading = !!plantsKey && loadedKey !== requestKey;
194
+
195
+ let charts = useMemo(
196
+ () => (result ? getChartData(result, plantsKey.split(",").map(Number), deferredMerged) : []),
197
+ [result, plantsKey, deferredMerged],
198
+ );
199
+ let settings = useMemo(
200
+ () => ({ date: new Date(dateKey), minOffset, maxOffset, thickBars: deferredThickBars, readOnly, onMove }),
201
+ [dateKey, minOffset, maxOffset, deferredThickBars, readOnly, onMove],
202
+ );
203
+
204
+ if (plants.length === 0) {
205
+ return <Alert data-color="warning">{getLocalizedString("No plant specified")}</Alert>;
206
+ }
207
+
208
+ return (
209
+ <div className="ObVehicleDeliveries">
210
+ <div className="ObVehicleDeliveries-options">
211
+ <div className="ObVehicleDeliveries-status">
212
+ {(loading || drawing) && <Spinner data-size="sm" aria-label={getLocalizedString("Loading")} />}
213
+ </div>
214
+ <Checkbox
215
+ data-size="sm"
216
+ label={getLocalizedString("Show thick bars")}
217
+ checked={thickBars}
218
+ onChange={(event) => setThickBars(event.target.checked)}
219
+ />
220
+ <Checkbox
221
+ data-size="sm"
222
+ label={getLocalizedString("Show pump reservations")}
223
+ checked={includePumps}
224
+ onChange={(event) => setIncludePumps(event.target.checked)}
225
+ />
226
+ <Checkbox
227
+ data-size="sm"
228
+ label={getLocalizedString("Show all planned")}
229
+ checked={includeAllPlanned}
230
+ onChange={(event) => setIncludeAllPlanned(event.target.checked)}
231
+ />
232
+ <Checkbox
233
+ data-size="sm"
234
+ label={getLocalizedString("Show vehicles together")}
235
+ checked={merged}
236
+ onChange={(event) => setMerged(event.target.checked)}
237
+ />
238
+ </div>
239
+ {error && <Alert data-color="danger">{error}</Alert>}
240
+ {charts.map((chart) => (
241
+ <div key={`${dateKey}-${chart.key}`}>
242
+ <DeliveriesChart data={chart} settings={settings} onShowVehicle={setVehicleId} onRendered={onRendered} />
243
+ <hr />
244
+ </div>
245
+ ))}
246
+ <Paragraph data-size="xs" className="ObVehicleDeliveries-legend">
247
+ {getLocalizedString("No marking = Concrete mixer")}
248
+ <br />P = {getLocalizedString("Pump / combination vehicle")}
249
+ <br />S = {getLocalizedString("Large pump / tower pump")}
250
+ <br />T = {getLocalizedString("Vehicle with telescopic chute")}
251
+ <br />B = {getLocalizedString("Conveyor belt vehicle")}
252
+ <br />A = {getLocalizedString("Other transport (trailer, wheel loader, rental vehicle, pick-up load etc.)")}
253
+ </Paragraph>
254
+ <VehicleInfoDialog
255
+ vehicleId={vehicleId}
256
+ date={settings.date}
257
+ onClose={() => setVehicleId(null)}
258
+ onOutOfServiceChanged={reload}
259
+ />
260
+ </div>
261
+ );
262
+ }
@@ -0,0 +1,117 @@
1
+ import { describe, expect, it } from "vitest";
2
+
3
+ import type { DeliveriesResult, DeliveryRecord, VehicleRecord } from "./data.js";
4
+ import { compareVehicles, cropText, getChartData, getVehicleFeature, getVehicleLabel } from "./model.js";
5
+
6
+ function vehicle(ObjectNo: number, extra: Partial<VehicleRecord> = {}): VehicleRecord {
7
+ return {
8
+ LocationID: 1,
9
+ ObjectNo,
10
+ Model: null,
11
+ MixerCapacity: null,
12
+ BoomLength: null,
13
+ IsTruck: true,
14
+ IsPump: false,
15
+ BigPump: false,
16
+ Telescopic: false,
17
+ ConveyorBelt: false,
18
+ VirtualVehicle: false,
19
+ ...extra,
20
+ };
21
+ }
22
+
23
+ function delivery(PlantID: number, VehicleID: number, DeliveryTicketID: number | null): DeliveryRecord {
24
+ return {
25
+ PlantID,
26
+ VehicleID,
27
+ DeliveryTicketID,
28
+ CallOffID: 1,
29
+ DriverID: null,
30
+ CustomerAdr1: null,
31
+ BuildSiteAdr1: null,
32
+ Telescopic: false,
33
+ ProdTime: new Date(0),
34
+ Arrival: null,
35
+ UnloadStart: null,
36
+ UnloadComplete: null,
37
+ ReturnTime: new Date(1),
38
+ PrimKey: `${PlantID}-${VehicleID}`,
39
+ };
40
+ }
41
+
42
+ function result(vehicles: VehicleRecord[], deliveries: DeliveryRecord[]): DeliveriesResult {
43
+ return {
44
+ Table: [
45
+ { PlantID: 1, Description: "One" },
46
+ { PlantID: 2, Description: "Two" },
47
+ ],
48
+ Table1: vehicles,
49
+ Table2: deliveries,
50
+ Table3: [],
51
+ Table4: [],
52
+ };
53
+ }
54
+
55
+ describe("compareVehicles", () => {
56
+ it("lists virtual vehicles, then trucks, then other transport, then pumps, then big pumps", () => {
57
+ let sorted = [
58
+ vehicle(1, { IsTruck: false }),
59
+ vehicle(2, { IsPump: true, BigPump: true }),
60
+ vehicle(3, { IsPump: true }),
61
+ vehicle(5),
62
+ vehicle(4),
63
+ vehicle(6, { VirtualVehicle: true }),
64
+ ].toSorted(compareVehicles);
65
+
66
+ expect(sorted.map((v) => v.ObjectNo)).toEqual([6, 4, 5, 1, 3, 2]);
67
+ });
68
+ });
69
+
70
+ describe("getChartData", () => {
71
+ it("gives each plant its vehicles, and those another plant has a delivery on", () => {
72
+ let charts = getChartData(
73
+ result([vehicle(10), vehicle(20, { LocationID: 2 })], [delivery(1, 20, 5)]),
74
+ [1, 2],
75
+ false,
76
+ );
77
+
78
+ expect(charts.map((chart) => chart.vehicles.map((v) => v.ObjectNo))).toEqual([[10, 20], [20]]);
79
+ });
80
+
81
+ it("shows a planned delivery from another plant, but no ticket from one", () => {
82
+ let vehicles = [vehicle(1500), vehicle(1600, { LocationID: 2 })];
83
+ let planned = delivery(2, 1500, null);
84
+ let ticket = delivery(2, 1500, 7);
85
+ let [first] = getChartData(result(vehicles, [planned, ticket]), [1], false);
86
+
87
+ expect(first.deliveries).toEqual([planned]);
88
+ });
89
+
90
+ it("keeps one chart in merged mode and drops duplicate vehicles", () => {
91
+ let charts = getChartData(result([vehicle(1), vehicle(1)], []), [1, 2], true);
92
+
93
+ expect(charts).toHaveLength(1);
94
+ expect(charts[0].vehicles).toHaveLength(1);
95
+ });
96
+ });
97
+
98
+ describe("labels", () => {
99
+ it("splits a virtual vehicle number", () => {
100
+ expect(getVehicleLabel({ ObjectNo: 43007, VirtualVehicle: true })).toBe("43-007");
101
+ expect(getVehicleLabel({ ObjectNo: 5357, VirtualVehicle: false })).toBe("5357");
102
+ });
103
+
104
+ it("adds the boom length to the feature", () => {
105
+ expect(getVehicleFeature(vehicle(1, { IsPump: true, BoomLength: 36 }))).toEqual({
106
+ label: "P 36m",
107
+ color: "#DDDDFF",
108
+ });
109
+ expect(getVehicleFeature(vehicle(1))).toBeNull();
110
+ });
111
+
112
+ it("crops from either end", () => {
113
+ expect(cropText("abcdef", 3)).toBe("abc..");
114
+ expect(cropText("abcdef", 3, true)).toBe("..def");
115
+ expect(cropText(null, 3)).toBe("");
116
+ });
117
+ });
@@ -0,0 +1,139 @@
1
+ import type {
2
+ DeliveriesResult,
3
+ DeliveryRecord,
4
+ OutOfServiceRecord,
5
+ PlantRecord,
6
+ PumpBookingRecord,
7
+ VehicleRecord,
8
+ } from "./data.js";
9
+
10
+ export type ChartData = {
11
+ key: string;
12
+ plants: PlantRecord[];
13
+ vehicles: VehicleRecord[];
14
+ deliveries: DeliveryRecord[];
15
+ pumpBookings: PumpBookingRecord[];
16
+ outOfService: OutOfServiceRecord[];
17
+ merged: boolean;
18
+ /** Index into the palette for each plant, stable however the charts are split. */
19
+ colorIndex: Map<number, number>;
20
+ };
21
+
22
+ export function compareVehicles(a: VehicleRecord, z: VehicleRecord) {
23
+ let flags: Array<[boolean, boolean]> = [
24
+ [!a.VirtualVehicle, !z.VirtualVehicle],
25
+ [!!a.IsPump, !!z.IsPump],
26
+ [!!a.BigPump, !!z.BigPump],
27
+ [!a.IsTruck, !z.IsTruck],
28
+ ];
29
+
30
+ for (let [first, second] of flags) {
31
+ if (first !== second) return first ? 1 : -1;
32
+ }
33
+
34
+ return a.ObjectNo - z.ObjectNo || (a.LocationID ?? 0) - (z.LocationID ?? 0);
35
+ }
36
+
37
+ /** A planned delivery on a virtual vehicle can come from another plant, so a vehicle can be listed twice. */
38
+ export function uniqueVehicles(vehicles: VehicleRecord[]) {
39
+ let seen = new Set<number>();
40
+ return vehicles.filter((vehicle) => {
41
+ if (seen.has(vehicle.ObjectNo)) return false;
42
+ seen.add(vehicle.ObjectNo);
43
+ return true;
44
+ });
45
+ }
46
+
47
+ export function getChartData(result: DeliveriesResult, selectedPlants: number[], merged: boolean): ChartData[] {
48
+ let { Table: plants, Table2: deliveries, Table3: pumpBookings, Table4: outOfService } = result;
49
+ let vehicles = uniqueVehicles(result.Table1);
50
+ let colorIndex = new Map(selectedPlants.map((plantId, index) => [plantId, index]));
51
+
52
+ if (plants.length === 0 || vehicles.length === 0) return [];
53
+
54
+ if (merged) {
55
+ return [
56
+ {
57
+ key: "merged",
58
+ plants,
59
+ vehicles: vehicles.toSorted(compareVehicles),
60
+ deliveries,
61
+ pumpBookings,
62
+ outOfService,
63
+ merged,
64
+ colorIndex,
65
+ },
66
+ ];
67
+ }
68
+
69
+ return selectedPlants.flatMap((plantId) => {
70
+ let plant = plants.find((candidate) => candidate.PlantID === plantId);
71
+ if (!plant) return [];
72
+
73
+ let plantDeliveries = deliveries.filter((delivery) => delivery.PlantID === plantId);
74
+ let deliveryVehicles = new Set(plantDeliveries.map((delivery) => delivery.VehicleID));
75
+ let plantVehicles = vehicles.filter(
76
+ (vehicle) => vehicle.LocationID === plantId || deliveryVehicles.has(vehicle.ObjectNo),
77
+ );
78
+ if (plantVehicles.length === 0) return [];
79
+
80
+ let vehicleIds = new Set(plantVehicles.map((vehicle) => vehicle.ObjectNo));
81
+
82
+ // A planned delivery from another plant occupies the vehicle here as well.
83
+ let plannedElsewhere = deliveries.filter(
84
+ (delivery) =>
85
+ delivery.PlantID !== plantId &&
86
+ vehicleIds.has(delivery.VehicleID) &&
87
+ delivery.VehicleID >= 1000 &&
88
+ delivery.DeliveryTicketID === null,
89
+ );
90
+
91
+ return [
92
+ {
93
+ key: String(plantId),
94
+ plants: [plant],
95
+ vehicles: plantVehicles.toSorted(compareVehicles),
96
+ deliveries: [...plantDeliveries, ...plannedElsewhere],
97
+ pumpBookings: pumpBookings.filter((booking) => vehicleIds.has(booking.Pump)),
98
+ outOfService: outOfService.filter((entry) => vehicleIds.has(entry.ObjectNo)),
99
+ merged,
100
+ colorIndex,
101
+ },
102
+ ];
103
+ });
104
+ }
105
+
106
+ export function cropText(text: string | null | undefined, maxLength: number, cropStart = false) {
107
+ if (text == null) return "";
108
+ if (text.length <= maxLength) return text;
109
+ return cropStart ? `..${text.slice(text.length - maxLength)}` : `${text.slice(0, maxLength)}..`;
110
+ }
111
+
112
+ /** Virtual vehicles are numbered plant * 1000 + vehicle, and read better split. */
113
+ export function getVehicleLabel(vehicle: Pick<VehicleRecord, "ObjectNo" | "VirtualVehicle">) {
114
+ if (vehicle.VirtualVehicle && vehicle.ObjectNo > 9999) {
115
+ return `${Math.floor(vehicle.ObjectNo / 1000)}-${String(vehicle.ObjectNo % 1000).padStart(3, "0")}`;
116
+ }
117
+
118
+ return String(vehicle.ObjectNo);
119
+ }
120
+
121
+ export function getVehicleFeature(vehicle: VehicleRecord) {
122
+ let feature: { label: string; color: string } | null = null;
123
+
124
+ if (vehicle.BigPump) feature = { label: "S", color: "#FFE4C4" };
125
+ else if (vehicle.IsPump) feature = { label: "P", color: "#DDDDFF" };
126
+ else if (vehicle.Telescopic) feature = { label: "T", color: "#D1FFDB" };
127
+ else if (vehicle.ConveyorBelt) feature = { label: "B", color: "#DDDDDD" };
128
+ else if (!vehicle.IsTruck) feature = { label: "A", color: "#EEEEEE" };
129
+
130
+ if (feature && vehicle.BoomLength && vehicle.BoomLength > 0) {
131
+ return { ...feature, label: `${feature.label} ${vehicle.BoomLength}m` };
132
+ }
133
+
134
+ return feature;
135
+ }
136
+
137
+ export function getChartHeight(vehicleCount: number, thickBars: boolean, merged: boolean) {
138
+ return vehicleCount * (thickBars ? 65 : 26) + 45 + (merged ? 120 : 70);
139
+ }
@@ -0,0 +1,38 @@
1
+ import Highcharts from "highcharts";
2
+
3
+ /**
4
+ * The colours of the plants, in the order they are selected. The old Highcharts palette, which
5
+ * people know the plants by, except that its dark grey is lightened to read on a dark background.
6
+ */
7
+ export const PLANT_COLORS = [
8
+ "#7cb5ec",
9
+ "#8d8d96",
10
+ "#90ed7d",
11
+ "#f7a35c",
12
+ "#8085e9",
13
+ "#f15c80",
14
+ "#e4d354",
15
+ "#2b908f",
16
+ "#f45b5b",
17
+ "#91e8e1",
18
+ ];
19
+
20
+ /** Hours and minutes of a wall clock time carried as UTC. */
21
+ export function formatTime(value: Date | number | null | undefined) {
22
+ if (value === null || value === undefined) return "";
23
+
24
+ return new Intl.DateTimeFormat(globalThis.af?.userSession?.culture, {
25
+ hour: "2-digit",
26
+ minute: "2-digit",
27
+ timeZone: "UTC",
28
+ }).format(value);
29
+ }
30
+
31
+ /** For text from the database placed in the HTML labels and tooltips of a chart. */
32
+ export function escapeHtml(value: string | number | null | undefined) {
33
+ return String(value ?? "").replace(/[&<>"']/g, (char) => `&#${char.charCodeAt(0)};`);
34
+ }
35
+
36
+ export function barColor(color: string, opacity: number) {
37
+ return { color: Highcharts.color(color).setOpacity(opacity).get("rgba") as string };
38
+ }
@@ -0,0 +1,20 @@
1
+ export {
2
+ CallOffDeliveries,
3
+ type CallOffDeliveriesHandle,
4
+ type CallOffDeliveriesProps,
5
+ } from "./CallOffDeliveries/index.js";
6
+ export { ProductionPlan, type ProductionPlanHandle, type ProductionPlanProps } from "./ProductionPlan/index.js";
7
+ export { Pumping, type PumpingHandle, type PumpingProps } from "./Pumping/index.js";
8
+ export {
9
+ UnboundPreview,
10
+ type UnboundPreviewProps,
11
+ type PlannedDelivery,
12
+ type OtherDelivery,
13
+ parsePlannedDeliveries,
14
+ parseOtherDeliveries,
15
+ } from "./UnboundPreview/index.js";
16
+ export {
17
+ VehicleDeliveries,
18
+ type VehicleDeliveriesHandle,
19
+ type VehicleDeliveriesProps,
20
+ } from "./VehicleDeliveries/index.js";
@@ -0,0 +1,36 @@
1
+ import { useState } from "react";
2
+
3
+ /** The charts keep their options in localStorage, under a prefix per page. */
4
+ export function readStored(key: string) {
5
+ try {
6
+ return localStorage.getItem(key);
7
+ } catch {
8
+ return null;
9
+ }
10
+ }
11
+
12
+ export function writeStored(key: string, value: string | null) {
13
+ try {
14
+ if (value === null) localStorage.removeItem(key);
15
+ else localStorage.setItem(key, value);
16
+ } catch {
17
+ // Without storage the setting lasts as long as the page.
18
+ }
19
+ }
20
+
21
+ export function useStoredFlag(key: string) {
22
+ let [value, setValue] = useState(() => readStored(key) === "true");
23
+
24
+ return [
25
+ value,
26
+ (next: boolean) => {
27
+ writeStored(key, String(next));
28
+ setValue(next);
29
+ },
30
+ ] as const;
31
+ }
32
+
33
+ export function readOffset(key: string, fallback: number) {
34
+ let stored = readStored(key);
35
+ return stored === null ? fallback : Number.parseInt(stored, 10);
36
+ }
@@ -1,6 +1,6 @@
1
1
  .ObColorCard-root {
2
2
  --bg-color-border: black;
3
- --bg-color-main: white;
3
+ --bg-color-main: var(--ds-color-neutral-background-default, white);
4
4
  --bg-size: var(--ds-size-3, 0.75rem);
5
5
  --card-color: rgb(0, 0, 0);
6
6
 
@@ -12,7 +12,7 @@
12
12
  box-shadow:
13
13
  0 1px 12px rgba(0, 0, 0, 0.15),
14
14
  0 1px 6px rgba(0, 0, 0, 0.25);
15
- color: #666;
15
+ color: var(--ds-color-neutral-text-subtle, #666);
16
16
  background-image: linear-gradient(
17
17
  to right,
18
18
  var(--bg-color-border),
@@ -45,7 +45,7 @@
45
45
 
46
46
  &:hover,
47
47
  &:focus {
48
- --bg-color-main: #f5f5f5;
48
+ --bg-color-main: var(--ds-color-neutral-surface-hover, #f5f5f5);
49
49
  box-shadow:
50
50
  0 3px 18px rgba(0, 0, 0, 0.15),
51
51
  0 3px 12px rgba(0, 0, 0, 0.25);
@@ -73,7 +73,7 @@
73
73
 
74
74
  &.ObColorCard-minor {
75
75
  flex: 0 0 calc(var(--ds-size-8, 2rem) * 2);
76
- border-right: 1px solid #e3e3e3;
76
+ border-right: 1px solid var(--ds-color-neutral-border-subtle, #e3e3e3);
77
77
  transition: margin ease-in-out 300ms;
78
78
 
79
79
  @media screen and (min-width: 48rem) {
@@ -83,11 +83,11 @@
83
83
  }
84
84
 
85
85
  .ObColorCard-detailValue {
86
- color: #555555;
86
+ color: var(--ds-color-neutral-text-default, #555555);
87
87
  }
88
88
 
89
89
  .ObColorCard-detailLabel {
90
- color: #696969;
90
+ color: var(--ds-color-neutral-text-subtle, #696969);
91
91
  font-size: var(--ds-font-size-1, 0.8rem);
92
92
  text-transform: uppercase;
93
93
  }
@@ -136,7 +136,7 @@
136
136
 
137
137
  width: 0.6em;
138
138
  height: 0.6em;
139
- background: white;
139
+ background: var(--ds-color-neutral-background-default, white);
140
140
  border: 2px solid var(--bg-color-border, #999);
141
141
  border-radius: 50%;
142
142
  box-sizing: border-box;
@@ -149,6 +149,6 @@
149
149
  top: calc(0.25em + 0.6em + 0.15em); /* dot top + dot height + 0.15em spacing */
150
150
  left: calc(0.3em - 1px); /* half of the circle width minus half the border width */
151
151
  height: calc(100% - 0.95em + var(--ds-size-4, 1rem) + 0.0625em); /* height of container - top + gap */
152
- border-left: 2px dotted #999;
152
+ border-left: 2px dotted var(--ds-color-neutral-border-default, #999);
153
153
  z-index: 0;
154
154
  }