Commit Graph

46 Commits

Author SHA1 Message Date
Marshal
234a74e812 implement empty-container return service: add return quantity handling, update related DTOs, services, and UI components 2026-07-15 22:48:04 +00:00
Marshal
fc44eee25e implement update train details feature: add DTO, service method, and UI modal for editing train name and run numbers 2026-07-15 20:14:39 +00:00
Marshal
d7d9db9c3a changes 2026-07-15 14:27:00 +00:00
Marshal
19c9da28ae changes 2026-07-15 13:29:01 +00:00
Marshal
6d0cf50b4d train 2026-07-14 11:06:49 +00:00
Marshal
4b7f6d2548 enhance contract and booking services with server-side search and validation improvements
- Added  parameter to  and  for server-side free-text search on contract reference, company name, and booking details.
- Introduced new validation errors in  for container clashes and space issues when creating bookings.
- Implemented paginated dropdown settings retrieval in .
- Updated  to fetch active yards using a new method that handles pagination.
- Enhanced  with a  method to fetch all records by walking through pages.
- Refactored  to support filtering and pagination in schedule listings.
- Improved  to return a paginated list of facilities.
- Updated UI components in  and  to utilize debounced search inputs for better performance.
- Added alerts in  to inform users about booking constraints related to splits and capacity.
- Enhanced  to display notifications for split bookings and capacity usage.
2026-07-12 10:51:31 +00:00
Marshal
6c54493bbc changes 2026-07-09 08:41:15 +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
94904ea6d0 resolve conflict 2026-07-07 21:46:25 +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
natib21
fb4ffa5d67 fix 2026-07-06 12:23:25 +00:00
marshal
8084b411ca Merge pull request #453 from Tria-plc/freight_feature/usermanagement
Freight feature/usermanagement
2026-07-04 08:00:26 +03: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
natib21
9d3efe7f15 fix 2026-07-04 03:47:36 +00:00
Marshal
8ea2c8e95a add hard capacity ceiling to weight limit rules 2026-07-04 01:11:23 +00:00
Marshal
57d3752ea5 fix issues 2026-07-03 13:53:17 +00:00
marshal
9c18d086d7 changes 2026-07-01 20:55:17 +03:00
Marshal
33d3aa9294 Enhance rule engine form to support currency formatting and suffix display 2026-06-30 15:18:30 +00:00
Marshal
0a23ade118 enhance contract management features
- Update ContractActionsToolbar to streamline contract generation and signing processes.
- Introduce getStaffRowAction for improved action handling in contract list rows.
- Implement auto-generation of contracts upon final approval in useContracts hook.
- Refactor BookingDetailPage to remove unnecessary container type property.
- Add action buttons in ContractRequestsPage for better user interaction.
- Simplify container types configuration in resources.
- Remove unused properties from booking types.
- Introduce ContractViewPage for staff and customer contract signing.
- Enhance NewContractPage to validate document uploads before proceeding.
- Improve StepDocuments to ensure required documents are uploaded.
2026-06-27 17:38:26 +00:00
marshal
0379de8147 Merge branch 'freight_feature/profile' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 02:49:24 +03:00
Marshal
9d81a2e1ee integrate global logistics staff user into seeder
refactor pricing data seeder to fold surcharge types into rates
update route meta subtitle to remove surcharge types
enhance RuleEngineFormDialog to support conditional field visibility
 remove surcharge types from URL constants and related services
add cargo leaf options query for bulk cargo type selection
update RuleEngineResourcePage to utilize cargo leaf options
modify resources configuration to remove surcharge types
implement migration to fold surcharge types into rates
create utility to derive legacy rate types from new rate structure
2026-06-23 23:15:32 +00:00
marshal
72df5ce689 Merge branch 'freight/develop' of github.com:Tria-plc/edr-platform into freight_feature/profile 2026-06-24 01:22:31 +03:00
Marshal
29f6928059 feat: add unit of measure selection for cargo types and update related calculations in booking forms 2026-06-23 21:00:51 +00:00
Nathnael
cbbad02b29 fix: type error and other fixes 2026-06-23 13:14:06 +00:00
ghost2023
cdfe7c1f5b fix: type errors 2026-06-23 15:02:25 +03:00
yaschalew
7f51f24a77 fix conflict 2026-06-22 14:23:43 +03:00
Nathnael Wondisha
fff679369d Merge branch 'freight/develop' into freight/style/ui-sync 2026-06-22 11:58:18 +03:00
Nathnael
8fb432e30f style: finalize the style of the dashboard 2026-06-22 08:52:45 +00:00
natib21
b47fb2c475 fix data table 2026-06-20 09:54:05 +00:00
natib21
1c420781ea vehicle 2026-06-19 13:58:33 +00:00
natib21
b4ed7d492d fix vehicle 2026-06-19 06:56:07 +00:00
Marshal
ed114b1999 feat(cargo-types): add route for cargo types detail view and enhance CargoTypesPage with breadcrumbs and improved navigation 2026-06-18 20:49:46 +00:00
Marshal
aa105a5e76 feat(cargo-types): add CargoTypesPage for managing freight cargo categories and types 2026-06-18 20:19:40 +00:00
Marshal
3afccbd660 fix priority ui 2026-06-16 10:24:22 +00:00
Marshal
0778021d86 implement priority 2026-06-16 09:26:57 +00: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
88df20be6b change price logic on the ,rule engine ui, auto generate the contrat 2026-06-08 10:04:23 +03:00
marshal
4993453993 generate contract by the system, add waggon type,fix ui 2026-06-07 01:20:52 +03:00
Marshal
053b4f35c5 changes 2026-06-06 06:32:04 +00:00
marshal
d226d7ef22 booking flow,summtion, approval, contract, mock payemnt and integration to back office, and also add permissions 2026-06-05 10:38:31 +03:00
marshal
125ee18308 implement booking flow 2026-06-04 15:16:27 +03:00
marshal
f93a502247 add migration file when the app is starting 2026-06-02 16:43:37 +03:00
marshal
452ebdbc0a rule engine and configration and fix booking for custoemr 2026-06-01 23:15:11 +03:00
hagiye
ccbc642075 rure engine 2026-05-30 11:19:40 +03:00
hagiye
a5dc50f410 rule engine UI 2026-05-28 16:26:52 +03:00