Enhance overview and train scheduling features

- Updated OverviewContractsTabPanel to include a new donut chart for freight type distribution.
- Modified OverviewOperationsTabPanel to improve data visualization with additional charts and refactored data handling.
- Introduced CreateScheduleWindowFields component for configuring booking windows in train scheduling.
- Added new API endpoints for allocation candidates and booking allocation in trainScheduling.service.
- Enhanced BookingRequestsPage to support allocation of paid bookings with a modal for selecting alternative dates.
- Updated QUERY_KEYS and URLS constants to accommodate new operations and features.
- Improved type definitions for overview and train scheduling to support new functionalities.

apps/edr-freight-api/src/modules/overview/dto/overview-response.dto.ts

@@ -21,6 +21,8 @@ export class OverviewOperationsKpisDto {
   @ApiProperty() wagonsAvailable!: number;
   @ApiProperty() containersInTransit!: number;
   @ApiProperty() cargoesLoaded!: number;
+  @ApiProperty() schedulesUpcoming!: number;
+  @ApiProperty() dispatchedToday!: number;
 }
 
 export class OverviewCustomerKpisDto {

apps/edr-freight-api/src/modules/overview/dto/overview-tab-response.dto.ts

@@ -104,10 +104,40 @@ export class OverviewBillingTabDto {
   generatedAt!: string;
 }
 
+export class OverviewDirectionTrendPointDto {
+  @ApiProperty({ example: '2026-08-01' }) date!: string;
+  @ApiProperty() importCount!: number;
+  @ApiProperty() exportCount!: number;
+  @ApiProperty() domesticCount!: number;
+}
+
+export class OverviewTonnagePointDto {
+  @ApiProperty() label!: string;
+  @ApiProperty() tons!: number;
+}
+
 export class OverviewOperationsTabDto {
   @ApiProperty({ type: OverviewOperationsKpisDto })
   kpis!: OverviewOperationsKpisDto;
 
+  @ApiProperty({ type: [OverviewDirectionTrendPointDto] })
+  departureTrend!: OverviewDirectionTrendPointDto[];
+
+  @ApiProperty({ type: [OverviewStatusCountDto] })
+  scheduleStatusBreakdown!: OverviewStatusCountDto[];
+
+  @ApiProperty({ type: [OverviewLabelCountDto] })
+  wagonsByType!: OverviewLabelCountDto[];
+
+  @ApiProperty({ type: [OverviewLabelCountDto] })
+  wagonsByYard!: OverviewLabelCountDto[];
+
+  @ApiProperty({ type: [OverviewLabelCountDto] })
+  containersBySize!: OverviewLabelCountDto[];
+
+  @ApiProperty({ type: [OverviewTonnagePointDto] })
+  cargoTonnageByType!: OverviewTonnagePointDto[];
+
   @ApiProperty({ type: [OverviewStatusCountDto] })
   trainStatusBreakdown!: OverviewStatusCountDto[];
 

apps/edr-freight-api/src/modules/overview/overview.controller.ts

@@ -99,8 +99,10 @@ export class OverviewController {
   @BookingView()
   @ApiOperation({ summary: 'Operations tab metrics and charts' })
   @ApiOkResponse({ type: OverviewOperationsTabDto })
-  getOperationsTab(): Promise<OverviewOperationsTabDto> {
-    return this.overviewService.getOperationsTab();
+  getOperationsTab(
+    @Query() query: OverviewQueryDto,
+  ): Promise<OverviewOperationsTabDto> {
+    return this.overviewService.getOperationsTab(query.range ?? '30d');
   }
 
   @Get('customers')

apps/edr-freight-api/src/modules/overview/overview.module.ts

@@ -9,6 +9,7 @@ import { Container } from "../container-management/entities/container.entity";
 import { Company } from "../companies/entities/company.entity";
 import { Contract } from "../contracts/entities/contract.entity";
 import { PaymentEntity } from "../payment/entities/payment.entity";
+import { TrainSchedule } from "../train-schedules/entities/train-schedule.entity";
 import { Train } from "../trains/entities/train.entity";
 import { Wagon } from "../wagons/entities/wagon.entity";
 import { UserTradeAccessModule } from "../user-trade-access/user-trade-access.module";
@@ -23,6 +24,7 @@ import { OverviewService } from "./overview.service";
       PaymentEntity,
       Company,
       Train,
+      TrainSchedule,
       Wagon,
       Container,
       Cargo,

apps/edr-freight-api/src/modules/overview/overview.repository.ts

@@ -11,7 +11,12 @@ import { Cargo } from "../cargoes/entities/cargoes.entity";
 import { Container } from "../container-management/entities/container.entity";
 import { Contract } from "../contracts/entities/contract.entity";
 import { PaymentEntity } from "../payment/entities/payment.entity";
+import { CargoType } from "../rule-engine/entities/cargo-type.entity";
+import { ContainerType } from "../rule-engine/entities/container-type.entity";
+import { Yard } from "../rule-engine/entities/yard.entity";
+import { TrainSchedule } from "../train-schedules/entities/train-schedule.entity";
 import { Train } from "../trains/entities/train.entity";
+import { WagonType } from "../wagon-types/entities/wagon-type.entity";
 import { Wagon } from "../wagons/entities/wagon.entity";
 import {
   OVERVIEW_CLOSED_STATUSES,
@@ -83,6 +88,8 @@ export class OverviewRepository {
     private readonly companyRepository: Repository<Company>,
     @InjectRepository(Train)
     private readonly trainRepository: Repository<Train>,
+    @InjectRepository(TrainSchedule)
+    private readonly trainScheduleRepository: Repository<TrainSchedule>,
     @InjectRepository(Wagon)
     private readonly wagonRepository: Repository<Wagon>,
     @InjectRepository(Container)
@@ -146,9 +153,17 @@ export class OverviewRepository {
     wagonsAvailable: number;
     containersInTransit: number;
     cargoesLoaded: number;
+    schedulesUpcoming: number;
+    dispatchedToday: number;
   }> {
-    const [trainsActive, wagonsAvailable, containersInTransit, cargoesLoaded] =
-      await Promise.all([
+    const [
+      trainsActive,
+      wagonsAvailable,
+      containersInTransit,
+      cargoesLoaded,
+      schedulesUpcoming,
+      dispatchedToday,
+    ] = await Promise.all([
         this.trainRepository
           .createQueryBuilder("train")
           .where("train.deleted_at IS NULL")
@@ -178,6 +193,22 @@ export class OverviewRepository {
             statuses: ["LOADED", "IN_TRANSIT"],
           })
           .getCount(),
+        this.trainScheduleRepository
+          .createQueryBuilder("schedule")
+          .where("schedule.deleted_at IS NULL")
+          .andWhere("schedule.status = :status", {
+            status: Freight.TrainScheduleStatus.Scheduled,
+          })
+          .andWhere("schedule.scheduled_departure_date >= CURRENT_DATE")
+          .getCount(),
+        this.trainScheduleRepository
+          .createQueryBuilder("schedule")
+          .where("schedule.deleted_at IS NULL")
+          .andWhere("schedule.status = :status", {
+            status: Freight.TrainScheduleStatus.Dispatched,
+          })
+          .andWhere("schedule.scheduled_departure_date::date = CURRENT_DATE")
+          .getCount(),
       ]);
 
     return {
@@ -185,6 +216,8 @@ export class OverviewRepository {
       wagonsAvailable,
       containersInTransit,
       cargoesLoaded,
+      schedulesUpcoming,
+      dispatchedToday,
     };
   }
 
@@ -533,6 +566,141 @@ export class OverviewRepository {
     return this.statusBreakdown(this.cargoRepository, "cargo");
   }
 
+  async getScheduleStatusBreakdown(): Promise<
+    { status: string; count: number }[]
+  > {
+    return this.statusBreakdown(this.trainScheduleRepository, "schedule");
+  }
+
+  /** Scheduled departures per day over the range, split by trade direction. */
+  async getDepartureTrend(days: number): Promise<
+    {
+      date: string;
+      importCount: number;
+      exportCount: number;
+      domesticCount: number;
+    }[]
+  > {
+    const rows = await this.trainScheduleRepository
+      .createQueryBuilder("schedule")
+      .select(
+        `to_char(schedule.scheduled_departure_date::date, 'YYYY-MM-DD')`,
+        "date",
+      )
+      .addSelect(
+        `COUNT(*) FILTER (WHERE schedule.direction = 'IMPORT')::int`,
+        "importCount",
+      )
+      .addSelect(
+        `COUNT(*) FILTER (WHERE schedule.direction = 'EXPORT')::int`,
+        "exportCount",
+      )
+      .addSelect(
+        `COUNT(*) FILTER (WHERE schedule.direction NOT IN ('IMPORT', 'EXPORT') OR schedule.direction IS NULL)::int`,
+        "domesticCount",
+      )
+      .where("schedule.deleted_at IS NULL")
+      .andWhere("schedule.status != :draft", {
+        draft: Freight.TrainScheduleStatus.Draft,
+      })
+      .andWhere(
+        `schedule.scheduled_departure_date >= CURRENT_DATE - :days::int + 1`,
+        { days },
+      )
+      .andWhere(
+        `schedule.scheduled_departure_date < CURRENT_DATE + :ahead::int`,
+        { ahead: 8 },
+      )
+      .groupBy("schedule.scheduled_departure_date::date")
+      .orderBy("schedule.scheduled_departure_date::date", "ASC")
+      .getRawMany<{
+        date: string;
+        importCount: string;
+        exportCount: string;
+        domesticCount: string;
+      }>();
+
+    return rows.map((row) => ({
+      date: row.date,
+      importCount: Number(row.importCount),
+      exportCount: Number(row.exportCount),
+      domesticCount: Number(row.domesticCount),
+    }));
+  }
+
+  async getWagonsByType(): Promise<{ label: string; count: number }[]> {
+    const rows = await this.wagonRepository
+      .createQueryBuilder("wagon")
+      .leftJoin(WagonType, "wagon_type", "wagon_type.id = wagon.wagon_type_id")
+      .select(`COALESCE(wagon_type.name, 'Unknown')`, "label")
+      .addSelect("COUNT(*)::int", "count")
+      .where("wagon.deleted_at IS NULL")
+      .groupBy("wagon_type.name")
+      .orderBy("count", "DESC")
+      .getRawMany<{ label: string; count: string }>();
+
+    return rows.map((row) => ({ label: row.label, count: Number(row.count) }));
+  }
+
+  async getWagonsByYard(limit: number): Promise<
+    { label: string; count: number }[]
+  > {
+    const rows = await this.wagonRepository
+      .createQueryBuilder("wagon")
+      .innerJoin(Yard, "yard", "yard.id = wagon.current_yard_id")
+      .select("yard.label", "label")
+      .addSelect("COUNT(*)::int", "count")
+      .where("wagon.deleted_at IS NULL")
+      .groupBy("yard.label")
+      .orderBy("count", "DESC")
+      .limit(limit)
+      .getRawMany<{ label: string; count: string }>();
+
+    return rows.map((row) => ({ label: row.label, count: Number(row.count) }));
+  }
+
+  async getContainersBySize(): Promise<{ label: string; count: number }[]> {
+    const rows = await this.containerRepository
+      .createQueryBuilder("container")
+      .leftJoin(
+        ContainerType,
+        "container_type",
+        "container_type.id = container.container_type_id",
+      )
+      .select(
+        `COALESCE(container_type.size_ft::text || ' ft', container_type.code, 'Unknown')`,
+        "label",
+      )
+      .addSelect("COUNT(*)::int", "count")
+      .where("container.deleted_at IS NULL")
+      .groupBy("container_type.size_ft")
+      .addGroupBy("container_type.code")
+      .orderBy("count", "DESC")
+      .getRawMany<{ label: string; count: string }>();
+
+    return rows.map((row) => ({ label: row.label, count: Number(row.count) }));
+  }
+
+  /** Total cargo weight (tons) grouped by cargo type, heaviest first. */
+  async getCargoTonnageByType(limit: number): Promise<
+    { label: string; tons: number }[]
+  > {
+    const rows = await this.cargoRepository
+      .createQueryBuilder("cargo")
+      .leftJoin(CargoType, "cargo_type", "cargo_type.id = cargo.cargo_type_id")
+      .select(`COALESCE(cargo_type.cargo_type_name, 'Other')`, "label")
+      .addSelect(`ROUND(COALESCE(SUM(cargo.weight), 0) / 1000, 1)`, "tons")
+      .where("cargo.deleted_at IS NULL")
+      .groupBy("cargo_type.cargo_type_name")
+      .orderBy("tons", "DESC")
+      .limit(limit)
+      .getRawMany<{ label: string; tons: string }>();
+
+    return rows
+      .map((row) => ({ label: row.label, tons: Number(row.tons) }))
+      .filter((row) => row.tons > 0);
+  }
+
   private async statusBreakdown(
     repository: Repository<ObjectLiteral>,
     alias: string,

apps/edr-freight-api/src/modules/overview/overview.service.ts

@@ -202,15 +202,31 @@ export class OverviewService {
     };
   }
 
-  async getOperationsTab(): Promise<OverviewOperationsTabDto> {
+  async getOperationsTab(
+    range: OverviewRangeQuery = '30d',
+  ): Promise<OverviewOperationsTabDto> {
+    const days = OVERVIEW_RANGE_DAYS[range];
+
     const [
       kpis,
+      departureTrend,
+      scheduleStatusBreakdown,
+      wagonsByType,
+      wagonsByYard,
+      containersBySize,
+      cargoTonnageByType,
       trainStatusBreakdown,
       wagonStatusBreakdown,
       containerStatusBreakdown,
       cargoStatusBreakdown,
     ] = await Promise.all([
       this.overviewRepository.getOperationsKpis(),
+      this.overviewRepository.getDepartureTrend(days),
+      this.overviewRepository.getScheduleStatusBreakdown(),
+      this.overviewRepository.getWagonsByType(),
+      this.overviewRepository.getWagonsByYard(8),
+      this.overviewRepository.getContainersBySize(),
+      this.overviewRepository.getCargoTonnageByType(8),
       this.overviewRepository.getTrainStatusBreakdown(),
       this.overviewRepository.getWagonStatusBreakdown(),
       this.overviewRepository.getContainerStatusBreakdown(),
@@ -219,6 +235,12 @@ export class OverviewService {
 
     return {
       kpis,
+      departureTrend,
+      scheduleStatusBreakdown,
+      wagonsByType,
+      wagonsByYard,
+      containersBySize,
+      cargoTonnageByType,
       trainStatusBreakdown,
       wagonStatusBreakdown,
       containerStatusBreakdown,