train

apps/edr-freight-web/backoffice/src/services/api.ts

@@ -200,6 +200,7 @@ import {
   type WagonMovementRecord,
   type WagonTransferRequest,
   type CreateTransferRequestPayload,
+  type TransferHistory,
 } from "./wagon.service";
 import { warehouseService } from "./warehouse.service";
 
@@ -1701,6 +1702,21 @@ export const api = {
       undefined,
       () => [["wagonTransferRequests"]],
     ),
+
+    history: endpoint<void, TransferHistory>(
+      "wagonTransferRequests",
+      "history",
+      () => wagonTransferRequestService.myHistory().then((r) => r.data),
+      () => ["wagonTransferRequests", "history", "mine"],
+    ),
+
+    historyAll: endpoint<{ userId?: string }, TransferHistory>(
+      "wagonTransferRequests",
+      "historyAll",
+      ({ userId }) =>
+        wagonTransferRequestService.allHistory(userId).then((r) => r.data),
+      ({ userId }) => ["wagonTransferRequests", "history", "all", userId ?? ""],
+    ),
   },
 
   trains: {
@@ -1781,6 +1797,15 @@ export const api = {
       () => TRAIN_BUILDER_INVALIDATIONS,
     ),
 
+    setYard: endpoint<{ id: string; currentYardId: string }, TrainComposition>(
+      "train-builder",
+      "setYard",
+      ({ id, currentYardId }) =>
+        trainBuilderService.setYard(id, currentYardId).then((r) => r.data),
+      undefined,
+      () => TRAIN_BUILDER_INVALIDATIONS,
+    ),
+
     assignWagons: endpoint<{ id: string; wagonIds: string[] }, TrainComposition>(
       "train-builder",
       "assignWagons",

apps/edr-freight-web/backoffice/src/services/trainBuilder.service.ts

@@ -26,7 +26,7 @@ export interface BuiltTrainSummary {
   currentYard: YardRefLite | null;
   locomotives: Array<{ id: string; code: string; name: string | null }>;
   wagonCount: number;
-  maxGrossTons: number;
+  totalTareTons: number;
   totalLengthMeters: number;
   maxPullWeightTons: number;
 }
@@ -63,12 +63,15 @@ export interface TrainCompositionWagon {
 export interface TrainCompositionTotals {
   wagonCount: number;
   totalTareTons: number;
+  /** Informational only — building never checks against full capacity. */
   totalCapacityTons: number;
-  maxGrossTons: number;
   totalLengthMeters: number;
   maxPullWeightTons: number;
   maxTrainLengthMeters: number;
-  weightUtilizationPct: number | null;
+  /** Cargo the locomotives can still haul once pulling the empty consist. */
+  payloadCapacityTons: number;
+  /** Share of the haul limit consumed by the empty wagons alone. */
+  tareUtilizationPct: number | null;
   lengthUtilizationPct: number | null;
 }
 
@@ -126,7 +129,7 @@ export interface AvailableTrain {
   currentYard: YardRefLite | null;
   locomotives: Array<{ id: string; code: string; name: string | null }>;
   wagonCount: number;
-  maxGrossTons: number;
+  totalTareTons: number;
   totalLengthMeters: number;
   maxPullWeightTons: number;
   atOriginYard: boolean;
@@ -157,6 +160,9 @@ export const trainBuilderService = {
   build: (payload: BuildTrainPayload) => apiClient.post<TrainComposition>(BASE, payload),
   setLocomotives: (id: string, locomotiveIds: string[]) =>
     apiClient.put<TrainComposition>(`${BASE}/${id}/locomotives`, { locomotiveIds }),
+  /** Relocate the train — coupled locomotives and wagons move with it. */
+  setYard: (id: string, currentYardId: string) =>
+    apiClient.patch<TrainComposition>(`${BASE}/${id}/yard`, { currentYardId }),
   assignWagons: (id: string, wagonIds: string[]) =>
     apiClient.post<TrainComposition>(`${BASE}/${id}/wagons`, { wagonIds }),
   removeWagon: (id: string, wagonId: string) =>

apps/edr-freight-web/backoffice/src/services/wagon.service.ts

@@ -55,9 +55,12 @@ export interface WagonMovementRecord {
   bookingId: string | null;
   kind: Freight.WagonMovementKind;
   movedByUserId: string | null;
+  /** The transfer request this move fulfilled, when one drove it. */
+  transferRequestId: string | null;
   occurredAt: string;
   note: string | null;
   createdAt: string;
+  wagon?: { id: string; wagonNumber?: string } | null;
 }
 
 export const wagonService = {
@@ -120,11 +123,25 @@ export interface CreateTransferRequestPayload {
   note?: string;
 }
 
+/** Per-user activity: requests filed/fulfilled + the wagons physically moved. */
+export interface TransferHistory {
+  requests: WagonTransferRequest[];
+  movements: WagonMovementRecord[];
+}
+
 export const wagonTransferRequestService = {
   list: (status?: Freight.WagonTransferRequestStatus) =>
     apiClient.get<WagonTransferRequest[]>(
       `/wagon-transfer-requests${status ? `?status=${status}` : ''}`,
     ),
+  /** The caller's own history (both roles: requests they filed and fulfilled). */
+  myHistory: () =>
+    apiClient.get<TransferHistory>('/wagon-transfer-requests/history'),
+  /** Admin: any/all staff's history (optional userId filter). */
+  allHistory: (userId?: string) =>
+    apiClient.get<TransferHistory>(
+      `/wagon-transfer-requests/history/all${userId ? `?userId=${userId}` : ''}`,
+    ),
   getById: (id: string) =>
     apiClient.get<WagonTransferRequest>(`/wagon-transfer-requests/${id}`),
   create: (data: CreateTransferRequestPayload) =>