Merge branch 'contrat-backup2' of github.com:Tria-plc/edr-platform into contrat-backup2

apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchBoardPage.tsx

@@ -41,6 +41,7 @@ import {
   BookingPipeline,
   HeroChip,
   totalBookingCount,
+  WindowPhasePill,
   WindowStatusPill,
 } from "@/components/trainScheduling/batchVisuals";
 import { RouteCorridor } from "@/components/trainScheduling/scheduleVisuals";
@@ -233,7 +234,16 @@ function ScheduleCard({ schedule }: { schedule: BatchBoardSchedule }) {
               </Text>
             </Box>
           </Group>
-          <WindowStatusPill status={schedule.bookingWindowStatus} />
+          <Stack gap={4} align="flex-end">
+            <WindowStatusPill status={schedule.bookingWindowStatus} />
+            {schedule.windowPhase ? (
+              <WindowPhasePill
+                phase={schedule.windowPhase}
+                cycleNo={schedule.bookingCycleNo}
+                size="sm"
+              />
+            ) : null}
+          </Stack>
         </Group>
 
         <RouteCorridor

apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx

@@ -24,6 +24,7 @@ import {
   CalendarDays,
   CheckCircle2,
   ChevronLeft,
+  ClipboardCheck,
   ChevronRight,
   Clock,
   FileSignature,
@@ -52,6 +53,7 @@ import {
   BookingPipeline,
   HeroChip,
   totalBookingCount,
+  WindowPhasePill,
   WindowStatusPill,
 } from "@/components/trainScheduling/batchVisuals";
 import { RouteCorridor } from "@/components/trainScheduling/scheduleVisuals";
@@ -62,6 +64,7 @@ import { useToast } from "@/hooks/use-toast";
 import type {
   BatchBoardBookingDetail,
   BatchBoardBookingState,
+  BatchBoardScheduleDetail,
   BatchWindowGroup,
   BookingAllocationStatus,
 } from "@/types/trainScheduling";
@@ -114,6 +117,61 @@ const fmtDateTime = (iso: string | null) =>
     }).format(new Date(iso))
     : "—";
 
+const eatDayFmt = new Intl.DateTimeFormat("en-CA", {
+  timeZone: "Africa/Addis_Ababa",
+  year: "numeric",
+  month: "2-digit",
+  day: "2-digit",
+});
+
+/** "11:00 EAT" if the timestamp falls on today (EAT), else "05 Jun, 11:00 EAT". */
+const fmtPhaseTime = (iso: string) => {
+  const date = new Date(iso);
+  const time = new Intl.DateTimeFormat("en-GB", {
+    hour: "2-digit",
+    minute: "2-digit",
+    hour12: false,
+    timeZone: "Africa/Addis_Ababa",
+  }).format(date);
+  if (eatDayFmt.format(date) === eatDayFmt.format(new Date())) {
+    return `${time} EAT`;
+  }
+  const day = new Intl.DateTimeFormat("en-GB", {
+    day: "2-digit",
+    month: "short",
+    timeZone: "Africa/Addis_Ababa",
+  }).format(date);
+  return `${day}, ${time} EAT`;
+};
+
+/** Countdown label for the current booking-cycle phase, e.g. "Closes 11:00 EAT". */
+function phaseCountdown(data: BatchBoardScheduleDetail): string | null {
+  switch (data.windowPhase) {
+    case "PRE_WINDOW":
+      return data.windowOpensAt
+        ? `Opens ${fmtPhaseTime(data.windowOpensAt)}`
+        : null;
+    case "OPEN":
+      return data.windowClosesAt
+        ? `Closes ${fmtPhaseTime(data.windowClosesAt)}`
+        : null;
+    case "DOC_REVIEW":
+      return data.docReviewEndsAt
+        ? `Doc review ends ${fmtPhaseTime(data.docReviewEndsAt)}`
+        : null;
+    case "PAYMENT":
+      return data.paymentPhaseEndsAt
+        ? `Payment ends ${fmtPhaseTime(data.paymentPhaseEndsAt)}`
+        : null;
+    case "CLOSED_FOR_DAY":
+      return data.windowOpensAt
+        ? `Reopens ${fmtPhaseTime(data.windowOpensAt)}`
+        : null;
+    default:
+      return null;
+  }
+}
+
 const initials = (name: string) =>
   name
     .split(/\s+/)
