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

Implement client-side validation for container and bul
This commit is contained in:
marshal
2026-07-09 11:17:43 +03:00
committed by GitHub
3 changed files with 7 additions and 3 deletions

View File

@@ -22,7 +22,9 @@ export class TrainSchedulesRepository extends BaseRepository<TrainSchedule> {
return this.repo(manager).findOne({
where: { id },
relations: {
route: true,
// Yards carry the route's display name; without them formatRouteLabel
// degrades to the literal "Origin → Destination".
route: { originYard: true, destinationYard: true },
trainSet: {
locomotive: true,
locomotives: { locomotive: true },

View File

@@ -635,7 +635,8 @@ export class BookingBatchService implements OnModuleInit {
trainSet: { locomotive: true },
originStation: true,
destinationStation: true,
route: true,
// Yards supply the route's display name for `routeName` below.
route: { originYard: true, destinationYard: true },
},
order: { scheduledDepartureDate: "ASC" },
});

View File

@@ -2634,7 +2634,8 @@ export class TrainSchedulingService {
const schedules = await this.trainSchedulesRepository.findAll({
relations: {
trainSet: { locomotive: true, locomotives: { locomotive: true } },
route: true,
// Yards carry the route's display name used by mapScheduleListItem.
route: { originYard: true, destinationYard: true },
originStation: true,
destinationStation: true,
scheduleBookings: { booking: true },