Merge pull request #306 from R0m1k3/1.1

1.1

client/src/pages/Dashboard.tsx

@@ -224,6 +224,15 @@ export default function Dashboard() {
       return (dateB ? dateB.getTime() : 0) - (dateA ? dateA.getTime() : 0);
     })
     .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
     .filter((d: any) => {
@@ -237,16 +246,7 @@ export default function Dashboard() {
   console.log('🚚 Dashboard - Upcoming deliveries result:', upcomingDeliveries.length, upcomingDeliveries);
 
   // Calculs pour les statistiques
-  const pendingOrdersCount = Array.isArray(allOrders) ? allOrders.filter((order: any) => {
+  const pendingOrdersCount = Array.isArray(allOrders) ? allOrders.filter((order: any) => order.status === 'pending').length : 0;
-    if (order.status !== 'pending') return false;
-    
-    // Vérifier si la commande est en pending depuis plus de 10 jours
-    const orderDate = safeDate(order.createdAt);
-    if (!orderDate) return false;
-    
-    const daysDiff = Math.floor((new Date().getTime() - orderDate.getTime()) / (1000 * 60 * 60 * 24));
-    return daysDiff > 10;
-  }).length : 0;
   const averageDeliveryTime = Math.round(stats?.averageDeliveryTime || 0);
   const deliveredThisMonth = Array.isArray(allDeliveries) ? allDeliveries.filter((delivery: any) => {
     const deliveryDate = safeDate(delivery.deliveredDate || delivery.createdAt);
@@ -440,38 +440,52 @@ export default function Dashboard() {
 
       {/* Main Content Grid */}
       <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">
           <CardHeader className="pb-4 border-b border-gray-100">
             <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>
           </CardHeader>
           <CardContent className="space-y-3 p-6">
-            {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 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>
         </Card>
@@ -554,18 +568,23 @@ export default function Dashboard() {
                         <span className="text-red-400">Aucun magasin</span>
                       ) : (
                         <div className="flex flex-wrap gap-1">
-                          {participatingStores.map((participation: any) => (
+                          {participatingStores.map((participation: any) => {
-                            <Badge 
+                            const isCurrentStore = selectedStoreId && participation.groupId === parseInt(selectedStoreId.toString());
-                              key={participation.groupId} 
+                            const groupColor = participation.group?.color || '#1976D2';
-                              className={`text-xs ${
+                            
-                                selectedStoreId && participation.groupId === parseInt(selectedStoreId.toString())
+                            return (
-                                  ? 'bg-green-100 text-green-800 border border-green-300'
+                              <Badge 
-                                  : 'bg-gray-100 text-gray-700'
+                                key={participation.groupId} 
-                              }`}
+                                className={`text-xs text-white border ${isCurrentStore ? 'ring-2 ring-white ring-offset-1' : ''}`}
-                            >
+                                style={{ 
-                              {participation.group.name}
+                                  backgroundColor: groupColor,
-                            </Badge>
+                                  borderColor: groupColor
-                          ))}
+                                }}
+                              >
+                                {participation.group.name}
+                              </Badge>
+                            );
+                          })}
                         </div>
                       )}
                     </div>