Skip to content

Commit 454a2a9

Browse files
committed
add new transports in admin panel
1 parent 92e98c4 commit 454a2a9

File tree

2 files changed

+73
-7
lines changed

2 files changed

+73
-7
lines changed

Frontend/src/renderer/components/admin/transport-component/add-transport-component/add-transport.tsx

+24-4
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,23 @@ export default function AdminAddTransport({
6969
}
7070
}
7171

72+
const mapping = {
73+
'Truck': 'truck',
74+
'Mini-Truck': 'mini_truck',
75+
'Van': 'van',
76+
'Mini-Van': 'mini_van',
77+
'Ship': 'ship',
78+
'Rail Transport': 'rail_transport',
79+
'Plane': 'plane',
80+
'Helicopter': 'helicopter',
81+
'Refrigerator Truck': 'refrigerated_truck',
82+
'Car': 'car'
83+
}
84+
7285
const response = await transportApi.addTransport({
7386
transport_capacity: Number(newTransportData.Capacity),
7487
transport_speed: Number(newTransportData['Max Speed']),
75-
transport_type: newTransportData.Type,
88+
transport_type: mapping[newTransportData.Type],
7689
price_per_weight: Number(newTransportData['Price_weight']),
7790
});
7891

@@ -149,9 +162,16 @@ export default function AdminAddTransport({
149162
onChange={onRoleChange}
150163
style={{ minHeight: '2vw' }}
151164
>
152-
<Select.Option value="truck">Truck</Select.Option>
153-
<Select.Option value="van">Van</Select.Option>
154-
<Select.Option value="car">Car</Select.Option>
165+
<Select.Option value="Truck">Truck</Select.Option>
166+
<Select.Option value="Van">Van</Select.Option>
167+
<Select.Option value="Car">Car</Select.Option>
168+
<Select.Option value="Plane">Plane</Select.Option>
169+
<Select.Option value="Helicopter">Helicopter</Select.Option>
170+
<Select.Option value="Rail Transport">Rail Transport</Select.Option>
171+
<Select.Option value="Mini-Truck">Mini-Truck</Select.Option>
172+
<Select.Option value="Mini-Van">Mini-Van</Select.Option>
173+
<Select.Option value="Refrigerator Truck">Refrigerator Truck</Select.Option>
174+
<Select.Option value="Ship">Ship</Select.Option>
155175
</Select>
156176
</Form.Item>
157177
<Form.Item

Frontend/src/renderer/components/admin/transport-component/transport.tsx

+49-3
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,19 @@ export default function AdminTransport() {
3535
const [transportData, setTransportData] = useState({});
3636
const { showError } = useError();
3737

38+
const reverseMapping = {
39+
'truck': 'Truck',
40+
'mini_truck': 'Mini-Truck',
41+
'van': 'Van',
42+
'mini_van': 'Mini-Van',
43+
'ship': 'Ship',
44+
'rail_transport': 'Rail Transport',
45+
'plane': 'Plane',
46+
'helicopter': 'Helicopter',
47+
'refrigerated_truck': 'Refrigerator Truck',
48+
'car': 'Car'
49+
};
50+
3851
const handleMenuClick: MenuProps['onClick'] = (e) => {
3952
console.log('click', e);
4053
setSelectedType(e.domEvent.target.innerText);
@@ -81,7 +94,7 @@ export default function AdminTransport() {
8194
capacity: transports[i].transport_capacity,
8295
maxSpeed: transports[i].transport_speed,
8396
price_weight: transports[i].price_per_weight,
84-
type: transports[i].transport_type,
97+
type: reverseMapping[transports[i].transport_type],
8598
});
8699
}
87100
setDataSource(data);
@@ -99,8 +112,20 @@ export default function AdminTransport() {
99112
}, 100);
100113

101114
const filters = {};
115+
const mapping = {
116+
'Truck': 'truck',
117+
'Mini-Truck': 'mini_truck',
118+
'Van': 'van',
119+
'Mini-Van': 'mini_van',
120+
'Ship': 'ship',
121+
'Rail Transport': 'rail_transport',
122+
'Plane': 'plane',
123+
'Helicopter': 'helicopter',
124+
'Refrigerator Truck': 'refrigerated_truck',
125+
'Car': 'car'
126+
}
102127
if (selectedType) {
103-
filters.transport_type = selectedType.toLowerCase();
128+
filters.transport_type = mapping[selectedType];
104129
}
105130

106131
if (selectedType === 'All' && filters.transport_type) {
@@ -230,6 +255,27 @@ export default function AdminTransport() {
230255
{
231256
label: 'Car',
232257
},
258+
{
259+
label: 'Plane',
260+
},
261+
{
262+
label: 'Ship',
263+
},
264+
{
265+
label: 'Mini-Van',
266+
},
267+
{
268+
label: 'Mini-Truck'
269+
},
270+
{
271+
label: 'Refrigerator Truck'
272+
},
273+
{
274+
label: 'Rail Transport'
275+
},
276+
{
277+
label: 'Helicopter'
278+
}
233279
];
234280

235281
const menuProps = {
@@ -278,7 +324,7 @@ export default function AdminTransport() {
278324
capacity: transports[i].transport_capacity,
279325
maxSpeed: transports[i].transport_speed,
280326
price_weight: transports[i].price_per_weight,
281-
type: transports[i].transport_type,
327+
type: reverseMapping[transports[i].transport_type],
282328
});
283329
}
284330
setDataSource(data);

0 commit comments

Comments
 (0)