Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-08-28 16:00:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,071 Commits 96 Branches 0 Tags
998282b3b5a7bec100bb00be8e98c53f86e425b0
Commit Graph

72 Commits

Author SHA1 Message Date
marshal
85110adc3f Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-19 15:57:26 +03:00
marshal
f1dfbbcc3f Replace EDR logo image with Train icon in FreightSidebar 2026-06-19 01:13:52 +03:00
marshal
72b63c319e - Fix shipping line mapping to use ID instead of name in EditBookingPage and NewBookingPage 2026-06-19 01:07:05 +03:00
Hagernesh
be12a9d496 fee invoice frontend 2026-06-18 00:12:59 +00:00
Hagernesh
01aec12ee9 feat(warehouse): Batch 5 — config-driven allocation + storage/demurrage fee rules 
- Allocation rules engine: cargo/container/trade criteria -> deterministic yard/warehouse/zone by code; wired into auto-unload (fallback to default)
- Storage/demurrage fee rules: configurable freeDays + ratePerDay; most-specific match; fee preview per inventory item
- Inventory demurrage timestamps: inspectionStartedAt, inspectionCompletedAt, readyForPickupAt, releaseDate, gateClearedAt
- Migration 1790000000000 (allocation_rules + fee_rules tables + inventory date columns)
- Frontend: Allocation & Fees config page, automatic Fee Preview modal, plumbing/hooks
- No invoice/payment (Batch 6)

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-06-17 23:53:04 +00:00
Hagernesh
89d651693b automation of loading and unloading 2026-06-17 22:33:06 +00:00
Hagernesh
5b8cb16c1a automation 2026-06-17 22:00:53 +00:00
Hagernesh
f528b75737 Warehouse 2026-06-17 12:44:57 +00:00
Marshal
2de3f78fb0 Add payments management features including summary and listing, and integrate with the dashboard 2026-06-17 04:35:43 +00:00
Marshal
c76f8648a9 Updated signature handling, added booking detail components, introduced a signature management page, updated routing, enabled document downloads, and simplified the profile page. 2026-06-17 01:02:09 +00:00
Marshal
853c2b2765 Merge branch 'dev' of github.com:Tria-plc/edr-platform into freight_feature/priority 2026-06-16 22:50:01 +00:00
marshal
e815b4d976 Refactor API base URL configuration to use centralized constant across applications 2026-06-16 23:06:46 +03:00
Marshal
052829c7e6 Add freight demo data seeder and permissions management 
- Introduced `DemoFreightDataSeeder` to seed demo freight data including wagons, approval rules, and staff users.
- Added `seed:freight-demo` script to `package.json` for easy execution.
- Updated permissions for operations officer and added permission checks in various components.
- Enhanced sidebar and booking actions to respect user permissions.
 2026-06-16 15:28:10 +00:00
Marshal
f6c28635bc add 'My signature' menu item to user menu 2026-06-16 14:26:17 +00:00
Marshal
2d0f5ce6ee changes 2026-06-16 14:17:40 +00:00
Marshal
366a335f85 add reusable per-user contract signatures with profile prefill and approval 2026-06-16 13:26:45 +00:00
marshal
23272f972a Merge pull request #171 from Tria-plc/freight_feature/priority 
Freight feature/priority
 2026-06-16 13:34:18 +03:00
Marshal
3afccbd660 fix priority ui 2026-06-16 10:24:22 +00:00
ghost2023
b6ece994fc Merge branch 'freight/feat/booking-schedule' into freight/develop 2026-06-16 12:39:56 +03:00
Nathnael
7044dcfb43 payment ui for booking 2026-06-16 09:20:31 +00:00
marshal
a0dbb4ca6f backoffice cleen up 2026-06-16 11:04:36 +03:00
marshal
87b0ce6339 Replace wagon/locomotive readiness with yard tracking, assign unassigned bookings from origin-yard fleet, standardize rates on USD with CBE ETB conversion, and update fleet/scheduling UI 2026-06-14 02:13:08 +03:00
Marshal
b73bf2154e add detail batch and allocation monitoring page 2026-06-13 18:28:39 +00:00
Marshal
d3a479c142 ui fix 2026-06-12 14:21:07 +00:00
Marshal
6b79348074 ui fix 2026-06-12 12:59:01 +00:00
Marshal
db39e77e90 fix batch page ui 2026-06-12 12:46:51 +00:00
Hagernesh
95c6a71438 feat(warehouse): batch 3 — loading, dispatch & train-departure visibility 
- WarehouseLoading entity + Batch3 migration (wagon loading records)
- wagon-aware load() with validation; dispatch moved to PATCH
- read-only SchedulingReadFacade (schedule/wagon/departure) — never writes scheduling
- new endpoints: GET /warehouse-loadings, loadable-wagons, booking schedule
- Loading Queue / Loaded Inventory / Dispatch Queue pages + routes + sidebar
- FreightVisual illustrations (page heroes + empty states)
- booking detail: loaded/dispatched/wagon + read-only train schedule

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
 2026-06-12 12:44:40 +00:00
