Tria/edr-platform
1
0
Fork 0
mirror of https://github.com/Tria-plc/edr-platform.git synced 2026-09-06 15:55:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
5,177 Commits 108 Branches 0 Tags
b002cc23d2fa595cf84ac4e8ec66c8a60365d3e8
Commit Graph

5177 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Hagernesh
c0fdffa7ef Marshalling document empty wagon rendering 2026-07-20 07:13:52 +00:00
Hagernesh
eb998bfddd Facility 2026-07-20 07:13:51 +00:00
Hagernesh
ee6ad7da8b Auto arrival train 2026-07-20 07:13:51 +00:00
Hagernesh
a5973de6e1 feat(intercity): a facility only handles the cargo its equipment can lift 
Containers need a reach stacker or gantry, so only Indode, Modjo and Dire Dawa
take them. Bulk needs far less and is handled at all five facilities. Having a
facility was previously enough to load anything, so a container booking through
Sebeta or Adama would have been accepted and then had nothing to lift it.

- yard_facilities gains handles_container / handles_bulk, both defaulting true so
  a facility handles everything unless told otherwise; the seeder states the real
  capability.
- The intercity gate now refuses cargo a facility cannot lift, saying which type,
  not just "no facility". canHandleFreight keeps that rule in the resolver so
  callers cannot get it subtly wrong.
- The intercity list resolves each end against the booking's own freight type, so
  the view flags a container booking routed through a bulk-only yard while the
  train is still coming rather than when the load is refused.

Import/export untouched — the gate is still DOMESTIC-only.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
 2026-07-20 07:13:51 +00:00
marshal
096e69ba43 Merge pull request #831 from Tria-plc/freight_feature/usermanagement 
Add train deactivation feature and import train number management
 2026-07-20 10:06:21 +03:00
Marshal
771aa2a605 Add train deactivation feature and import train number management 
- Introduced DEACTIVATED status for trains, allowing staff to park trains indefinitely.
- Implemented methods to deactivate and reactivate trains in the TrainBuilderService.
- Added UI components for train deactivation and reactivation in TrainBuilderDetailPage.
- Created a dropdown setting for admin-managed import train numbers, with corresponding migrations.
- Updated yard code length to accommodate soft-delete suffix.
- Enhanced train status handling to include DEACTIVATED state.
 2026-07-20 07:04:23 +00:00
Nathnael
3d4996e4df feat: setup forget password to the backoffice 2026-07-20 06:19:12 +00:00
marshal
2e52bb6fc8 Merge pull request #830 from Tria-plc/freight_feature/usermanagement 
Enhance cargo description handling in contract forms
 2026-07-20 09:11:45 +03:00
Marshal
ab355d0e16 Enhance cargo description handling in contract forms 2026-07-20 06:10:50 +00:00
marshal
a263cade24 Merge pull request #829 from Tria-plc/freight_feature/usermanagement 
changes
 2026-07-20 08:54:09 +03:00
Marshal
bac0fa7f48 changes 2026-07-20 05:51:21 +00:00
marshal
5d94e8acf2 Merge pull request #828 from Tria-plc/dev 
freight deployment
 2026-07-20 06:09:16 +03:00
marshal
721245cdc0 Merge pull request #827 from Tria-plc/freight_feature/usermanagement 
Freight feature/usermanagement
 2026-07-20 06:08:31 +03:00
Marshal
8354804505 Merge branch 'main' of github.com:Tria-plc/edr-platform into freight_feature/usermanagement 2026-07-20 03:07:42 +00:00
marshal
f672d66a92 Merge pull request #826 from Tria-plc/freight_feature/usermanagement 
changes
 2026-07-20 06:06:06 +03:00
Marshal
4969f62896 changes 2026-07-20 03:05:28 +00:00
Stephanos A.
13e9b1622b Merge pull request #825 from Tria-plc/quick-fix-main 
Reports (overall, seats report, passenger export) updates
 2026-07-20 00:42:46 +03:00
Stephanos A.
8d7a914ab7 Merge branch 'dev' into quick-fix-main 2026-07-20 00:42:25 +03:00
Stephanos A.
e683ed50b9 Merge pull request #824 from Tria-plc/quick-fix-main 
Reports (overall, seats report, passenger export) updates
 2026-07-20 00:39:59 +03:00
