mirror of
https://github.com/R0m1k3/LogiFlow.git
synced 2026-10-24 15:38:18 +02:00
Display all pending orders on the dashboard regardless of creation date
Updates the dashboard to filter and display all orders with a 'pending' status, including sorting by creation date and highlighting overdue orders. Replit-Commit-Author: Agent Replit-Commit-Session-Id: 98f01874-e00c-4bbe-9d71-b0b338001848 Replit-Commit-Checkpoint-Type: full_checkpoint Replit-Commit-Screenshot-Url: https://storage.googleapis.com/screenshot-production-us-central1/1957c339-2757-4d1f-8e92-e9f71a1ce58e/98f01874-e00c-4bbe-9d71-b0b338001848/XDIQsDu
This commit is contained in:
1 parent
8fb739f944
commit
dbca763d4b
1 file changed
+48
-25
@@ -224,6 +224,15 @@ export default function Dashboard() {
|
|||||||
return (dateB ? dateB.getTime() : 0) - (dateA ? dateA.getTime() : 0);
|
return (dateB ? dateB.getTime() : 0) - (dateA ? dateA.getTime() : 0);
|
||||||
})
|
})
|
||||||
.slice(0, 4) : []; // Afficher les 4 dernières commandes
|
.slice(0, 4) : []; // Afficher les 4 dernières commandes
|
||||||
|
|
||||||
|
// Toutes les commandes en attente (peu importe la date)
|
||||||
|
const pendingOrders = Array.isArray(allOrders) ? allOrders
|
||||||
|
.filter((order: any) => order.status === 'pending')
|
||||||
|
.sort((a: any, b: any) => {
|
||||||
|
const dateA = safeDate(a.createdAt);
|
||||||
|
const dateB = safeDate(b.createdAt);
|
||||||
|
return (dateB ? dateB.getTime() : 0) - (dateA ? dateA.getTime() : 0);
|
||||||
|
}) : [];
|
||||||
|
|
||||||
const upcomingDeliveries = Array.isArray(allDeliveries) ? allDeliveries
|
const upcomingDeliveries = Array.isArray(allDeliveries) ? allDeliveries
|
||||||
.filter((d: any) => {
|
.filter((d: any) => {
|
||||||
@@ -440,38 +449,52 @@ export default function Dashboard() {
|
|||||||
|
|
||||||
{/* Main Content Grid */}
|
{/* Main Content Grid */}
|
||||||
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6">
|
<div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 gap-4 sm:gap-6">
|
||||||
{/* Dernières Commandes */}
|
{/* Commandes en Attente */}
|
||||||
<Card className="bg-white border border-gray-200 shadow-lg hover:shadow-xl transition-shadow">
|
<Card className="bg-white border border-gray-200 shadow-lg hover:shadow-xl transition-shadow">
|
||||||
<CardHeader className="pb-4 border-b border-gray-100">
|
<CardHeader className="pb-4 border-b border-gray-100">
|
||||||
<CardTitle className="text-lg font-semibold text-gray-800 flex items-center">
|
<CardTitle className="text-lg font-semibold text-gray-800 flex items-center">
|
||||||
<FileText className="h-5 w-5 mr-3 text-blue-600" />
|
<Clock className="h-5 w-5 mr-3 text-orange-600" />
|
||||||
Dernières Commandes
|
Commandes en Attente
|
||||||
|
{pendingOrders.length > 0 && (
|
||||||
|
<Badge variant="destructive" className="ml-2 text-xs">
|
||||||
|
{pendingOrders.length}
|
||||||
|
</Badge>
|
||||||
|
)}
|
||||||
</CardTitle>
|
</CardTitle>
|
||||||
</CardHeader>
|
</CardHeader>
|
||||||
<CardContent className="space-y-3 p-6">
|
<CardContent className="space-y-3 p-6 max-h-96 overflow-y-auto">
|
||||||
{recentOrders.length > 0 ? recentOrders.map((order: any) => (
|
{pendingOrders.length > 0 ? pendingOrders.map((order: any) => {
|
||||||
<div key={order.id} className="flex items-center justify-between p-4 bg-gray-50 hover:bg-gray-100 transition-colors border-l-3 border-blue-500">
|
// Calculer le nombre de jours en attente
|
||||||
<div className="flex items-center space-x-3">
|
const orderDate = safeDate(order.createdAt);
|
||||||
<div className="h-2 w-2 bg-blue-500"></div>
|
const daysPending = orderDate ? Math.floor((new Date().getTime() - orderDate.getTime()) / (1000 * 60 * 60 * 24)) : 0;
|
||||||
<div>
|
const isOverdue = daysPending > 10;
|
||||||
<p className="font-medium text-gray-900">{order.supplier?.name}</p>
|
|
||||||
<p className="text-sm text-gray-600">{order.group?.name}</p>
|
return (
|
||||||
|
<div key={order.id} className={`flex items-center justify-between p-4 transition-colors border-l-3 ${
|
||||||
|
isOverdue ? 'bg-red-50 hover:bg-red-100 border-red-500' : 'bg-orange-50 hover:bg-orange-100 border-orange-500'
|
||||||
|
}`}>
|
||||||
|
<div className="flex items-center space-x-3">
|
||||||
|
<div className={`h-2 w-2 ${isOverdue ? 'bg-red-500' : 'bg-orange-500'}`}></div>
|
||||||
|
<div>
|
||||||
|
<p className="font-medium text-gray-900">{order.supplier?.name}</p>
|
||||||
|
<p className="text-sm text-gray-600">{order.group?.name}</p>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div className="text-right">
|
||||||
|
<Badge
|
||||||
|
variant={isOverdue ? 'destructive' : 'secondary'}
|
||||||
|
className="text-xs"
|
||||||
|
>
|
||||||
|
{daysPending} jour{daysPending > 1 ? 's' : ''}
|
||||||
|
</Badge>
|
||||||
|
<p className="text-xs text-gray-500 mt-1">
|
||||||
|
{safeFormat(order.plannedDate, "d MMM")}
|
||||||
|
</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="text-right">
|
);
|
||||||
<Badge
|
}) : (
|
||||||
variant={order.status === 'delivered' ? 'default' : order.status === 'planned' ? 'secondary' : 'destructive'}
|
<p className="text-gray-600 text-center py-8">Aucune commande en attente</p>
|
||||||
className="text-xs"
|
|
||||||
>
|
|
||||||
{order.status === 'delivered' ? 'Livrée' : order.status === 'planned' ? 'Planifiée' : 'En attente'}
|
|
||||||
</Badge>
|
|
||||||
<p className="text-xs text-gray-500 mt-1">
|
|
||||||
{safeFormat(order.plannedDate, "d MMM")}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
)) : (
|
|
||||||
<p className="text-gray-600 text-center py-8">Aucune commande récente</p>
|
|
||||||
)}
|
)}
|
||||||
</CardContent>
|
</CardContent>
|
||||||
</Card>
|
</Card>
|
||||||
|
|||||||
Reference in new issue
Block a user