@@ -462,6 +520,9 @@ export default function BatchScheduleDetailPage() {
   const runAllocation = useMutation(
     api.trainScheduling.runAllocation.mutationOptions(),
   );
+  const completeDocReview = useMutation(
+    api.trainScheduling.completeDocReview.mutationOptions(),
+  );
 
   const hasAssignedWagons = useMemo(
     () =>
@@ -607,6 +668,24 @@ export default function BatchScheduleDetailPage() {
   );
   const selectedDay = dayGroups[selectedIndex];
 
+  const handleCompleteDocReview = () => {
+    completeDocReview
+      .mutateAsync(scheduleId ?? "")
+      .then(() => {
+        toast({
+          title: "Document review complete",
+          description: "Batch is running for this route-day group",
+        });
+        void refetch();
+      })
+      .catch(() => {
+        toast({
+          title: "Could not complete document review",
+          variant: "destructive",
+        });
+      });
+  };
+
   const handleRunAllocation = () => {
     runAllocation
       .mutateAsync({ scheduleId: scheduleId ?? "" })
@@ -641,6 +720,7 @@ export default function BatchScheduleDetailPage() {
   }
 
   const totalBookings = totalBookingCount(data.counts);
+  const countdown = phaseCountdown(data);
 
   return (
     <PageContainer fluid>
@@ -689,6 +769,12 @@ export default function BatchScheduleDetailPage() {
                     {data.trainNumber ?? data.routeName ?? "Schedule"}
                   </Title>
                   <WindowStatusPill status={data.bookingWindowStatus} />
+                  {data.windowPhase ? (
+                    <WindowPhasePill
+                      phase={data.windowPhase}
+                      cycleNo={data.bookingCycleNo}
+                    />
+                  ) : null}
                   <HeroChip>{data.status}</HeroChip>
                 </Group>
                 <RouteCorridor
@@ -717,6 +803,12 @@ export default function BatchScheduleDetailPage() {
                       {data.locomotive.maxTrainLengthMeters} m
                     </HeroChip>
                   ) : null}
+                  {data.windowPhase ? (
+                    <HeroChip icon={<Clock size={12} />}>
+                      Cycle {data.bookingCycleNo}
+                      {countdown ? ` · ${countdown}` : ""}
+                    </HeroChip>
+                  ) : null}
                 </Group>
               </Stack>
 
@@ -730,6 +822,17 @@ export default function BatchScheduleDetailPage() {
                 >
                   Refresh
                 </Button>
+                {data.windowPhase === "DOC_REVIEW" ? (
+                  <Button
+                    color="yellow"
+                    radius="md"
+                    leftSection={<ClipboardCheck size={16} />}
+                    loading={completeDocReview.isPending}
+                    onClick={handleCompleteDocReview}
+                  >
+                    Doc review complete — run batch
+                  </Button>
+                ) : null}
                 <Button
                   color="edr-green"
                   radius="md"

apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainScheduleV2ListPage.tsx

@@ -36,6 +36,10 @@ import { KpiStrip, PageContainer, PageHeader } from "@/components/page";
 import RuleEngineListFooter from "@/components/ruleEngine/RuleEngineListFooter";
 import { ruleEngineTable } from "@/components/ruleEngine/ruleEngineStyles";
 import { FreightTypeBadge } from "@/components/trainScheduling/ScheduleStatusBadge";
+import {
+  locomotiveOption,
+  showScheduleWarnings,
+} from "@/components/trainScheduling/locomotiveOptions";
 import {
   RouteCorridor,
   StatusPill,
@@ -110,7 +114,7 @@ export default function TrainScheduleV2ListPage() {
       selectedRoute.originYard?.label ??
       selectedRoute.originYard?.code ??
       "the route origin yard";
-    return `Only locomotives currently at ${originLabel} are shown`;
+    return `All in-service locomotives are shown — those not yet at ${originLabel} or already on future schedules are flagged`;
   }, [selectedRoute]);
 
   useEffect(() => {
@@ -356,6 +360,7 @@ export default function TrainScheduleV2ListPage() {
         payload: { routeId, scheduleDate, locomotiveIds },
       });
       toast({ title: "Train schedule created" });
+      showScheduleWarnings(created.warnings);
       setCreateOpen(false);
       navigate(`/dashboard/operations/train-scheduling-v2/${created.id}`);
     } catch (err) {
@@ -554,10 +559,7 @@ export default function TrainScheduleV2ListPage() {
             placeholder={
               routeId ? "Select at least two locomotives" : "Select a route first"
             }
-            data={(locomotivesQuery.data ?? []).map((l) => ({
-              value: l.id,
-              label: `${l.code}${l.name ? ` — ${l.name}` : ""}`,
-            }))}
+            data={(locomotivesQuery.data ?? []).map((l) => locomotiveOption(l))}
             value={locomotiveIds}
             onChange={setLocomotiveIds}
             searchable

apps/edr-freight-web/backoffice/src/pages/trainScheduling/TrainSchedulingGlobalRulesPage.tsx

@@ -34,6 +34,13 @@ export default function TrainSchedulingGlobalRulesPage() {
         maxWagonsPerTrain: Number(form.maxWagonsPerTrain),
         max20ftContainerWeightTons: Number(form.max20ftContainerWeightTons),
         max20ftPairWeightDiffTons: Number(form.max20ftPairWeightDiffTons),
+        importWindowLeadDays: Number(form.importWindowLeadDays),
+        exportBookingLeadHours: Number(form.exportBookingLeadHours),
+        windowOpenHour: Number(form.windowOpenHour),
+        windowDurationHours: Number(form.windowDurationHours),
+        docReviewMinutes: Number(form.docReviewMinutes),
+        paymentWindowMinutes: Number(form.paymentWindowMinutes),
+        reopenDelayMinutes: Number(form.reopenDelayMinutes),
       });
       setForm(updated);
       toast({ title: "Train scheduling rules saved" });
@@ -108,6 +115,87 @@ export default function TrainSchedulingGlobalRulesPage() {
             min={0}
             disabled={loading}
           />
+        </Stack>
+      </Card>
+
+      <Card maw={720} mt="md">
+        <Stack gap="md">
+          <PageHeader
+            title="Booking windows"
+            subtitle="Import booking-day cycle and export lead time. All times in Addis Ababa (EAT)."
+          />
+          <NumberInput
+            label="Import window lead (days)"
+            description="The single booking day opens this many days before departure"
+            value={form.importWindowLeadDays ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, importWindowLeadDays: Number(value) }))
+            }
+            min={0}
+            disabled={loading}
+          />
+          <NumberInput
+            label="Export booking lead (hours)"
+            description="Export bookings are accepted first-come-first-serve starting this many hours before departure"
+            value={form.exportBookingLeadHours ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, exportBookingLeadHours: Number(value) }))
+            }
+            min={1}
+            disabled={loading}
+          />
+          <NumberInput
+            label="Window open hour (EAT)"
+            description="Local hour the import window opens on its booking day (e.g. 8 = 08:00)"
+            value={form.windowOpenHour ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, windowOpenHour: Number(value) }))
+            }
+            min={0}
+            max={23}
+            disabled={loading}
+          />
+          <NumberInput
+            label="Window duration (hours)"
+            value={form.windowDurationHours ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, windowDurationHours: Number(value) }))
+            }
+            min={0.25}
+            max={12}
+            step={0.25}
+            disabled={loading}
+          />
+          <NumberInput
+            label="Document review (minutes)"
+            description="Max staff time to accept booking documents after the window closes"
+            value={form.docReviewMinutes ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, docReviewMinutes: Number(value) }))
+            }
+            min={0}
+            disabled={loading}
+          />
+          <NumberInput
+            label="Payment window (minutes)"
+            description="Time a selected customer has to pay before the slot expires"
+            value={form.paymentWindowMinutes ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, paymentWindowMinutes: Number(value) }))
+            }
+            min={1}
+            disabled={loading}
+          />
+          <NumberInput
+            label="Reopen delay (minutes)"
+            description="Delay after window close before reopening when the train is not full (90 = 11:00 close → 12:30 reopen)"
+            value={form.reopenDelayMinutes ?? ""}
+            onChange={(value) =>
+              setForm((current) => ({ ...current, reopenDelayMinutes: Number(value) }))
+            }
+            min={1}
+            disabled={loading}
+          />
           <Group justify="flex-end">
             <Button loading={saving} disabled={loading} onClick={() => void handleSave()}>
               Save rules