diff --git a/attached_assets/Pasted--Querying-user-groups-for-user-admin-local-Found-0-group-assignments-for-user-adm-1754944991616_1754944991617.txt b/attached_assets/Pasted--Querying-user-groups-for-user-admin-local-Found-0-group-assignments-for-user-adm-1754944991616_1754944991617.txt new file mode 100644 index 0000000..ee9493f --- /dev/null +++ b/attached_assets/Pasted--Querying-user-groups-for-user-admin-local-Found-0-group-assignments-for-user-adm-1754944991616_1754944991617.txt @@ -0,0 +1,201 @@ + + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +Deliveries API called with: { + + startDate: undefined, + + endDate: undefined, + + storeId: undefined, + + withBL: undefined, + + userRole: 'admin' + +} + +Admin filtering deliveries with groupIds: undefined + +Fetching all deliveries + +Deliveries returned: 80 items + +GET /api/deliveries 304 in 28ms + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ“„ SPA: Serving index.html for /[object%20Object] + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ“„ SPA: Serving index.html for /[object%20Object] + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ“„ SPA: Serving index.html for /[object%20Object] + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +Orders API called with: { + + startDate: '2025-08-01', + + endDate: '2025-08-31', + + storeId: '1', + + userRole: 'admin' + +} + +Admin filtering with groupIds: [ 1 ] + +Fetching orders by date range: 2025-08-01 to 2025-08-31 + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +πŸ” getUserWithGroups called for user: admin_local + +πŸ” Querying user_groups for user: admin_local + +Orders returned: 9 items + +πŸ” Found 0 group assignments for user admin_local + +πŸ” Raw query result: [] + +βœ… Processed 0 groups for user admin_local + +Deliveries API called with: { + + startDate: '2025-08-01', + + endDate: '2025-08-31', + + storeId: '1', + + withBL: undefined, + + userRole: 'admin' + +} + +Admin filtering deliveries with groupIds: [ 1 ] + +Fetching deliveries by date range: 2025-08-01 to 2025-08-31 + +GET /api/orders 304 in 23ms + +Deliveries returned: 20 items + +GET /api/deliveries 304 in 31ms + +HEAD /api/health 200 in 0ms \ No newline at end of file diff --git a/attached_assets/image_1754944953948.png b/attached_assets/image_1754944953948.png new file mode 100644 index 0000000..5c55046 Binary files /dev/null and b/attached_assets/image_1754944953948.png differ diff --git a/client/src/pages/Calendar.tsx b/client/src/pages/Calendar.tsx index cd951a8..6b60549 100644 --- a/client/src/pages/Calendar.tsx +++ b/client/src/pages/Calendar.tsx @@ -149,38 +149,53 @@ export default function Calendar() { try { console.log('πŸ”„ Starting manual sync of order-delivery status...'); - // Solution temporaire : rΓ©cupΓ©rer TOUTES les donnΓ©es et faire la sync cΓ΄tΓ© client + // Solution temporaire : rΓ©cupΓ©rer TOUTES les donnΓ©es sans filtres de dates + console.log('πŸ“‘ Fetching ALL orders (no date filter)...'); const ordersResponse = await fetch('/api/orders', { credentials: 'include' }); - const allOrders = await ordersResponse.json(); + const filteredOrders = await ordersResponse.json(); // RΓ©cupΓ©rer aussi toutes les livraisons pour avoir une vue complΓ¨te + console.log('πŸ“‘ Fetching ALL deliveries (no date filter)...'); const deliveriesResponse = await fetch('/api/deliveries', { credentials: 'include' }); const allDeliveries = await deliveriesResponse.json(); + // Enrichir les commandes avec leurs livraisons pour avoir les bonnes relations + const enrichedOrders = filteredOrders.map(order => { + const orderDeliveries = allDeliveries.filter(delivery => delivery.orderId === order.id); + return { + ...order, + deliveries: orderDeliveries + }; + }); + console.log('πŸ“Š Data loaded for sync:', { - orders: allOrders.length, - deliveries: allDeliveries.length, + filteredOrders: filteredOrders.length, + enrichedOrders: enrichedOrders.length, + allDeliveries: allDeliveries.length, deliveredDeliveries: allDeliveries.filter(d => d.status === 'delivered').length }); // Chercher spΓ©cifiquement CMD-55 - const cmd55 = allOrders.find(o => o.id === 55); - if (cmd55) { - console.log('🎯 CMD-55 Details:', { - id: cmd55.id, - status: cmd55.status, - deliveries: cmd55.deliveries?.length || 0, - deliveryDetails: cmd55.deliveries || [] - }); - } else { - console.log('❌ CMD-55 not found in current orders'); - } + const cmd55 = enrichedOrders.find(o => o.id === 55); + const cmd55Deliveries = allDeliveries.filter(d => d.orderId === 55); + + console.log('🎯 CMD-55 Analysis:', { + foundInOrders: !!cmd55, + cmd55Status: cmd55?.status || 'NOT_FOUND', + cmd55Deliveries: cmd55Deliveries.length, + deliveryStatuses: cmd55Deliveries.map(d => ({ + id: d.id, + status: d.status, + deliveredDate: d.deliveredDate, + scheduledDate: d.scheduledDate + })) + }); let problematicOrders = 0; let fixedOrders = 0; - // Parcourir les commandes et identifier celles Γ  corriger - for (const order of allOrders) { + // Parcourir les commandes enrichies et identifier celles Γ  corriger + for (const order of enrichedOrders) { console.log(`πŸ” Analyzing order #CMD-${order.id}:`, { status: order.status, deliveries: order.deliveries?.length || 0,