Commit Graph

122 Commits

Author SHA1 Message Date
Marshal
1abef3ce34 enhance shipment requests page with filtering and sorting options
- Added status and cargo filters to the ShipmentRequestsPage.
- Implemented date range filtering for preferred dates.
- Introduced sorting options for shipment requests based on submission date and reference.
- Enhanced the display of shipment request details, including status badges and customer information.
- Updated the UI to include a search input with clear functionality and improved layout for filters.

feat: add equipment return option in new shipment form

- Introduced a toggle for equipment return in the NewShipmentPage.
- Updated form schema to include  field for container contracts.
- Enhanced user experience with visual feedback on the equipment return selection.

fix: update booking DTO to include equipment return option

- Added  field to CreateBookingUnderContractDto for per-shipment override.
- Updated related types and schemas to accommodate the new field for better contract handling.
2026-07-10 10:32:41 +00:00
Marshal
e4429592d3 fix issues 2026-07-09 20:26:14 +00:00
Marshal
1d77cc9219 add Excel import functionality for container bookings 2026-07-09 18:10:58 +00:00
Marshal
a7d05fba34 test batch system 2026-07-09 17:04:25 +00:00
Marshal
1690f9e498 Enhance bulk booking handling and wagon capacity calculations across services 2026-07-09 15:30:00 +00:00
Marshal
3afadcd9f2 small fix 2026-07-09 13:36:36 +00:00
Marshal
eb819d66a1 Enhance wagon capacity handling and validation in booking service
- Added default capacities for container and bulk wagons.
- Updated wagonsFor method to consider weight and length for wagon calculations.
- Improved handling of overweight bookings with appropriate warnings.
- Adjusted tests to reflect changes in wagon capacity and validation logic.
2026-07-09 13:10:32 +00:00
Marshal
15707d9070 Implement client-side validation for container and bul 2026-07-09 08:16:59 +00:00
Marshal
f736523afd Implement client-side validation for container and bul 2026-07-09 08:13:20 +00:00
Marshal
61ec67cc2e Refactor wagon specifications to rely on wagon type; remove tare weight and max payload from wagon entity and related components 2026-07-09 07:42:02 +00:00
Marshal
cd8fb2b321 enhance gate pass and freight payment handling in train scheduling
- Updated the logic in  to ensure that a booking only earns its gate pass once the freight charges are settled.
- Added logging for bookings that have not settled freight payment when securing gate passes.
- Modified seeders to ensure that bookings have associated company profiles to prevent data inconsistencies.
- Updated freight permissions to include new clearance actions for bookings.
- Enhanced the UI to reflect changes in the clearance process, including new shipment request pages and improved status handling in the clearance action panel.
- Adjusted the contract clearance list to accommodate both customs contracts and shipment bookings.
- Improved the handling of GENERAL contracts in various components to ensure proper booking flow and visibility.
2026-07-09 07:19:36 +00:00
Marshal
1b2b3f68f8 Add tareWeightTons property to CreateWagonTypeDto and update related components 2026-07-09 06:05:34 +00:00
Marshal
bedcdca78b Enforce non-negative values for numeric inputs across various components 2026-07-09 04:24:08 +00:00
Marshal
305d35b2de resolve merge conflict 2026-07-09 03:39:06 +00:00
Marshal
ddddcfb71f Refactor wagon type handling and container wagon calculations
- Removed maxWagonsPerTrain from WagonType entity and related DTOs.
- Updated containerWagonsForLines function to calculate required wagons based on container lines more accurately.
- Added unit tests for containerWagonsForLines to ensure correct calculations.
- Adjusted related services and scripts to reflect the removal of maxWagonsPerTrain.
- Enhanced booking and contract components to use new status labels for better user experience.
- Implemented validation for unique container numbers in shipment forms.
2026-07-09 03:36:35 +00:00
marshal
8de7754e35 Merge pull request #535 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-08 12:09:40 +03:00
Marshal
44023efb12 solve priorty issue 2026-07-08 09:08:53 +00:00
Hagernesh
9ffc8bfb0b Notify customer on Sign handover, truck assignment, arrival and dispatch of train 2026-07-08 07:07:33 +00:00
Marshal
9dd9ace313 add reference field to train schedules and implement unique sequence generation 2026-07-07 23:06:44 +00:00
Marshal
94904ea6d0 resolve conflict 2026-07-07 21:46:25 +00:00
Marshal
87a95b37bf enhance train scheduling and booking management 2026-07-07 21:38:45 +00:00
Marshal
8addfdf3e2 changes 2026-07-07 18:40:32 +00:00
Marshal
b57840c907 add CUSTOMS type to priority configs and update related logic 2026-07-07 16:42:57 +00:00
Marshal
f300600bfa changes 2026-07-07 12:28:47 +00:00
marshal
86c7e0cbe8 Merge pull request #499 from Tria-plc/freight_feature/usermanagement
implement self-healing for freight payment milestones and enhance con…
2026-07-07 10:51:23 +03:00
Marshal
05d71eb6da implement self-healing for freight payment milestones and enhance contract change request visibility 2026-07-07 07:45:59 +00:00
Hagernesh Tadesse
ff0fa6bb9e Merge pull request #498 from Tria-plc/Doublehandling
Doublehandling
2026-07-07 09:48:26 +03:00
Marshal
05b13e84a8 enhance booking and contract notification systems
- Added detailed logging for socket connection events in useBookingWindowSocket.
- Introduced new notification types for contract status and schedule updates.
- Updated notification visuals to include new icons for contract status.
- Enhanced notification href resolution for contract status and schedule updates.
- Implemented booking lifecycle notifier service for customer and staff notifications.
- Created contract notifier service for managing contract lifecycle notifications.
- Added end-to-end tests for booking window socket functionality.
2026-07-06 21:03:08 +00:00
Hagernesh
838895897d Marshaling doc fix 2026-07-06 19:12:14 +00:00
Marshal
8bd00ea78a enhance user management and booking features with permissions and real-time updates 2026-07-06 17:15:22 +00:00
Marshal
fed5f2f43f implement intercity booking management and booking window websocket integration 2026-07-06 13:28:21 +00:00
Marshal
58fa0d9184 improve error handling and query structure in runWarehouseArrivalAutomation 2026-07-05 22:41:39 +00:00
Marshal
5192c6b949 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-05 22:22:34 +00:00
Marshal
ac7bff8cc8 add overnight desk handling and effective window configuration for train schedules 2026-07-05 22:22:04 +00:00
Marshal
caa8397563 enhance booking window logic to support overnight desk configurations and update related UI components 2026-07-05 21:29:09 +00:00
Marshal
3485a7d63d add loading confirmation for import-Djibouti trains before dispatch 2026-07-05 21:07:03 +00:00
Marshal
1433796db0 add loading status management for bookings 2026-07-05 19:56:21 +00:00
Marshal
3e2299960a add script to seed freight contracts across flow variants 2026-07-05 18:06:24 +00:00
Marshal
3447394e32 add bookings management and settings 2026-07-05 10:22:58 +00:00
Marshal
dfdf7a025d fix(freight): guard booking-desk hours against overnight ranges
Review follow-ups on the window-close-hour feature:

