🚀 Release v1.1.1

- Tipo: patch - Database backup: database-backups/vigilanzaturni_v1.1.1_20251115_101122.sql.gz - Data: 2025-11-15 10:11:44
Show all guards in planning, marking those already busy
2025-11-15 10:11:44 +00:00 · 2025-10-29 09:56:33 +00:00 · 2025-10-29 09:31:44 +00:00 · 2025-10-29 09:24:38 +00:00 · 2025-10-29 08:52:43 +00:00 · 2025-10-29 08:30:30 +00:00
46 changed files with 8944 additions and 804 deletions
--- a/.replit
+++ b/.replit
@ -19,6 +19,14 @@ externalPort = 80
 localPort = 33035
 externalPort = 3001
 [[ports]]
 localPort = 40417
 externalPort = 8000
 [[ports]]
 localPort = 41295
 externalPort = 5173
 [[ports]]
 localPort = 41343
 externalPort = 3000
@ -31,6 +39,10 @@ externalPort = 4200
 localPort = 42175
 externalPort = 3002
 [[ports]]
 localPort = 42187
 externalPort = 6800
 [[ports]]
 localPort = 43169
 externalPort = 5000
--- a/attached_assets/immagine_1761064454333.png
+++ b/attached_assets/immagine_1761064454333.png
--- a/attached_assets/immagine_1761122257056.png
+++ b/attached_assets/immagine_1761122257056.png
--- a/attached_assets/immagine_1761123543970.png
+++ b/attached_assets/immagine_1761123543970.png
--- a/client/index.html
+++ b/client/index.html
@ -18,6 +18,11 @@
    <link rel="preconnect" href="https://fonts.googleapis.com">
    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&family=JetBrains+Mono:wght@400;500;600&display=swap" rel="stylesheet">
    <!-- Leaflet CSS -->
    <link rel="stylesheet" href="https://unpkg.com/leaflet@1.9.4/dist/leaflet.css"
     integrity="sha256-p4NxAoJBhIIN+hmNHrzRCf9tD/miZyoHS5obTRR9BMY="
     crossorigin=""/>
  </head>
  <body>
    <div id="root"></div>
