Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-09-07 13:05:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #797 from Tria-plc/quick-fix

Browse Source 
Build issue resolution
This commit is contained in:
Stephanos A.
2026-07-18 19:53:28 +03:00
committed by GitHub
parent 3ebcfb03cb 554baf2595
commit 77f5ce656f
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
apps/edr-passenger-api/src/modules/reports/reports.service.ts
View File

@@ -95,7 +95,7 @@ export class ReportsService {
where: { departureAt: { gte: dateFrom, lte: dateTo } }, where: { departureAt: { gte: dateFrom, lte: dateTo } },
include: { include: {
coachAssignments: { include: { coach: { include: { seats: true } } } }, coachAssignments: { include: { coach: { include: { seats: true } } } },
bookings: { include: { seats: true } }, bookings: { include: { seats: { where: { scheduleId: schedule.id } } } },
}, },
}); });
@@ -212,6 +212,7 @@ export class ReportsService {
where: { status: { in: ['CONFIRMED', 'BOARDED'] } }, where: { status: { in: ['CONFIRMED', 'BOARDED'] } },
include: { include: {
seats: { seats: {
where: { scheduleId },
include: { include: {
seat: { include: { coach: { include: { coachType: true } } } }, seat: { include: { coach: { include: { coachType: true } } } },
}, },

3
apps/edr-passenger-web/backoffice/src/app/reports/passengers/page.tsx
View File

@@ -9,10 +9,7 @@ import { formatDateTime } from '@/lib/utils';
interface ScheduleOption { id: string; label: string; } interface ScheduleOption { id: string; label: string; }
interface ScheduleOption { id: string; label: string; }
interface PassengersReport { interface PassengersReport {
schedule: { id: string; trainName: string; origin: string; destination: string; departureAt: string; arrivalAt: string; };
schedule: { id: string; trainName: string; origin: string; destination: string; departureAt: string; arrivalAt: string; }; schedule: { id: string; trainName: string; origin: string; destination: string; departureAt: string; arrivalAt: string; };
summary: { totalSeats: number; totalPassengers: number; occupancyRate: number }; summary: { totalSeats: number; totalPassengers: number; occupancyRate: number };
byCoach: { coachNumber: string; coachType: string; totalSeats: number; booked: number; occupancyRate: number }[]; byCoach: { coachNumber: string; coachType: string; totalSeats: number; booked: number; occupancyRate: number }[];