mirror of
https://github.com/Tria-plc/edr-platform.git
synced 2026-09-09 10:58:14 +00:00
Merge branch 'freight/hot_fix' of github.com:Tria-plc/edr-platform into freight/hot_fix
This commit is contained in:
@@ -54,15 +54,16 @@ export function TrackingPage() {
|
|||||||
}));
|
}));
|
||||||
}, [vehicles]);
|
}, [vehicles]);
|
||||||
|
|
||||||
const activeVehicles = useMemo(
|
// For demo: show all vehicles as trackable (or filter by ACTIVE if status data available)
|
||||||
() => vehiclesWithGPS.filter(v => v.status === 'ACTIVE'),
|
const trackableVehicles = useMemo(
|
||||||
|
() => vehiclesWithGPS.slice(0, 10), // Limit to first 10 for demo
|
||||||
[vehiclesWithGPS]
|
[vehiclesWithGPS]
|
||||||
);
|
);
|
||||||
|
|
||||||
const selectedVehicle = activeVehicles.find(v => v.id === selectedVehicleId);
|
const selectedVehicle = trackableVehicles.find(v => v.id === selectedVehicleId);
|
||||||
const vehicleOptions = useMemo(
|
const vehicleOptions = useMemo(
|
||||||
() => activeVehicles.map(v => ({ label: v.registrationNumber, value: v.id })),
|
() => trackableVehicles.map(v => ({ label: v.registrationNumber, value: v.id })),
|
||||||
[activeVehicles]
|
[trackableVehicles]
|
||||||
);
|
);
|
||||||
|
|
||||||
// Map dimensions
|
// Map dimensions
|
||||||
@@ -101,7 +102,7 @@ export function TrackingPage() {
|
|||||||
<Text fw={500}>Map View</Text>
|
<Text fw={500}>Map View</Text>
|
||||||
<Group gap="xs">
|
<Group gap="xs">
|
||||||
<Badge color="edr-green" leftSection={<Radio size={12} />}>
|
<Badge color="edr-green" leftSection={<Radio size={12} />}>
|
||||||
{vehiclesWithGPS.filter(v => v.status === 'ACTIVE').length} Active
|
{trackableVehicles.length} Tracked
|
||||||
</Badge>
|
</Badge>
|
||||||
</Group>
|
</Group>
|
||||||
</Group>
|
</Group>
|
||||||
@@ -151,8 +152,8 @@ export function TrackingPage() {
|
|||||||
))}
|
))}
|
||||||
</svg>
|
</svg>
|
||||||
|
|
||||||
{/* Vehicle markers - show only active vehicles */}
|
{/* Vehicle markers */}
|
||||||
{vehiclesWithGPS.filter(v => v.status === 'ACTIVE').map((vehicle) => {
|
{trackableVehicles.map((vehicle) => {
|
||||||
const coords = getMapCoords(vehicle.gps.lat, vehicle.gps.lng);
|
const coords = getMapCoords(vehicle.gps.lat, vehicle.gps.lng);
|
||||||
const isSelected = vehicle.id === selectedVehicleId;
|
const isSelected = vehicle.id === selectedVehicleId;
|
||||||
|
|
||||||
@@ -308,14 +309,14 @@ export function TrackingPage() {
|
|||||||
</Card>
|
</Card>
|
||||||
)}
|
)}
|
||||||
|
|
||||||
{/* All Active Vehicles List */}
|
{/* Tracked Vehicles List */}
|
||||||
<Card withBorder p="lg">
|
<Card withBorder p="lg">
|
||||||
<Stack gap="md">
|
<Stack gap="md">
|
||||||
<Text fw={500}>Active Vehicles ({activeVehicles.length})</Text>
|
<Text fw={500}>Tracked Vehicles ({trackableVehicles.length})</Text>
|
||||||
<div style={{ maxHeight: '300px', overflowY: 'auto' }}>
|
<div style={{ maxHeight: '300px', overflowY: 'auto' }}>
|
||||||
<Table size="sm">
|
<Table size="sm">
|
||||||
<Table.Tbody>
|
<Table.Tbody>
|
||||||
{activeVehicles.slice(0, 10).map(v => (
|
{trackableVehicles.map(v => (
|
||||||
<Table.Tr
|
<Table.Tr
|
||||||
key={v.id}
|
key={v.id}
|
||||||
style={{
|
style={{
|
||||||
|
|||||||
Reference in New Issue
Block a user