marshal
ef0abf1c41 auto allocation and batch managemnt, tracking the train 2026-06-12 11:42:46 +03:00
Hagernesh
72e2e3c985 Recieved invontory detals 2026-06-12 06:58:21 +00:00
Marshal
cde3e462ba automate the schedule 2026-06-11 19:42:23 +00:00
Hagernesh
c86118cd8d feat(warehouse): add warehouse management module (batch 1) 
Backend (edr-freight-api):
- Warehouse, WarehouseYard, WarehouseZone, WarehouseInventory entities
- CRUD for warehouses/yards/zones with scoped code uniqueness
- Inventory receive with location-hierarchy + capacity validation and
  transactional capacity-counter updates
- inspect / ready-for-loading status transitions
- inventory inquiry (booking/customer/container/cargo-type joins)
- migration creating freight.warehouse* tables

Frontend (freight backoffice):
- types, service, react-query hooks, URL constants
- reusable components: badges, filters, table/card views, inventory and
  inquiry tables, create/receive modals
- pages: Warehouse list, detail (overview/yards/zones/inventory tabs),
  inventory, inventory inquiry
- Warehouse Information card + Receive At Warehouse on booking detail
- routes + sidebar nav; app-wide ErrorBoundary

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-06-11 15:54:56 +00:00
Marshal
f85c13ce8c Merge branch 'freight_feature/schedule' of github.com:Tria-plc/edr-platform into freight_feature/schedule 2026-06-11 11:15:29 +00:00
Marshal
20289621f3 fix ui 2026-06-11 08:19:16 +00:00
marshal
10b011de8f merge conflict 2026-06-10 16:45:45 +03:00
Marshal
088295d81f schedule logic 2026-06-10 09:22:57 +00:00
Marshal
0335555892 overview, booking and train scheduling ui 2026-06-10 07:53:15 +00:00
Marshal
2b5a0f4e96 ui design for schedule 2026-06-10 00:12:52 +00:00
Marshal
257428be18 ui design for schedule 2026-06-09 23:25:52 +00:00
marshal
5774d7db9d booking operations and trains scheduling also allocations 2026-06-10 00:48:32 +03:00
hagiye
eda21e22d8 Resolve merge conflicts from Train-Scheduling 2026-06-08 16:51:29 +03:00
marshal
88df20be6b change price logic on the ,rule engine ui, auto generate the contrat 2026-06-08 10:04:23 +03:00
hagiye
b78796d76b mantine added to Train, wagon, containers and cargoes 2026-06-08 09:29:34 +03:00
hagiye
bffa5020ac wagon types added UI with API integrations 2026-06-07 21:56:33 +03:00
marshal
4993453993 generate contract by the system, add waggon type,fix ui 2026-06-07 01:20:52 +03:00
marshal
3fa1f54e3a fix ui 2026-06-07 00:32:07 +03:00
Marshal
08b46c306f ui improvemnt 2026-06-06 21:17:20 +00:00
Michael Abebe
a9c2f2eb97 feat(freight): added routes and locomotives 2026-06-06 16:23:48 +03:00
marshal
3e3841cf6f changes 2026-06-06 10:08:55 +03:00
Marshal
053b4f35c5 changes 2026-06-06 06:32:04 +00:00
ghost2023
da0f1e4cc9 feat(bookings): enhance contract viewer and backoffice UI consistency 2026-06-06 09:11:30 +03:00