From 78e735f944e359b4302960530c16229699a418db Mon Sep 17 00:00:00 2001 From: natib21 Date: Fri, 19 Jun 2026 13:17:20 +0000 Subject: [PATCH] vehicle --- .../src/components/fleet/FleetRecordActions.tsx | 6 +++--- .../backoffice/src/pages/fleet/FleetResourcePage.tsx | 8 ++++---- .../backoffice/src/pages/fleet/config/resources.ts | 5 +++-- 3 files changed, 10 insertions(+), 9 deletions(-) diff --git a/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx b/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx index 2972b9d5b..959273aa6 100644 --- a/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx +++ b/apps/edr-freight-web/backoffice/src/components/fleet/FleetRecordActions.tsx @@ -48,7 +48,7 @@ const FleetRecordActions = ({ onEdit(record)} @@ -81,14 +81,14 @@ const FleetRecordActions = ({ ) : null} - onEdit(record)}> + onEdit(record)}> - + diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx index c9e56ae57..5d5e5ae39 100644 --- a/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx +++ b/apps/edr-freight-web/backoffice/src/pages/fleet/FleetResourcePage.tsx @@ -333,8 +333,8 @@ const FleetResourcePage = () => { key={option.value} size="xs" radius="md" - variant={filter.value === option.value ? "filled" : "light"} - color={filter.value === option.value ? "green" : "gray"} + variant={filter.value === option.value ? "filled" : "outline"} + color="green" onClick={() => { setListFilterValues((prev) => ({ ...prev, @@ -359,8 +359,8 @@ const FleetResourcePage = () => { key={option.value} size="xs" radius="md" - variant={statusFilter === option.value ? "filled" : "light"} - color={statusFilter === option.value ? "green" : "gray"} + variant={statusFilter === option.value ? "filled" : "outline"} + color="green" onClick={() => setStatusFilter(option.value)} > {option.label} diff --git a/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts b/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts index 8c9d0e561..ca9ff73cc 100644 --- a/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts +++ b/apps/edr-freight-web/backoffice/src/pages/fleet/config/resources.ts @@ -401,12 +401,13 @@ export const FLEET_RESOURCES: FleetResourceConfig[] = [ searchKeys: ["plateNumber", "registrationNumber", "manufacturer", "model", "vehicleType", "status"], columns: [ { id: "plateNumber", header: "Plate Number", accessorKey: "plateNumber", format: "code" }, - { id: "vehicleType", header: "Type", accessorKey: "vehicleType" }, + { id: "registrationNumber", header: "Registration", accessorKey: "registrationNumber" }, { id: "manufacturer", header: "Manufacturer", accessorKey: "manufacturer" }, { id: "model", header: "Model", accessorKey: "model" }, + { id: "vehicleType", header: "Type", accessorKey: "vehicleType" }, { id: "year", header: "Year", accessorKey: "year", format: "number" }, { id: "fuelType", header: "Fuel Type", accessorKey: "fuelType" }, - { id: "capacity", header: "Capacity", accessorKey: "capacity", format: "number" }, + { id: "capacity", header: "Capacity (tons)", accessorKey: "capacity", format: "number" }, { id: "status", header: "Status", accessorKey: "status", format: "statusBadge" }, ], formFields: [