Merge pull request #457 from Tria-plc/freight_feature/usermanagement

chages

apps/edr-freight-api/src/modules/train-scheduling/booking-batch.service.ts

@@ -310,7 +310,10 @@ export class BookingBatchService implements OnModuleInit {
   private async openRouteDayGroups(): Promise<RouteDayGroup[]> {
     const open = (
       await this.trainSchedulesRepository.findAll({
-        where: { bookingWindowStatus: "OPEN" },
+        where: [
+          { bookingWindowStatus: "OPEN", status: TrainScheduleStatusEnum.Draft },
+          { bookingWindowStatus: "OPEN", status: TrainScheduleStatusEnum.Scheduled },
+        ],
       })
     ).filter((s) => s.windowPhase == null);
     const groups = new Map<string, RouteDayGroup>();

apps/edr-freight-api/src/modules/train-scheduling/train-scheduling.service.ts

@@ -2049,7 +2049,9 @@ export class TrainSchedulingService {
       await this.trainSchedulesRepository.updateStatus(
         id,
         TrainScheduleStatusEnum.Cancelled,
-        {},
+        // Retire the booking window so a canceled schedule never lingers as an
+        // "open window" in booking-window lists or the legacy batch fill.
+        { bookingWindowStatus: 'CLOSED', windowPhase: 'DONE' },
         manager,
       );
       if (schedule.trainSetId) {

apps/edr-freight-web/backoffice/src/components/contracts/GlUpcomingWindowsSection.tsx

@@ -235,6 +235,8 @@ export function GlUpcomingWindowsSection() {
     const rows = (data ?? []).filter(
       (w) => w.windowPhase != null && w.windowPhase !== "DONE" && !isPast(w),
     );
+    // Canceled schedules are retired to windowPhase='DONE' server-side, so the
+    // guard above already excludes them; they never reach the upcoming list.
     // Open lanes first, then by opening time.
     return rows.sort((a, b) => {
       const openDiff = Number(b.isOpenNow) - Number(a.isOpenNow);