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

Batch 1 to 3 implementation

Browse Source
This commit is contained in:
hagiye
2026-06-16 11:36:24 +03:00
parent c2b5b3b926
commit f5d6d8e7da
26 changed files with 50 additions and 1250 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
apps/edr-freight-web/backoffice/src/App.tsx
View File

@@ -33,24 +33,14 @@ import UserManagementPage from "./pages/dashboard/user-management/UserManagement
import UsersPage from "./pages/dashboard/user-management/UsersPage";
import DropdownSettingsPage from "./pages/dropdown_settings/DropdownSettingsPage";
import FileUploadSettingsPage from "./pages/documents/FileUploadSettingsPage";
import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
import TrainsPage from "./pages/trains/TrainsPage";
<<<<<<< HEAD
import {
CargoesCrudPage,
ContainersCrudPage,
LocomotivesCrudPage,
TrainMasterDataPage,
WagonsCrudPage,
} from "./pages/fleet/FleetCrudPages";
=======
import TrainScheduleV2ListPage from "./pages/trainScheduling/TrainScheduleV2ListPage";
import TrainScheduleV2DetailPage from "./pages/trainScheduling/TrainScheduleV2DetailPage";
import TrainSchedulingGlobalRulesPage from "./pages/trainScheduling/TrainSchedulingGlobalRulesPage";
import FleetResourcePage from "./pages/fleet/FleetResourcePage";
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
import RuleEngineLegacyRedirect from "./pages/ruleEngine/RuleEngineLegacyRedirect";
import RuleEngineResourcePage from "./pages/ruleEngine/RuleEngineResourcePage";
import TrainsPage from "./pages/trains/TrainsPage";
import TrainScheduleV2ListPage from "./pages/trainScheduling/TrainScheduleV2ListPage";
import TrainScheduleV2DetailPage from "./pages/trainScheduling/TrainScheduleV2DetailPage";
import TrainSchedulingGlobalRulesPage from "./pages/trainScheduling/TrainSchedulingGlobalRulesPage";
import FleetResourcePage from "./pages/fleet/FleetResourcePage";
import { getCategorySidebarChildren } from "./pages/ruleEngine/config/resources";
import TrainDetailPage from "./pages/trains/TrainDetailPage";
import RoutesPage from "./pages/fleet/RoutesPage";
import WarehouseListPage from "./pages/warehouses/WarehouseListPage";
@@ -289,35 +279,24 @@ const App = () => {
path="booking-requests/:id/contract"
element={<BookingContractPage />}
/>
<Route path="operations/train-scheduling" element={<TrainsPage />} />
<<<<<<< HEAD
<Route path="trains" element={<TrainMasterDataPage />} />
<Route path="operations/train-scheduling" element={<TrainsPage />} />
=======
<Route
path="operations/train-scheduling-v2"
element={<TrainScheduleV2ListPage />}
/>
<Route
path="operations/train-scheduling-v2/:scheduleId"
element={<TrainScheduleV2DetailPage />}
/>
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
<Route path="routes" element={<RoutesPage />} />
<Route path="locomotives" element={<FleetResourcePage />} />
<Route path="trains" element={<FleetResourcePage />} />
<Route path="trains/:id" element={<TrainDetailPage />} />
<<<<<<< HEAD
<Route path="wagons" element={<WagonsCrudPage />} />
<Route path="containers" element={<ContainersCrudPage />} />
<Route path="cargoes" element={<CargoesCrudPage />} />
=======
<Route path="wagons" element={<FleetResourcePage />} />
<Route path="containers" element={<FleetResourcePage />} />
<Route path="cargoes" element={<FleetResourcePage />} />
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
<Route path="warehouses" element={<WarehouseListPage />} />
<Route path="operations/train-scheduling" element={<TrainsPage />} />
<Route
path="operations/train-scheduling-v2"
element={<TrainScheduleV2ListPage />}
/>
<Route
path="operations/train-scheduling-v2/:scheduleId"
element={<TrainScheduleV2DetailPage />}
/>
<Route path="routes" element={<RoutesPage />} />
<Route path="locomotives" element={<FleetResourcePage />} />
<Route path="trains" element={<FleetResourcePage />} />
<Route path="trains/:id" element={<TrainDetailPage />} />
<Route path="wagons" element={<FleetResourcePage />} />
<Route path="containers" element={<FleetResourcePage />} />
<Route path="cargoes" element={<FleetResourcePage />} />
<Route path="warehouses" element={<WarehouseListPage />} />
<Route path="warehouses/:id" element={<WarehouseDetailPage />} />
<Route path="warehouse-inventory" element={<WarehouseInventoryPage />} />
<Route path="inventory-inquiry" element={<InventoryInquiryPage />} />

4
apps/edr-freight-web/backoffice/src/services/wagon-types.service.ts
View File

@@ -19,11 +19,7 @@ const asList = <T>(payload: ListResponse<T>): T[] =>
export const wagonTypesService = {
async getWagonTypes() {
const response = await api.get<ListResponse<WagonType>>('/wagon-types', {
<<<<<<< HEAD
params: { isActive: 'all' },
=======
params: { isActive: 'all', pageSize: 500 },
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
});
return asList(response.data);
},

37
apps/edr-freight-web/backoffice/src/types/trainScheduling.ts
View File

@@ -136,20 +136,15 @@ export interface LocomotiveRecord {
name?: string | null;
maxPullWeightTons: number;
maxTrainLengthMeters: number;
<<<<<<< HEAD
status:
| 'AVAILABLE'
| 'UNAVAILABLE'
| 'IMPORT_READY'
| 'EXPORT_READY'
| 'ASSIGNED'
| 'MAINTENANCE'
| 'OUT_OF_SERVICE';
locomotiveType?: 'DIESEL' | 'ELECTRIC';
=======
status: "AVAILABLE" | "ASSIGNED" | "MAINTENANCE" | "OUT_OF_SERVICE";
| "AVAILABLE"
| "UNAVAILABLE"
| "IMPORT_READY"
| "EXPORT_READY"
| "ASSIGNED"
| "MAINTENANCE"
| "OUT_OF_SERVICE";
locomotiveType?: "DIESEL" | "ELECTRIC";
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
}
export interface TrainScheduleListItem {
@@ -250,21 +245,12 @@ export interface TrainScheduleDetail {
code: string;
name: string;
} | null;
<<<<<<< HEAD
physicalWagon?: {
id: string;
wagonNumber: string;
status: string;
} | null;
allocations: Array<{
id: string;
bookingId: string;
bookingReference: string | null;
allocatedWeightTons: number;
}>;
=======
allocations: TrainScheduleWagonAllocation[];
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
}>;
} | null;
bookings: Array<{
@@ -281,13 +267,10 @@ export interface TrainScheduleDetail {
export interface TrainScheduleFilters {
originStationId?: string;
destinationStationId?: string;
<<<<<<< HEAD
scheduleDate?: string;
assignmentType?: AssignmentType;
tradeDirection?: TradeDirection;
=======
schedulingStatus?: SchedulingStatus;
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
}
export interface TrainSchedulePreviewPayload {
@@ -295,9 +278,7 @@ export interface TrainSchedulePreviewPayload {
scheduleDate: string;
originStationId: string;
destinationStationId: string;
<<<<<<< HEAD
assignmentType?: AssignmentType;
=======
targetScheduleId?: string;
maxTrainWeightTons?: number;
maxTrainLengthMeters?: number;
@@ -320,7 +301,6 @@ export interface ReschedulePlan {
readmitted: RescheduleBookingSummary[];
finalBookingIds: string[];
warnings: string[];
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
}
export interface CreateTrainSchedulePayload {
@@ -328,11 +308,9 @@ export interface CreateTrainSchedulePayload {
scheduleDate: string;
arrivalDate?: string;
locomotiveId: string;
<<<<<<< HEAD
assignmentType?: AssignmentType;
bookingIds: string[];
wagonIds?: string[];
=======
maxTrainWeightTons?: number;
maxTrainLengthMeters?: number;
maxWagonsPerTrain?: number;
@@ -354,5 +332,4 @@ export interface PinWagonAssignment {
export interface PinWagonsPayload {
assignments: PinWagonAssignment[];
>>>>>>> 10b011de8feafce5c0bae21594df5b36596587db
}