--- a/client/src/App.tsx
+++ b/client/src/App.tsx
@ -24,6 +24,13 @@ import Services from "@/pages/services";
 import Planning from "@/pages/planning";
 import OperationalPlanning from "@/pages/operational-planning";
 import GeneralPlanning from "@/pages/general-planning";
 import ServicePlanning from "@/pages/service-planning";
 import Customers from "@/pages/customers";
 import PlanningMobile from "@/pages/planning-mobile";
 import MyShiftsFixed from "@/pages/my-shifts-fixed";
 import MyShiftsMobile from "@/pages/my-shifts-mobile";
 import SitePlanningView from "@/pages/site-planning-view";
 import WeeklyGuards from "@/pages/weekly-guards";
 function Router() {
  const { isAuthenticated, isLoading } = useAuth();
@ -38,13 +45,20 @@ function Router() {
          <Route path="/" component={Dashboard} />
          <Route path="/guards" component={Guards} />
          <Route path="/sites" component={Sites} />
          <Route path="/customers" component={Customers} />
          <Route path="/services" component={Services} />
          <Route path="/vehicles" component={Vehicles} />
          <Route path="/shifts" component={Shifts} />
          <Route path="/planning" component={Planning} />
          <Route path="/operational-planning" component={OperationalPlanning} />
          <Route path="/general-planning" component={GeneralPlanning} />
          <Route path="/service-planning" component={ServicePlanning} />
          <Route path="/planning-mobile" component={PlanningMobile} />
          <Route path="/advanced-planning" component={AdvancedPlanning} />
          <Route path="/my-shifts-fixed" component={MyShiftsFixed} />
          <Route path="/my-shifts-mobile" component={MyShiftsMobile} />
          <Route path="/site-planning-view" component={SitePlanningView} />
          <Route path="/weekly-guards" component={WeeklyGuards} />
          <Route path="/reports" component={Reports} />
          <Route path="/notifications" component={Notifications} />
          <Route path="/users" component={Users} />
--- a/client/src/components/app-sidebar.tsx
+++ b/client/src/components/app-sidebar.tsx
@ -11,6 +11,12 @@ import {
  ClipboardList,
  Car,
  Briefcase,
  Navigation,
  ChevronDown,
  FileText,
  FolderKanban,
  Building2,
  Wrench,
 } from "lucide-react";
 import { Link, useLocation } from "wouter";
 import {
@ -22,15 +28,31 @@ import {
  SidebarMenu,
  SidebarMenuButton,
  SidebarMenuItem,
  SidebarMenuSub,
  SidebarMenuSubItem,
  SidebarMenuSubButton,
  SidebarHeader,
  SidebarFooter,
 } from "@/components/ui/sidebar";
 import {
  Collapsible,
  CollapsibleContent,
  CollapsibleTrigger,
 } from "@/components/ui/collapsible";
 import { useAuth } from "@/hooks/useAuth";
 import { Avatar, AvatarFallback, AvatarImage } from "@/components/ui/avatar";
 import { Button } from "@/components/ui/button";
 import { ThemeToggle } from "@/components/theme-toggle";
-const menuItems = [
+interface MenuItem {
  title: string;
  url?: string;
  icon: any;
  roles: string[];
  items?: MenuItem[];
 }
 const menuItems: MenuItem[] = [
  {
    title: "Dashboard",
    url: "/",
@ -38,35 +60,47 @@ const menuItems = [
    roles: ["admin", "coordinator", "guard", "client"],
  },
  {
-    title: "Turni",
+    title: "Planning",
-    url: "/shifts",
+    icon: FolderKanban,
    icon: Calendar,
    roles: ["admin", "coordinator", "guard"],
  },
  {
    title: "Pianificazione",
    url: "/planning",
    icon: ClipboardList,
    roles: ["admin", "coordinator"],
-  },
+    items: [
      {
-    title: "Pianificazione Operativa",
+        title: "Fissi",
    url: "/operational-planning",
    icon: Calendar,
    roles: ["admin", "coordinator"],
  },
  {
    title: "Planning Generale",
        url: "/general-planning",
-    icon: BarChart3,
+        icon: Calendar,
        roles: ["admin", "coordinator"],
      },
      {
-    title: "Gestione Pianificazioni",
+        title: "Mobili",
-    url: "/advanced-planning",
+        url: "/planning-mobile",
        icon: Navigation,
        roles: ["admin", "coordinator"],
      },
      {
        title: "Vista",
        url: "/service-planning",
        icon: ClipboardList,
        roles: ["admin", "coordinator"],
      },
      {
        title: "Guardie Settimanale",
        url: "/weekly-guards",
        icon: Users,
        roles: ["admin", "coordinator"],
      },
    ],
  },
  {
    title: "Scadenziario",
    url: "/advanced-planning",
    icon: Calendar,
    roles: ["admin", "coordinator"],
  },
  {
    title: "Anagrafiche",
    icon: Building2,
    roles: ["admin", "coordinator"],
    items: [
      {
        title: "Guardie",
        url: "/guards",
@ -79,6 +113,25 @@ const menuItems = [
        icon: MapPin,
        roles: ["admin", "coordinator", "client"],
      },
      {
        title: "Clienti",
        url: "/customers",
        icon: Briefcase,
        roles: ["admin", "coordinator"],
      },
      {
        title: "Automezzi",
        url: "/vehicles",
        icon: Car,
        roles: ["admin", "coordinator"],
      },
    ],
  },
  {
    title: "Tipologia",
    icon: Wrench,
    roles: ["admin", "coordinator"],
    items: [
      {
        title: "Servizi",
        url: "/services",
@ -86,23 +139,31 @@ const menuItems = [
        roles: ["admin", "coordinator"],
      },
      {
-    title: "Parco Automezzi",
+        title: "Contratti",
-    url: "/vehicles",
+        url: "/parameters",
-    icon: Car,
+        icon: Settings,
        roles: ["admin", "coordinator"],
      },
    ],
  },
  {
    title: "Report",
    url: "/reports",
    icon: BarChart3,
    roles: ["admin", "coordinator", "client"],
    items: [
      {
        title: "Report Amministrativo",
        url: "/reports",
        icon: FileText,
        roles: ["admin", "coordinator", "client"],
      },
    ],
  },
  {
-    title: "Notifiche",
+    title: "Utilità",
-    url: "/notifications",
+    icon: Settings,
    icon: Bell,
    roles: ["admin", "coordinator", "guard"],
-  },
+    items: [
      {
        title: "Utenti",
        url: "/users",
@ -110,10 +171,12 @@ const menuItems = [
        roles: ["admin"],
      },
      {
-    title: "Parametri",
+        title: "Notifiche",
-    url: "/parameters",
+        url: "/notifications",
-    icon: Settings,
+        icon: Bell,
-    roles: ["admin", "coordinator"],
+        roles: ["admin", "coordinator", "guard"],
      },
    ],
  },
 ];
@ -121,9 +184,78 @@ export function AppSidebar() {
  const { user } = useAuth();
  const [location] = useLocation();
-  const filteredItems = menuItems.filter(
+  const filterMenuItems = (items: MenuItem[]): MenuItem[] => {
-    (item) => user && item.roles.includes(user.role)
+    if (!user) return [];
    return items.filter((item) => {
      const hasRole = item.roles.includes(user.role);
      if (!hasRole) return false;
      if (item.items) {
        item.items = filterMenuItems(item.items);
        return item.items.length > 0;
      }
      return true;
    });
  };
  const filteredItems = filterMenuItems(menuItems);
  const renderMenuItem = (item: MenuItem) => {
    // Menu item con sottomenu
    if (item.items && item.items.length > 0) {
      const isAnySubItemActive = item.items.some((subItem) => location === subItem.url);
      return (
        <Collapsible key={item.title} defaultOpen={isAnySubItemActive} className="group/collapsible">
          <SidebarMenuItem>
            <CollapsibleTrigger asChild>
              <SidebarMenuButton data-testid={`menu-${item.title.toLowerCase()}`}>
                <item.icon className="h-4 w-4" />
                <span>{item.title}</span>
                <ChevronDown className="ml-auto h-4 w-4 transition-transform group-data-[state=open]/collapsible:rotate-180" />
              </SidebarMenuButton>
            </CollapsibleTrigger>
            <CollapsibleContent>
              <SidebarMenuSub>
                {item.items.map((subItem) => (
                  <SidebarMenuSubItem key={subItem.title}>
                    <SidebarMenuSubButton
                      asChild
                      isActive={location === subItem.url}
                      data-testid={`link-${subItem.title.toLowerCase().replace(/\s+/g, '-')}`}
                    >
                      <Link href={subItem.url!}>
                        <subItem.icon className="h-4 w-4" />
                        <span>{subItem.title}</span>
                      </Link>
                    </SidebarMenuSubButton>
                  </SidebarMenuSubItem>
                ))}
              </SidebarMenuSub>
            </CollapsibleContent>
          </SidebarMenuItem>
        </Collapsible>
      );
    }
    // Menu item semplice
    return (
      <SidebarMenuItem key={item.title}>
        <SidebarMenuButton
          asChild
          isActive={location === item.url}
          data-testid={`link-${item.title.toLowerCase().replace(/\s+/g, '-')}`}
        >
          <Link href={item.url!}>
            <item.icon className="h-4 w-4" />
            <span>{item.title}</span>
          </Link>
        </SidebarMenuButton>
      </SidebarMenuItem>
    );
  };
  return (
    <Sidebar>
@ -142,20 +274,7 @@ export function AppSidebar() {
          <SidebarGroupLabel>Menu Principale</SidebarGroupLabel>
          <SidebarGroupContent>
            <SidebarMenu>
-              {filteredItems.map((item) => (
+              {filteredItems.map(renderMenuItem)}
                <SidebarMenuItem key={item.title}>
                  <SidebarMenuButton
                    asChild
                    isActive={location === item.url}
                    data-testid={`link-${item.title.toLowerCase()}`}
                  >
                    <Link href={item.url}>
                      <item.icon className="h-4 w-4" />
                      <span>{item.title}</span>
                    </Link>
                  </SidebarMenuButton>
                </SidebarMenuItem>
              ))}
            </SidebarMenu>
          </SidebarGroupContent>
        </SidebarGroup>
--- a/client/src/pages/customers.tsx
+++ b/client/src/pages/customers.tsx
@ -0,0 +1,616 @@
 import { useState } from "react";
 import { useQuery, useMutation } from "@tanstack/react-query";
 import { Customer, InsertCustomer, insertCustomerSchema } from "@shared/schema";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
 import { Form, FormControl, FormField, FormItem, FormLabel, FormMessage } from "@/components/ui/form";
 import { Input } from "@/components/ui/input";
 import { Textarea } from "@/components/ui/textarea";
 import { Switch } from "@/components/ui/switch";
 import { useForm } from "react-hook-form";
 import { zodResolver } from "@hookform/resolvers/zod";
 import { Plus, Building2, Pencil, Trash2, Phone, Mail } from "lucide-react";
 import { apiRequest, queryClient } from "@/lib/queryClient";
 import { useToast } from "@/hooks/use-toast";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
  Table,
  TableBody,
  TableCell,
  TableHead,
  TableHeader,
  TableRow,
 } from "@/components/ui/table";
 import {
  AlertDialog,
  AlertDialogAction,
  AlertDialogCancel,
  AlertDialogContent,
  AlertDialogDescription,
  AlertDialogFooter,
  AlertDialogHeader,
  AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
 export default function Customers() {
  const { toast } = useToast();
  const [isCreateDialogOpen, setIsCreateDialogOpen] = useState(false);
  const [editingCustomer, setEditingCustomer] = useState<Customer | null>(null);
  const [deletingCustomerId, setDeletingCustomerId] = useState<string | null>(null);
  const { data: customers, isLoading } = useQuery<Customer[]>({
    queryKey: ["/api/customers"],
  });
  const form = useForm<InsertCustomer>({
    resolver: zodResolver(insertCustomerSchema),
    defaultValues: {
      name: "",
      businessName: "",
      vatNumber: "",
      fiscalCode: "",
      address: "",
      city: "",
      province: "",
      zipCode: "",
      phone: "",
      email: "",
      pec: "",
      contactPerson: "",
      notes: "",
      isActive: true,
    },
  });
  const createMutation = useMutation({
    mutationFn: async (data: InsertCustomer) => {
      return await apiRequest("POST", "/api/customers", data);
    },
    onSuccess: () => {
      queryClient.invalidateQueries({ queryKey: ["/api/customers"] });
      toast({
        title: "Cliente creato",
        description: "Il cliente è stato aggiunto con successo",
      });
      setIsCreateDialogOpen(false);
      form.reset();
    },
    onError: (error) => {
      toast({
        title: "Errore",
        description: error.message,
        variant: "destructive",
      });
    },
  });
  const updateMutation = useMutation({
    mutationFn: async ({ id, data }: { id: string; data: InsertCustomer }) => {
      return await apiRequest("PATCH", `/api/customers/${id}`, data);
    },
    onSuccess: () => {
      queryClient.invalidateQueries({ queryKey: ["/api/customers"] });
      toast({
        title: "Cliente aggiornato",
        description: "I dati del cliente sono stati aggiornati",
      });
      setEditingCustomer(null);
      form.reset();
    },
    onError: (error) => {
      toast({
        title: "Errore",
        description: error.message,
        variant: "destructive",
      });
    },
  });
  const deleteMutation = useMutation({
    mutationFn: async (id: string) => {
      return await apiRequest("DELETE", `/api/customers/${id}`, undefined);
    },
    onSuccess: () => {
      queryClient.invalidateQueries({ queryKey: ["/api/customers"] });
      toast({
        title: "Cliente eliminato",
        description: "Il cliente è stato eliminato con successo",
      });
      setDeletingCustomerId(null);
    },
    onError: (error) => {
      toast({
        title: "Errore",
        description: error.message,
        variant: "destructive",
      });
      setDeletingCustomerId(null);
    },
  });
  const onSubmit = (data: InsertCustomer) => {
    if (editingCustomer) {
      updateMutation.mutate({ id: editingCustomer.id, data });
    } else {
      createMutation.mutate(data);
    }
  };
  const openEditDialog = (customer: Customer) => {
    setEditingCustomer(customer);
    form.reset({
      name: customer.name || "",
      businessName: customer.businessName || "",
      vatNumber: customer.vatNumber || "",
      fiscalCode: customer.fiscalCode || "",
      address: customer.address || "",
      city: customer.city || "",
      province: customer.province || "",
      zipCode: customer.zipCode || "",
      phone: customer.phone || "",
      email: customer.email || "",
      pec: customer.pec || "",
      contactPerson: customer.contactPerson || "",
      notes: customer.notes || "",
      isActive: customer.isActive ?? true,
    });
    setIsCreateDialogOpen(true);
  };
  const handleDialogOpenChange = (open: boolean) => {
    setIsCreateDialogOpen(open);
    if (!open) {
      // Reset only on close
      setEditingCustomer(null);
      form.reset();
    }
  };
  if (isLoading) {
    return (
      <div className="space-y-6">
        <Skeleton className="h-12 w-full" />
        <Skeleton className="h-96 w-full" />
      </div>
    );
  }
  return (
    <div className="space-y-6">
      {/* Header */}
      <div className="flex items-center justify-between">
        <div>
          <h1 className="text-3xl font-bold tracking-tight" data-testid="text-page-title">
            Anagrafica Clienti
          </h1>
          <p className="text-muted-foreground">
            Gestione anagrafica clienti e contratti
          </p>
        </div>
        <Dialog open={isCreateDialogOpen} onOpenChange={handleDialogOpenChange}>
          <DialogTrigger asChild>
            <Button data-testid="button-create-customer">
              <Plus className="mr-2 h-4 w-4" />
              Nuovo Cliente
            </Button>
          </DialogTrigger>
          <DialogContent className="max-w-2xl max-h-[90vh] overflow-y-auto">
            <DialogHeader>
              <DialogTitle>
                {editingCustomer ? "Modifica Cliente" : "Nuovo Cliente"}
              </DialogTitle>
              <DialogDescription>
                Inserisci i dati anagrafici del cliente
              </DialogDescription>
            </DialogHeader>
            <Form {...form}>
              <form onSubmit={form.handleSubmit(onSubmit)} className="space-y-4">
                <div className="grid grid-cols-2 gap-4">
                  <FormField
                    control={form.control}
                    name="name"
                    render={({ field }) => (
                      <FormItem className="col-span-2">
                        <FormLabel>Nome Cliente *</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="es. Banca Centrale Roma"
                            data-testid="input-name"
                            {...field}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="businessName"
                    render={({ field }) => (
                      <FormItem className="col-span-2">
                        <FormLabel>Ragione Sociale</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="es. Banca Centrale S.p.A."
                            data-testid="input-business-name"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="vatNumber"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Partita IVA</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="12345678901"
                            data-testid="input-vat-number"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="fiscalCode"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Codice Fiscale</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="CF cliente"
                            data-testid="input-fiscal-code"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="address"
                    render={({ field }) => (
                      <FormItem className="col-span-2">
                        <FormLabel>Indirizzo</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="Via, numero civico"
                            data-testid="input-address"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="city"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Città</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="Roma"
                            data-testid="input-city"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="province"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Provincia</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="RM"
                            maxLength={2}
                            data-testid="input-province"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="zipCode"
                    render={({ field }) => (
                      <FormItem className="col-span-2">
                        <FormLabel>CAP</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="00100"
                            data-testid="input-zip-code"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="phone"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Telefono</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="+39 06 1234567"
                            data-testid="input-phone"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="email"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Email</FormLabel>
                        <FormControl>
                          <Input
                            type="email"
                            placeholder="info@cliente.it"
                            data-testid="input-email"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="pec"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>PEC</FormLabel>
                        <FormControl>
                          <Input
                            type="email"
                            placeholder="pec@cliente.it"
                            data-testid="input-pec"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="contactPerson"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Referente</FormLabel>
                        <FormControl>
                          <Input
                            placeholder="Nome e cognome referente"
                            data-testid="input-contact-person"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="notes"
                    render={({ field }) => (
                      <FormItem className="col-span-2">
                        <FormLabel>Note</FormLabel>
                        <FormControl>
                          <Textarea
                            placeholder="Note aggiuntive sul cliente"
                            data-testid="input-notes"
                            {...field}
                            value={field.value || ""}
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={form.control}
                    name="isActive"
                    render={({ field }) => (
                      <FormItem className="flex items-center gap-2 space-y-0 col-span-2">
                        <FormControl>
                          <Switch
                            checked={field.value ?? true}
                            onCheckedChange={field.onChange}
                            data-testid="switch-is-active"
                          />
                        </FormControl>
                        <FormLabel className="!mt-0">Cliente Attivo</FormLabel>
                      </FormItem>
                    )}
                  />
                </div>
                <div className="flex justify-end gap-2 pt-4">
                  <Button
                    type="button"
                    variant="outline"
                    onClick={() => handleDialogOpenChange(false)}
                    data-testid="button-cancel"
                  >
                    Annulla
                  </Button>
                  <Button
                    type="submit"
                    disabled={createMutation.isPending || updateMutation.isPending}
                    data-testid="button-submit"
                  >
                    {editingCustomer ? "Aggiorna" : "Crea"}
                  </Button>
                </div>
              </form>
            </Form>
          </DialogContent>
        </Dialog>
      </div>
      {/* Customers Table */}
      <Card>
        <CardHeader>
          <CardTitle>Lista Clienti</CardTitle>
          <CardDescription>
            {customers?.length || 0} clienti registrati
          </CardDescription>
        </CardHeader>
        <CardContent>
          <Table>
            <TableHeader>
              <TableRow>
                <TableHead>Nome</TableHead>
                <TableHead>Ragione Sociale</TableHead>
                <TableHead>Città</TableHead>
                <TableHead>Referente</TableHead>
                <TableHead>Contatti</TableHead>
                <TableHead>Stato</TableHead>
                <TableHead className="text-right">Azioni</TableHead>
              </TableRow>
            </TableHeader>
            <TableBody>
              {customers?.map((customer) => (
                <TableRow key={customer.id} data-testid={`row-customer-${customer.id}`}>
                  <TableCell className="font-medium">
                    <div className="flex items-center gap-2">
                      <Building2 className="h-4 w-4 text-muted-foreground" />
                      {customer.name}
                    </div>
                  </TableCell>
                  <TableCell className="text-sm text-muted-foreground">
                    {customer.businessName || "-"}
                  </TableCell>
                  <TableCell>
                    {customer.city ? `${customer.city} (${customer.province})` : "-"}
                  </TableCell>
                  <TableCell>{customer.contactPerson || "-"}</TableCell>
                  <TableCell>
                    <div className="flex flex-col gap-1 text-sm">
                      {customer.phone && (
                        <div className="flex items-center gap-1">
                          <Phone className="h-3 w-3" />
                          {customer.phone}
                        </div>
                      )}
                      {customer.email && (
                        <div className="flex items-center gap-1">
                          <Mail className="h-3 w-3" />
                          {customer.email}
                        </div>
                      )}
                    </div>
                  </TableCell>
                  <TableCell>
                    <Badge variant={customer.isActive ? "default" : "secondary"}>
                      {customer.isActive ? "Attivo" : "Inattivo"}
                    </Badge>
                  </TableCell>
                  <TableCell className="text-right">
                    <div className="flex justify-end gap-2">
                      <Button
                        variant="ghost"
                        size="icon"
                        onClick={() => openEditDialog(customer)}
                        data-testid={`button-edit-${customer.id}`}
                      >
                        <Pencil className="h-4 w-4" />
                      </Button>
                      <Button
                        variant="ghost"
                        size="icon"
                        onClick={() => setDeletingCustomerId(customer.id)}
                        data-testid={`button-delete-${customer.id}`}
                      >
                        <Trash2 className="h-4 w-4 text-destructive" />
                      </Button>
                    </div>
                  </TableCell>
                </TableRow>
              ))}
              {(!customers || customers.length === 0) && (
                <TableRow>
                  <TableCell colSpan={7} className="text-center text-muted-foreground py-8">
                    Nessun cliente registrato
                  </TableCell>
                </TableRow>
              )}
            </TableBody>
          </Table>
        </CardContent>
      </Card>
      {/* Delete Confirmation Dialog */}
      <AlertDialog open={!!deletingCustomerId} onOpenChange={() => setDeletingCustomerId(null)}>
        <AlertDialogContent>
          <AlertDialogHeader>
            <AlertDialogTitle>Conferma eliminazione</AlertDialogTitle>
            <AlertDialogDescription>
              Sei sicuro di voler eliminare questo cliente? L'operazione non può essere annullata.
            </AlertDialogDescription>
          </AlertDialogHeader>
          <AlertDialogFooter>
            <AlertDialogCancel data-testid="button-cancel-delete">Annulla</AlertDialogCancel>
            <AlertDialogAction
              onClick={() => deletingCustomerId && deleteMutation.mutate(deletingCustomerId)}
              data-testid="button-confirm-delete"
              className="bg-destructive hover:bg-destructive/90"
            >
              Elimina
            </AlertDialogAction>
          </AlertDialogFooter>
        </AlertDialogContent>
      </AlertDialog>
    </div>
  );
 }
--- a/client/src/pages/general-planning.tsx
+++ b/client/src/pages/general-planning.tsx
@ -1,4 +1,4 @@
-import { useState } from "react";
+import { useState, useEffect } from "react";
 import { useQuery, useMutation } from "@tanstack/react-query";
 import { format, startOfWeek, addWeeks } from "date-fns";
 import { it } from "date-fns/locale";
@ -8,7 +8,7 @@ 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 { ChevronLeft, ChevronRight, Calendar, MapPin, Users, AlertTriangle, Car, Edit, CheckCircle2, Plus, Trash2, Clock } from "lucide-react";
+import { ChevronLeft, ChevronRight, Calendar, MapPin, Users, AlertTriangle, Car, Edit, CheckCircle2, Plus, Trash2, Clock, Copy, Circle } from "lucide-react";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
 import {
@ -19,9 +19,19 @@ import {
  DialogHeader,
  DialogTitle,
 } from "@/components/ui/dialog";
 import {
  AlertDialog,
  AlertDialogAction,
  AlertDialogCancel,
  AlertDialogContent,
  AlertDialogDescription,
  AlertDialogFooter,
  AlertDialogHeader,
  AlertDialogTitle,
 } from "@/components/ui/alert-dialog";
 import { queryClient, apiRequest } from "@/lib/queryClient";
 import { useToast } from "@/hooks/use-toast";
-import type { GuardAvailability } from "@shared/schema";
+import type { GuardAvailability, Vehicle as VehicleDb } from "@shared/schema";
 interface GuardWithHours {
  assignmentId: string;
@ -44,6 +54,9 @@ interface SiteData {
  siteId: string;
  siteName: string;
  serviceType: string;
  serviceStartTime: string;
  serviceEndTime: string;
  serviceHours: number;
  minGuards: number;
  guards: GuardWithHours[];
  vehicles: Vehicle[];
@ -72,9 +85,15 @@ interface GeneralPlanningResponse {
 }
 // Helper per formattare orario in formato italiano 24h (HH:MM)
 // IMPORTANTE: Gli orari nel DB sono UTC, visualizzali in timezone Europe/Rome
 const formatTime = (dateString: string) => {
  const date = new Date(dateString);
-  return date.toLocaleTimeString("it-IT", { hour: "2-digit", minute: "2-digit", hour12: false });
+  return date.toLocaleTimeString("it-IT", { 
    hour: "2-digit", 
    minute: "2-digit", 
    hour12: false,
    timeZone: "Europe/Rome"  // Converti da UTC a Italy time
  });
 };
 // Helper per formattare data in formato italiano (gg/mm/aaaa)
@ -92,9 +111,13 @@ export default function GeneralPlanning() {
  // Form state per assegnazione guardia
  const [selectedGuardId, setSelectedGuardId] = useState<string>("");
  const [selectedVehicleId, setSelectedVehicleId] = useState<string>("none");
  const [startTime, setStartTime] = useState<string>("06:00");
  const [durationHours, setDurationHours] = useState<number>(8);
  const [consecutiveDays, setConsecutiveDays] = useState<number>(1);
  const [showOvertimeGuards, setShowOvertimeGuards] = useState<boolean>(false);
  const [ccnlConfirmation, setCcnlConfirmation] = useState<{ message: string; data: any } | null>(null);
  const [showCopyWeekConfirmation, setShowCopyWeekConfirmation] = useState<boolean>(false);
  // Query per dati planning settimanale
  const { data: planningData, isLoading } = useQuery<GeneralPlanningResponse>({
@ -125,7 +148,7 @@ export default function GeneralPlanning() {
  };
  // Query per guardie disponibili (solo quando dialog è aperto)
-  const { data: availableGuards, isLoading: isLoadingGuards } = useQuery<GuardAvailability[]>({
+  const { data: availableGuards, isLoading: isLoadingGuards, refetch: refetchGuards } = useQuery<GuardAvailability[]>({
    queryKey: ["/api/guards/availability", selectedCell?.siteId, selectedLocation, startTime, durationHours],
    queryFn: async () => {
      if (!selectedCell) return [];
@ -137,16 +160,44 @@ export default function GeneralPlanning() {
      return response.json();
    },
    enabled: !!selectedCell, // Query attiva solo se dialog è aperto
    staleTime: 0, // Dati sempre considerati stale, refetch ad ogni apertura dialog
  });
  // Query per veicoli disponibili (solo quando dialog è aperto)
  const { data: availableVehicles, isLoading: isLoadingVehicles } = useQuery<VehicleDb[]>({
    queryKey: ["/api/vehicles/available", selectedLocation],
    queryFn: async () => {
      if (!selectedCell) return [];
      const response = await fetch(`/api/vehicles/available?location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch available vehicles");
      return response.json();
    },
    enabled: !!selectedCell,
    staleTime: 0,
  });
  // Calcola dati aggiornati della cella selezionata (per auto-refresh dialog)
  const currentCellData = (() => {
    if (!selectedCell || !planningData) return selectedCell?.data;
    // Trova i dati freschi da planningData
    const day = planningData.days.find(d => d.date === selectedCell.date);
    if (!day) return selectedCell.data;
    const updatedSite = day.sites.find(s => s.siteId === selectedCell.siteId);
    return updatedSite || selectedCell.data;
  })();
  // Mutation per eliminare assegnazione guardia
  const deleteAssignmentMutation = useMutation({
    mutationFn: async (assignmentId: string) => {
      return apiRequest("DELETE", `/api/shift-assignments/${assignmentId}`, undefined);
    },
-    onSuccess: () => {
+    onSuccess: async () => {
-      queryClient.invalidateQueries({ queryKey: ["/api/general-planning"] });
+      // Invalida e refetch planning generale per aggiornare dialog
-      queryClient.invalidateQueries({ queryKey: ["/api/guards/availability"] });
+      await queryClient.invalidateQueries({ queryKey: ["/api/general-planning"] });
      await queryClient.invalidateQueries({ queryKey: ["/api/guards/availability"] });
      await queryClient.refetchQueries({ queryKey: ["/api/general-planning"] });
      toast({
        title: "Guardia rimossa",
@ -164,35 +215,53 @@ export default function GeneralPlanning() {
  // Mutation per assegnare guardia con orari (anche multi-giorno)
  const assignGuardMutation = useMutation({
-    mutationFn: async (data: { siteId: string; date: string; guardId: string; startTime: string; durationHours: number; consecutiveDays: number }) => {
+    mutationFn: async (data: { siteId: string; date: string; guardId: string; startTime: string; durationHours: number; consecutiveDays: number; vehicleId?: string; force?: boolean }) => {
      return apiRequest("POST", "/api/general-planning/assign-guard", data);
    },
-    onSuccess: () => {
+    onSuccess: async () => {
-      // Invalida cache planning generale
+      // Invalida cache planning generale, guardie e veicoli
-      queryClient.invalidateQueries({ queryKey: ["/api/general-planning"] });
+      await queryClient.invalidateQueries({ queryKey: ["/api/general-planning"] });
-      queryClient.invalidateQueries({ queryKey: ["/api/guards/availability"] });
+      await queryClient.invalidateQueries({ queryKey: ["/api/guards/availability"] });
      await queryClient.invalidateQueries({ queryKey: ["/api/vehicles/available"] });
      // Refetch immediatamente guardie disponibili per aggiornare lista
      await refetchGuards();
      toast({
        title: "Guardia assegnata",
        description: "La guardia è stata assegnata con successo",
      });
-      // Reset form
+      // Reset form (NON chiudere dialog per vedere lista aggiornata)
      setSelectedGuardId("");
-      setSelectedCell(null);
+      setSelectedVehicleId("");
      setCcnlConfirmation(null); // Reset dialog conferma se aperto
    },
-    onError: (error: any) => {
+    onError: (error: any, variables) => {
      // Parse error message from API response
      let errorMessage = "Impossibile assegnare la guardia";
      let errorType = "";
      if (error.message) {
        // Error format from apiRequest: "STATUS_CODE: {json_body}"
-        const match = error.message.match(/^\d+:\s*(.+)$/);
+        const match = error.message.match(/^(\d+):\s*(.+)$/);
        if (match) {
          const statusCode = match[1];
          try {
-            const parsed = JSON.parse(match[1]);
+            const parsed = JSON.parse(match[2]);
            errorMessage = parsed.message || errorMessage;
            errorType = parsed.type || "";
            // Se è un errore CCNL (409 con tipo CCNL_VIOLATION), mostra dialog conferma
            if (statusCode === "409" && errorType === "CCNL_VIOLATION") {
              setCcnlConfirmation({
                message: errorMessage,
                data: variables
              });
              return; // Non mostrare toast, mostra dialog
            }
          } catch {
-            errorMessage = match[1];
+            errorMessage = match[2];
          }
        } else {
          errorMessage = error.message;
@ -207,6 +276,54 @@ export default function GeneralPlanning() {
    },
  });
  // Mutation per copiare turni settimanali
  const copyWeekMutation = useMutation({
    mutationFn: async () => {
      return apiRequest("POST", "/api/shift-assignments/copy-week", {
        weekStart: format(weekStart, "yyyy-MM-dd"),
        location: selectedLocation,
      });
    },
    onSuccess: async (response: any) => {
      const data = await response.json();
      toast({
        title: "Settimana copiata!",
        description: `${data.copiedShifts} turni e ${data.copiedAssignments} assegnazioni copiate nella settimana successiva`,
      });
      // Invalida cache e naviga alla settimana successiva
      await queryClient.invalidateQueries({ queryKey: ["/api/general-planning"] });
      setWeekStart(addWeeks(weekStart, 1)); // Naviga alla settimana copiata
      setShowCopyWeekConfirmation(false);
    },
    onError: (error: any) => {
      let errorMessage = "Impossibile copiare la settimana";
      if (error.message) {
        const match = error.message.match(/^(\d+):\s*(.+)$/);
        if (match) {
          try {
            const parsed = JSON.parse(match[2]);
            errorMessage = parsed.message || errorMessage;
          } catch {
            errorMessage = match[2];
          }
        } else {
          errorMessage = error.message;
        }
      }
      toast({
        title: "Errore Copia Settimana",
        description: errorMessage,
        variant: "destructive",
      });
      setShowCopyWeekConfirmation(false);
    },
  });
  // Handler per submit form assegnazione guardia
  const handleAssignGuard = () => {
    if (!selectedCell || !selectedGuardId) return;
@ -218,6 +335,7 @@ export default function GeneralPlanning() {
      startTime,
      durationHours,
      consecutiveDays,
      ...(selectedVehicleId && selectedVehicleId !== "none" && { vehicleId: selectedVehicleId }),
    });
  };
@ -261,7 +379,7 @@ export default function GeneralPlanning() {
      <div className="flex flex-col gap-4 md:flex-row md:items-center md:justify-between">
        <div>
          <h1 className="text-3xl font-bold tracking-tight" data-testid="text-page-title">
-            Planning Generale
+            Planning Fissi
          </h1>
          <p className="text-muted-foreground">
            Vista settimanale turni con calcolo automatico guardie mancanti
@ -289,7 +407,7 @@ export default function GeneralPlanning() {
            </div>
            {/* Navigazione settimana */}
-            <div className="flex items-center gap-2">
+            <div className="flex items-center gap-2 flex-wrap">
              <Button
                variant="outline"
                size="icon"
@ -316,6 +434,16 @@ export default function GeneralPlanning() {
              >
                <ChevronRight className="h-4 w-4" />
              </Button>
              <Button
                variant="default"
                onClick={() => setShowCopyWeekConfirmation(true)}
                disabled={isLoading || !planningData || copyWeekMutation.isPending}
                data-testid="button-copy-week"
              >
                <Copy className="h-4 w-4 mr-2" />
                {copyWeekMutation.isPending ? "Copia in corso..." : "Copia Turno Settimanale"}
              </Button>
            </div>
            {/* Info settimana */}
@ -516,8 +644,9 @@ export default function GeneralPlanning() {
        setStartTime("06:00");
        setDurationHours(8);
        setConsecutiveDays(1);
        setSelectedVehicleId("");
      }}>
-        <DialogContent className="max-w-2xl">
+        <DialogContent className="max-w-6xl max-h-[90vh] flex flex-col">
          <DialogHeader>
            <DialogTitle className="flex items-center gap-2">
              <Calendar className="h-5 w-5" />
@ -529,125 +658,9 @@ export default function GeneralPlanning() {
          </DialogHeader>
          {selectedCell && (
-            <div className="space-y-4">
+            <div className="space-y-4 overflow-y-auto pr-2">
-              {/* Info turni */}
+              {/* Form assegnazione guardia - SEMPRE IN ALTO E VISIBILE */}
-              <div className="grid grid-cols-2 gap-4">
+              <div className="bg-accent/5 border border-accent/20 rounded-lg p-4 space-y-4">
                <div>
                  <p className="text-sm text-muted-foreground">Turni Pianificati</p>
                  <p className="text-2xl font-bold">{selectedCell.data.shiftsCount}</p>
                </div>
                <div>
                  <p className="text-sm text-muted-foreground">Ore Totali</p>
                  <p className="text-2xl font-bold">{selectedCell.data.totalShiftHours}h</p>
                </div>
              </div>
              {/* Guardie assegnate */}
              {selectedCell.data.guards.length > 0 && (
                <div className="space-y-2">
                  <div className="flex items-center gap-2 text-sm font-semibold">
                    <Users className="h-4 w-4" />
                    Guardie Assegnate ({selectedCell.data.guards.length})
                  </div>
                  <div className="grid gap-2">
                    {selectedCell.data.guards.map((guard, idx) => (
                      <div key={idx} className="flex items-center justify-between p-2 bg-accent/10 rounded-md">
                        <div>
                          <p className="font-medium">{guard.guardName}</p>
                          <p className="text-xs text-muted-foreground">{guard.badgeNumber}</p>
                        </div>
                        <Badge variant="secondary">{guard.hours}h</Badge>
                      </div>
                    ))}
                  </div>
                </div>
              )}
              {/* Veicoli */}
              {selectedCell.data.vehicles.length > 0 && (
                <div className="space-y-2">
                  <div className="flex items-center gap-2 text-sm font-semibold">
                    <Car className="h-4 w-4" />
                    Veicoli Assegnati ({selectedCell.data.vehicles.length})
                  </div>
                  <div className="grid gap-2">
                    {selectedCell.data.vehicles.map((vehicle, idx) => (
                      <div key={idx} className="flex items-center gap-2 p-2 bg-accent/10 rounded-md">
                        <p className="font-medium">{vehicle.licensePlate}</p>
                        <p className="text-sm text-muted-foreground">
                          {vehicle.brand} {vehicle.model}
                        </p>
                      </div>
                    ))}
                  </div>
                </div>
              )}
              {/* Guardie mancanti */}
              {selectedCell.data.missingGuards > 0 && (
                <div className="p-4 bg-destructive/10 border border-destructive/20 rounded-md">
                  <div className="flex items-center gap-2 text-destructive font-semibold mb-2">
                    <AlertTriangle className="h-5 w-5" />
                    Attenzione: Guardie Mancanti
                  </div>
                  <p className="text-sm">
                    Servono ancora <span className="font-bold">{selectedCell.data.missingGuards}</span>{" "}
                    {selectedCell.data.missingGuards === 1 ? "guardia" : "guardie"} per coprire completamente il servizio
                    (calcolato su {selectedCell.data.totalShiftHours}h con max 9h per guardia e {selectedCell.data.minGuards} {selectedCell.data.minGuards === 1 ? "guardia minima" : "guardie minime"} contemporanee)
                  </p>
                </div>
              )}
              {/* No turni */}
              {selectedCell.data.shiftsCount === 0 && (
                <div className="text-center py-8 text-muted-foreground">
                  <Calendar className="h-12 w-12 mx-auto mb-4 opacity-50" />
                  <p>Nessun turno pianificato per questa data</p>
                </div>
              )}
              {/* Form assegnazione guardia */}
              <div className="border-t pt-4 space-y-4">
                {/* Mostra guardie già assegnate per questo giorno */}
                {selectedCell.data.guards.length > 0 && (
                  <div className="bg-muted/30 p-3 rounded-md space-y-2">
                    <p className="text-xs font-medium text-muted-foreground">
                      Guardie già assegnate per questa data:
                    </p>
                    <div className="grid gap-2">
                      {selectedCell.data.guards.map((guard, idx) => (
                        <div key={idx} className="flex items-start justify-between gap-2 bg-background p-2.5 rounded border">
                          <div className="flex-1 space-y-1">
                            <div className="flex items-center gap-2">
                              <span className="font-medium text-sm">{guard.guardName}</span>
                              <Badge variant="outline" className="text-xs">#{guard.badgeNumber}</Badge>
                            </div>
                            <div className="flex items-center gap-2 text-xs text-muted-foreground">
                              <Clock className="h-3 w-3" />
                              <span>{formatTime(guard.plannedStartTime)} - {formatTime(guard.plannedEndTime)}</span>
                              <span className="font-medium">({guard.hours}h)</span>
                            </div>
                          </div>
                          <Button
                            variant="ghost"
                            size="icon"
                            className="h-7 w-7 text-destructive hover:text-destructive hover:bg-destructive/10"
                            onClick={() => {
                              if (confirm(`Confermi di voler rimuovere ${guard.guardName} da questo turno?`)) {
                                deleteAssignmentMutation.mutate(guard.assignmentId);
                              }
                            }}
                            disabled={deleteAssignmentMutation.isPending}
                            data-testid={`button-delete-assignment-${guard.guardId}`}
                          >
                            <Trash2 className="h-4 w-4" />
                          </Button>
                        </div>
                      ))}
                    </div>
                  </div>
                )}
                <div className="flex items-center gap-2 text-sm font-semibold">
                  <Plus className="h-4 w-4" />
                  Assegna Nuova Guardia
@ -704,12 +717,35 @@ export default function GeneralPlanning() {
                    })()}
                  </div>
-                  {/* Select guardia disponibile */}
+                  {/* Select guardia (tutte, evidenziate in rosso se impegnate) */}
                  {(() => {
                    // Mostra TUTTE le guardie, ma filtra solo per ore ordinarie/straordinario
                    const filteredGuards = availableGuards?.filter(g => 
                      showOvertimeGuards || !g.requiresOvertime
                    ) || [];
                    const hasOvertimeGuards = availableGuards?.some(g => g.requiresOvertime) || false;
                    return (
                      <div className="space-y-2">
-                    <Label htmlFor="guard-select">Guardia Disponibile</Label>
+                        <div className="flex items-center justify-between">
                          <Label htmlFor="guard-select">Guardia</Label>
                          {!isLoadingGuards && hasOvertimeGuards && (
                            <Button
                              variant="outline"
                              size="sm"
                              onClick={() => setShowOvertimeGuards(!showOvertimeGuards)}
                              className="h-7 text-xs"
                              data-testid="button-toggle-overtime"
                            >
                              {showOvertimeGuards ? "Nascondi" : "Mostra"} Straordinario
                            </Button>
                          )}
                        </div>
                        {isLoadingGuards ? (
                          <Skeleton className="h-10 w-full" />
                        ) : (
                          <>
                            <Select 
                              value={selectedGuardId} 
                              onValueChange={setSelectedGuardId}
@ -719,31 +755,57 @@ export default function GeneralPlanning() {
                                <SelectValue placeholder="Seleziona guardia..." />
                              </SelectTrigger>
                              <SelectContent>
-                          {availableGuards && availableGuards.length > 0 ? (
+                                {filteredGuards.length > 0 ? (
-                            availableGuards.map((guard) => (
+                                  filteredGuards.map((guard) => (
                                    <SelectItem key={guard.guardId} value={guard.guardId}>
-                                {guard.guardName} ({guard.badgeNumber}) - {guard.weeklyHoursRemaining}h disponibili
+                                      <div className={`flex items-center gap-1.5 ${guard.isAvailable ? "" : "text-destructive font-medium"}`}>
-                                {guard.conflicts && guard.conflicts.length > 0 && " ⚠️"}
+                                        {!guard.isAvailable && <Circle className="h-3 w-3 fill-current" />}
                                        <span>
                                          {guard.guardName} ({guard.badgeNumber}) - {guard.ordinaryHoursRemaining}h ord.
                                          {guard.requiresOvertime && ` + ${guard.overtimeHoursRemaining}h strao.`}
                                          {guard.requiresOvertime && " 🔸"}
                                        </span>
                                      </div>
                                    </SelectItem>
                                  ))
                                ) : (
                                  <SelectItem value="no-guards" disabled>
-                              Nessuna guardia disponibile
+                                    {showOvertimeGuards 
                                      ? "Nessuna guardia" 
                                      : "Nessuna guardia con ore ordinarie (prova 'Mostra Straordinario')"}
                                  </SelectItem>
                                )}
                              </SelectContent>
                            </Select>
                            {filteredGuards.length === 0 && !showOvertimeGuards && hasOvertimeGuards && (
                              <p className="text-xs text-muted-foreground">
                                ℹ️ Alcune guardie richiedono straordinario. Clicca "Mostra Straordinario" per vederle.
                              </p>
                            )}
-                    {availableGuards && availableGuards.length > 0 && selectedGuardId && (
+                            {filteredGuards.length > 0 && selectedGuardId && (
                              <div className="text-xs space-y-1">
                                {(() => {
-                          const guard = availableGuards.find(g => g.guardId === selectedGuardId);
+                                  const guard = availableGuards?.find(g => g.guardId === selectedGuardId);
                                  if (!guard) return null;
                                  return (
                                    <>
                                      <p className="text-muted-foreground">
                                        Ore ordinarie: {guard.ordinaryHoursRemaining}h / 40h disponibili
                                        {guard.requiresOvertime && ` • Straordinario: ${guard.overtimeHoursRemaining}h / 8h`}
                                      </p>
                                      <p className="text-muted-foreground">
                                        Ore assegnate: {guard.weeklyHoursAssigned}h / {guard.weeklyHoursMax}h (rimangono {guard.weeklyHoursRemaining}h)
                                      </p>
                                      {guard.nightHoursAssigned > 0 && (
                                        <p className="text-muted-foreground">
                                          Ore notturne: {guard.nightHoursAssigned}h / 48h settimanali
                                        </p>
                                      )}
                                      {guard.hasRestViolation && (
                                        <p className="text-yellow-600 dark:text-yellow-500 font-medium">
                                          ⚠️ Attenzione: riposo insufficiente dall'ultimo turno
                                        </p>
                                      )}
                                      {guard.conflicts && guard.conflicts.length > 0 && (
                                        <p className="text-destructive font-medium">
                                          ⚠️ Conflitto: {guard.conflicts.map((c: any) => 
@ -761,6 +823,42 @@ export default function GeneralPlanning() {
                                })()}
                              </div>
                            )}
                          </>
                        )}
                      </div>
                    );
                  })()}
                  {/* Select veicolo (opzionale) */}
                  <div className="space-y-2">
                    <Label htmlFor="vehicle-select">Veicolo (opzionale)</Label>
                    {isLoadingVehicles ? (
                      <Skeleton className="h-10 w-full" />
                    ) : (
                      <Select 
                        value={selectedVehicleId} 
                        onValueChange={setSelectedVehicleId}
                        disabled={assignGuardMutation.isPending}
                      >
                        <SelectTrigger id="vehicle-select" data-testid="select-vehicle">
                          <SelectValue placeholder="Nessun veicolo" />
                        </SelectTrigger>
                        <SelectContent>
                          <SelectItem value="none">Nessun veicolo</SelectItem>
                          {availableVehicles && availableVehicles.length > 0 ? (
                            availableVehicles.map((vehicle) => (
                              <SelectItem key={vehicle.id} value={vehicle.id}>
                                {vehicle.licensePlate} - {vehicle.brand} {vehicle.model}
                              </SelectItem>
                            ))
                          ) : (
                            <SelectItem value="no-vehicles" disabled>
                              Nessun veicolo disponibile
                            </SelectItem>
                          )}
                        </SelectContent>
                      </Select>
                    )}
                  </div>
                  {/* Bottone assegna */}
@ -781,6 +879,128 @@ export default function GeneralPlanning() {
                  </Button>
                </div>
              </div>
              {/* Guardie già assegnate - fuori dal form box per evitare di nascondere il form */}
              {currentCellData && currentCellData.guards.length > 0 && (
                <div className="space-y-2">
                  <h3 className="text-sm font-semibold flex items-center gap-2">
                    <Users className="h-4 w-4" />
                    Guardie Già Assegnate ({currentCellData.guards.length})
                  </h3>
                  <div className="grid gap-2">
                    {currentCellData.guards.map((guard, idx) => (
                      <div key={idx} className="flex items-start justify-between gap-2 bg-muted/30 p-2.5 rounded border">
                        <div className="flex-1 space-y-1">
                          <div className="flex items-center gap-2">
                            <span className="font-medium text-sm">{guard.guardName}</span>
                            <Badge variant="outline" className="text-xs">#{guard.badgeNumber}</Badge>
                          </div>
                          <div className="flex items-center gap-2 text-xs text-muted-foreground">
                            <Clock className="h-3 w-3" />
                            <span>{formatTime(guard.plannedStartTime)} - {formatTime(guard.plannedEndTime)}</span>
                            <span className="font-medium">({guard.hours}h)</span>
                          </div>
                        </div>
                        <Button
                          variant="ghost"
                          size="icon"
                          className="h-7 w-7 text-destructive hover:text-destructive hover:bg-destructive/10"
                          onClick={() => {
                            if (confirm(`Confermi di voler rimuovere ${guard.guardName} da questo turno?`)) {
                              deleteAssignmentMutation.mutate(guard.assignmentId);
                            }
                          }}
                          disabled={deleteAssignmentMutation.isPending}
                          data-testid={`button-delete-assignment-${guard.guardId}`}
                        >
                          <Trash2 className="h-4 w-4" />
                        </Button>
                      </div>
                    ))}
                  </div>
                </div>
              )}
              {/* Separator */}
              <div className="border-t" />
              {/* Info turni esistenti */}
              <div className="space-y-4">
                <h3 className="font-semibold text-sm">Informazioni Servizio</h3>
                {/* Tipo servizio e orario */}
                {currentCellData && (
                  <div className="bg-muted/30 p-3 rounded-md space-y-2">
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Tipo Servizio</span>
                      <Badge variant="outline">{currentCellData.serviceType}</Badge>
                    </div>
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Orario Servizio</span>
                      <span className="text-sm font-medium">{currentCellData.serviceStartTime} - {currentCellData.serviceEndTime}</span>
                    </div>
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Ore Richieste</span>
                      <span className="text-sm font-bold">{currentCellData.serviceHours}h</span>
                    </div>
                  </div>
                )}
                <div className="grid grid-cols-2 gap-4">
                  <div>
                    <p className="text-sm text-muted-foreground">Turni Pianificati</p>
                    <p className="text-2xl font-bold">{currentCellData?.shiftsCount || 0}</p>
                  </div>
                  <div>
                    <p className="text-sm text-muted-foreground">Ore Assegnate</p>
                    <p className="text-2xl font-bold">{currentCellData?.totalShiftHours || 0}h</p>
                  </div>
                </div>
                {/* Guardie mancanti */}
                {currentCellData && currentCellData.missingGuards > 0 && (
                  <div className="p-4 bg-destructive/10 border border-destructive/20 rounded-md">
                    <div className="flex items-center gap-2 text-destructive font-semibold mb-2">
                      <AlertTriangle className="h-5 w-5" />
                      Attenzione: Guardie Mancanti
                    </div>
                    <p className="text-sm">
                      Servono ancora <span className="font-bold">{currentCellData.missingGuards}</span>{" "}
                      {currentCellData.missingGuards === 1 ? "guardia" : "guardie"} per coprire completamente il servizio
                      (calcolato su {currentCellData.totalShiftHours}h con max 9h per guardia e {currentCellData.minGuards} {currentCellData.minGuards === 1 ? "guardia minima" : "guardie minime"} contemporanee)
                    </p>
                  </div>
                )}
                {/* Veicoli */}
                {currentCellData && currentCellData.vehicles.length > 0 && (
                  <div className="space-y-2">
                    <div className="flex items-center gap-2 text-sm font-semibold">
                      <Car className="h-4 w-4" />
                      Veicoli Assegnati ({currentCellData.vehicles.length})
                    </div>
                    <div className="grid gap-2">
                      {currentCellData.vehicles.map((vehicle, idx) => (
                        <div key={idx} className="flex items-center gap-2 p-2 bg-accent/10 rounded-md">
                          <p className="font-medium">{vehicle.licensePlate}</p>
                          <p className="text-sm text-muted-foreground">
                            {vehicle.brand} {vehicle.model}
                          </p>
                        </div>
                      ))}
                    </div>
                  </div>
                )}
                {/* No turni */}
                {selectedCell.data.shiftsCount === 0 && (
                  <div className="text-center py-6 text-muted-foreground">
                    <Calendar className="h-10 w-10 mx-auto mb-3 opacity-50" />
                    <p className="text-sm">Nessun turno pianificato per questa data</p>
                    <p className="text-xs mt-1">Usa il modulo sopra per assegnare la prima guardia</p>
                  </div>
                )}
              </div>
            </div>
          )}
@ -795,6 +1015,97 @@ export default function GeneralPlanning() {
          </DialogFooter>
        </DialogContent>
      </Dialog>
      {/* Dialog conferma forzatura CCNL */}
      <AlertDialog open={!!ccnlConfirmation} onOpenChange={() => setCcnlConfirmation(null)}>
        <AlertDialogContent>
          <AlertDialogHeader>
            <AlertDialogTitle className="flex items-center gap-2">
              <AlertTriangle className="h-5 w-5 text-yellow-600" />
              Superamento Limite CCNL
            </AlertDialogTitle>
            <AlertDialogDescription className="space-y-2">
              <p className="text-foreground font-medium">
                {ccnlConfirmation?.message}
              </p>
              <p className="text-sm">
                Vuoi forzare comunque l'assegnazione? L'operazione verrà registrata e potrai consultarla nei report.
              </p>
            </AlertDialogDescription>
          </AlertDialogHeader>
          <AlertDialogFooter>
            <AlertDialogCancel data-testid="button-cancel-force">Annulla</AlertDialogCancel>
            <AlertDialogAction
              onClick={() => {
                if (ccnlConfirmation) {
                  assignGuardMutation.mutate({
                    ...ccnlConfirmation.data,
                    force: true
                  });
                }
              }}
              data-testid="button-confirm-force"
              className="bg-yellow-600 hover:bg-yellow-700"
            >
              Forza Assegnazione
            </AlertDialogAction>
          </AlertDialogFooter>
        </AlertDialogContent>
      </AlertDialog>
      {/* Dialog conferma copia settimana */}
      <AlertDialog open={showCopyWeekConfirmation} onOpenChange={setShowCopyWeekConfirmation}>
        <AlertDialogContent>
          <AlertDialogHeader>
            <AlertDialogTitle className="flex items-center gap-2">
              <Copy className="h-5 w-5" />
              Copia Turno Settimanale
            </AlertDialogTitle>
            <AlertDialogDescription asChild>
              <div className="space-y-3">
                <p className="text-foreground font-medium">
                  Vuoi copiare tutti i turni della settimana corrente nella settimana successiva?
                </p>
                {planningData && (
                  <div className="space-y-2 bg-muted/30 p-3 rounded-md">
                    <div className="flex items-center justify-between text-sm">
                      <span className="text-muted-foreground">Settimana corrente:</span>
                      <span className="font-medium">
                        {format(new Date(planningData.weekStart), "dd MMM", { locale: it })} -{" "}
                        {format(new Date(planningData.weekEnd), "dd MMM yyyy", { locale: it })}
                      </span>
                    </div>
                    <div className="flex items-center justify-between text-sm">
                      <span className="text-muted-foreground">Verrà copiata in:</span>
                      <span className="font-medium">
                        {format(addWeeks(new Date(planningData.weekStart), 1), "dd MMM", { locale: it })} -{" "}
                        {format(addWeeks(new Date(planningData.weekEnd), 1), "dd MMM yyyy", { locale: it })}
                      </span>
                    </div>
                    <div className="flex items-center justify-between text-sm">
                      <span className="text-muted-foreground">Sede:</span>
                      <span className="font-medium">{formatLocation(selectedLocation)}</span>
                    </div>
                  </div>
                )}
                <p className="text-sm text-muted-foreground">
                  Tutti i turni e le assegnazioni guardie verranno duplicati con le stesse caratteristiche (orari, dotazioni, veicoli).
                </p>
              </div>
            </AlertDialogDescription>
          </AlertDialogHeader>
          <AlertDialogFooter>
            <AlertDialogCancel data-testid="button-cancel-copy-week">Annulla</AlertDialogCancel>
            <AlertDialogAction
              onClick={() => copyWeekMutation.mutate()}
              data-testid="button-confirm-copy-week"
              disabled={copyWeekMutation.isPending}
            >
              {copyWeekMutation.isPending ? "Copia in corso..." : "Conferma Copia"}
            </AlertDialogAction>
          </AlertDialogFooter>
        </AlertDialogContent>
      </AlertDialog>
    </div>
  );
 }
--- a/client/src/pages/my-shifts-fixed.tsx
+++ b/client/src/pages/my-shifts-fixed.tsx
@ -0,0 +1,244 @@
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Calendar, MapPin, Clock, Shield, Car, ChevronLeft, ChevronRight } from "lucide-react";
 import { format, addDays, startOfWeek, parseISO, isValid } from "date-fns";
 import { it } from "date-fns/locale";
 interface ShiftAssignment {
  id: string;
  shiftId: string;
  plannedStartTime: string;
  plannedEndTime: string;
  armed: boolean;
  vehicleId: string | null;
  vehiclePlate: string | null;
  site: {
    id: string;
    name: string;
    address: string;
    location: string;
  };
  shift: {
    shiftDate: string;
    startTime: string;
    endTime: string;
  };
 }
 export default function MyShiftsFixed() {
  // Data iniziale: inizio settimana corrente
  const [currentWeekStart, setCurrentWeekStart] = useState(() => {
    const today = new Date();
    return startOfWeek(today, { weekStartsOn: 1 });
  });
  // Query per recuperare i turni fissi della guardia loggata
  const { data: user } = useQuery<any>({
    queryKey: ["/api/auth/user"],
  });
  const { data: myShifts, isLoading } = useQuery<ShiftAssignment[]>({
    queryKey: ["/api/my-shifts/fixed", currentWeekStart.toISOString()],
    queryFn: async () => {
      const weekEnd = addDays(currentWeekStart, 6);
      const response = await fetch(
        `/api/my-shifts/fixed?startDate=${currentWeekStart.toISOString()}&endDate=${weekEnd.toISOString()}`
      );
      if (!response.ok) throw new Error("Failed to fetch shifts");
      return response.json();
    },
    enabled: !!user,
  });
  // Naviga settimana precedente
  const handlePreviousWeek = () => {
    setCurrentWeekStart(addDays(currentWeekStart, -7));
  };
  // Naviga settimana successiva
  const handleNextWeek = () => {
    setCurrentWeekStart(addDays(currentWeekStart, 7));
  };
  // Raggruppa i turni per giorno
  const shiftsByDay = myShifts?.reduce((acc, shift) => {
    const date = shift.shift.shiftDate;
    if (!acc[date]) acc[date] = [];
    acc[date].push(shift);
    return acc;
  }, {} as Record<string, ShiftAssignment[]>) || {};
  // Genera array di 7 giorni della settimana
  const weekDays = Array.from({ length: 7 }, (_, i) => addDays(currentWeekStart, i));
  const locationLabels: Record<string, string> = {
    roccapiemonte: "Roccapiemonte",
    milano: "Milano",
    roma: "Roma",
  };
  return (
    <div className="h-full flex flex-col p-6 space-y-6">
      {/* Header */}
      <div className="flex items-center justify-between">
        <div>
          <h1 className="text-3xl font-bold" data-testid="title-my-shifts-fixed">
            I Miei Turni Fissi
          </h1>
          <p className="text-sm text-muted-foreground">
            Visualizza i tuoi turni con orari e dotazioni operative
          </p>
        </div>
      </div>
      {/* Navigazione settimana */}
      <Card>
        <CardHeader>
          <div className="flex items-center justify-between">
            <Button
              variant="outline"
              size="sm"
              onClick={handlePreviousWeek}
              data-testid="button-prev-week"
            >
              <ChevronLeft className="h-4 w-4 mr-1" />
              Settimana Precedente
            </Button>
            <CardTitle className="text-center">
              {format(currentWeekStart, "dd MMMM", { locale: it })} -{" "}
              {format(addDays(currentWeekStart, 6), "dd MMMM yyyy", { locale: it })}
            </CardTitle>
            <Button
              variant="outline"
              size="sm"
              onClick={handleNextWeek}
              data-testid="button-next-week"
            >
              Settimana Successiva
              <ChevronRight className="h-4 w-4 ml-1" />
            </Button>
          </div>
        </CardHeader>
      </Card>
      {/* Loading state */}
      {isLoading && (
        <Card>
          <CardContent className="py-12 text-center text-muted-foreground">
            Caricamento turni...
          </CardContent>
        </Card>
      )}
      {/* Griglia giorni settimana */}
      {!isLoading && (
        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
          {weekDays.map((day) => {
            const dateStr = format(day, "yyyy-MM-dd");
            const dayShifts = shiftsByDay[dateStr] || [];
            return (
              <Card key={dateStr} data-testid={`day-card-${dateStr}`}>
                <CardHeader className="pb-3">
                  <CardTitle className="text-lg">
                    {format(day, "EEEE dd/MM", { locale: it })}
                  </CardTitle>
                  <CardDescription>
                    {dayShifts.length === 0
                      ? "Nessun turno"
                      : `${dayShifts.length} turno${dayShifts.length > 1 ? "i" : ""}`}
                  </CardDescription>
                </CardHeader>
                <CardContent className="space-y-3">
                  {dayShifts.length === 0 ? (
                    <div className="text-center py-4 text-sm text-muted-foreground">
                      Riposo
                    </div>
                  ) : (
                    dayShifts.map((shift) => {
                      // Parsing sicuro orari (DB in UTC → visualizza in Europe/Rome)
                      let startTime = "N/A";
                      let endTime = "N/A";
                      if (shift.plannedStartTime) {
                        const parsedStart = new Date(shift.plannedStartTime);
                        if (isValid(parsedStart)) {
                          startTime = parsedStart.toLocaleTimeString("it-IT", {
                            hour: "2-digit",
                            minute: "2-digit",
                            hour12: false,
                            timeZone: "Europe/Rome"
                          });
                        }
                      }
                      if (shift.plannedEndTime) {
                        const parsedEnd = new Date(shift.plannedEndTime);
                        if (isValid(parsedEnd)) {
                          endTime = parsedEnd.toLocaleTimeString("it-IT", {
                            hour: "2-digit",
                            minute: "2-digit",
                            hour12: false,
                            timeZone: "Europe/Rome"
                          });
                        }
                      }
                      return (
                        <div
                          key={shift.id}
                          className="border rounded-lg p-3 space-y-2"
                          data-testid={`shift-${shift.id}`}
                        >
                          <div className="flex items-start justify-between gap-2">
                            <div className="flex-1 space-y-1">
                              <p className="font-semibold text-sm">{shift.site.name}</p>
                              <div className="flex items-center gap-1 text-xs text-muted-foreground">
                                <MapPin className="h-3 w-3" />
                                <span>{locationLabels[shift.site.location] || shift.site.location}</span>
                              </div>
                            </div>
                          </div>
                          <div className="flex items-center gap-1 text-sm">
                            <Clock className="h-4 w-4 text-muted-foreground" />
                            <span className="font-medium">
                              {startTime} - {endTime}
                            </span>
                          </div>
                          {/* Dotazioni */}
                          <div className="flex gap-2 flex-wrap">
                            {shift.armed && (
                              <Badge variant="outline" className="text-xs">
                                <Shield className="h-3 w-3 mr-1" />
                                Armato
                              </Badge>
                            )}
                            {shift.vehicleId && (
                              <Badge variant="outline" className="text-xs">
                                <Car className="h-3 w-3 mr-1" />
                                {shift.vehiclePlate || "Automezzo"}
                              </Badge>
                            )}
                          </div>
                          <div className="pt-1 border-t text-xs text-muted-foreground">
                            {shift.site.address}
                          </div>
                        </div>
                      );
                    })
                  )}
                </CardContent>
              </Card>
            );
          })}
        </div>
      )}
    </div>
  );
 }
--- a/client/src/pages/my-shifts-mobile.tsx
+++ b/client/src/pages/my-shifts-mobile.tsx
@ -0,0 +1,247 @@
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Calendar, MapPin, Navigation, ChevronLeft, ChevronRight } from "lucide-react";
 import { format, addDays, startOfWeek, parseISO, isValid } from "date-fns";
 import { it } from "date-fns/locale";
 interface PatrolRouteStop {
  siteId: string;
  siteName: string;
  siteAddress: string;
  sequenceOrder: number;
  latitude: string | null;
  longitude: string | null;
 }
 interface PatrolRoute {
  id: string;
  shiftDate: string;
  startTime: string;
  endTime: string;
  location: string;
  status: string;
  vehicleId: string | null;
  vehiclePlate: string | null;
  stops: PatrolRouteStop[];
 }
 export default function MyShiftsMobile() {
  // Data iniziale: inizio settimana corrente
  const [currentWeekStart, setCurrentWeekStart] = useState(() => {
    const today = new Date();
    return startOfWeek(today, { weekStartsOn: 1 });
  });
  // Query per recuperare i turni mobile della guardia loggata
  const { data: user } = useQuery<any>({
    queryKey: ["/api/auth/user"],
  });
  const { data: myRoutes, isLoading } = useQuery<PatrolRoute[]>({
    queryKey: ["/api/my-shifts/mobile", currentWeekStart.toISOString()],
    queryFn: async () => {
      const weekEnd = addDays(currentWeekStart, 6);
      const response = await fetch(
        `/api/my-shifts/mobile?startDate=${currentWeekStart.toISOString()}&endDate=${weekEnd.toISOString()}`
      );
      if (!response.ok) throw new Error("Failed to fetch patrol routes");
      return response.json();
    },
    enabled: !!user,
  });
  // Naviga settimana precedente
  const handlePreviousWeek = () => {
    setCurrentWeekStart(addDays(currentWeekStart, -7));
  };
  // Naviga settimana successiva
  const handleNextWeek = () => {
    setCurrentWeekStart(addDays(currentWeekStart, 7));
  };
  // Raggruppa i patrol routes per giorno
  const routesByDay = myRoutes?.reduce((acc, route) => {
    const date = route.shiftDate;
    if (!acc[date]) acc[date] = [];
    acc[date].push(route);
    return acc;
  }, {} as Record<string, PatrolRoute[]>) || {};
  // Genera array di 7 giorni della settimana
  const weekDays = Array.from({ length: 7 }, (_, i) => addDays(currentWeekStart, i));
  const locationLabels: Record<string, string> = {
    roccapiemonte: "Roccapiemonte",
    milano: "Milano",
    roma: "Roma",
  };
  const statusLabels: Record<string, string> = {
    planned: "Pianificato",
    in_progress: "In Corso",
    completed: "Completato",
    cancelled: "Annullato",
  };
  const statusColors: Record<string, string> = {
    planned: "bg-blue-500/10 text-blue-500 border-blue-500/20",
    in_progress: "bg-green-500/10 text-green-500 border-green-500/20",
    completed: "bg-gray-500/10 text-gray-500 border-gray-500/20",
    cancelled: "bg-red-500/10 text-red-500 border-red-500/20",
  };
  return (
    <div className="h-full flex flex-col p-6 space-y-6">
      {/* Header */}
      <div className="flex items-center justify-between">
        <div>
          <h1 className="text-3xl font-bold" data-testid="title-my-shifts-mobile">
            I Miei Turni Pattuglia
          </h1>
          <p className="text-sm text-muted-foreground">
            Visualizza i tuoi percorsi di pattuglia con sequenza tappe
          </p>
        </div>
      </div>
      {/* Navigazione settimana */}
      <Card>
        <CardHeader>
          <div className="flex items-center justify-between">
            <Button
              variant="outline"
              size="sm"
              onClick={handlePreviousWeek}
              data-testid="button-prev-week"
            >
              <ChevronLeft className="h-4 w-4 mr-1" />
              Settimana Precedente
            </Button>
            <CardTitle className="text-center">
              {format(currentWeekStart, "dd MMMM", { locale: it })} -{" "}
              {format(addDays(currentWeekStart, 6), "dd MMMM yyyy", { locale: it })}
            </CardTitle>
            <Button
              variant="outline"
              size="sm"
              onClick={handleNextWeek}
              data-testid="button-next-week"
            >
              Settimana Successiva
              <ChevronRight className="h-4 w-4 ml-1" />
            </Button>
          </div>
        </CardHeader>
      </Card>
      {/* Loading state */}
      {isLoading && (
        <Card>
          <CardContent className="py-12 text-center text-muted-foreground">
            Caricamento turni pattuglia...
          </CardContent>
        </Card>
      )}
      {/* Griglia giorni settimana */}
      {!isLoading && (
        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
          {weekDays.map((day) => {
            const dateStr = format(day, "yyyy-MM-dd");
            const dayRoutes = routesByDay[dateStr] || [];
            return (
              <Card key={dateStr} data-testid={`day-card-${dateStr}`}>
                <CardHeader className="pb-3">
                  <CardTitle className="text-lg">
                    {format(day, "EEEE dd/MM", { locale: it })}
                  </CardTitle>
                  <CardDescription>
                    {dayRoutes.length === 0
                      ? "Nessuna pattuglia"
                      : `${dayRoutes.length} pattuglia${dayRoutes.length > 1 ? "e" : ""}`}
                  </CardDescription>
                </CardHeader>
                <CardContent className="space-y-3">
                  {dayRoutes.length === 0 ? (
                    <div className="text-center py-4 text-sm text-muted-foreground">
                      Riposo
                    </div>
                  ) : (
                    dayRoutes.map((route) => (
                      <div
                        key={route.id}
                        className="border rounded-lg p-3 space-y-3"
                        data-testid={`patrol-route-${route.id}`}
                      >
                        {/* Header pattuglia */}
                        <div className="flex items-start justify-between gap-2">
                          <div className="flex-1 space-y-1">
                            <div className="flex items-center gap-2">
                              <Navigation className="h-4 w-4 text-muted-foreground" />
                              <span className="font-semibold text-sm">
                                Pattuglia {locationLabels[route.location]}
                              </span>
                            </div>
                            <div className="flex items-center gap-1 text-xs text-muted-foreground">
                              <MapPin className="h-3 w-3" />
                              <span>{route.stops.length} tappe</span>
                            </div>
                          </div>
                          <Badge 
                            variant="outline" 
                            className={statusColors[route.status] || ""}
                          >
                            {statusLabels[route.status] || route.status}
                          </Badge>
                        </div>
                        {/* Sequenza tappe */}
                        <div className="space-y-2 pl-4 border-l-2 border-muted">
                          {route.stops
                            .sort((a, b) => a.sequenceOrder - b.sequenceOrder)
                            .map((stop, index) => (
                              <div
                                key={stop.siteId}
                                className="space-y-1"
                                data-testid={`stop-${index}`}
                              >
                                <div className="flex items-start gap-2">
                                  <Badge className="bg-green-600 h-5 w-5 p-0 flex items-center justify-center text-xs">
                                    {stop.sequenceOrder}
                                  </Badge>
                                  <div className="flex-1 space-y-0.5">
                                    <p className="text-sm font-medium leading-tight">
                                      {stop.siteName}
                                    </p>
                                    <p className="text-xs text-muted-foreground leading-tight">
                                      {stop.siteAddress}
                                    </p>
                                  </div>
                                </div>
                              </div>
                            ))}
                        </div>
                        {/* Info veicolo */}
                        {route.vehiclePlate && (
                          <div className="pt-2 border-t text-xs text-muted-foreground">
                            Automezzo: {route.vehiclePlate}
                          </div>
                        )}
                      </div>
                    ))
                  )}
                </CardContent>
              </Card>
            );
          })}
        </div>
      )}
    </div>
  );
 }
--- a/client/src/pages/planning-mobile.tsx
+++ b/client/src/pages/planning-mobile.tsx
--- a/client/src/pages/reports.tsx
+++ b/client/src/pages/reports.tsx
@ -1,227 +1,619 @@
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { ShiftWithDetails, Guard } from "@shared/schema";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
-import { BarChart3, Users, Clock, Calendar, TrendingUp } from "lucide-react";
+import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Button } from "@/components/ui/button";
 import { Skeleton } from "@/components/ui/skeleton";
-import { differenceInHours, format, startOfMonth, endOfMonth } from "date-fns";
+import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 import { Badge } from "@/components/ui/badge";
 import { Download, Users, Building2, Clock, TrendingUp } from "lucide-react";
 import { format } from "date-fns";
 import { it } from "date-fns/locale";
-export default function Reports() {
+type Location = "roccapiemonte" | "milano" | "roma";
  const { data: shifts, isLoading: shiftsLoading } = useQuery<ShiftWithDetails[]>({
    queryKey: ["/api/shifts"],
  });
-  const { data: guards, isLoading: guardsLoading } = useQuery<Guard[]>({
+interface GuardReport {
-    queryKey: ["/api/guards"],
+  guardId: string;
-  });
+  guardName: string;
-
+  badgeNumber: string;
-  const isLoading = shiftsLoading || guardsLoading;
+  ordinaryHours: number;
-
+  overtimeHours: number;
-  // Calculate statistics
+  totalHours: number;
-  const completedShifts = shifts?.filter(s => s.status === "completed") || [];
+  mealVouchers: number;
-  const totalHours = completedShifts.reduce((acc, shift) => {
+  workingDays: number;
    return acc + differenceInHours(new Date(shift.endTime), new Date(shift.startTime));
  }, 0);
  // Hours per guard
  const hoursPerGuard: Record<string, { name: string; hours: number }> = {};
  completedShifts.forEach(shift => {
    shift.assignments.forEach(assignment => {
      const guardId = assignment.guardId;
      const guardName = `${assignment.guard.user?.firstName || ""} ${assignment.guard.user?.lastName || ""}`.trim();
      const hours = differenceInHours(new Date(shift.endTime), new Date(shift.startTime));
      if (!hoursPerGuard[guardId]) {
        hoursPerGuard[guardId] = { name: guardName, hours: 0 };
 }
-      hoursPerGuard[guardId].hours += hours;
+
-    });
+interface SiteReport {
  siteId: string;
  siteName: string;
  serviceTypes: {
    name: string;
    hours: number;
    shifts: number;
  }[];
  totalHours: number;
  totalShifts: number;
 }
 interface CustomerReport {
  customerId: string;
  customerName: string;
  sites: {
    siteId: string;
    siteName: string;
    serviceTypes: {
      name: string;
      hours: number;
      shifts: number;
      passages: number;
      inspections: number;
      interventions: number;
    }[];
    totalHours: number;
    totalShifts: number;
  }[];
  totalHours: number;
  totalShifts: number;
  totalPatrolPassages: number;
  totalInspections: number;
  totalInterventions: number;
 }
 export default function Reports() {
  const [selectedLocation, setSelectedLocation] = useState<Location>("roccapiemonte");
  const [selectedMonth, setSelectedMonth] = useState<string>(format(new Date(), "yyyy-MM"));
  // Query per report guardie
  const { data: guardReport, isLoading: isLoadingGuards } = useQuery<{
    month: string;
    location: string;
    guards: GuardReport[];
    summary: {
      totalGuards: number;
      totalOrdinaryHours: number;
      totalOvertimeHours: number;
      totalHours: number;
      totalMealVouchers: number;
    };
  }>({
    queryKey: ["/api/reports/monthly-guard-hours", selectedMonth, selectedLocation],
    queryFn: async () => {
      const response = await fetch(`/api/reports/monthly-guard-hours?month=${selectedMonth}&location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch guard report");
      return response.json();
    },
  });
-  const guardStats = Object.values(hoursPerGuard).sort((a, b) => b.hours - a.hours);
+  // Query per report siti
-
+  const { data: siteReport, isLoading: isLoadingSites } = useQuery<{
-  // Monthly statistics
+    month: string;
-  const currentMonth = new Date();
+    location: string;
-  const monthStart = startOfMonth(currentMonth);
+    sites: SiteReport[];
-  const monthEnd = endOfMonth(currentMonth);
+    summary: {
-  
+      totalSites: number;
-  const monthlyShifts = completedShifts.filter(s => {
+      totalHours: number;
-    const shiftDate = new Date(s.startTime);
+      totalShifts: number;
-    return shiftDate >= monthStart && shiftDate <= monthEnd;
+    };
  }>({
    queryKey: ["/api/reports/billable-site-hours", selectedMonth, selectedLocation],
    queryFn: async () => {
      const response = await fetch(`/api/reports/billable-site-hours?month=${selectedMonth}&location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch site report");
      return response.json();
    },
  });
-  const monthlyHours = monthlyShifts.reduce((acc, shift) => {
+  // Query per report clienti
-    return acc + differenceInHours(new Date(shift.endTime), new Date(shift.startTime));
+  const { data: customerReport, isLoading: isLoadingCustomers } = useQuery<{
-  }, 0);
+    month: string;
    location: string;
    customers: CustomerReport[];
    summary: {
      totalCustomers: number;
      totalHours: number;
      totalShifts: number;
      totalPatrolPassages: number;
      totalInspections: number;
      totalInterventions: number;
    };
  }>({
    queryKey: ["/api/reports/customer-billing", selectedMonth, selectedLocation],
    queryFn: async () => {
      const response = await fetch(`/api/reports/customer-billing?month=${selectedMonth}&location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch customer report");
      return response.json();
    },
  });
  // Genera mesi disponibili (ultimi 12 mesi)
  const availableMonths = Array.from({ length: 12 }, (_, i) => {
    const date = new Date();
    date.setMonth(date.getMonth() - i);
    return format(date, "yyyy-MM");
  });
  // Export CSV guardie
  const exportGuardsCSV = () => {
    if (!guardReport?.guards) return;
    const headers = "Guardia,Badge,Ore Ordinarie,Ore Straordinarie,Ore Totali,Buoni Pasto,Giorni Lavorativi\n";
    const rows = guardReport.guards.map(g => 
      `"${g.guardName}",${g.badgeNumber},${g.ordinaryHours},${g.overtimeHours},${g.totalHours},${g.mealVouchers},${g.workingDays}`
    ).join("\n");
    const csv = headers + rows;
    const blob = new Blob([csv], { type: "text/csv" });
    const url = URL.createObjectURL(blob);
    const a = document.createElement("a");
    a.href = url;
    a.download = `ore_guardie_${selectedMonth}_${selectedLocation}.csv`;
    a.click();
  };
  // Export CSV siti
  const exportSitesCSV = () => {
    if (!siteReport?.sites) return;
    const headers = "Sito,Tipologia Servizio,Ore,Turni\n";
    const rows = siteReport.sites.flatMap(s => 
      s.serviceTypes.map(st => 
        `"${s.siteName}","${st.name}",${st.hours},${st.shifts}`
      )
    ).join("\n");
    const csv = headers + rows;
    const blob = new Blob([csv], { type: "text/csv" });
    const url = URL.createObjectURL(blob);
    const a = document.createElement("a");
    a.href = url;
    a.download = `ore_siti_${selectedMonth}_${selectedLocation}.csv`;
    a.click();
  };
  // Export CSV clienti
  const exportCustomersCSV = () => {
    if (!customerReport?.customers) return;
    const headers = "Cliente,Sito,Tipologia Servizio,Ore,Turni,Passaggi,Ispezioni,Interventi\n";
    const rows = customerReport.customers.flatMap(c => 
      c.sites.flatMap(s => 
        s.serviceTypes.map(st => 
          `"${c.customerName}","${s.siteName}","${st.name}",${st.hours},${st.shifts},${st.passages},${st.inspections},${st.interventions}`
        )
      )
    ).join("\n");
    const csv = headers + rows;
    const blob = new Blob([csv], { type: "text/csv" });
    const url = URL.createObjectURL(blob);
    const a = document.createElement("a");
    a.href = url;
    a.download = `fatturazione_clienti_${selectedMonth}_${selectedLocation}.csv`;
    a.click();
  };
  return (
-    <div className="space-y-6">
+    <div className="h-full overflow-auto p-6 space-y-6">
      {/* Header */}
      <div>
-        <h1 className="text-3xl font-semibold mb-2">Report e Statistiche</h1>
+        <h1 className="text-3xl font-bold">Report e Export</h1>
        <p className="text-muted-foreground">
-          Ore lavorate e copertura servizi
+          Ore lavorate, buoni pasto e fatturazione
        </p>
      </div>
-      {isLoading ? (
+      {/* Filtri */}
-        <div className="grid gap-4 md:grid-cols-3">
+      <Card>
-          <Skeleton className="h-32" />
+        <CardContent className="pt-6">
-          <Skeleton className="h-32" />
+          <div className="flex flex-wrap items-center gap-4">
-          <Skeleton className="h-32" />
+            <div className="flex-1 min-w-[200px]">
              <label className="text-sm font-medium mb-2 block">Sede</label>
              <Select value={selectedLocation} onValueChange={(v) => setSelectedLocation(v as Location)}>
                <SelectTrigger data-testid="select-location">
                  <SelectValue />
                </SelectTrigger>
                <SelectContent>
                  <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
                  <SelectItem value="milano">Milano</SelectItem>
                  <SelectItem value="roma">Roma</SelectItem>
                </SelectContent>
              </Select>
            </div>
-      ) : (
+
            <div className="flex-1 min-w-[200px]">
              <label className="text-sm font-medium mb-2 block">Mese</label>
              <Select value={selectedMonth} onValueChange={setSelectedMonth}>
                <SelectTrigger data-testid="select-month">
                  <SelectValue />
                </SelectTrigger>
                <SelectContent>
                  {availableMonths.map(month => {
                    const [year, monthNum] = month.split("-");
                    const date = new Date(parseInt(year), parseInt(monthNum) - 1);
                    return (
                      <SelectItem key={month} value={month}>
                        {format(date, "MMMM yyyy", { locale: it })}
                      </SelectItem>
                    );
                  })}
                </SelectContent>
              </Select>
            </div>
          </div>
        </CardContent>
      </Card>
      {/* Tabs Report */}
      <Tabs defaultValue="guards" className="space-y-6">
        <TabsList className="grid w-full max-w-[600px] grid-cols-3">
          <TabsTrigger value="guards" data-testid="tab-guard-report">
            <Users className="h-4 w-4 mr-2" />
            Report Guardie
          </TabsTrigger>
          <TabsTrigger value="sites" data-testid="tab-site-report">
            <Building2 className="h-4 w-4 mr-2" />
            Report Siti
          </TabsTrigger>
          <TabsTrigger value="customers" data-testid="tab-customer-report">
            <Building2 className="h-4 w-4 mr-2" />
            Report Clienti
          </TabsTrigger>
        </TabsList>
        {/* Tab Report Guardie */}
        <TabsContent value="guards" className="space-y-4">
          {isLoadingGuards ? (
            <div className="space-y-4">
              <Skeleton className="h-32 w-full" />
              <Skeleton className="h-64 w-full" />
            </div>
          ) : guardReport ? (
            <>
-          {/* Summary Cards */}
+              {/* Summary cards */}
-          <div className="grid gap-4 md:grid-cols-3">
+              <div className="grid gap-4 md:grid-cols-4">
            <Card>
              <CardHeader className="pb-3">
                <CardDescription className="flex items-center gap-2">
                  <Clock className="h-4 w-4" />
                  Ore Totali Lavorate
                </CardDescription>
              </CardHeader>
              <CardContent>
                <p className="text-3xl font-semibold" data-testid="text-total-hours">
                  {totalHours}h
                </p>
                <p className="text-xs text-muted-foreground mt-1">
                  {completedShifts.length} turni completati
                </p>
              </CardContent>
            </Card>
            <Card>
              <CardHeader className="pb-3">
                <CardDescription className="flex items-center gap-2">
                  <Calendar className="h-4 w-4" />
                  Ore Mese Corrente
                </CardDescription>
              </CardHeader>
              <CardContent>
                <p className="text-3xl font-semibold" data-testid="text-monthly-hours">
                  {monthlyHours}h
                </p>
                <p className="text-xs text-muted-foreground mt-1">
                  {format(currentMonth, "MMMM yyyy", { locale: it })}
                </p>
              </CardContent>
            </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <Users className="h-4 w-4" />
-                  Guardie Attive
+                      Guardie
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
-                <p className="text-3xl font-semibold" data-testid="text-active-guards">
+                    <p className="text-2xl font-semibold">{guardReport.summary.totalGuards}</p>
-                  {guardStats.length}
+                  </CardContent>
-                </p>
+                </Card>
-                <p className="text-xs text-muted-foreground mt-1">
+
-                  Con turni completati
+                <Card>
-                </p>
+                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <Clock className="h-4 w-4" />
                      Ore Ordinarie
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{guardReport.summary.totalOrdinaryHours}h</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <TrendingUp className="h-4 w-4" />
                      Ore Straordinarie
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{guardReport.summary.totalOvertimeHours}h</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription>Buoni Pasto</CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{guardReport.summary.totalMealVouchers}</p>
                  </CardContent>
                </Card>
              </div>
-          {/* Hours per Guard */}
+              {/* Tabella guardie */}
              <Card>
                <CardHeader>
-              <CardTitle className="flex items-center gap-2">
+                  <div className="flex items-center justify-between">
-                <BarChart3 className="h-5 w-5" />
+                    <div>
-                Ore per Guardia
+                      <CardTitle>Dettaglio Ore per Guardia</CardTitle>
-              </CardTitle>
+                      <CardDescription>Ordinarie, straordinarie e buoni pasto</CardDescription>
-              <CardDescription>
+                    </div>
-                Ore totali lavorate per ogni guardia
+                    <Button onClick={exportGuardsCSV} data-testid="button-export-guards">
-              </CardDescription>
+                      <Download className="h-4 w-4 mr-2" />
                      Export CSV
                    </Button>
                  </div>
                </CardHeader>
                <CardContent>
-              {guardStats.length > 0 ? (
+                  {guardReport.guards.length > 0 ? (
-                <div className="space-y-3">
+                    <div className="overflow-x-auto">
-                  {guardStats.map((stat, index) => (
+                      <table className="w-full">
-                    <div
+                        <thead>
-                      key={index}
+                          <tr className="border-b">
-                      className="flex items-center gap-4"
+                            <th className="text-left p-3 font-medium">Guardia</th>
-                      data-testid={`guard-stat-${index}`}
+                            <th className="text-left p-3 font-medium">Badge</th>
-                    >
+                            <th className="text-right p-3 font-medium">Ore Ord.</th>
-                      <div className="flex-1 min-w-0">
+                            <th className="text-right p-3 font-medium">Ore Strao.</th>
-                        <p className="font-medium truncate">{stat.name}</p>
+                            <th className="text-right p-3 font-medium">Totale</th>
-                        <div className="mt-1 h-2 bg-secondary rounded-full overflow-hidden">
+                            <th className="text-center p-3 font-medium">Buoni Pasto</th>
-                          <div
+                            <th className="text-center p-3 font-medium">Giorni</th>
-                            className="h-full bg-primary"
+                          </tr>
-                            style={{
+                        </thead>
-                              width: `${(stat.hours / (guardStats[0]?.hours || 1)) * 100}%`,
+                        <tbody>
-                            }}
+                          {guardReport.guards.map((guard) => (
-                          />
+                            <tr key={guard.guardId} className="border-b hover:bg-muted/50" data-testid={`guard-row-${guard.guardId}`}>
-                        </div>
+                              <td className="p-3">{guard.guardName}</td>
-                      </div>
+                              <td className="p-3"><Badge variant="outline">{guard.badgeNumber}</Badge></td>
-                      <div className="text-right">
+                              <td className="p-3 text-right font-mono">{guard.ordinaryHours}h</td>
-                        <p className="text-lg font-semibold font-mono">{stat.hours}h</p>
+                              <td className="p-3 text-right font-mono text-orange-600 dark:text-orange-500">
-                      </div>
+                                {guard.overtimeHours > 0 ? `${guard.overtimeHours}h` : "-"}
-                    </div>
+                              </td>
                              <td className="p-3 text-right font-mono font-semibold">{guard.totalHours}h</td>
                              <td className="p-3 text-center">{guard.mealVouchers}</td>
                              <td className="p-3 text-center text-muted-foreground">{guard.workingDays}</td>
                            </tr>
                          ))}
                        </tbody>
                      </table>
                    </div>
                  ) : (
-                <div className="text-center py-8">
+                    <p className="text-center text-muted-foreground py-8">Nessuna guardia con ore lavorate</p>
                  <BarChart3 className="h-12 w-12 text-muted-foreground mx-auto mb-3" />
                  <p className="text-sm text-muted-foreground">
                    Nessun dato disponibile
                  </p>
                </div>
              )}
            </CardContent>
          </Card>
          {/* Recent Shifts Summary */}
          <Card>
            <CardHeader>
              <CardTitle className="flex items-center gap-2">
                <TrendingUp className="h-5 w-5" />
                Turni Recenti
              </CardTitle>
              <CardDescription>
                Ultimi turni completati
              </CardDescription>
            </CardHeader>
            <CardContent>
              {completedShifts.length > 0 ? (
                <div className="space-y-3">
                  {completedShifts.slice(0, 5).map((shift) => (
                    <div
                      key={shift.id}
                      className="flex items-center justify-between p-3 rounded-md border"
                      data-testid={`recent-shift-${shift.id}`}
                    >
                      <div className="flex-1 min-w-0">
                        <p className="font-medium truncate">{shift.site.name}</p>
                        <p className="text-sm text-muted-foreground">
                          {format(new Date(shift.startTime), "dd MMM yyyy", { locale: it })}
                        </p>
                      </div>
                      <div className="text-right">
                        <p className="font-mono text-sm">
                          {differenceInHours(new Date(shift.endTime), new Date(shift.startTime))}h
                        </p>
                        <p className="text-xs text-muted-foreground">
                          {shift.assignments.length} guardie
                        </p>
                      </div>
                    </div>
                  ))}
                </div>
              ) : (
                <div className="text-center py-8">
                  <Calendar className="h-12 w-12 text-muted-foreground mx-auto mb-3" />
                  <p className="text-sm text-muted-foreground">
                    Nessun turno completato
                  </p>
                </div>
                  )}
                </CardContent>
              </Card>
            </>
          ) : null}
        </TabsContent>
        {/* Tab Report Siti */}
        <TabsContent value="sites" className="space-y-4">
          {isLoadingSites ? (
            <div className="space-y-4">
              <Skeleton className="h-32 w-full" />
              <Skeleton className="h-64 w-full" />
            </div>
          ) : siteReport ? (
            <>
              {/* Summary cards */}
              <div className="grid gap-4 md:grid-cols-3">
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <Building2 className="h-4 w-4" />
                      Siti Attivi
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{siteReport.summary.totalSites}</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <Clock className="h-4 w-4" />
                      Ore Fatturabili
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{siteReport.summary.totalHours}h</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription>Turni Totali</CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{siteReport.summary.totalShifts}</p>
                  </CardContent>
                </Card>
              </div>
              {/* Tabella siti */}
              <Card>
                <CardHeader>
                  <div className="flex items-center justify-between">
                    <div>
                      <CardTitle>Ore Fatturabili per Sito</CardTitle>
                      <CardDescription>Raggruppate per tipologia servizio</CardDescription>
                    </div>
                    <Button onClick={exportSitesCSV} data-testid="button-export-sites">
                      <Download className="h-4 w-4 mr-2" />
                      Export CSV
                    </Button>
                  </div>
                </CardHeader>
                <CardContent>
                  {siteReport.sites.length > 0 ? (
                    <div className="space-y-4">
                      {siteReport.sites.map((site) => (
                        <div key={site.siteId} className="border rounded-md p-4" data-testid={`site-report-${site.siteId}`}>
                          <div className="flex items-center justify-between mb-3">
                            <h3 className="font-semibold text-lg">{site.siteName}</h3>
                            <div className="flex items-center gap-2">
                              <Badge>{site.totalHours}h totali</Badge>
                              <Badge variant="outline">{site.totalShifts} turni</Badge>
                            </div>
                          </div>
                          <div className="space-y-2">
                            {site.serviceTypes.map((st, idx) => (
                              <div key={idx} className="flex items-center justify-between text-sm p-2 rounded bg-muted/50">
                                <span>{st.name}</span>
                                <div className="flex items-center gap-4">
                                  <span className="text-muted-foreground">{st.shifts} turni</span>
                                  <span className="font-mono font-semibold">{st.hours}h</span>
                                </div>
                              </div>
                            ))}
                          </div>
                        </div>
                      ))}
                    </div>
                  ) : (
                    <p className="text-center text-muted-foreground py-8">Nessun sito con ore fatturabili</p>
                  )}
                </CardContent>
              </Card>
            </>
          ) : null}
        </TabsContent>
        {/* Tab Report Clienti */}
        <TabsContent value="customers" className="space-y-4">
          {isLoadingCustomers ? (
            <div className="space-y-4">
              <Skeleton className="h-32 w-full" />
              <Skeleton className="h-64 w-full" />
            </div>
          ) : customerReport ? (
            <>
              {/* Summary cards */}
              <div className="grid gap-4 md:grid-cols-5">
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <Building2 className="h-4 w-4" />
                      Clienti
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{customerReport.summary.totalCustomers}</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription className="flex items-center gap-2">
                      <Clock className="h-4 w-4" />
                      Ore Totali
                    </CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{customerReport.summary.totalHours}h</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription>Passaggi</CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{customerReport.summary.totalPatrolPassages}</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription>Ispezioni</CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{customerReport.summary.totalInspections}</p>
                  </CardContent>
                </Card>
                <Card>
                  <CardHeader className="pb-3">
                    <CardDescription>Interventi</CardDescription>
                  </CardHeader>
                  <CardContent>
                    <p className="text-2xl font-semibold">{customerReport.summary.totalInterventions}</p>
                  </CardContent>
                </Card>
              </div>
              {/* Tabella clienti */}
              <Card>
                <CardHeader>
                  <div className="flex items-center justify-between">
                    <div>
                      <CardTitle>Fatturazione per Cliente</CardTitle>
                      <CardDescription>Dettaglio siti e servizi erogati</CardDescription>
                    </div>
                    <Button onClick={exportCustomersCSV} data-testid="button-export-customers">
                      <Download className="h-4 w-4 mr-2" />
                      Export CSV
                    </Button>
                  </div>
                </CardHeader>
                <CardContent>
                  {customerReport.customers.length > 0 ? (
                    <div className="space-y-6">
                      {customerReport.customers.map((customer) => (
                        <div key={customer.customerId} className="border-2 rounded-lg p-4" data-testid={`customer-report-${customer.customerId}`}>
                          {/* Header Cliente */}
                          <div className="flex items-center justify-between mb-4 pb-3 border-b">
                            <div>
                              <h3 className="font-semibold text-xl">{customer.customerName}</h3>
                              <p className="text-sm text-muted-foreground">{customer.sites.length} siti attivi</p>
                            </div>
                            <div className="flex items-center gap-2">
                              <Badge variant="default" className="text-base px-3 py-1">{customer.totalHours}h totali</Badge>
                              <Badge variant="outline">{customer.totalShifts} turni</Badge>
                              {customer.totalPatrolPassages > 0 && (
                                <Badge variant="secondary">{customer.totalPatrolPassages} passaggi</Badge>
                              )}
                              {customer.totalInspections > 0 && (
                                <Badge variant="secondary">{customer.totalInspections} ispezioni</Badge>
                              )}
                              {customer.totalInterventions > 0 && (
                                <Badge variant="secondary">{customer.totalInterventions} interventi</Badge>
                              )}
                            </div>
                          </div>
                          {/* Lista Siti */}
                          <div className="space-y-3">
                            {customer.sites.map((site) => (
                              <div key={site.siteId} className="bg-muted/30 rounded-md p-3">
                                <div className="flex items-center justify-between mb-2">
                                  <h4 className="font-medium">{site.siteName}</h4>
                                  <div className="flex items-center gap-2">
                                    <Badge variant="outline" className="text-xs">{site.totalHours}h</Badge>
                                    <Badge variant="outline" className="text-xs">{site.totalShifts} turni</Badge>
                                  </div>
                                </div>
                                <div className="space-y-1">
                                  {site.serviceTypes.map((st, idx) => (
                                    <div key={idx} className="flex items-center justify-between text-sm p-2 rounded bg-background">
                                      <span className="text-muted-foreground">{st.name}</span>
                                      <div className="flex items-center gap-3">
                                        {st.hours > 0 && <span className="font-mono">{st.hours}h</span>}
                                        {st.passages > 0 && (
                                          <Badge variant="secondary" className="text-xs">{st.passages} passaggi</Badge>
                                        )}
                                        {st.inspections > 0 && (
                                          <Badge variant="secondary" className="text-xs">{st.inspections} ispezioni</Badge>
                                        )}
                                        {st.interventions > 0 && (
                                          <Badge variant="secondary" className="text-xs">{st.interventions} interventi</Badge>
                                        )}
                                      </div>
                                    </div>
                                  ))}
                                </div>
                              </div>
                            ))}
                          </div>
                        </div>
                      ))}
                    </div>
                  ) : (
                    <p className="text-center text-muted-foreground py-8">Nessun cliente con servizi fatturabili</p>
                  )}
                </CardContent>
              </Card>
            </>
          ) : null}
        </TabsContent>
      </Tabs>
    </div>
  );
 }
--- a/client/src/pages/service-planning.tsx
+++ b/client/src/pages/service-planning.tsx
@ -0,0 +1,451 @@
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { format, addWeeks, addDays, startOfWeek } from "date-fns";
 import { it } from "date-fns/locale";
 import { ChevronLeft, ChevronRight, Users, Building2, Navigation, Shield, Car as CarIcon, MapPin } from "lucide-react";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardHeader, CardTitle } from "@/components/ui/card";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Skeleton } from "@/components/ui/skeleton";
 import { Badge } from "@/components/ui/badge";
 import { Tabs, TabsContent, TabsList, TabsTrigger } from "@/components/ui/tabs";
 type Location = "roccapiemonte" | "milano" | "roma";
 interface FixedShiftDetail {
  shiftId: string;
  date: string;
  from: string;
  to: string;
  siteName: string;
  siteAddress: string;
  siteId: string;
  isArmed: boolean;
  vehicle?: {
    licensePlate: string;
    brand: string;
    model: string;
  };
  hours: number;
 }
 interface FixedGuardSchedule {
  guardId: string;
  guardName: string;
  badgeNumber: string;
  shifts: FixedShiftDetail[];
  totalHours: number;
 }
 interface PatrolRoute {
  routeId: string;
  guardId: string;
  shiftDate: string;
  startTime: string;
  endTime: string;
  isArmedRoute: boolean;
  vehicle?: {
    licensePlate: string;
    brand: string;
    model: string;
  };
  stops: {
    siteId: string;
    siteName: string;
    siteAddress: string;
    sequenceOrder: number;
  }[];
 }
 interface MobileGuardSchedule {
  guardId: string;
  guardName: string;
  badgeNumber: string;
  routes: PatrolRoute[];
  totalRoutes: number;
 }
 interface SiteSchedule {
  siteId: string;
  siteName: string;
  location: string;
  shifts: {
    shiftId: string;
    date: string;
    from: string;
    to: string;
    guards: {
      guardName: string;
      badgeNumber: string;
      hours: number;
      isArmed: boolean;
    }[];
    vehicle?: {
      licensePlate: string;
      brand: string;
      model: string;
    };
    totalGuards: number;
    totalHours: number;
  }[];
  totalShifts: number;
  totalHours: number;
 }
 export default function ServicePlanning() {
  const [selectedLocation, setSelectedLocation] = useState<Location>("roccapiemonte");
  const [weekStart, setWeekStart] = useState<Date>(startOfWeek(new Date(), { weekStartsOn: 1 }));
  const [viewMode, setViewMode] = useState<"guard-fixed" | "guard-mobile" | "site">("guard-fixed");
  const weekStartStr = format(weekStart, "yyyy-MM-dd");
  // Query per vista Agenti Fissi
  const { data: fixedGuardSchedules, isLoading: isLoadingFixedGuards } = useQuery<FixedGuardSchedule[]>({
    queryKey: ["/api/service-planning/guards-fixed", weekStartStr, selectedLocation],
    queryFn: async () => {
      const response = await fetch(`/api/service-planning/guards-fixed?weekStart=${weekStartStr}&location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch fixed guard schedules");
      return response.json();
    },
    enabled: viewMode === "guard-fixed",
  });
  // Query per vista Agenti Mobili
  const { data: mobileGuardSchedules, isLoading: isLoadingMobileGuards } = useQuery<MobileGuardSchedule[]>({
    queryKey: ["/api/service-planning/guards-mobile", weekStartStr, selectedLocation],
    queryFn: async () => {
      const response = await fetch(`/api/service-planning/guards-mobile?weekStart=${weekStartStr}&location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch mobile guard schedules");
      return response.json();
    },
    enabled: viewMode === "guard-mobile",
  });
  // Query per vista Siti
  const { data: siteSchedules, isLoading: isLoadingSites } = useQuery<SiteSchedule[]>({
    queryKey: ["/api/service-planning/by-site", weekStartStr, selectedLocation],
    queryFn: async () => {
      const response = await fetch(`/api/service-planning/by-site?weekStart=${weekStartStr}&location=${selectedLocation}`);
      if (!response.ok) throw new Error("Failed to fetch site schedules");
      return response.json();
    },
    enabled: viewMode === "site",
  });
  const goToPreviousWeek = () => setWeekStart(addWeeks(weekStart, -1));
  const goToNextWeek = () => setWeekStart(addWeeks(weekStart, 1));
  return (
    <div className="h-full overflow-auto p-6 space-y-6">
      {/* Header */}
      <div className="flex items-center justify-between">
        <div>
          <h1 className="text-3xl font-bold">Planning di Servizio</h1>
          <p className="text-muted-foreground">
            Visualizza orari e dotazioni per agente fisso, agente mobile o per sito
          </p>
        </div>
      </div>
      {/* Controlli */}
      <Card>
        <CardContent className="pt-6">
          <div className="flex flex-wrap items-center gap-4">
            {/* Selezione sede */}
            <div className="flex-1 min-w-[200px]">
              <label className="text-sm font-medium mb-2 block">Sede</label>
              <Select value={selectedLocation} onValueChange={(v) => setSelectedLocation(v as Location)}>
                <SelectTrigger data-testid="select-location">
                  <SelectValue />
                </SelectTrigger>
                <SelectContent>
                  <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
                  <SelectItem value="milano">Milano</SelectItem>
                  <SelectItem value="roma">Roma</SelectItem>
                </SelectContent>
              </Select>
            </div>
            {/* Navigazione settimana */}
            <div className="flex-1 min-w-[300px]">
              <label className="text-sm font-medium mb-2 block">Settimana</label>
              <div className="flex items-center gap-2">
                <Button variant="outline" size="icon" onClick={goToPreviousWeek} data-testid="button-prev-week">
                  <ChevronLeft className="h-4 w-4" />
                </Button>
                <div className="flex-1 text-center font-medium">
                  {format(weekStart, "d MMM", { locale: it })} - {format(addDays(weekStart, 6), "d MMM yyyy", { locale: it })}
                </div>
                <Button variant="outline" size="icon" onClick={goToNextWeek} data-testid="button-next-week">
                  <ChevronRight className="h-4 w-4" />
                </Button>
              </div>
            </div>
          </div>
        </CardContent>
      </Card>
      {/* Tabs per vista */}
      <Tabs value={viewMode} onValueChange={(v) => setViewMode(v as "guard-fixed" | "guard-mobile" | "site")}>
        <TabsList className="grid w-full max-w-2xl grid-cols-3">
          <TabsTrigger value="guard-fixed" data-testid="tab-guard-fixed-view">
            <Users className="h-4 w-4 mr-2" />
            Agenti Fissi
          </TabsTrigger>
          <TabsTrigger value="guard-mobile" data-testid="tab-guard-mobile-view">
            <Navigation className="h-4 w-4 mr-2" />
            Agenti Mobili
          </TabsTrigger>
          <TabsTrigger value="site" data-testid="tab-site-view">
            <Building2 className="h-4 w-4 mr-2" />
            Vista Sito
          </TabsTrigger>
        </TabsList>
        {/* Vista Agenti Fissi */}
        <TabsContent value="guard-fixed" className="space-y-4 mt-6">
          {isLoadingFixedGuards ? (
            <div className="space-y-4">
              {[1, 2, 3].map((i) => (
                <Skeleton key={i} className="h-32 w-full" />
              ))}
            </div>
          ) : fixedGuardSchedules && fixedGuardSchedules.length > 0 ? (
            <div className="grid gap-4">
              {fixedGuardSchedules.map((guard) => (
                <Card key={guard.guardId} data-testid={`card-guard-fixed-${guard.guardId}`}>
                  <CardHeader>
                    <div className="flex items-center justify-between">
                      <CardTitle className="text-lg">
                        {guard.guardName} <Badge variant="outline">{guard.badgeNumber}</Badge>
                      </CardTitle>
                      <Badge>{guard.totalHours}h totali</Badge>
                    </div>
                  </CardHeader>
                  <CardContent>
                    {guard.shifts.length === 0 ? (
                      <p className="text-sm text-muted-foreground">Nessun turno fisso assegnato</p>
                    ) : (
                      <div className="space-y-3">
                        {guard.shifts.map((shift) => (
                          <div
                            key={shift.shiftId}
                            className="p-3 rounded-md bg-muted/50 space-y-2"
                            data-testid={`shift-${shift.shiftId}`}
                          >
                            <div className="flex items-start justify-between">
                              <div className="space-y-1 flex-1">
                                <div className="font-medium">{shift.siteName}</div>
                                <div className="text-sm text-muted-foreground flex items-center gap-1">
                                  <MapPin className="h-3 w-3" />
                                  {shift.siteAddress}
                                </div>
                                <div className="text-sm text-muted-foreground">
                                  {format(new Date(shift.date), "EEEE d MMM", { locale: it })} • {shift.from} - {shift.to} ({shift.hours}h)
                                </div>
                              </div>
                              <div className="flex flex-col items-end gap-1">
                                {shift.isArmed && (
                                  <Badge variant="outline" className="text-xs">
                                    <Shield className="h-3 w-3 mr-1" />
                                    Armato
                                  </Badge>
                                )}
                                {shift.vehicle && (
                                  <Badge variant="outline" className="text-xs">
                                    <CarIcon className="h-3 w-3 mr-1" />
                                    {shift.vehicle.licensePlate}
                                  </Badge>
                                )}
                              </div>
                            </div>
                          </div>
                        ))}
                      </div>
                    )}
                  </CardContent>
                </Card>
              ))}
            </div>
          ) : (
            <Card>
              <CardContent className="pt-6">
                <p className="text-center text-muted-foreground">Nessun agente con turni fissi assegnati</p>
              </CardContent>
            </Card>
          )}
        </TabsContent>
        {/* Vista Agenti Mobili */}
        <TabsContent value="guard-mobile" className="space-y-4 mt-6">
          {isLoadingMobileGuards ? (
            <div className="space-y-4">
              {[1, 2, 3].map((i) => (
                <Skeleton key={i} className="h-32 w-full" />
              ))}
            </div>
          ) : mobileGuardSchedules && mobileGuardSchedules.length > 0 ? (
            <div className="grid gap-4">
              {mobileGuardSchedules.map((guard) => (
                <Card key={guard.guardId} data-testid={`card-guard-mobile-${guard.guardId}`}>
                  <CardHeader>
                    <div className="flex items-center justify-between">
                      <CardTitle className="text-lg">
                        {guard.guardName} <Badge variant="outline">{guard.badgeNumber}</Badge>
                      </CardTitle>
                      <Badge>{guard.totalRoutes} {guard.totalRoutes === 1 ? 'percorso' : 'percorsi'}</Badge>
                    </div>
                  </CardHeader>
                  <CardContent>
                    {guard.routes.length === 0 ? (
                      <p className="text-sm text-muted-foreground">Nessun percorso pattuglia assegnato</p>
                    ) : (
                      <div className="space-y-4">
                        {guard.routes.map((route) => (
                          <div
                            key={route.routeId}
                            className="p-3 rounded-md bg-muted/50 space-y-3"
                            data-testid={`route-${route.routeId}`}
                          >
                            <div className="flex items-center justify-between">
                              <div className="font-medium">
                                {format(new Date(route.shiftDate), "EEEE d MMM yyyy", { locale: it })}
                              </div>
                              <div className="text-sm text-muted-foreground">
                                {route.startTime} - {route.endTime}
                              </div>
                            </div>
                            <div className="flex gap-2">
                              {route.isArmedRoute && (
                                <Badge variant="outline" className="text-xs">
                                  <Shield className="h-3 w-3 mr-1" />
                                  Armato
                                </Badge>
                              )}
                              {route.vehicle && (
                                <Badge variant="outline" className="text-xs">
                                  <CarIcon className="h-3 w-3 mr-1" />
                                  {route.vehicle.licensePlate}
                                </Badge>
                              )}
                            </div>
                            <div className="space-y-2">
                              <div className="text-sm font-medium flex items-center gap-1">
                                <Navigation className="h-4 w-4" />
                                Percorso ({route.stops.length} {route.stops.length === 1 ? 'tappa' : 'tappe'}):
                              </div>
                              <div className="space-y-1 pl-5">
                                {route.stops.map((stop) => (
                                  <div key={stop.siteId} className="text-sm text-muted-foreground flex items-start gap-2">
                                    <Badge variant="secondary" className="text-xs">
                                      {stop.sequenceOrder}
                                    </Badge>
                                    <div className="flex-1">
                                      <div className="font-medium text-foreground">{stop.siteName}</div>
                                      <div className="text-xs flex items-center gap-1">
                                        <MapPin className="h-3 w-3" />
                                        {stop.siteAddress}
                                      </div>
                                    </div>
                                  </div>
                                ))}
                              </div>
                            </div>
                          </div>
                        ))}
                      </div>
                    )}
                  </CardContent>
                </Card>
              ))}
            </div>
          ) : (
            <Card>
              <CardContent className="pt-6">
                <p className="text-center text-muted-foreground">Nessun agente con percorsi pattuglia assegnati</p>
              </CardContent>
            </Card>
          )}
        </TabsContent>
        {/* Vista Sito */}
        <TabsContent value="site" className="space-y-4 mt-6">
          {isLoadingSites ? (
            <div className="space-y-4">
              {[1, 2, 3].map((i) => (
                <Skeleton key={i} className="h-32 w-full" />
              ))}
            </div>
          ) : siteSchedules && siteSchedules.length > 0 ? (
            <div className="grid gap-4">
              {siteSchedules.map((site) => (
                <Card key={site.siteId} data-testid={`card-site-${site.siteId}`}>
                  <CardHeader>
                    <div className="flex items-center justify-between">
                      <CardTitle className="text-lg">{site.siteName}</CardTitle>
                      <div className="flex items-center gap-2">
                        <Badge variant="outline">{site.totalShifts} turni</Badge>
                        <Badge>{site.totalHours}h totali</Badge>
                      </div>
                    </div>
                  </CardHeader>
                  <CardContent>
                    {site.shifts.length === 0 ? (
                      <p className="text-sm text-muted-foreground">Nessun turno programmato</p>
                    ) : (
                      <div className="space-y-3">
                        {site.shifts.map((shift) => (
                          <div
                            key={shift.shiftId}
                            className="p-3 rounded-md bg-muted/50 space-y-2"
                            data-testid={`shift-${shift.shiftId}`}
                          >
                            <div className="flex items-center justify-between">
                              <div className="font-medium">
                                {format(new Date(shift.date), "EEEE d MMM", { locale: it })} • {shift.from} - {shift.to}
                              </div>
                              <div className="flex gap-1">
                                <Badge variant="secondary">{shift.totalGuards} {shift.totalGuards === 1 ? "guardia" : "guardie"}</Badge>
                                {shift.vehicle && (
                                  <Badge variant="outline" className="text-xs">
                                    <CarIcon className="h-3 w-3 mr-1" />
                                    {shift.vehicle.licensePlate}
                                  </Badge>
                                )}
                              </div>
                            </div>
                            <div className="space-y-1">
                              {shift.guards.map((guard, idx) => (
                                <div key={idx} className="text-sm text-muted-foreground flex items-center justify-between">
                                  <span>{guard.guardName} ({guard.badgeNumber}) - {guard.hours}h</span>
                                  {guard.isArmed && (
                                    <Badge variant="outline" className="text-xs">
                                      <Shield className="h-3 w-3 mr-1" />
                                      Armato
                                    </Badge>
                                  )}
                                </div>
                              ))}
                            </div>
                          </div>
                        ))}
                      </div>
                    )}
                  </CardContent>
                </Card>
              ))}
            </div>
          ) : (
            <Card>
              <CardContent className="pt-6">
                <p className="text-center text-muted-foreground">Nessun sito con turni programmati</p>
              </CardContent>
            </Card>
          )}
        </TabsContent>
      </Tabs>
    </div>
  );
 }
--- a/client/src/pages/services.tsx
+++ b/client/src/pages/services.tsx
@ -166,6 +166,7 @@ export default function Services() {
      description: "",
      icon: "Building2",
      color: "blue",
      classification: "fisso", // ✅ NUOVO: Discriminante Planning Fissi/Mobile
      isActive: true,
    },
  });
@ -178,6 +179,7 @@ export default function Services() {
      description: "",
      icon: "Building2",
      color: "blue",
      classification: "fisso", // ✅ NUOVO: Discriminante Planning Fissi/Mobile
      isActive: true,
    },
  });
@ -235,10 +237,7 @@ export default function Services() {
      description: type.description,
      icon: type.icon,
      color: type.color,
-      fixedPostHours: type.fixedPostHours || null,
+      classification: type.classification, // ✅ NUOVO: includi classification
      patrolPassages: type.patrolPassages || null,
      inspectionFrequency: type.inspectionFrequency || null,
      responseTimeMinutes: type.responseTimeMinutes || null,
      isActive: type.isActive,
    });
    setEditTypeDialogOpen(true);
@ -1071,91 +1070,28 @@ export default function Services() {
                />
              </div>
-              <div className="space-y-4 p-4 border rounded-lg">
+              {/* ✅ NUOVO: Classification (Fisso/Mobile) */}
                <h4 className="font-semibold text-sm">Parametri Specifici</h4>
                <div className="grid grid-cols-2 gap-4">
              <FormField
                control={createTypeForm.control}
-                    name="fixedPostHours"
+                name="classification"
                render={({ field }) => (
                  <FormItem>
-                        <FormLabel>Ore Presidio Fisso</FormLabel>
+                    <FormLabel>Tipo Pianificazione*</FormLabel>
                    <Select onValueChange={field.onChange} defaultValue={field.value}>
                      <FormControl>
-                          <Input
+                        <SelectTrigger data-testid="select-type-classification">
-                            type="number"
+                          <SelectValue />
-                            {...field}
+                        </SelectTrigger>
                            value={field.value || ""}
                            onChange={(e) => field.onChange(e.target.value ? parseInt(e.target.value) : null)}
                            placeholder="es: 8, 12"
                            data-testid="input-fixed-post-hours"
                          />
                      </FormControl>
                      <SelectContent>
                        <SelectItem value="fisso">Fisso (Planning Fissi)</SelectItem>
                        <SelectItem value="mobile">Mobile (Planning Mobile)</SelectItem>
                      </SelectContent>
                    </Select>
                    <FormMessage />
                  </FormItem>
                )}
              />
                  <FormField
                    control={createTypeForm.control}
                    name="patrolPassages"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Passaggi Pattugliamento</FormLabel>
                        <FormControl>
                          <Input
                            type="number"
                            {...field}
                            value={field.value || ""}
                            onChange={(e) => field.onChange(e.target.value ? parseInt(e.target.value) : null)}
                            placeholder="es: 3, 5"
                            data-testid="input-patrol-passages"
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={createTypeForm.control}
                    name="inspectionFrequency"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Frequenza Ispezioni (min)</FormLabel>
                        <FormControl>
                          <Input
                            type="number"
                            {...field}
                            value={field.value || ""}
                            onChange={(e) => field.onChange(e.target.value ? parseInt(e.target.value) : null)}
                            placeholder="es: 60, 120"
                            data-testid="input-inspection-frequency"
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={createTypeForm.control}
                    name="responseTimeMinutes"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Tempo Risposta (min)</FormLabel>
                        <FormControl>
                          <Input
                            type="number"
                            {...field}
                            value={field.value || ""}
                            onChange={(e) => field.onChange(e.target.value ? parseInt(e.target.value) : null)}
                            placeholder="es: 15, 30"
                            data-testid="input-response-time"
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                </div>
              </div>
              <FormField
                control={createTypeForm.control}
@ -1309,7 +1245,30 @@ export default function Services() {
                />
              </div>
-              <div className="space-y-4 p-4 border rounded-lg">
+              {/* ✅ NUOVO: Classification (Fisso/Mobile) */}
              <FormField
                control={editTypeForm.control}
                name="classification"
                render={({ field }) => (
                  <FormItem>
                    <FormLabel>Tipo Pianificazione*</FormLabel>
                    <Select onValueChange={field.onChange} value={field.value}>
                      <FormControl>
                        <SelectTrigger data-testid="select-edit-type-classification">
                          <SelectValue />
                        </SelectTrigger>
                      </FormControl>
                      <SelectContent>
                        <SelectItem value="fisso">Fisso (Planning Fissi)</SelectItem>
                        <SelectItem value="mobile">Mobile (Planning Mobile)</SelectItem>
                      </SelectContent>
                    </Select>
                    <FormMessage />
                  </FormItem>
                )}
              />
              <div className="space-y-4 p-4 border rounded-lg" style={{display: "none"}}>
                <h4 className="font-semibold text-sm">Parametri Specifici</h4>
                <div className="grid grid-cols-2 gap-4">
                  <FormField
--- a/client/src/pages/site-planning-view.tsx
+++ b/client/src/pages/site-planning-view.tsx
@ -0,0 +1,284 @@
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Badge } from "@/components/ui/badge";
 import { Button } from "@/components/ui/button";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { MapPin, Shield, Car, Clock, User, ChevronLeft, ChevronRight } from "lucide-react";
 import { format, addDays, startOfWeek, parseISO, isValid } from "date-fns";
 import { it } from "date-fns/locale";
 interface GuardAssignment {
  guardId: string;
  guardName: string;
  badgeNumber: string;
  plannedStartTime: string;
  plannedEndTime: string;
  armed: boolean;
  vehicleId: string | null;
  vehiclePlate: string | null;
 }
 interface SiteDayPlan {
  date: string;
  guards: GuardAssignment[];
 }
 interface Site {
  id: string;
  name: string;
  address: string;
  location: string;
 }
 export default function SitePlanningView() {
  const [selectedSiteId, setSelectedSiteId] = useState<string>("");
  const [currentWeekStart, setCurrentWeekStart] = useState(() => {
    const today = new Date();
    return startOfWeek(today, { weekStartsOn: 1 });
  });
  // Query sites
  const { data: sites } = useQuery<Site[]>({
    queryKey: ["/api/sites"],
  });
  // Query site planning
  const { data: sitePlanning, isLoading } = useQuery<SiteDayPlan[]>({
    queryKey: ["/api/site-planning", selectedSiteId, currentWeekStart.toISOString()],
    queryFn: async () => {
      if (!selectedSiteId) return [];
      const weekEnd = addDays(currentWeekStart, 6);
      const response = await fetch(
        `/api/site-planning/${selectedSiteId}?startDate=${currentWeekStart.toISOString()}&endDate=${weekEnd.toISOString()}`
      );
      if (!response.ok) throw new Error("Failed to fetch site planning");
      return response.json();
    },
    enabled: !!selectedSiteId,
  });
  // Naviga settimana precedente
  const handlePreviousWeek = () => {
    setCurrentWeekStart(addDays(currentWeekStart, -7));
  };
  // Naviga settimana successiva
  const handleNextWeek = () => {
    setCurrentWeekStart(addDays(currentWeekStart, 7));
  };
  // Raggruppa per giorno
  const planningByDay = sitePlanning?.reduce((acc, day) => {
    acc[day.date] = day.guards;
    return acc;
  }, {} as Record<string, GuardAssignment[]>) || {};
  // Genera array di 7 giorni della settimana
  const weekDays = Array.from({ length: 7 }, (_, i) => addDays(currentWeekStart, i));
  const selectedSite = sites?.find(s => s.id === selectedSiteId);
  const locationLabels: Record<string, string> = {
    roccapiemonte: "Roccapiemonte",
    milano: "Milano",
    roma: "Roma",
  };
  return (
    <div className="h-full flex flex-col p-6 space-y-6">
      {/* Header */}
      <div className="flex items-center justify-between">
        <div>
          <h1 className="text-3xl font-bold" data-testid="title-site-planning-view">
            Planning per Sito
          </h1>
          <p className="text-sm text-muted-foreground">
            Visualizza tutti gli agenti assegnati a un sito con dotazioni
          </p>
        </div>
      </div>
      {/* Selettore sito */}
      <Card>
        <CardHeader>
          <CardTitle>Seleziona Sito</CardTitle>
        </CardHeader>
        <CardContent>
          <div className="space-y-3">
            <Select value={selectedSiteId} onValueChange={setSelectedSiteId}>
              <SelectTrigger data-testid="select-site">
                <SelectValue placeholder="Seleziona un sito..." />
              </SelectTrigger>
              <SelectContent>
                {sites?.map((site) => (
                  <SelectItem key={site.id} value={site.id} data-testid={`site-option-${site.id}`}>
                    <div className="flex items-center gap-2">
                      <span className="font-medium">{site.name}</span>
                      <span className="text-xs text-muted-foreground">
                        ({locationLabels[site.location] || site.location})
                      </span>
                    </div>
                  </SelectItem>
                ))}
              </SelectContent>
            </Select>
            {selectedSite && (
              <div className="p-3 border rounded-lg bg-muted/20">
                <p className="font-semibold">{selectedSite.name}</p>
                <p className="text-sm text-muted-foreground">{selectedSite.address}</p>
              </div>
            )}
          </div>
        </CardContent>
      </Card>
      {/* Navigazione settimana */}
      {selectedSiteId && (
        <Card>
          <CardHeader>
            <div className="flex items-center justify-between">
              <Button
                variant="outline"
                size="sm"
                onClick={handlePreviousWeek}
                data-testid="button-prev-week"
              >
                <ChevronLeft className="h-4 w-4 mr-1" />
                Settimana Precedente
              </Button>
              <CardTitle className="text-center">
                {format(currentWeekStart, "dd MMMM", { locale: it })} -{" "}
                {format(addDays(currentWeekStart, 6), "dd MMMM yyyy", { locale: it })}
              </CardTitle>
              <Button
                variant="outline"
                size="sm"
                onClick={handleNextWeek}
                data-testid="button-next-week"
              >
                Settimana Successiva
                <ChevronRight className="h-4 w-4 ml-1" />
              </Button>
            </div>
          </CardHeader>
        </Card>
      )}
      {/* Loading state */}
      {isLoading && (
        <Card>
          <CardContent className="py-12 text-center text-muted-foreground">
            Caricamento planning sito...
          </CardContent>
        </Card>
      )}
      {/* Griglia giorni settimana */}
      {selectedSiteId && !isLoading && (
        <div className="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4 gap-4">
          {weekDays.map((day) => {
            const dateStr = format(day, "yyyy-MM-dd");
            const dayGuards = planningByDay[dateStr] || [];
            return (
              <Card key={dateStr} data-testid={`day-card-${dateStr}`}>
                <CardHeader className="pb-3">
                  <CardTitle className="text-lg">
                    {format(day, "EEEE dd/MM", { locale: it })}
                  </CardTitle>
                  <CardDescription>
                    {dayGuards.length === 0
                      ? "Nessun agente"
                      : `${dayGuards.length} agente${dayGuards.length > 1 ? "i" : ""}`}
                  </CardDescription>
                </CardHeader>
                <CardContent className="space-y-3">
                  {dayGuards.length === 0 ? (
                    <div className="text-center py-4 text-sm text-muted-foreground">
                      Nessuna copertura
                    </div>
                  ) : (
                    dayGuards.map((guard, index) => {
                      // Parsing sicuro orari (DB in UTC → visualizza in Europe/Rome)
                      let startTime = "N/A";
                      let endTime = "N/A";
                      if (guard.plannedStartTime) {
                        const parsedStart = new Date(guard.plannedStartTime);
                        if (isValid(parsedStart)) {
                          startTime = parsedStart.toLocaleTimeString("it-IT", {
                            hour: "2-digit",
                            minute: "2-digit",
                            hour12: false,
                            timeZone: "Europe/Rome"
                          });
                        }
                      }
                      if (guard.plannedEndTime) {
                        const parsedEnd = new Date(guard.plannedEndTime);
                        if (isValid(parsedEnd)) {
                          endTime = parsedEnd.toLocaleTimeString("it-IT", {
                            hour: "2-digit",
                            minute: "2-digit",
                            hour12: false,
                            timeZone: "Europe/Rome"
                          });
                        }
                      }
                      return (
                        <div
                          key={`${guard.guardId}-${index}`}
                          className="border rounded-lg p-3 space-y-2"
                          data-testid={`guard-assignment-${index}`}
                        >
                          <div className="flex items-start justify-between gap-2">
                            <div className="flex-1 space-y-1">
                              <div className="flex items-center gap-2">
                                <User className="h-4 w-4 text-muted-foreground" />
                                <span className="font-semibold text-sm">{guard.guardName}</span>
                              </div>
                              <div className="text-xs text-muted-foreground">
                                Matricola: {guard.badgeNumber}
                              </div>
                            </div>
                          </div>
                          <div className="flex items-center gap-1 text-sm">
                            <Clock className="h-4 w-4 text-muted-foreground" />
                            <span className="font-medium">
                              {startTime} - {endTime}
                            </span>
                          </div>
                          {/* Dotazioni */}
                          <div className="flex gap-2 flex-wrap">
                            {guard.armed && (
                              <Badge variant="outline" className="text-xs">
                                <Shield className="h-3 w-3 mr-1" />
                                Armato
                              </Badge>
                            )}
                            {guard.vehicleId && (
                              <Badge variant="outline" className="text-xs">
                                <Car className="h-3 w-3 mr-1" />
                                {guard.vehiclePlate || "Automezzo"}
                              </Badge>
                            )}
                          </div>
                        </div>
                      );
                    })
                  )}
                </CardContent>
              </Card>
            );
          })}
        </div>
      )}
    </div>
  );
 }
--- a/client/src/pages/sites.tsx
+++ b/client/src/pages/sites.tsx
@ -1,6 +1,6 @@
 import { useState } from "react";
 import { useQuery, useMutation } from "@tanstack/react-query";
-import { Site, InsertSite } from "@shared/schema";
+import { Site, InsertSite, Customer, ServiceType } from "@shared/schema";
 import { Button } from "@/components/ui/button";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogTrigger } from "@/components/ui/dialog";
@ -18,13 +18,6 @@ import { StatusBadge } from "@/components/status-badge";
 import { Badge } from "@/components/ui/badge";
 import { Skeleton } from "@/components/ui/skeleton";
 const shiftTypeLabels: Record<string, string> = {
  fixed_post: "Presidio Fisso",
  patrol: "Pattugliamento",
  night_inspection: "Ispettorato Notturno",
  quick_response: "Pronto Intervento",
 };
 const locationLabels: Record<string, string> = {
  roccapiemonte: "Roccapiemonte",
  milano: "Milano",
@ -35,17 +28,29 @@ export default function Sites() {
  const { toast } = useToast();
  const [isDialogOpen, setIsDialogOpen] = useState(false);
  const [editingSite, setEditingSite] = useState<Site | null>(null);
  const [isGeocoding, setIsGeocoding] = useState(false);
  const [isGeocodingEdit, setIsGeocodingEdit] = useState(false);
  const { data: sites, isLoading } = useQuery<Site[]>({
    queryKey: ["/api/sites"],
  });
  const { data: customers } = useQuery<Customer[]>({
    queryKey: ["/api/customers"],
  });
  const { data: serviceTypes } = useQuery<ServiceType[]>({
    queryKey: ["/api/service-types"],
  });
  const form = useForm<InsertSite>({
    resolver: zodResolver(insertSiteSchema),
    defaultValues: {
      name: "",
      address: "",
-      shiftType: "fixed_post",
+      customerId: undefined,
      location: "roccapiemonte",
      serviceTypeId: undefined,
      minGuards: 1,
      requiresArmed: false,
      requiresDriverLicense: false,
@ -54,6 +59,8 @@ export default function Sites() {
      contractEndDate: undefined,
      serviceStartTime: "",
      serviceEndTime: "",
      latitude: undefined,
      longitude: undefined,
      isActive: true,
    },
  });
@ -63,7 +70,9 @@ export default function Sites() {
    defaultValues: {
      name: "",
      address: "",
-      shiftType: "fixed_post",
+      customerId: undefined,
      location: "roccapiemonte",
      serviceTypeId: undefined,
      minGuards: 1,
      requiresArmed: false,
      requiresDriverLicense: false,
@ -72,6 +81,8 @@ export default function Sites() {
      contractEndDate: undefined,
      serviceStartTime: "",
      serviceEndTime: "",
      latitude: undefined,
      longitude: undefined,
      isActive: true,
    },
  });
@ -120,6 +131,82 @@ export default function Sites() {
    },
  });
  const handleGeocode = async () => {
    const address = form.getValues("address");
    if (!address) {
      toast({
        title: "Indirizzo mancante",
        description: "Inserisci un indirizzo prima di cercare le coordinate",
        variant: "destructive",
      });
      return;
    }
    setIsGeocoding(true);
    try {
      const response = await apiRequest(
        "POST",
        "/api/geocode",
        { address }
      );
      const result = await response.json();
      form.setValue("latitude", result.latitude);
      form.setValue("longitude", result.longitude);
      toast({
        title: "Coordinate trovate",
        description: `Indirizzo: ${result.displayName}`,
      });
    } catch (error: any) {
      toast({
        title: "Errore geocodifica",
        description: error.message || "Impossibile trovare le coordinate per questo indirizzo",
        variant: "destructive",
      });
    } finally {
      setIsGeocoding(false);
    }
  };
  const handleGeocodeEdit = async () => {
    const address = editForm.getValues("address");
    if (!address) {
      toast({
        title: "Indirizzo mancante",
        description: "Inserisci un indirizzo prima di cercare le coordinate",
        variant: "destructive",
      });
      return;
    }
    setIsGeocodingEdit(true);
    try {
      const response = await apiRequest(
        "POST",
        "/api/geocode",
        { address }
      );
      const result = await response.json();
      editForm.setValue("latitude", result.latitude);
      editForm.setValue("longitude", result.longitude);
      toast({
        title: "Coordinate trovate",
        description: `Indirizzo: ${result.displayName}`,
      });
    } catch (error: any) {
      toast({
        title: "Errore geocodifica",
        description: error.message || "Impossibile trovare le coordinate per questo indirizzo",
        variant: "destructive",
      });
    } finally {
      setIsGeocodingEdit(false);
    }
  };
  const onSubmit = (data: InsertSite) => {
    createMutation.mutate(data);
  };
@ -134,9 +221,12 @@ export default function Sites() {
    setEditingSite(site);
    editForm.reset({
      name: site.name,
-      address: site.address,
+      address: site.address || "",
      latitude: site.latitude || "",
      longitude: site.longitude || "",
      customerId: site.customerId ?? undefined,
      location: site.location,
-      shiftType: site.shiftType,
+      serviceTypeId: site.serviceTypeId ?? undefined,
      minGuards: site.minGuards,
      requiresArmed: site.requiresArmed,
      requiresDriverLicense: site.requiresDriverLicense,
@ -228,6 +318,94 @@ export default function Sites() {
                  )}
                />
                <div className="border rounded-lg p-4 space-y-4 bg-muted/50">
                  <div className="flex items-center justify-between">
                    <p className="text-sm font-medium flex items-center gap-2">
                      <MapPin className="h-4 w-4" />
                      Coordinate GPS (per mappa)
                    </p>
                    <Button
                      type="button"
                      variant="outline"
                      size="sm"
                      onClick={handleGeocode}
                      disabled={isGeocoding || !form.watch("address")}
                      data-testid="button-geocode"
                    >
                      {isGeocoding ? "Ricerca in corso..." : "📍 Trova Coordinate"}
                    </Button>
                  </div>
                  <div className="grid grid-cols-2 gap-4">
                    <FormField
                      control={form.control}
                      name="latitude"
                      render={({ field }) => (
                        <FormItem>
                          <FormLabel>Latitudine</FormLabel>
                          <FormControl>
                            <Input 
                              placeholder="41.9028" 
                              {...field} 
                              value={field.value || ""} 
                              data-testid="input-latitude" 
                            />
                          </FormControl>
                          <FormMessage />
                        </FormItem>
                      )}
                    />
                    <FormField
                      control={form.control}
                      name="longitude"
                      render={({ field }) => (
                        <FormItem>
                          <FormLabel>Longitudine</FormLabel>
                          <FormControl>
                            <Input 
                              placeholder="12.4964" 
                              {...field} 
                              value={field.value || ""} 
                              data-testid="input-longitude" 
                            />
                          </FormControl>
                          <FormMessage />
                        </FormItem>
                      )}
                    />
                  </div>
                  <p className="text-xs text-muted-foreground">
                    Le coordinate GPS permettono di visualizzare il sito sulla mappa in Planning Mobile
                  </p>
                </div>
                <FormField
                  control={form.control}
                  name="customerId"
                  render={({ field }) => (
                    <FormItem>
                      <FormLabel>Cliente (opzionale)</FormLabel>
                      <Select onValueChange={(value) => field.onChange(value || undefined)} value={field.value ?? undefined}>
                        <FormControl>
                          <SelectTrigger data-testid="select-customer">
                            <SelectValue placeholder="Nessun cliente" />
                          </SelectTrigger>
                        </FormControl>
                        <SelectContent>
                          {customers?.map((customer) => (
                            <SelectItem key={customer.id} value={customer.id}>
                              {customer.name}
                            </SelectItem>
                          ))}
                        </SelectContent>
                      </Select>
                      <FormMessage />
                    </FormItem>
                  )}
                />
                <FormField
                  control={form.control}
                  name="location"
@ -311,21 +489,22 @@ export default function Sites() {
                <FormField
                  control={form.control}
-                  name="shiftType"
+                  name="serviceTypeId"
                  render={({ field }) => (
                    <FormItem>
-                      <FormLabel>Tipologia Servizio</FormLabel>
+                      <FormLabel>Tipologia Servizio (opzionale)</FormLabel>
-                      <Select onValueChange={field.onChange} defaultValue={field.value}>
+                      <Select onValueChange={field.onChange} value={field.value ?? undefined}>
                        <FormControl>
-                          <SelectTrigger data-testid="select-shift-type">
+                          <SelectTrigger data-testid="select-service-type">
                            <SelectValue placeholder="Seleziona tipo servizio" />
                          </SelectTrigger>
                        </FormControl>
                        <SelectContent>
-                          <SelectItem value="fixed_post">Presidio Fisso</SelectItem>
+                          {serviceTypes?.filter(st => st.isActive).map((serviceType) => (
-                          <SelectItem value="patrol">Pattugliamento</SelectItem>
+                            <SelectItem key={serviceType.id} value={serviceType.id}>
-                          <SelectItem value="night_inspection">Ispettorato Notturno</SelectItem>
+                              {serviceType.label}
-                          <SelectItem value="quick_response">Pronto Intervento</SelectItem>
+                            </SelectItem>
                          ))}
                        </SelectContent>
                      </Select>
                      <FormMessage />
@ -489,6 +668,94 @@ export default function Sites() {
                )}
              />
              <div className="border rounded-lg p-4 space-y-4 bg-muted/50">
                <div className="flex items-center justify-between">
                  <p className="text-sm font-medium flex items-center gap-2">
                    <MapPin className="h-4 w-4" />
                    Coordinate GPS (per mappa)
                  </p>
                  <Button
                    type="button"
                    variant="outline"
                    size="sm"
                    onClick={handleGeocodeEdit}
                    disabled={isGeocodingEdit || !editForm.watch("address")}
                    data-testid="button-geocode-edit"
                  >
                    {isGeocodingEdit ? "Ricerca in corso..." : "📍 Trova Coordinate"}
                  </Button>
                </div>
                <div className="grid grid-cols-2 gap-4">
                  <FormField
                    control={editForm.control}
                    name="latitude"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Latitudine</FormLabel>
                        <FormControl>
                          <Input 
                            placeholder="41.9028" 
                            {...field} 
                            value={field.value || ""} 
                            data-testid="input-edit-latitude" 
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                  <FormField
                    control={editForm.control}
                    name="longitude"
                    render={({ field }) => (
                      <FormItem>
                        <FormLabel>Longitudine</FormLabel>
                        <FormControl>
                          <Input 
                            placeholder="12.4964" 
                            {...field} 
                            value={field.value || ""} 
                            data-testid="input-edit-longitude" 
                          />
                        </FormControl>
                        <FormMessage />
                      </FormItem>
                    )}
                  />
                </div>
                <p className="text-xs text-muted-foreground">
                  Le coordinate GPS permettono di visualizzare il sito sulla mappa in Planning Mobile
                </p>
              </div>
              <FormField
                control={editForm.control}
                name="customerId"
                render={({ field }) => (
                  <FormItem>
                    <FormLabel>Cliente (opzionale)</FormLabel>
                    <Select onValueChange={(value) => field.onChange(value || undefined)} value={field.value ?? undefined}>
                      <FormControl>
                        <SelectTrigger data-testid="select-edit-customer">
                          <SelectValue placeholder="Nessun cliente" />
                        </SelectTrigger>
                      </FormControl>
                      <SelectContent>
                        {customers?.map((customer) => (
                          <SelectItem key={customer.id} value={customer.id}>
                            {customer.name}
                          </SelectItem>
                        ))}
                      </SelectContent>
                    </Select>
                    <FormMessage />
                  </FormItem>
                )}
              />
              <FormField
                control={editForm.control}
                name="location"
@ -572,21 +839,22 @@ export default function Sites() {
              <FormField
                control={editForm.control}
-                name="shiftType"
+                name="serviceTypeId"
                render={({ field }) => (
                  <FormItem>
-                    <FormLabel>Tipologia Servizio</FormLabel>
+                    <FormLabel>Tipologia Servizio (opzionale)</FormLabel>
-                    <Select onValueChange={field.onChange} defaultValue={field.value}>
+                    <Select onValueChange={field.onChange} value={field.value ?? undefined}>
                      <FormControl>
-                        <SelectTrigger data-testid="select-edit-shift-type">
+                        <SelectTrigger data-testid="select-edit-service-type">
                          <SelectValue placeholder="Seleziona tipo servizio" />
                        </SelectTrigger>
                      </FormControl>
                      <SelectContent>
-                        <SelectItem value="fixed_post">Presidio Fisso</SelectItem>
+                        {serviceTypes?.filter(st => st.isActive).map((serviceType) => (
-                        <SelectItem value="patrol">Pattugliamento</SelectItem>
+                          <SelectItem key={serviceType.id} value={serviceType.id}>
-                        <SelectItem value="night_inspection">Ispettorato Notturno</SelectItem>
+                            {serviceType.label}
-                        <SelectItem value="quick_response">Pronto Intervento</SelectItem>
+                          </SelectItem>
                        ))}
                      </SelectContent>
                    </Select>
                    <FormMessage />
@ -765,9 +1033,14 @@ export default function Sites() {
              </CardHeader>
              <CardContent className="space-y-3">
                <div className="flex flex-wrap gap-2">
-                  <Badge variant="outline">
+                  {site.serviceTypeId && serviceTypes && (() => {
-                    {shiftTypeLabels[site.shiftType]}
+                    const serviceType = serviceTypes.find(st => st.id === site.serviceTypeId);
                    return serviceType ? (
                      <Badge variant="outline" data-testid={`badge-service-type-${site.id}`}>
                        {serviceType.label}
                      </Badge>
                    ) : null;
                  })()}
                  {(() => {
                    const status = getContractStatus(site);
                    const statusInfo = contractStatusLabels[status];
--- a/client/src/pages/weekly-guards.tsx
+++ b/client/src/pages/weekly-guards.tsx
@ -0,0 +1,448 @@
 import { useState } from "react";
 import { useQuery } from "@tanstack/react-query";
 import { Card, CardContent, CardDescription, CardHeader, CardTitle } from "@/components/ui/card";
 import { Select, SelectContent, SelectItem, SelectTrigger, SelectValue } from "@/components/ui/select";
 import { Button } from "@/components/ui/button";
 import { Dialog, DialogContent, DialogDescription, DialogHeader, DialogTitle, DialogFooter } from "@/components/ui/dialog";
 import { Badge } from "@/components/ui/badge";
 import { Calendar as CalendarIcon, ChevronLeft, ChevronRight, Users, Clock, MapPin, Navigation, ExternalLink } from "lucide-react";
 import { format, parseISO, addDays, startOfWeek, addWeeks } from "date-fns";
 import { it } from "date-fns/locale";
 import { Link } from "wouter";
 type AbsenceType = "sick_leave" | "vacation" | "personal_leave" | "injury";
 interface GuardScheduleData {
  guard: {
    id: string;
    firstName: string;
    lastName: string;
    badgeNumber: string;
  };
  fixedShifts: Array<{
    assignmentId: string;
    shiftId: string;
    plannedStartTime: Date;
    plannedEndTime: Date;
    siteName: string;
    siteId: string;
  }>;
  mobileShifts: Array<{
    routeId: string;
    shiftDate: string;
    startTime: string;
    endTime: string;
  }>;
  absences: Array<{
    id: string;
    type: AbsenceType;
    startDate: string;
    endDate: string;
  }>;
 }
 interface WeeklyScheduleResponse {
  weekStart: string;
  weekEnd: string;
  location: string;
  guards: GuardScheduleData[];
 }
 const ABSENCE_LABELS: Record<AbsenceType, string> = {
  sick_leave: "Malattia",
  vacation: "Ferie",
  personal_leave: "Permesso",
  injury: "Infortunio",
 };
 type DialogData = {
  type: "fixed" | "mobile";
  guardName: string;
  date: string;
  data: any;
 } | null;
 export default function WeeklyGuards() {
  const [selectedLocation, setSelectedLocation] = useState<string>("roccapiemonte");
  const [currentWeekStart, setCurrentWeekStart] = useState<Date>(() => 
    startOfWeek(new Date(), { weekStartsOn: 1 }) // Inizia lunedì
  );
  const [dialogData, setDialogData] = useState<DialogData>(null);
  const { data: scheduleData, isLoading, error } = useQuery<WeeklyScheduleResponse>({
    queryKey: ["/api/weekly-guards-schedule", selectedLocation, format(currentWeekStart, "yyyy-MM-dd")],
    queryFn: async () => {
      const startDate = format(currentWeekStart, "yyyy-MM-dd");
      const response = await fetch(
        `/api/weekly-guards-schedule?location=${selectedLocation}&startDate=${startDate}`
      );
      if (!response.ok) {
        throw new Error("Failed to fetch weekly schedule");
      }
      return response.json();
    },
    enabled: !!selectedLocation,
  });
  // Helper per ottenere i giorni della settimana
  const getWeekDays = () => {
    const days = [];
    for (let i = 0; i < 7; i++) {
      days.push(addDays(currentWeekStart, i));
    }
    return days;
  };
  const weekDays = getWeekDays();
  // Helper per trovare l'attività di una guardia in un giorno specifico
  const getDayActivity = (guardData: GuardScheduleData, date: Date) => {
    const dateStr = format(date, "yyyy-MM-dd");
    // Controlla assenze
    const absence = guardData.absences.find(abs => {
      const startDate = abs.startDate;
      const endDate = abs.endDate;
      return dateStr >= startDate && dateStr <= endDate;
    });
    if (absence) {
      return {
        type: "absence" as const,
        label: ABSENCE_LABELS[absence.type],
        data: absence,
      };
    }
    // Controlla turni fissi
    const fixedShift = guardData.fixedShifts.find(shift => {
      const shiftDate = format(new Date(shift.plannedStartTime), "yyyy-MM-dd");
      return shiftDate === dateStr;
    });
    if (fixedShift) {
      const startTime = format(new Date(fixedShift.plannedStartTime), "HH:mm");
      const endTime = format(new Date(fixedShift.plannedEndTime), "HH:mm");
      return {
        type: "fixed" as const,
        label: `${fixedShift.siteName} ${startTime}-${endTime}`,
        data: fixedShift,
      };
    }
    // Controlla turni mobili
    const mobileShift = guardData.mobileShifts.find(shift => shift.shiftDate === dateStr);
    if (mobileShift) {
      return {
        type: "mobile" as const,
        label: `Pattuglia ${mobileShift.startTime}-${mobileShift.endTime}`,
        data: mobileShift,
      };
    }
    return null;
  };
  const handlePreviousWeek = () => {
    setCurrentWeekStart(prev => addWeeks(prev, -1));
  };
  const handleNextWeek = () => {
    setCurrentWeekStart(prev => addWeeks(prev, 1));
  };
  const handleCellClick = (guardData: GuardScheduleData, activity: ReturnType<typeof getDayActivity>, date: Date) => {
    if (!activity || activity.type === "absence") return;
    const guardName = `${guardData.guard.lastName} ${guardData.guard.firstName}`;
    const dateStr = format(date, "EEEE dd MMMM yyyy", { locale: it });
    setDialogData({
      type: activity.type,
      guardName,
      date: dateStr,
      data: activity.data,
    });
  };
  return (
    <div className="container mx-auto p-6 space-y-6">
      <div className="flex items-center justify-between">
        <div>
          <h1 className="text-3xl font-bold flex items-center gap-2">
            <Users className="h-8 w-8 text-primary" />
            Guardie Settimanale
          </h1>
          <p className="text-muted-foreground mt-1">
            Vista riepilogativa delle assegnazioni settimanali per sede
          </p>
        </div>
      </div>
      {/* Filtri */}
      <Card>
        <CardHeader>
          <CardTitle className="flex items-center gap-2">
            <CalendarIcon className="h-5 w-5" />
            Filtri Visualizzazione
          </CardTitle>
          <CardDescription>
            Seleziona sede e settimana per visualizzare le assegnazioni
          </CardDescription>
        </CardHeader>
        <CardContent>
          <div className="flex items-end gap-4">
            <div className="flex-1">
              <label className="text-sm font-medium mb-2 block">Sede</label>
              <Select
                value={selectedLocation}
                onValueChange={setSelectedLocation}
                data-testid="select-location"
              >
                <SelectTrigger>
                  <SelectValue placeholder="Seleziona sede" />
                </SelectTrigger>
                <SelectContent>
                  <SelectItem value="roccapiemonte">Roccapiemonte</SelectItem>
                  <SelectItem value="milano">Milano</SelectItem>
                  <SelectItem value="roma">Roma</SelectItem>
                </SelectContent>
              </Select>
            </div>
            <div className="flex items-center gap-2">
              <Button
                variant="outline"
                size="icon"
                onClick={handlePreviousWeek}
                data-testid="button-previous-week"
              >
                <ChevronLeft className="h-4 w-4" />
              </Button>
              <div className="px-4 py-2 border rounded-md bg-muted min-w-[280px] text-center">
                <span className="font-medium">
                  {format(currentWeekStart, "d MMM", { locale: it })} - {format(addDays(currentWeekStart, 6), "d MMM yyyy", { locale: it })}
                </span>
              </div>
              <Button
                variant="outline"
                size="icon"
                onClick={handleNextWeek}
                data-testid="button-next-week"
              >
                <ChevronRight className="h-4 w-4" />
              </Button>
            </div>
          </div>
        </CardContent>
      </Card>
      {/* Griglia Settimanale */}
      {isLoading ? (
        <Card>
          <CardContent className="p-6">
            <p className="text-center text-muted-foreground">Caricamento...</p>
          </CardContent>
        </Card>
      ) : error ? (
        <Card>
          <CardContent className="p-6">
            <p className="text-center text-destructive">
              Errore nel caricamento della pianificazione. Riprova più tardi.
            </p>
          </CardContent>
        </Card>
      ) : scheduleData && scheduleData.guards.length > 0 ? (
        <Card>
          <CardContent className="p-0">
            <div className="overflow-x-auto">
              <table className="w-full border-collapse">
                <thead>
                  <tr className="border-b bg-muted/50">
                    <th className="sticky left-0 z-10 bg-muted/50 text-left p-3 font-medium min-w-[180px]">
                      Guardia
                    </th>
                    {weekDays.map((day, index) => (
                      <th key={index} className="text-center p-3 font-medium min-w-[200px]">
                        <div>{format(day, "EEE", { locale: it })}</div>
                        <div className="text-xs text-muted-foreground font-normal">
                          {format(day, "dd/MM")}
                        </div>
                      </th>
                    ))}
                  </tr>
                </thead>
                <tbody>
                  {scheduleData.guards.map((guardData) => (
                    <tr 
                      key={guardData.guard.id}
                      className="border-b hover:bg-muted/30"
                      data-testid={`row-guard-${guardData.guard.id}`}
                    >
                      <td className="sticky left-0 z-10 bg-background p-3 font-medium border-r">
                        <div className="flex flex-col">
                          <span className="text-sm">
                            {guardData.guard.lastName} {guardData.guard.firstName}
                          </span>
                          <span className="text-xs text-muted-foreground">
                            #{guardData.guard.badgeNumber}
                          </span>
                        </div>
                      </td>
                      {weekDays.map((day, dayIndex) => {
                        const activity = getDayActivity(guardData, day);
                        return (
                          <td 
                            key={dayIndex} 
                            className="p-2 text-center align-middle"
                          >
                            {activity ? (
                              activity.type === "absence" ? (
                                <div 
                                  className="text-xs px-2 py-1.5 rounded bg-amber-100 dark:bg-amber-900/30 text-amber-900 dark:text-amber-300"
                                  data-testid={`cell-absence-${guardData.guard.id}-${dayIndex}`}
                                >
                                  {activity.label}
                                </div>
                              ) : (
                                <Button
                                  variant="outline"
                                  size="sm"
                                  className="w-full h-auto text-xs px-2 py-1.5 whitespace-normal hover-elevate"
                                  onClick={() => handleCellClick(guardData, activity, day)}
                                  data-testid={`button-shift-${guardData.guard.id}-${dayIndex}`}
                                >
                                  {activity.label}
                                </Button>
                              )
                            ) : (
                              <span className="text-xs text-muted-foreground">-</span>
                            )}
                          </td>
                        );
                      })}
                    </tr>
                  ))}
                </tbody>
              </table>
            </div>
          </CardContent>
        </Card>
      ) : (
        <Card>
          <CardContent className="p-6">
            <p className="text-center text-muted-foreground">
              Nessuna guardia trovata per la sede selezionata
            </p>
          </CardContent>
        </Card>
      )}
      {/* Dialog Dettaglio Turno */}
      <Dialog open={!!dialogData} onOpenChange={() => setDialogData(null)}>
        <DialogContent className="max-w-2xl">
          <DialogHeader>
            <DialogTitle className="flex items-center gap-2">
              {dialogData?.type === "fixed" ? (
                <>
                  <MapPin className="h-5 w-5" />
                  Turno Fisso - {dialogData?.guardName}
                </>
              ) : (
                <>
                  <Navigation className="h-5 w-5" />
                  Turno Mobile - {dialogData?.guardName}
                </>
              )}
            </DialogTitle>
            <DialogDescription>
              {dialogData?.date}
            </DialogDescription>
          </DialogHeader>
          {dialogData && (
            <div className="space-y-4">
              {dialogData.type === "fixed" ? (
                // Dettagli turno fisso
                <div className="space-y-3">
                  <div className="bg-muted/30 p-3 rounded-md space-y-2">
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Sito</span>
                      <span className="text-sm font-medium">{dialogData.data.siteName}</span>
                    </div>
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Orario</span>
                      <div className="flex items-center gap-1 text-sm font-medium">
                        <Clock className="h-3 w-3" />
                        {format(new Date(dialogData.data.plannedStartTime), "HH:mm")} - {format(new Date(dialogData.data.plannedEndTime), "HH:mm")}
                      </div>
                    </div>
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Durata</span>
                      <span className="text-sm font-bold">
                        {Math.round((new Date(dialogData.data.plannedEndTime).getTime() - new Date(dialogData.data.plannedStartTime).getTime()) / (1000 * 60 * 60))}h
                      </span>
                    </div>
                  </div>
                  <div className="p-3 bg-blue-500/10 border border-blue-500/20 rounded-md">
                    <p className="text-sm text-muted-foreground">
                      Per modificare questo turno, vai alla pagina <Link href="/general-planning" className="text-primary font-medium hover:underline">Planning Fissi</Link>
                    </p>
                  </div>
                </div>
              ) : (
                // Dettagli turno mobile
                <div className="space-y-3">
                  <div className="bg-muted/30 p-3 rounded-md space-y-2">
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Tipo</span>
                      <Badge variant="outline">Pattuglia</Badge>
                    </div>
                    <div className="flex items-center justify-between">
                      <span className="text-sm text-muted-foreground">Orario</span>
                      <div className="flex items-center gap-1 text-sm font-medium">
                        <Clock className="h-3 w-3" />
                        {dialogData.data.startTime} - {dialogData.data.endTime}
                      </div>
                    </div>
                  </div>
                  <div className="p-3 bg-blue-500/10 border border-blue-500/20 rounded-md">
                    <p className="text-sm text-muted-foreground">
                      Per visualizzare il percorso completo e modificare il turno, vai alla pagina <Link href="/planning-mobile" className="text-primary font-medium hover:underline">Planning Mobile</Link>
                    </p>
                  </div>
                </div>
              )}
            </div>
          )}
          <DialogFooter>
            <Button variant="outline" onClick={() => setDialogData(null)}>
              Chiudi
            </Button>
            {dialogData?.type === "fixed" ? (
              <Link href="/general-planning">
                <Button data-testid="button-goto-planning-fissi">
                  <ExternalLink className="h-4 w-4 mr-2" />
                  Vai a Planning Fissi
                </Button>
              </Link>
            ) : (
              <Link href="/planning-mobile">
                <Button data-testid="button-goto-planning-mobile">
                  <ExternalLink className="h-4 w-4 mr-2" />
                  Vai a Planning Mobile
                </Button>
              </Link>
            )}
          </DialogFooter>
        </DialogContent>
      </Dialog>
    </div>
  );
 }
--- a/database-backups/vigilanzaturni_v1.0.18_20251017_155640.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.18_20251017_155640.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.19_20251017_172429.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.19_20251017_172429.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.20_20251018_074134.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.20_20251018_074134.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.21_20251018_081811.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.21_20251018_081811.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.22_20251018_082656.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.22_20251018_082656.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.23_20251018_092039.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.23_20251018_092039.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.24_20251018_102519.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.24_20251018_102519.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.25_20251021_141055.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.25_20251021_141055.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.26_20251021_154042.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.26_20251021_154042.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.27_20251021_162727.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.27_20251021_162727.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.51_20251024_132912.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.51_20251024_132912.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.52_20251024_145327.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.52_20251024_145327.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.53_20251024_163455.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.53_20251024_163455.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.54_20251024_172526.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.54_20251024_172526.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.55_20251025_072838.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.55_20251025_072838.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.56_20251025_074951.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.56_20251025_074951.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.57_20251025_080211.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.57_20251025_080211.sql.gz
--- a/database-backups/vigilanzaturni_v1.0.58_20251025_090445.sql.gz
+++ b/database-backups/vigilanzaturni_v1.0.58_20251025_090445.sql.gz
--- a/database-backups/vigilanzaturni_v1.1.0_20251025_090838.sql.gz
+++ b/database-backups/vigilanzaturni_v1.1.0_20251025_090838.sql.gz
--- a/database-backups/vigilanzaturni_v1.1.1_20251115_101122.sql.gz
+++ b/database-backups/vigilanzaturni_v1.1.1_20251115_101122.sql.gz
--- a/package-lock.json
+++ b/package-lock.json
@ -9,6 +9,9 @@
      "version": "1.0.0",
      "license": "MIT",
      "dependencies": {
        "@dnd-kit/core": "^6.3.1",
        "@dnd-kit/sortable": "^10.0.0",
        "@dnd-kit/utilities": "^3.2.2",
        "@hookform/resolvers": "^3.10.0",
        "@jridgewell/trace-mapping": "^0.3.25",
        "@neondatabase/serverless": "^0.10.4",
@ -41,6 +44,7 @@
        "@radix-ui/react-tooltip": "^1.2.0",
        "@tanstack/react-query": "^5.60.5",
        "@types/bcrypt": "^6.0.0",
        "@types/leaflet": "^1.9.21",
        "@types/memoizee": "^0.4.12",
        "@types/pg": "^8.15.5",
        "bcrypt": "^6.0.0",
@ -56,6 +60,7 @@
        "express-session": "^1.18.1",
        "framer-motion": "^11.13.1",
        "input-otp": "^1.4.2",
        "leaflet": "^1.9.4",
        "lucide-react": "^0.453.0",
        "memoizee": "^0.4.17",
        "memorystore": "^1.6.7",
@ -69,6 +74,7 @@
        "react-dom": "^18.3.1",
        "react-hook-form": "^7.55.0",
        "react-icons": "^5.4.0",
        "react-leaflet": "^4.2.1",
        "react-resizable-panels": "^2.1.7",
        "recharts": "^2.15.2",
        "tailwind-merge": "^2.6.0",
@ -414,6 +420,59 @@
        "node": ">=6.9.0"
      }
    },
    "node_modules/@dnd-kit/accessibility": {
      "version": "3.1.1",
      "resolved": "https://registry.npmjs.org/@dnd-kit/accessibility/-/accessibility-3.1.1.tgz",
      "integrity": "sha512-2P+YgaXF+gRsIihwwY1gCsQSYnu9Zyj2py8kY5fFvUM1qm2WA2u639R6YNVfU4GWr+ZM5mqEsfHZZLoRONbemw==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
        "react": ">=16.8.0"
      }
    },
    "node_modules/@dnd-kit/core": {
      "version": "6.3.1",
      "resolved": "https://registry.npmjs.org/@dnd-kit/core/-/core-6.3.1.tgz",
      "integrity": "sha512-xkGBRQQab4RLwgXxoqETICr6S5JlogafbhNsidmrkVv2YRs5MLwpjoF2qpiGjQt8S9AoxtIV603s0GIUpY5eYQ==",
      "license": "MIT",
      "dependencies": {
        "@dnd-kit/accessibility": "^3.1.1",
        "@dnd-kit/utilities": "^3.2.2",
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
        "react": ">=16.8.0",
        "react-dom": ">=16.8.0"
      }
    },
    "node_modules/@dnd-kit/sortable": {
      "version": "10.0.0",
      "resolved": "https://registry.npmjs.org/@dnd-kit/sortable/-/sortable-10.0.0.tgz",
      "integrity": "sha512-+xqhmIIzvAYMGfBYYnbKuNicfSsk4RksY2XdmJhT+HAC01nix6fHCztU68jooFiMUB01Ky3F0FyOvhG/BZrWkg==",
      "license": "MIT",
      "dependencies": {
        "@dnd-kit/utilities": "^3.2.2",
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
        "@dnd-kit/core": "^6.3.0",
        "react": ">=16.8.0"
      }
    },
    "node_modules/@dnd-kit/utilities": {
      "version": "3.2.2",
      "resolved": "https://registry.npmjs.org/@dnd-kit/utilities/-/utilities-3.2.2.tgz",
      "integrity": "sha512-+MKAJEOfaBe5SmV6t34p80MMKhjvUz0vRrvVJbPT0WElzaOJ/1xs+D+KDv+tD/NE5ujfrChEcshd4fLn0wpiqg==",
      "license": "MIT",
      "dependencies": {
        "tslib": "^2.0.0"
      },
      "peerDependencies": {
        "react": ">=16.8.0"
      }
    },
    "node_modules/@drizzle-team/brocli": {
      "version": "0.10.2",
      "resolved": "https://registry.npmjs.org/@drizzle-team/brocli/-/brocli-0.10.2.tgz",
@ -2790,6 +2849,17 @@
      "resolved": "https://registry.npmjs.org/@radix-ui/rect/-/rect-1.1.1.tgz",
      "integrity": "sha512-HPwpGIzkl28mWyZqG52jiqDJ12waP11Pa1lGoiyUkIEuMLBP0oeK/C89esbXrxsky5we7dfd8U58nm0SgAWpVw=="
    },
    "node_modules/@react-leaflet/core": {
      "version": "2.1.0",
      "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-2.1.0.tgz",
      "integrity": "sha512-Qk7Pfu8BSarKGqILj4x7bCSZ1pjuAPZ+qmRwH5S7mDS91VSbVVsJSrW4qA+GPrro8t69gFYVMWb1Zc4yFmPiVg==",
      "license": "Hippocratic-2.1",
      "peerDependencies": {
        "leaflet": "^1.9.0",
        "react": "^18.0.0",
        "react-dom": "^18.0.0"
      }
    },
    "node_modules/@replit/vite-plugin-cartographer": {
      "version": "0.3.1",
      "resolved": "https://registry.npmjs.org/@replit/vite-plugin-cartographer/-/vite-plugin-cartographer-0.3.1.tgz",
@ -3571,6 +3641,12 @@
        "@types/express": "*"
      }
    },
    "node_modules/@types/geojson": {
      "version": "7946.0.16",
      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
      "license": "MIT"
    },
    "node_modules/@types/http-errors": {
      "version": "2.0.4",
      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
@ -3578,6 +3654,15 @@
      "dev": true,
      "license": "MIT"
    },
    "node_modules/@types/leaflet": {
      "version": "1.9.21",
      "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.21.tgz",
      "integrity": "sha512-TbAd9DaPGSnzp6QvtYngntMZgcRk+igFELwR2N99XZn7RXUdKgsXMR+28bUO0rPsWp8MIu/f47luLIQuSLYv/w==",
      "license": "MIT",
      "dependencies": {
        "@types/geojson": "*"
      }
    },
    "node_modules/@types/memoizee": {
      "version": "0.4.12",
      "resolved": "https://registry.npmjs.org/@types/memoizee/-/memoizee-0.4.12.tgz",
@ -5549,6 +5634,12 @@
        "node": ">=6"
      }
    },
    "node_modules/leaflet": {
      "version": "1.9.4",
      "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz",
      "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==",
      "license": "BSD-2-Clause"
    },
    "node_modules/lightningcss": {
      "version": "1.29.2",
      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.29.2.tgz",
@ -6820,6 +6911,20 @@
      "integrity": "sha512-/LLMVyas0ljjAtoYiPqYiL8VWXzUUdThrmU5+n20DZv+a+ClRoevUzw5JxU+Ieh5/c87ytoTBV9G1FiKfNJdmg==",
      "license": "MIT"
    },
    "node_modules/react-leaflet": {
      "version": "4.2.1",
      "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-4.2.1.tgz",
      "integrity": "sha512-p9chkvhcKrWn/H/1FFeVSqLdReGwn2qmiobOQGO3BifX+/vV/39qhY8dGqbdcPh1e6jxh/QHriLXr7a4eLFK4Q==",
      "license": "Hippocratic-2.1",
      "dependencies": {
        "@react-leaflet/core": "^2.1.0"
      },
      "peerDependencies": {
        "leaflet": "^1.9.0",
        "react": "^18.0.0",
        "react-dom": "^18.0.0"
      }
    },
    "node_modules/react-refresh": {
      "version": "0.17.0",
      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.17.0.tgz",
--- a/package.json
+++ b/package.json
@ -11,6 +11,9 @@
    "db:push": "drizzle-kit push"
  },
  "dependencies": {
    "@dnd-kit/core": "^6.3.1",
    "@dnd-kit/sortable": "^10.0.0",
    "@dnd-kit/utilities": "^3.2.2",
    "@hookform/resolvers": "^3.10.0",
    "@jridgewell/trace-mapping": "^0.3.25",
    "@neondatabase/serverless": "^0.10.4",
@ -43,6 +46,7 @@
    "@radix-ui/react-tooltip": "^1.2.0",
    "@tanstack/react-query": "^5.60.5",
    "@types/bcrypt": "^6.0.0",
    "@types/leaflet": "^1.9.21",
    "@types/memoizee": "^0.4.12",
    "@types/pg": "^8.15.5",
    "bcrypt": "^6.0.0",
@ -58,6 +62,7 @@
    "express-session": "^1.18.1",
    "framer-motion": "^11.13.1",
    "input-otp": "^1.4.2",
    "leaflet": "^1.9.4",
    "lucide-react": "^0.453.0",
    "memoizee": "^0.4.17",
    "memorystore": "^1.6.7",
@ -71,6 +76,7 @@
    "react-dom": "^18.3.1",
    "react-hook-form": "^7.55.0",
    "react-icons": "^5.4.0",
    "react-leaflet": "^4.2.1",
    "react-resizable-panels": "^2.1.7",
    "recharts": "^2.15.2",
    "tailwind-merge": "^2.6.0",
--- a/replit.md
+++ b/replit.md
@ -1,7 +1,7 @@
 # VigilanzaTurni - Sistema Gestione Turni per Istituti di Vigilanza
 ## Overview
-VigilanzaTurni is a professional 24/7 shift management system designed for security companies. It offers multi-role authentication (Admin, Coordinator, Guard, Client), comprehensive guard and site management, 24/7 shift planning, a live operational dashboard with KPIs, reporting for worked hours, and a notification system. The system supports multi-location operations (Roccapiemonte, Milano, Roma) managing 250+ security personnel across different branches. The project aims to streamline operations and enhance efficiency for security institutes.
+VigilanzaTurni is a professional 24/7 shift management system for security companies, designed to streamline operations and enhance efficiency. It supports multi-role authentication (Admin, Coordinator, Guard, Client) and multi-location operations, managing over 250 security personnel across different branches. Key capabilities include comprehensive guard and site management, 24/7 shift planning, a live operational dashboard with KPIs, reporting for worked hours, and a notification system. The project aims to provide a robust, scalable solution for security companies, improving operational control and resource allocation.
 ## User Preferences
 - Interfaccia in italiano
@ -19,6 +19,7 @@ VigilanzaTurni is a professional 24/7 shift management system designed for secur
 - **Autenticazione**: Replit Auth (OIDC)
 - **State Management**: TanStack Query v5
 - **Routing**: Wouter
 - **Maps**: Leaflet + react-leaflet + OpenStreetMap tiles
 ### Design System
 - **Font Principale**: Inter (sans-serif)
@ -28,74 +29,50 @@ VigilanzaTurni is a professional 24/7 shift management system designed for secur
 - **Componenti**: Shadcn UI with an operational design.
 ### Database Schema
-The database includes core tables for `users`, `guards`, `certifications`, `sites`, `shifts`, `shift_assignments`, and `notifications`. Advanced scheduling and constraints are managed via `guard_constraints`, `site_preferences`, `contract_parameters`, `training_courses`, `holidays`, `holiday_assignments`, `absences`, and `absence_affected_shifts`. All tables include appropriate foreign keys and unique constraints to maintain data integrity.
+The database supports managing users, guards, certifications, sites, shifts, shift assignments, notifications, customers, and service types. It also includes tables for advanced scheduling constraints such as guard constraints, site preferences, contract parameters, training courses, holidays, and absences. Service types include specialized parameters like `fixedPostHours`, `patrolPassages`, `inspectionFrequency`, and `responseTimeMinutes`.
-**Recent Schema Updates (October 2025)**:
+### Core Features
- Service types now include specialized parameters: `fixedPostHours` (ore presidio fisso), `patrolPassages` (numero passaggi pattuglia), `inspectionFrequency` (frequenza ispezioni), `responseTimeMinutes` (tempo risposta pronto intervento)
+- **Multi-Sede Operational Planning**: Location-first approach for shift planning, filtering resources by selected branch.
- Sites include service schedule fields: `serviceStartTime` and `serviceEndTime` (formato HH:MM)
+- **Service Type Classification**: Classifies services as "fisso" (fixed posts) or "mobile" (patrols, inspections) to route sites to appropriate planning modules.
- **Contract Management**: Sites now include contract fields: `contractReference` (codice contratto), `contractStartDate`, `contractEndDate` (date validità contratto in formato YYYY-MM-DD)
+- **Planning Fissi**: Weekly planning grid for fixed posts, enabling shift creation with guard availability checks. Includes weekly shift duplication feature with confirmation dialog and automatic navigation.
- Sites now reference service types via `serviceTypeId` foreign key; `shiftType` is optional and can be derived from service type
+- **Planning Mobile**: Guard-centric interface for mobile services, displaying guard availability and hours, with an interactive Leaflet map showing sites. Features include:
- **Multi-Location Support**: Added `location` field (enum: roccapiemonte, milano, roma) to `sites`, `guards`, and `vehicles` tables for complete multi-sede resource isolation
+  - **Smart Site Assignment Indicators**: Sites already in patrol routes display "Assegnato a [Guard Name]" button with scroll-to functionality; unassigned sites show "Non assegnato" text
-
+  - **Drag-and-Drop Reordering**: Interactive drag-and-drop using @dnd-kit library for patrol route stops with visual feedback and automatic sequenceOrder persistence
-**Recent Features (October 17-18, 2025)**:
+  - **Route Optimization**: OSRM API integration with TSP (Traveling Salesman Problem) nearest neighbor algorithm; displays total distance (km) and estimated travel time in dedicated dialog
- **Multi-Sede Operational Planning**: Redesigned operational planning workflow with location-first approach:
+  - **Patrol Sequence List View**: Daily view of planned patrol routes with stops visualization
-  1. Select sede (Roccapiemonte/Milano/Roma) - first step with default value
+  - **Custom Shift Timing**: Configurable start time and duration for each patrol route (replaces hardcoded 08:00-20:00)
-  2. Select date
+  - **Shift Overlap Validation**: POST /api/patrol-routes/check-overlaps endpoint verifies:
-  3. View uncovered sites filtered by selected sede
+    - No conflicts with existing fixed post shifts (shift_assignments)
-  4. Select site → view available resources (guards and vehicles) filtered by sede
+    - No conflicts with other mobile patrol routes
-  5. Assign resources and create shift
+    - Weekly hours compliance with contract parameters (maxHoursPerWeek + maxOvertimePerWeek)
- **Location-Based Filtering**: Backend endpoints use INNER JOIN with sites table to ensure complete resource isolation between locations - guards/vehicles in one sede remain available even when assigned to shifts in other sedi
+  - **Force-Save Dialog**: Interactive conflict resolution when saving patrol routes with overlaps or contractual limit violations; shows detailed conflict information and allows coordinator override
- **Site Management**: Added sede selection in site creation/editing forms with visual badges showing location in site listings
+  - **Multi-Day Duplication**: Duplication dialog supports "numero giorni consecutivi" field to create patrol sequences across N consecutive days; includes overlap validation (conservative approach: blocks entire operation if any day has conflicts)
- **Planning Generale (October 18, 2025)**: New weekly planning overview feature showing all sites × 7 days in table format:
+- **Customer Management**: Full CRUD operations for customer details and customer-centric reporting with CSV export.
-  - **Contract filtering**: Shows only sites with active contracts in the week dates (`contractStartDate <= weekEnd AND contractEndDate >= weekStart`)
+- **Dashboard Operativa**: Live KPIs and real-time shift status.
-  - Backend endpoint `/api/general-planning?weekStart=YYYY-MM-DD&location=sede` with complex joins and location filtering
+- **Gestione Guardie**: Complete profiles with skill matrix, certification management, and badge numbers.
-  - Automatic missing guards calculation: `ceil(totalShiftHours / maxHoursPerGuard) × minGuards - assignedGuards` (e.g., 24h shift, 2 guards min, 9h max = 6 total needed)
+- **Gestione Siti/Commesse**: Sites are associated with service types, including schedule, contract management, and location assignment. Automatic geocoding is supported.
-  - **Weekly summary**: Shows total guards needed, guards assigned (counting slots, not unique people), and guards missing for the entire week
+- **Pianificazione Turni**: 24/7 calendar, manual guard assignment, basic constraints, and shift statuses.
-  - Table cells display: assigned guards with hours, vehicles, missing guards badge (if any), shift count, total hours
+- **Advanced Planning**: Management of guard constraints, site preferences, contract parameters, training courses, holidays, and absences. Includes patrol route persistence and exclusivity constraints between fixed and mobile shifts.
-  - Interactive cells with click handler opening detail dialog
+- **Guard Planning Views**: Dedicated views for guards to see their fixed post shifts and mobile patrol routes.
-  - Dialog shows: shift count, total hours, guard list with hours and badge numbers, vehicle list, missing guards warning with explanation
+- **Site Planning View**: Coordinators can view all guards assigned to a specific site over a week.
-  - **Direct Shift Creation from Dialog**: Users can now create multi-day shifts directly from the Planning Generale dialog:
+- **Shift Duplication Features**:
-    - Select guard from dropdown showing name + weekly available hours (max 45h - assigned hours)
+  - **Weekly Copy (Planning Fissi)**: POST /api/shift-assignments/copy-week endpoint duplicates all shifts and assignments from selected week to next week (+7 days) with atomic transaction. Frontend includes confirmation dialog with week details and success feedback.
-    - Specify number of consecutive days (1-7)
+  - **Patrol Sequence Duplication (Planning Mobili)**: POST /api/patrol-routes/duplicate endpoint with dual behavior: UPDATE when target date = source date (modifies guard), CREATE when different date (duplicates route with all stops). Frontend shows daily sequence list with duplication dialog (date picker defaulting to next day, guard selector pre-filled but changeable).
-    - Backend endpoint `POST /api/general-planning/shifts` with atomic transaction using `db.transaction()` - all shifts created or none (rollback on error)
+- **Guardie Settimanale**: Compact weekly schedule view showing all guards' assignments across the week in a grid format. Features include:
-    - Validates contract dates, site and guard existence before transaction
+  - **Weekly Grid View**: Guard names in first column, 7 daily columns (Mon-Sun) with compact cell display
-    - Automatically creates shifts spanning multiple days with correct time ranges from site service schedule
+  - **Multi-Source Aggregation**: GET /api/weekly-guards-schedule endpoint aggregates fixed shifts, patrol routes, and absences by location and week
-    - TanStack Query mutation with cache invalidation for real-time planning grid updates
+  - **Compact Cell Format**: Fixed posts show "Site Name HH:mm-HH:mm", mobile patrols show "Pattuglia HH:mm-HH:mm", absences show status (Ferie/Malattia/Permesso/Riposo)
-  - "Modifica in Pianificazione Operativa" button in dialog navigates to operational planning page with pre-filled date/location parameters
+  - **Read-Only Dialogs**: Clicking cells opens appropriate dialog (fixed shift details or mobile patrol info) with navigation links to Planning Fissi/Mobile for edits
-  - Week navigation (previous/next week) with location selector
+  - **Location and Week Filters**: Dropdown for branch selection, week navigation with prev/next buttons displaying "Settimana dal DD MMM al DD MMM YYYY"
  - Operational planning page now supports query parameters (`?date=YYYY-MM-DD&location=sede`) for seamless integration
 **Recent Bug Fixes (October 17-18, 2025)**:
 - **Operational Planning Date Handling**: Fixed date sanitization in `/api/operational-planning/uncovered-sites` and `/api/operational-planning/availability` endpoints to handle malformed date inputs (e.g., "2025-10-17/2025-10-17"). Both endpoints now validate dates using `parseISO`/`isValid` and return 400 for invalid formats.
 - **Checkbox Event Propagation**: Fixed double-toggle bug in operational planning resource selection by wrapping vehicle and guard checkboxes in `<div onClick={e => e.stopPropagation()}>` to prevent Card onClick from firing when clicking checkboxes.
 - **Multi-Sede Resource Isolation**: Fixed critical bug where resources from different sedi were incorrectly marked as unavailable due to global shift queries. Now both availability and uncovered-sites endpoints filter shifts by location using JOIN with sites table.
 - **QueryKey Cache Invalidation**: Fixed queryKey structure from single-string to hierarchical array with custom queryFn to enable targeted cache invalidation by location and date while preventing URL concatenation errors.
 - **apiRequest Parameter Order (October 18, 2025)**: Fixed inverted parameters bug in Planning Generale shift creation mutation. Changed `apiRequest(url, method, data)` to correct signature `apiRequest(method, url, data)` matching queryClient.ts function definition.
 ### API Endpoints
 Comprehensive RESTful API endpoints are provided for Authentication, Users, Guards, Sites, Shifts, and Notifications, supporting full CRUD operations with role-based access control.
 ### Frontend Routes
 Key frontend routes include `/`, `/guards`, `/sites`, `/shifts`, `/reports`, `/notifications`, and `/users`, with access controlled by user roles.
 ### User Roles
- **Admin**: Full access to all functionalities, managing guards, sites, shifts, and reports.
+- **Admin**: Full access.
- **Coordinator**: Shift planning, guard assignment, operational site management, and reporting.
+- **Coordinator**: Shift planning, guard assignment, operational site management, reporting.
- **Guard**: View assigned shifts, future time-punching, notifications, and personal profile.
+- **Guard**: View assigned shifts, time-punching, notifications, personal profile.
- **Client**: View assigned sites, service reporting, and KPIs.
+- **Client**: View assigned sites, service reporting, KPIs.
-### Key Features
+### Critical Date/Timezone Handling
- **Dashboard Operativa**: Live KPIs (active shifts, total guards, active sites, expiring certifications) and real-time shift status.
+The system handles timezone conversions for shift times, converting Italy local time from the frontend to UTC for database storage, and back to Italy local time for display, accounting for DST.
 - **Gestione Guardie**: Complete profiles with skill matrix (armed, fire safety, first aid, driver's license), certification management with automatic expiry, and unique badge numbers.
 - **Gestione Siti/Commesse**: Service types with specialized parameters (fixed post hours, patrol passages, inspection frequency, response time) and minimum requirements (guard count, armed, driver's license). Sites include service schedule (start/end time), contract management (reference code, validity period with start/end dates), and location/sede assignment. Contract status is visualized with badges (active/expiring/expired) and enforces shift creation only within active contract periods.
 - **Pianificazione Operativa Multi-Sede**: Location-aware workflow for shift assignment:
  1. Select sede (Roccapiemonte/Milano/Roma) → filters all subsequent data by location
  2. Select date → view uncovered sites with coverage status (sede-filtered)
  3. Select site → view available resources (guards and vehicles matching sede and requirements)
  4. Assign resources → create shift with atomic guard assignments and vehicle allocation
 - **Pianificazione Turni**: 24/7 calendar, manual guard assignment, basic constraints, and shift statuses (planned, active, completed, cancelled).
 - **Reportistica**: Total hours worked, monthly hours per guard, shift statistics, and data export capabilities.
 - **Advanced Planning**: Management of guard constraints (preferences, max hours, rest days), site preferences (preferred/blacklisted guards), contract parameters, training courses, holidays, and absences with substitution system.
 ## External Dependencies
 - **Replit Auth**: For OpenID Connect (OIDC) based authentication.
@ -106,7 +83,7 @@ Key frontend routes include `/`, `/guards`, `/sites`, `/shifts`, `/reports`, `/n
 - **TanStack Query**: For data fetching and state management.
 - **Wouter**: For client-side routing.
 - **date-fns**: For date manipulation and formatting.
- **PM2**: Production process manager for Node.js applications.
+- **Leaflet**: Interactive map library with react-leaflet bindings and OpenStreetMap tiles.
- **Nginx**: As a reverse proxy for the production environment.
+- **Nominatim**: OpenStreetMap geocoding API for automatic address-to-coordinates conversion.
- **Let's Encrypt**: For SSL/TLS certificates.
+- **OSRM (Open Source Routing Machine)**: Public API (router.project-osrm.org) for distance matrix calculation and route optimization in Planning Mobile. No authentication required.
- **GitLab CI/CD**: For continuous integration and deployment.
+- **@dnd-kit**: Drag-and-drop library (@dnd-kit/core, @dnd-kit/sortable, @dnd-kit/utilities) for interactive patrol route reordering.
--- a/server/localAuth.ts
+++ b/server/localAuth.ts
@ -138,13 +138,38 @@ export async function setupLocalAuth(app: Express) {
  });
  // Route login locale POST
-  app.post("/api/local-login", passport.authenticate("local"), (req, res) => {
+  app.post("/api/local-login", (req, res, next) => {
-    res.json({ 
+    passport.authenticate("local", (err: any, user: any, info: any) => {
      if (err) {
        return res.status(500).json({ 
          success: false, 
          message: "Errore durante il login" 
        });
      }
      if (!user) {
        return res.status(401).json({ 
          success: false, 
          message: info?.message || "Email o password non corretti" 
        });
      }
      req.login(user, (loginErr) => {
        if (loginErr) {
          return res.status(500).json({ 
            success: false, 
            message: "Errore durante il login" 
          });
        }
        return res.json({ 
          success: true, 
          user: req.user,
          message: "Login effettuato con successo" 
        });
      });
    })(req, res, next);
  });
  // Route logout
--- a/server/routes.ts
+++ b/server/routes.ts
--- a/server/storage.ts
+++ b/server/storage.ts
@ -4,6 +4,7 @@ import {
  guards,
  certifications,
  vehicles,
  customers,
  sites,
  shifts,
  shiftAssignments,
@ -26,6 +27,8 @@ import {
  type InsertCertification,
  type Vehicle,
  type InsertVehicle,
  type Customer,
  type InsertCustomer,
  type Site,
  type InsertSite,
  type Shift,
@ -85,6 +88,13 @@ export interface IStorage {
  updateServiceType(id: string, serviceType: Partial<InsertServiceType>): Promise<ServiceType | undefined>;
  deleteServiceType(id: string): Promise<ServiceType | undefined>;
  // Customer operations
  getAllCustomers(): Promise<Customer[]>;
  getCustomer(id: string): Promise<Customer | undefined>;
  createCustomer(customer: InsertCustomer): Promise<Customer>;
  updateCustomer(id: string, customer: Partial<InsertCustomer>): Promise<Customer | undefined>;
  deleteCustomer(id: string): Promise<Customer | undefined>;
  // Site operations
  getAllSites(): Promise<Site[]>;
  getSite(id: string): Promise<Site | undefined>;
@ -342,6 +352,35 @@ export class DatabaseStorage implements IStorage {
    return deleted;
  }
  // Customer operations
  async getAllCustomers(): Promise<Customer[]> {
    return await db.select().from(customers).orderBy(desc(customers.createdAt));
  }
  async getCustomer(id: string): Promise<Customer | undefined> {
    const [customer] = await db.select().from(customers).where(eq(customers.id, id));
    return customer;
  }
  async createCustomer(customer: InsertCustomer): Promise<Customer> {
    const [newCustomer] = await db.insert(customers).values(customer).returning();
    return newCustomer;
  }
  async updateCustomer(id: string, customerData: Partial<InsertCustomer>): Promise<Customer | undefined> {
    const [updated] = await db
      .update(customers)
      .set({ ...customerData, updatedAt: new Date() })
      .where(eq(customers.id, id))
      .returning();
    return updated;
  }
  async deleteCustomer(id: string): Promise<Customer | undefined> {
    const [deleted] = await db.delete(customers).where(eq(customers.id, id)).returning();
    return deleted;
  }
  // Site operations
  async getAllSites(): Promise<Site[]> {
    return await db.select().from(sites);
@ -688,6 +727,22 @@ export class DatabaseStorage implements IStorage {
      return start1 < end2 && end1 > start2;
    };
    // Helper: Calculate night hours (22:00-06:00)
    const calculateNightHours = (start: Date, end: Date): number => {
      let nightHours = 0;
      const current = new Date(start);
      while (current < end) {
        const hour = current.getUTCHours();
        if (hour >= 22 || hour < 6) {
          nightHours += 1;
        }
        current.setHours(current.getHours() + 1);
      }
      return nightHours;
    };
    // Calculate week boundaries for weekly hours calculation
    const weekStart = new Date(plannedStart);
    weekStart.setDate(plannedStart.getDate() - plannedStart.getDay() + (plannedStart.getDay() === 0 ? -6 : 1));
@ -695,9 +750,19 @@ export class DatabaseStorage implements IStorage {
    const weekEnd = addDays(weekStart, 6);
    weekEnd.setHours(23, 59, 59, 999);
-    // Get max weekly hours from CCNL settings (default 45h)
+    // Get contract parameters
-    const maxHoursSetting = await this.getCcnlSetting('weeklyGuardHours');
+    let contractParams = await this.getContractParameters();
-    const maxWeeklyHours = maxHoursSetting ? Number(maxHoursSetting.value) : 45;
+    if (!contractParams) {
      contractParams = await this.createContractParameters({
        contractType: "CCNL_VIGILANZA_2024",
      });
    }
    const maxOrdinaryHours = contractParams.maxHoursPerWeek || 40; // 40h
    const maxOvertimeHours = contractParams.maxOvertimePerWeek || 8; // 8h
    const maxTotalHours = maxOrdinaryHours + maxOvertimeHours; // 48h
    const maxNightHours = contractParams.maxNightHoursPerWeek || 48; // 48h
    const minDailyRest = contractParams.minDailyRestHours || 11; // 11h
    // Get site to check requirements
    const site = await this.getSite(siteId);
@ -718,6 +783,9 @@ export class DatabaseStorage implements IStorage {
      return true;
    });
    const requestedHours = differenceInHours(plannedEnd, plannedStart);
    const requestedNightHours = calculateNightHours(plannedStart, plannedEnd);
    // Analyze each guard's availability
    const guardsWithAvailability: GuardAvailability[] = [];
@ -737,17 +805,34 @@ export class DatabaseStorage implements IStorage {
            gte(shiftAssignments.plannedStartTime, weekStart),
            lte(shiftAssignments.plannedStartTime, weekEnd)
          )
-        );
+        )
        .orderBy(desc(shiftAssignments.plannedEndTime));
-      // Calculate total weekly hours assigned
+      // Calculate total weekly hours and night hours assigned
      let weeklyHoursAssigned = 0;
      let nightHoursAssigned = 0;
      let lastShiftEnd: Date | null = null;
      for (const assignment of weeklyAssignments) {
        const hours = differenceInHours(assignment.plannedEndTime, assignment.plannedStartTime);
        weeklyHoursAssigned += hours;
        nightHoursAssigned += calculateNightHours(assignment.plannedStartTime, assignment.plannedEndTime);
        // Track last shift end for rest calculation
        if (!lastShiftEnd || assignment.plannedEndTime > lastShiftEnd) {
          lastShiftEnd = assignment.plannedEndTime;
        }
      }
-      const weeklyHoursRemaining = maxWeeklyHours - weeklyHoursAssigned;
+      // Calculate ordinary and overtime hours
-      const requestedHours = differenceInHours(plannedEnd, plannedStart);
+      const ordinaryHoursAssigned = Math.min(weeklyHoursAssigned, maxOrdinaryHours);
      const overtimeHoursAssigned = Math.max(0, weeklyHoursAssigned - maxOrdinaryHours);
      const ordinaryHoursRemaining = Math.max(0, maxOrdinaryHours - weeklyHoursAssigned);
      const overtimeHoursRemaining = Math.max(0, maxOvertimeHours - overtimeHoursAssigned);
      const weeklyHoursRemaining = ordinaryHoursRemaining + overtimeHoursRemaining;
      // Check if shift requires overtime
      const requiresOvertime = requestedHours > ordinaryHoursRemaining;
      // Check for time conflicts with the requested slot
      const conflicts = [];
@ -771,19 +856,42 @@ export class DatabaseStorage implements IStorage {
        }
      }
      // Check rest violation (11h between shifts)
      let hasRestViolation = false;
      if (lastShiftEnd) {
        const hoursSinceLastShift = differenceInHours(plannedStart, lastShiftEnd);
        if (hoursSinceLastShift < minDailyRest) {
          hasRestViolation = true;
          reasons.push(`Riposo insufficiente (${Math.max(0, hoursSinceLastShift).toFixed(1)}h dall'ultimo turno, minimo ${minDailyRest}h)`);
        }
      }
      // Determine availability
      let isAvailable = true;
      // EXCLUDE guards already assigned on same day/time
      if (conflicts.length > 0) {
        isAvailable = false;
        reasons.push(`Già assegnata in ${conflicts.length} turno/i nello stesso orario`);
      }
      // Check if enough hours available (total)
      if (weeklyHoursRemaining < requestedHours) {
        isAvailable = false;
        reasons.push(`Ore settimanali insufficienti (${Math.max(0, weeklyHoursRemaining)}h disponibili, ${requestedHours}h richieste)`);
      }
      // Check night hours limit
      if (nightHoursAssigned + requestedNightHours > maxNightHours) {
        isAvailable = false;
        reasons.push(`Ore notturne esaurite (${nightHoursAssigned}h lavorate, max ${maxNightHours}h/settimana)`);
      }
      // Rest violation makes guard unavailable
      if (hasRestViolation) {
        isAvailable = false;
      }
      // Build guard name from new fields
      const guardName = guard.firstName && guard.lastName
        ? `${guard.firstName} ${guard.lastName}`
@ -795,17 +903,27 @@ export class DatabaseStorage implements IStorage {
        badgeNumber: guard.badgeNumber,
        weeklyHoursRemaining,
        weeklyHoursAssigned,
-        weeklyHoursMax: maxWeeklyHours,
+        weeklyHoursMax: maxTotalHours,
        ordinaryHoursRemaining,
        overtimeHoursRemaining,
        nightHoursAssigned,
        requiresOvertime,
        hasRestViolation,
        lastShiftEnd,
        isAvailable,
        conflicts,
        unavailabilityReasons: reasons,
      });
    }
-    // Sort: available first, then by remaining hours (descending)
+    // Sort: available with ordinary hours first, then overtime, then unavailable
    guardsWithAvailability.sort((a, b) => {
      if (a.isAvailable && !b.isAvailable) return -1;
      if (!a.isAvailable && b.isAvailable) return 1;
      if (a.isAvailable && b.isAvailable) {
        if (!a.requiresOvertime && b.requiresOvertime) return -1;
        if (a.requiresOvertime && !b.requiresOvertime) return 1;
      }
      return b.weeklyHoursRemaining - a.weeklyHoursRemaining;
    });
--- a/shared/schema.ts
+++ b/shared/schema.ts
@ -91,6 +91,11 @@ export const locationEnum = pgEnum("location", [
  "roma",          // Sede Roma
 ]);
 export const serviceClassificationEnum = pgEnum("service_classification", [
  "fisso",   // Presidio fisso - Planning Fissi
  "mobile",  // Pattuglie/ronde/interventi - Planning Mobile
 ]);
 // ============= SESSION & AUTH TABLES (Replit Auth) =============
 // Session storage table - mandatory for Replit Auth
@ -189,6 +194,9 @@ export const serviceTypes = pgTable("service_types", {
  icon: varchar("icon").notNull().default("Building2"), // Nome icona Lucide
  color: varchar("color").notNull().default("blue"), // blue, green, purple, orange
  // ✅ NUOVO: Classificazione servizio - determina quale planning usare
  classification: serviceClassificationEnum("classification").notNull().default("fisso"),
  // Parametri specifici per tipo servizio
  fixedPostHours: integer("fixed_post_hours"), // Ore presidio fisso (es. 8, 12)
  patrolPassages: integer("patrol_passages"), // Numero passaggi pattugliamento (es. 3, 5)
@ -200,13 +208,35 @@ export const serviceTypes = pgTable("service_types", {
  updatedAt: timestamp("updated_at").defaultNow(),
 });
 // ============= CUSTOMERS =============
 export const customers = pgTable("customers", {
  id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
  name: varchar("name").notNull(),
  businessName: varchar("business_name"), // Ragione sociale
  vatNumber: varchar("vat_number"), // Partita IVA
  fiscalCode: varchar("fiscal_code"), // Codice fiscale
  address: varchar("address"),
  city: varchar("city"),
  province: varchar("province"),
  zipCode: varchar("zip_code"),
  phone: varchar("phone"),
  email: varchar("email"),
  pec: varchar("pec"), // PEC (Posta Elettronica Certificata)
  contactPerson: varchar("contact_person"), // Referente
  notes: text("notes"),
  isActive: boolean("is_active").default(true),
  createdAt: timestamp("created_at").defaultNow(),
  updatedAt: timestamp("updated_at").defaultNow(),
 });
 // ============= SITES & CONTRACTS =============
 export const sites = pgTable("sites", {
  id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
  name: varchar("name").notNull(),
  address: varchar("address").notNull(),
-  clientId: varchar("client_id").references(() => users.id),
+  customerId: varchar("customer_id").references(() => customers.id),
  location: locationEnum("location").notNull().default("roccapiemonte"), // Sede gestionale
  // Service requirements
@ -267,6 +297,50 @@ export const shiftAssignments = pgTable("shift_assignments", {
  // Actual check-in/out times (recorded when guard clocks in/out)
  checkInTime: timestamp("check_in_time"),
  checkOutTime: timestamp("check_out_time"),
  // Dotazioni operative per questo turno specifico
  isArmedOnDuty: boolean("is_armed_on_duty").default(false), // Guardia armata per questo turno
  assignedVehicleId: varchar("assigned_vehicle_id").references(() => vehicles.id, { onDelete: "set null" }), // Automezzo assegnato
 });
 // ============= PATROL ROUTES (TURNI PATTUGLIA) =============
 export const patrolRoutes = pgTable("patrol_routes", {
  id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
  guardId: varchar("guard_id").notNull().references(() => guards.id, { onDelete: "cascade" }),
  // Data e orari del turno pattuglia
  shiftDate: date("shift_date").notNull(), // Data del turno
  startTime: varchar("start_time").notNull(), // Orario inizio (HH:MM)
  endTime: varchar("end_time").notNull(), // Orario fine (HH:MM)
  status: shiftStatusEnum("status").notNull().default("planned"),
  location: locationEnum("location").notNull(), // Sede di riferimento
  // Dotazioni
  vehicleId: varchar("vehicle_id").references(() => vehicles.id, { onDelete: "set null" }),
  isArmedRoute: boolean("is_armed_route").default(false), // Percorso con guardia armata
  notes: text("notes"),
  createdAt: timestamp("created_at").defaultNow(),
  updatedAt: timestamp("updated_at").defaultNow(),
 });
 export const patrolRouteStops = pgTable("patrol_route_stops", {
  id: varchar("id").primaryKey().default(sql`gen_random_uuid()`),
  patrolRouteId: varchar("patrol_route_id").notNull().references(() => patrolRoutes.id, { onDelete: "cascade" }),
  siteId: varchar("site_id").notNull().references(() => sites.id, { onDelete: "cascade" }),
  sequenceOrder: integer("sequence_order").notNull(), // Ordine nel percorso (1, 2, 3...)
  estimatedArrivalTime: varchar("estimated_arrival_time"), // Orario stimato arrivo (HH:MM)
  actualArrivalTime: timestamp("actual_arrival_time"), // Orario effettivo arrivo
  // Check completamento tappa
  isCompleted: boolean("is_completed").default(false),
  completedAt: timestamp("completed_at"),
  notes: text("notes"), // Note specifiche per questa tappa
  createdAt: timestamp("created_at").defaultNow(),
 });
 // ============= CCNL SETTINGS =============
@ -478,7 +552,6 @@ export const usersRelations = relations(users, ({ one, many }) => ({
    fields: [users.id],
    references: [guards.userId],
  }),
  managedSites: many(sites),
  notifications: many(notifications),
 }));
@ -489,6 +562,7 @@ export const guardsRelations = relations(guards, ({ one, many }) => ({
  }),
  certifications: many(certifications),
  shiftAssignments: many(shiftAssignments),
  patrolRoutes: many(patrolRoutes),
  constraints: one(guardConstraints),
  sitePreferences: many(sitePreferences),
  trainingCourses: many(trainingCourses),
@ -510,12 +584,17 @@ export const certificationsRelations = relations(certifications, ({ one }) => ({
  }),
 }));
 export const customersRelations = relations(customers, ({ many }) => ({
  sites: many(sites),
 }));
 export const sitesRelations = relations(sites, ({ one, many }) => ({
-  client: one(users, {
+  customer: one(customers, {
-    fields: [sites.clientId],
+    fields: [sites.customerId],
-    references: [users.id],
+    references: [customers.id],
  }),
  shifts: many(shifts),
  patrolRouteStops: many(patrolRouteStops),
  preferences: many(sitePreferences),
 }));
@ -540,6 +619,33 @@ export const shiftAssignmentsRelations = relations(shiftAssignments, ({ one }) =
    fields: [shiftAssignments.guardId],
    references: [guards.id],
  }),
  assignedVehicle: one(vehicles, {
    fields: [shiftAssignments.assignedVehicleId],
    references: [vehicles.id],
  }),
 }));
 export const patrolRoutesRelations = relations(patrolRoutes, ({ one, many }) => ({
  guard: one(guards, {
    fields: [patrolRoutes.guardId],
    references: [guards.id],
  }),
  vehicle: one(vehicles, {
    fields: [patrolRoutes.vehicleId],
    references: [vehicles.id],
  }),
  stops: many(patrolRouteStops),
 }));
 export const patrolRouteStopsRelations = relations(patrolRouteStops, ({ one }) => ({
  patrolRoute: one(patrolRoutes, {
    fields: [patrolRouteStops.patrolRouteId],
    references: [patrolRoutes.id],
  }),
  site: one(sites, {
    fields: [patrolRouteStops.siteId],
    references: [sites.id],
  }),
 }));
 export const notificationsRelations = relations(notifications, ({ one }) => ({
@ -680,6 +786,12 @@ export const insertServiceTypeSchema = createInsertSchema(serviceTypes).omit({
  updatedAt: true,
 });
 export const insertCustomerSchema = createInsertSchema(customers).omit({
  id: true,
  createdAt: true,
  updatedAt: true,
 });
 export const insertSiteSchema = createInsertSchema(sites).omit({
  id: true,
  createdAt: true,
@ -692,6 +804,17 @@ export const insertShiftSchema = createInsertSchema(shifts).omit({
  updatedAt: true,
 });
 export const insertPatrolRouteSchema = createInsertSchema(patrolRoutes).omit({
  id: true,
  createdAt: true,
  updatedAt: true,
 });
 export const insertPatrolRouteStopSchema = createInsertSchema(patrolRouteStops).omit({
  id: true,
  createdAt: true,
 });
 // Form schema that accepts datetime strings and transforms to Date
 export const insertShiftFormSchema = z.object({
  siteId: z.string().min(1, "Sito obbligatorio"),
@ -794,6 +917,9 @@ export type Vehicle = typeof vehicles.$inferSelect;
 export type InsertServiceType = z.infer<typeof insertServiceTypeSchema>;
 export type ServiceType = typeof serviceTypes.$inferSelect;
 export type InsertCustomer = z.infer<typeof insertCustomerSchema>;
 export type Customer = typeof customers.$inferSelect;
 export type InsertSite = z.infer<typeof insertSiteSchema>;
 export type Site = typeof sites.$inferSelect;
@ -887,6 +1013,12 @@ export const guardAvailabilitySchema = z.object({
  weeklyHoursRemaining: z.number(),
  weeklyHoursAssigned: z.number(),
  weeklyHoursMax: z.number(),
  ordinaryHoursRemaining: z.number(), // Ore ordinarie disponibili (max 40h)
  overtimeHoursRemaining: z.number(), // Ore straordinario disponibili (max 8h)
  nightHoursAssigned: z.number(), // Ore notturne lavorate (22:00-06:00)
  requiresOvertime: z.boolean(), // True se richiede straordinario
  hasRestViolation: z.boolean(), // True se viola riposo obbligatorio
  lastShiftEnd: z.date().nullable(), // Fine ultimo turno (per calcolo riposo)
  isAvailable: z.boolean(),
  conflicts: z.array(guardConflictSchema),
  unavailabilityReasons: z.array(z.string()),
--- a/version.json
+++ b/version.json
@ -1,7 +1,205 @@
 {
-  "version": "1.0.27",
+  "version": "1.1.1",
-  "lastUpdate": "2025-10-21T16:27:43.584Z",
+  "lastUpdate": "2025-11-15T10:11:44.404Z",
  "changelog": [
    {
      "version": "1.1.1",
      "date": "2025-11-15",
      "type": "patch",
      "description": "Deployment automatico v1.1.1"
    },
    {
      "version": "1.1.0",
      "date": "2025-10-25",
      "type": "minor",
      "description": "Deployment automatico v1.1.0"
    },
    {
      "version": "1.0.58",
      "date": "2025-10-25",
      "type": "patch",
      "description": "Deployment automatico v1.0.58"
    },
    {
      "version": "1.0.57",
      "date": "2025-10-25",
      "type": "patch",
      "description": "Deployment automatico v1.0.57"
    },
    {
      "version": "1.0.56",
      "date": "2025-10-25",
      "type": "patch",
      "description": "Deployment automatico v1.0.56"
    },
    {
      "version": "1.0.55",
      "date": "2025-10-25",
      "type": "patch",
      "description": "Deployment automatico v1.0.55"
    },
    {
      "version": "1.0.54",
      "date": "2025-10-24",
      "type": "patch",
      "description": "Deployment automatico v1.0.54"
    },
    {
      "version": "1.0.53",
      "date": "2025-10-24",
      "type": "patch",
      "description": "Deployment automatico v1.0.53"
    },
    {
      "version": "1.0.52",
      "date": "2025-10-24",
      "type": "patch",
      "description": "Deployment automatico v1.0.52"
    },
    {
      "version": "1.0.51",
      "date": "2025-10-24",
      "type": "patch",
      "description": "Deployment automatico v1.0.51"
    },
    {
      "version": "1.0.50",
      "date": "2025-10-24",
      "type": "patch",
      "description": "Deployment automatico v1.0.50"
    },
    {
      "version": "1.0.49",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.49"
    },
    {
      "version": "1.0.48",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.48"
    },
    {
      "version": "1.0.47",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.47"
    },
    {
      "version": "1.0.46",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.46"
    },
    {
      "version": "1.0.45",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.45"
    },
    {
      "version": "1.0.44",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.44"
    },
    {
      "version": "1.0.43",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.43"
    },
    {
      "version": "1.0.42",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.42"
    },
    {
      "version": "1.0.41",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.41"
    },
    {
      "version": "1.0.40",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.40"
    },
    {
      "version": "1.0.39",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.39"
    },
    {
      "version": "1.0.38",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.38"
    },
    {
      "version": "1.0.37",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.37"
    },
    {
      "version": "1.0.36",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.36"
    },
    {
      "version": "1.0.35",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.35"
    },
    {
      "version": "1.0.34",
      "date": "2025-10-23",
      "type": "patch",
      "description": "Deployment automatico v1.0.34"
    },
    {
      "version": "1.0.33",
      "date": "2025-10-22",
      "type": "patch",
      "description": "Deployment automatico v1.0.33"
    },
    {
      "version": "1.0.32",
      "date": "2025-10-22",
      "type": "patch",
      "description": "Deployment automatico v1.0.32"
    },
    {
      "version": "1.0.31",
      "date": "2025-10-22",
      "type": "patch",
      "description": "Deployment automatico v1.0.31"
    },
    {
      "version": "1.0.30",
      "date": "2025-10-22",
      "type": "patch",
      "description": "Deployment automatico v1.0.30"
    },
    {
      "version": "1.0.29",
      "date": "2025-10-21",
      "type": "patch",
      "description": "Deployment automatico v1.0.29"
    },
    {
      "version": "1.0.28",
      "date": "2025-10-21",
      "type": "patch",
      "description": "Deployment automatico v1.0.28"
    },
    {
      "version": "1.0.27",
      "date": "2025-10-21",
@ -103,72 +301,6 @@
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.11"
    },
    {
      "version": "1.0.10",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.10"
    },
    {
      "version": "1.0.9",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.9"
    },
    {
      "version": "1.0.8",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.8"
    },
    {
      "version": "1.0.7",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.7"
    },
    {
      "version": "1.0.6",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.6"
    },
    {
      "version": "1.0.5",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.5"
    },
    {
      "version": "1.0.4",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.4"
    },
    {
      "version": "1.0.3",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.3"
    },
    {
      "version": "1.0.2",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.2"
    },
    {
      "version": "1.0.1",
      "date": "2025-10-17",
      "type": "patch",
      "description": "Deployment automatico v1.0.1"
    },
    {
      "version": "1.0.0",
      "date": "2025-01-17",
      "type": "initial",
      "description": "Versione iniziale VigilanzaTurni - Sistema completo gestione turni vigilanza"
    }
  ]
 }