Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-29 19:58:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Enhance bulk booking handling and wagon capacity calculations across …
This commit is contained in:
marshal
2026-07-09 18:31:00 +03:00
committed by GitHub
parent 3d80f2d040 1690f9e498
commit 3ff84d687a
11 changed files with 278 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
apps/edr-freight-web/backoffice/src/pages/trainScheduling/BatchScheduleDetailPage.tsx
View File

@@ -20,7 +20,7 @@ import {
AlertTriangle,
ArrowLeft,
ArrowLeftRight,
// Boxes,
Boxes,
CalendarDays,
CheckCircle2,
ClipboardCheck,
@@ -348,9 +348,9 @@ const BOOKING_COLUMNS: ColumnDef<BatchBoardBookingDetail>[] = [
const b = row.original;
return (
<Group gap={4} wrap="nowrap">
{/* <Badge variant="default" radius="sm" size="sm">
<Badge variant="default" radius="sm" size="sm">
{b.wagons}w
</Badge> */}
</Badge>
<Badge variant="default" radius="sm" size="sm">
{fmtTons(b.weightTons)}
</Badge>
@@ -890,14 +890,14 @@ export default function BatchScheduleDetailPage() {
<KpiStrip
items={[
// {
// label: "Allocated wagons",
// value: data.capacity.maxWagons
// ? `${data.capacity.allocatedWagons} / ${data.capacity.maxWagons}`
// : data.capacity.allocatedWagons,
// hint: "on this train",
// icon: Boxes,
// },
{
label: "Allocated wagons",
value: data.capacity.maxWagons
? `${data.capacity.allocatedWagons} / ${data.capacity.maxWagons}`
: data.capacity.allocatedWagons,
hint: "on this train",
icon: Boxes,
},
{
label: "Train length",
value: data.capacity.maxLengthMeters
@@ -1111,7 +1111,7 @@ export default function BatchScheduleDetailPage() {
<TrainCompositionDiagram
locomotive={scheduleDetailQuery.data.trainSet?.locomotive}
wagons={scheduleDetailQuery.data.trainSet?.wagons ?? []}
freightType="CONTAINER"
freightType={scheduleDetailQuery.data.freightType ?? null}
trainNumber={scheduleDetailQuery.data.trainNumber}
totalLengthMeters={
scheduleDetailQuery.data.trainSet?.totalLengthMeters
@@ -1133,7 +1133,7 @@ export default function BatchScheduleDetailPage() {
<TrainConsistView
scheduleDetail={scheduleDetailQuery.data}
scheduleId={scheduleId ?? ""}
maxWagons={53}
maxWagons={data.capacity.maxWagons ?? 53}
highlightBookingId={selectedBookingId}
/>
</Box>