Stephanos A
c62491b236 Reports (overall, seats report, passenger export) updates 2026-07-20 00:37:10 +03:00
robiman
efa3c218fe Merge pull request #823 from Tria-plc/alpha 
Include coach number to voucher
 2026-07-20 00:22:00 +03:00
Roba Boru
3293040438 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 00:19:31 +03:00
Roba Boru
f5cbf512ea Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-20 00:17:32 +03:00
Stephanos A.
594e56b042 Merge pull request #822 from Tria-plc/quick-fix-main 
Search schedule update
 2026-07-19 23:58:35 +03:00
Roba Boru
c31a337a98 Include coach number to voucher 2026-07-19 23:58:14 +03:00
Stephanos A
57390647d8 Search schedule update 2026-07-19 23:57:16 +03:00
Stephanos A.
225f5df10e Merge pull request #821 from Tria-plc/quick-fix-main 
Passenger list report filter updates
 2026-07-19 22:53:18 +03:00
Stephanos A
8e84fcebd5 Passenger list report filter updates 2026-07-19 22:52:23 +03:00
robiman
903219eec1 Merge pull request #820 from Tria-plc/alpha 
Fix price inconsistency
 2026-07-19 22:50:41 +03:00
Roba Boru
a6e4f0538c Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 22:48:46 +03:00
Roba Boru
68cf5dbbd7 Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 22:47:24 +03:00
Roba Boru
bb78c1880e Merge branch 'alpha' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 22:47:11 +03:00
Roba Boru
d43229528e Fix price inconsistency 2026-07-19 22:46:36 +03:00
Abubeker Yasin
2efd105a2d Merge pull request #819 from Tria-plc/alpha 
fix: ( telebirr ) read transId from webhook for provider_txn_id
 2026-07-19 22:37:39 +03:00
Abubeker Yasin
f48a4735c8 fix: ( telebirr ) read transId from webhook for provider_txn_id 2026-07-19 22:16:20 +03:00
mulish77
c7af33028e Merge pull request #818 from Tria-plc/main 
Main
 2026-07-19 21:58:28 +03:00
Stephanos A.
d099222f4f Merge pull request #817 from Tria-plc/quick-fix-main 
Quick fix main
 2026-07-19 21:09:03 +03:00
Stephanos A
eb41f4bb5f Merge branch 'quick-fix-main' of github.com:Tria-plc/edr-platform into quick-fix-main 2026-07-19 21:03:27 +03:00
Stephanos A
264206b57a Passenger report updates 2026-07-19 20:58:00 +03:00
Abubeker Yasin
2eef2da5bc Merge pull request #816 from Tria-plc/user_seed 
feat: ( users ) seed ticket officer and director users
 2026-07-19 18:58:10 +03:00
Abubeker Yasin
5317ca0d19 feat: ( users ) seed ticket officer and director users 2026-07-19 18:57:31 +03:00
robiman
38fc628df2 Merge pull request #815 from Tria-plc/alpha 
Fix blocked seat count on booking result
 2026-07-19 18:52:52 +03:00
Roba Boru
996c0d8896 Merge branch 'main' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 18:51:41 +03:00
Roba Boru
ac2cbf7e7e Merge branch 'dev' of https://github.com/Tria-plc/edr-platform into alpha 2026-07-19 18:51:23 +03:00
Roba Boru
f57f8d4550 Fix blocked seat count on booking result 2026-07-19 18:50:37 +03:00
robiman
e62c9be31a Merge pull request #814 from Tria-plc/alpha 
Fix migration
 2026-07-19 18:30:01 +03:00
Roba Boru
1e08f98705 Fix migration 2026-07-19 18:29:23 +03:00
robiman
04215291ff Merge pull request #813 from Tria-plc/alpha 
debug(passenger-api): expose Prisma error code in 500 response body
 2026-07-19 18:21:38 +03:00
Roba Boru
1804fba5bb debug(passenger-api): expose Prisma error code in 500 response body 
Adds prismaCode and prismaMeta fields to 500 responses so the exact
Prisma error code (P2022, P2023, etc.) is visible in curl/Swagger without
needing server log access. Temporary diagnostic aid.

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
 2026-07-19 18:18:08 +03:00
robiman
bbb6056234 Merge pull request #812 from Tria-plc/alpha 
fix(passenger-api): repair StopStatus enum values in deployed DB
 2026-07-19 17:58:01 +03:00