- Reject windowCloseHour < windowOpenHour when saving global rules. The
  reopen engine (nextCycleOpensAt) assumes the daily desk runs within one
  EAT day; an overnight range would misroute a ready-time inside the span
  to the next morning. openHour === closeHour stays valid (24-hour desk).
- Derive the board projection's runaway cap from the real first-open →
  departure span over the minimum per-cycle advance, so a legitimate
  long-lead config is never silently truncated (was a flat 200).
- Document the open <= close precondition on nextCycleOpensAt and clarify
  the ready-before-open comment.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-05 09:07:21 +00:00
Marshal
93b8b69464 Add window close hour to booking desk configuration 2026-07-05 08:53:27 +00:00
Hagernesh
5954f9a349 Merge remote-tracking branch 'origin/dev' into CutomerTruckAssign
:qa!
2026-07-04 09:53:28 +00:00
Hagernesh
0a17018215 fix: don't block import train dispatch on loading confirmation
Loading (loaded-on-train step + per-booking loading status) no longer gates
dispatch/departure of a Djibouti import train. Per-booking loading status stays
tracking-only; a scheduled train dispatches once gatepass is granted, without
waiting on loading confirmation.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
2026-07-04 09:50:25 +00:00
Hagernesh
d8da2e49cb fix 2026-07-04 09:42:09 +00:00
marshal
ef2e8b6461 Merge pull request #460 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-04 12:04:03 +03:00
Marshal
e6328fc897 changes 2026-07-04 09:03:24 +00:00
Hagernesh Tadesse
d6e4aa188f Merge pull request #459 from Tria-plc/CutomerTruckAssign
Cutomer truck assign

Fields: Truck Plate Number, Driver Name, Truck Type, Container Number to Load (now the Select I just wired) → Verify & Submit Assignment.
2026-07-04 10:59:48 +03:00
Hagernesh
e8e3e01f31 release order document fix 2026-07-04 07:36:53 +00:00
Marshal
74118165c6 chages 2026-07-04 07:16:23 +00:00
Marshal
f37078d51d update joins in repository services to use entity classes and enhance booking form with hazardous/reefer toggles 2026-07-04 04:59:51 +00:00