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

Merge branch 'dev' of github.com:Tria-plc/edr-platform into contrat-backup2

Browse Source
This commit is contained in:
marshal
2026-07-02 21:02:22 +03:00
parent dd47068a4b 1f0af964ff
commit d4561b948a
28 changed files with 585 additions and 166 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apps/edr-freight-web/backoffice/src/components/ContainerAllocationTable.tsx
View File

@@ -42,8 +42,8 @@ export function ContainerAllocationTable({
);
const { data: vehicles = [], isLoading: vehiclesLoading } = useQuery({
queryKey: ["vehicles", "active"],
queryFn: () => vehiclesService.getAll({ status: "ACTIVE" }),
queryKey: ["vehicles", "free"],
queryFn: () => vehiclesService.getAll({ status: "ACTIVE", availability: "FREE" }),
});
const vehicleOptions = useMemo(
@@ -99,7 +99,7 @@ export function ContainerAllocationTable({
<Stack gap="md">
{vehicles.length === 0 && (
<Alert icon={<AlertCircle size={16} />} color="yellow">
No active vehicles available. Add vehicles before allocating containers.
No free vehicles available. Free up or add vehicles before allocating containers.
</Alert>
)}

6
apps/edr-freight-web/backoffice/src/components/FirstMileContainerAllocationTable.tsx
View File

@@ -42,8 +42,8 @@ export function FirstMileContainerAllocationTable({
);
const { data: vehicles = [], isLoading: vehiclesLoading } = useQuery({
queryKey: ["vehicles", "active"],
queryFn: () => vehiclesService.getAll({ status: "ACTIVE" }),
queryKey: ["vehicles", "free"],
queryFn: () => vehiclesService.getAll({ status: "ACTIVE", availability: "FREE" }),
});
const vehicleOptions = useMemo(
@@ -99,7 +99,7 @@ export function FirstMileContainerAllocationTable({
<Stack gap="md">
{vehicles.length === 0 && (
<Alert icon={<AlertCircle size={16} />} color="yellow">
No active vehicles available. Add vehicles before allocating containers.
No free vehicles available. Free up or add vehicles before allocating containers.
</Alert>
)}

6
apps/edr-freight-web/backoffice/src/components/LastMileContainerAllocationTable.tsx
View File

@@ -42,8 +42,8 @@ export function LastMileContainerAllocationTable({
);
const { data: vehicles = [], isLoading: vehiclesLoading } = useQuery({
queryKey: ["vehicles", "active"],
queryFn: () => vehiclesService.getAll({ status: "ACTIVE" }),
queryKey: ["vehicles", "free"],
queryFn: () => vehiclesService.getAll({ status: "ACTIVE", availability: "FREE" }),
});
const vehicleOptions = useMemo(
@@ -99,7 +99,7 @@ export function LastMileContainerAllocationTable({
<Stack gap="md">
{vehicles.length === 0 && (
<Alert icon={<AlertCircle size={16} />} color="yellow">
No active vehicles available. Add vehicles before allocating containers.
No free vehicles available. Free up or add vehicles before allocating containers.
</Alert>
)}

2
apps/edr-freight-web/backoffice/src/components/fleet/fleetFormat.tsx
View File

@@ -25,6 +25,8 @@ export const formatFleetCell = (
const getStatusColor = (st: string): string => {
const s = st.toUpperCase();
if (s === "ACTIVE" || s === "AVAILABLE") return "green";
if (s === "FREE") return "teal";
if (s === "BUSY") return "blue";
if (s === "INACTIVE") return "gray";
if (s === "SUSPENDED" || s === "OUT_OF_SERVICE") return "red";
if (s === "MAINTENANCE" || s === "ON_LEAVE") return "orange";