Michael/LogiFlow
1
0 Fork 0
mirror of https://github.com/R0m1k3/LogiFlow.git synced 2026-10-18 20:57:40 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #300 from R0m1k3/1.1

Browse Source 
Add visual indicator for deliveries linked to orders on the calendar
This commit is contained in:
LogiFlow authored and GitHub committed 2025-09-01 14:07:30 +02:00
2 parents be4c7a750c a39b71ab39
commit 3c4e8ff336
1 file changed
+8 -2
Download Patch File Download Diff File Expand all files Collapse all files
client/src/components/CalendarGrid.tsx
+8 -2
View File
@@ -1,7 +1,7 @@
import { format, startOfMonth, endOfMonth, eachDayOfInterval, isSameDay, isSameMonth, isToday } from "date-fns"; import { format, startOfMonth, endOfMonth, eachDayOfInterval, isSameDay, isSameMonth, isToday } from "date-fns";
import { fr } from "date-fns/locale"; import { fr } from "date-fns/locale";
import { safeDate } from "@/lib/dateUtils"; import { safeDate } from "@/lib/dateUtils";
import { Plus, Check, MoreHorizontal, Package } from "lucide-react"; import { Plus, Check, MoreHorizontal, Package, Link } from "lucide-react";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog"; import { Dialog, DialogContent, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
import { useState } from "react"; import { useState } from "react";
@@ -87,7 +87,13 @@ function CalendarItem({ item, type, onItemClick }: { item: any, type: 'order' |
<span className="truncate font-semibold" style={{fontSize: '11px', lineHeight: '1.2'}}> <span className="truncate font-semibold" style={{fontSize: '11px', lineHeight: '1.2'}}>
{item.supplier?.name || 'Livraison'} - {formatQuantity(item.quantity, item.unit)} {item.supplier?.name || 'Livraison'} - {formatQuantity(item.quantity, item.unit)}
</span> </span>
<div style={{display: 'flex', alignItems: 'center', marginLeft: '4px'}}> <div style={{display: 'flex', alignItems: 'center', gap: '4px', marginLeft: '4px'}}>
{/* Badge pour livraison liée à une commande */}
{item.orderId && (
<div className="w-4 h-4 bg-blue-500 rounded-full flex items-center justify-center" title="Liée à une commande">
<Link className="w-2 h-2 text-white" />
</div>
)}
{item.status === 'pending' && ( {item.status === 'pending' && (
<div className="w-2 h-2 bg-green-600 rounded-full" title="En attente" /> <div className="w-2 h-2 bg-green-600 rounded-full" title="En attente" />
)} )}