trains, wagons,containers and cargoes schema and API

2026-09-08 03:05:42 +00:00 · 2026-06-04 15:56:29 +03:00
parent 18015ceaff
commit 71ac89edc7
66 changed files with 2077 additions and 90 deletions
--- a/apps/edr-freight-web/backoffice/src/components/wagons/AssignWagonDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/wagons/AssignWagonDialog.tsx
@@ -0,0 +1,52 @@
+import { useState } from 'react';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from '@/components/ui/select';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { useWagons, useAssignWagonToTrain } from '@/hooks/useWagons';
+import { useToast } from '@/hooks/use-toast';
+import { Plus } from 'lucide-react';
+
+export function AssignWagonDialog({ trainId }: { trainId: string }) {
+  const [open, setOpen] = useState(false);
+  const [wagonId, setWagonId] = useState('');
+  const [sequence, setSequence] = useState<number>();
+  const { data: wagons } = useWagons();
+  const assign = useAssignWagonToTrain();
+  const { toast } = useToast();
+
+  const available = wagons?.filter(w => w.status === 'AVAILABLE' || !w.trainId);
+
+  const handleAssign = async () => {
+    if (!wagonId) return;
+    await assign.mutateAsync({ wagonId, trainId, sequenceNumber: sequence });
+    toast({ title: 'Assigned', description: 'Wagon attached to train.' });
+    setOpen(false);
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild><Button size="sm"><Plus className="mr-2 h-4 w-4" />Assign Wagon</Button></DialogTrigger>
+      <DialogContent>
+        <DialogHeader><DialogTitle>Assign Wagon to Train</DialogTitle></DialogHeader>
+        <div className="space-y-4">
+          <div>
+            <Label>Wagon</Label>
+            <Select value={wagonId} onValueChange={setWagonId}>
+              <SelectTrigger><SelectValue placeholder="Select wagon" /></SelectTrigger>
+              <SelectContent>
+                {available?.map(w => <SelectItem key={w.id} value={w.id}>{w.wagonNumber}</SelectItem>)}
+              </SelectContent>
+            </Select>
+          </div>
+          <div>
+            <Label>Sequence (optional)</Label>
+            <Input type="number" value={sequence ?? ''} onChange={e => setSequence(parseInt(e.target.value) || undefined)} />
+          </div>
+          <Button onClick={handleAssign} disabled={assign.isPending}>Assign</Button>
+        </div>
+      </DialogContent>
+    </Dialog>
+  );
+}
--- a/apps/edr-freight-web/backoffice/src/components/wagons/WagonFormDialog.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/wagons/WagonFormDialog.tsx
@@ -0,0 +1,71 @@
+// src/components/wagons/WagonFormDialog.tsx
+import { useState, useEffect } from 'react';
+import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from '@/components/ui/dialog';
+import { Button } from '@/components/ui/button';
+import { Input } from '@/components/ui/input';
+import { Label } from '@/components/ui/label';
+import { useCreateWagon, useUpdateWagon } from '@/hooks/useWagons';
+import { useToast } from '@/hooks/use-toast';
+
+interface WagonFormDialogProps {
+  trigger?: React.ReactNode;
+  wagon?: any;
+  onSuccess?: () => void;
+}
+
+export function WagonFormDialog({ trigger, wagon, onSuccess }: WagonFormDialogProps) {
+  const [open, setOpen] = useState(false);
+  const [form, setForm] = useState({
+    wagonNumber: '',
+    wagonTypeId: '',
+    tareWeight: 0,
+    maxPayloadWeight: 0,
+    status: 'AVAILABLE',
+    notes: ''
+  });
+  const createWagon = useCreateWagon();
+  const updateWagon = useUpdateWagon();
+  const { toast } = useToast();
+
+  useEffect(() => {
+    if (wagon) setForm({
+      wagonNumber: wagon.wagonNumber,
+      wagonTypeId: wagon.wagonTypeId,
+      tareWeight: wagon.tareWeight,
+      maxPayloadWeight: wagon.maxPayloadWeight,
+      status: wagon.status,
+      notes: wagon.notes || ''
+    });
+  }, [wagon]);
+
+  const handleSubmit = async (e: React.FormEvent) => {
+    e.preventDefault();
+    try {
+      if (wagon) await updateWagon.mutateAsync({ id: wagon.id, data: form });
+      else await createWagon.mutateAsync(form);
+      toast({ title: wagon ? 'Wagon updated' : 'Wagon created', description: `${form.wagonNumber} saved.` });
+      setOpen(false);
+      onSuccess?.();
+    } catch {
+      toast({ title: 'Error', description: `Failed to ${wagon ? 'update' : 'create'} wagon.`, variant: 'destructive' });
+    }
+  };
+
+  return (
+    <Dialog open={open} onOpenChange={setOpen}>
+      <DialogTrigger asChild>{trigger || <Button>New Wagon</Button>}</DialogTrigger>
+      <DialogContent>
+        <DialogHeader><DialogTitle>{wagon ? 'Edit Wagon' : 'Create Wagon'}</DialogTitle></DialogHeader>
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <div><Label>Wagon Number*</Label><Input required value={form.wagonNumber} onChange={e => setForm({...form, wagonNumber: e.target.value})} /></div>
+          <div><Label>Wagon Type ID*</Label><Input required value={form.wagonTypeId} onChange={e => setForm({...form, wagonTypeId: e.target.value})} /></div>
+          <div><Label>Tare Weight (kg)*</Label><Input type="number" required value={form.tareWeight} onChange={e => setForm({...form, tareWeight: parseFloat(e.target.value)})} /></div>
+          <div><Label>Max Payload (kg)*</Label><Input type="number" required value={form.maxPayloadWeight} onChange={e => setForm({...form, maxPayloadWeight: parseFloat(e.target.value)})} /></div>
+          <div><Label>Status</Label><Input value={form.status} onChange={e => setForm({...form, status: e.target.value})} /></div>
+          <div><Label>Notes</Label><Input value={form.notes} onChange={e => setForm({...form, notes: e.target.value})} /></div>
+          <Button type="submit" disabled={createWagon.isPending || updateWagon.isPending}>Save</Button>
+        </form>
+      </DialogContent>
+    </Dialog>
+  );
+}
--- a/apps/edr-freight-web/backoffice/src/components/wagons/WagonsTable.tsx
+++ b/apps/edr-freight-web/backoffice/src/components/wagons/WagonsTable.tsx
@@ -0,0 +1,63 @@
+import { useWagonsByTrain, useUnassignWagon, useReorderWagons } from '@/hooks/useWagons';
+import { Table, TableBody, TableCell, TableHead, TableHeader, TableRow } from '@/components/ui/table';
+import { Button } from '@/components/ui/button';
+import { Trash2, GripVertical } from 'lucide-react';
+import { DragDropContext, Droppable, Draggable } from '@hello-pangea/dnd';
+
+export function WagonsTable({ trainId }: { trainId: string }) {
+  const { data: wagons, refetch } = useWagonsByTrain(trainId);
+  const unassign = useUnassignWagon();
+  const reorder = useReorderWagons();
+
+  const onDragEnd = (result: any) => {
+    if (!result.destination) return;
+    const items = Array.from(wagons || []);
+    const [removed] = items.splice(result.source.index, 1);
+    items.splice(result.destination.index, 0, removed);
+    reorder.mutate({ trainId, wagonIds: items.map(w => w.id) });
+  };
+
+  if (!wagons?.length) return <div className="text-muted-foreground">No wagons assigned.</div>;
+
+  return (
+    <DragDropContext onDragEnd={onDragEnd}>
+      <Droppable droppableId="wagons">
+        {(provided) => (
+          <Table {...provided.droppableProps} ref={provided.innerRef}>
+            <TableHeader>
+              <TableRow>
+                <TableHead className="w-10"></TableHead>
+                <TableHead>Number</TableHead>
+                <TableHead>Type</TableHead>
+                <TableHead>Sequence</TableHead>
+                <TableHead>Status</TableHead>
+                <TableHead>Actions</TableHead>
+              </TableRow>
+            </TableHeader>
+            <TableBody>
+              {wagons.map((wagon, idx) => (
+                <Draggable key={wagon.id} draggableId={wagon.id} index={idx}>
+                  {(provided) => (
+                    <TableRow ref={provided.innerRef} {...provided.draggableProps}>
+                      <TableCell {...provided.dragHandleProps}><GripVertical className="h-4 w-4 cursor-grab" /></TableCell>
+                      <TableCell>{wagon.wagonNumber}</TableCell>
+                      <TableCell>{wagon.wagonTypeId}</TableCell>
+                      <TableCell>{wagon.sequenceNumber}</TableCell>
+                      <TableCell>{wagon.status}</TableCell>
+                      <TableCell>
+                        <Button variant="ghost" size="icon" onClick={() => unassign.mutateAsync(wagon.id).then(() => refetch())}>
+                          <Trash2 className="h-4 w-4" />
+                        </Button>
+                      </TableCell>
+                    </TableRow>
+                  )}
+                </Draggable>
+              ))}
+              {provided.placeholder}
+            </TableBody>
+          </Table>
+        )}
+      </Droppable>
+    </DragDropContext>
+  );
+}