diff --git a/.replit b/.replit
index 90b1d94..c451b5c 100644
--- a/.replit
+++ b/.replit
@@ -39,6 +39,10 @@ externalPort = 5000
 localPort = 43267
 externalPort = 3003
 
+[[ports]]
+localPort = 45469
+externalPort = 5173
+
 [env]
 PORT = "5000"
 
diff --git a/client/src/pages/general-planning.tsx b/client/src/pages/general-planning.tsx
index 97e8bc1..e1b3916 100644
--- a/client/src/pages/general-planning.tsx
+++ b/client/src/pages/general-planning.tsx
@@ -685,97 +685,111 @@ export default function GeneralPlanning() {
                   </div>
 
                   {/* Select guardia disponibile */}
-                  <div className="space-y-2">
-                    <div className="flex items-center justify-between">
-                      <Label htmlFor="guard-select">Guardia Disponibile</Label>
-                      {!isLoadingGuards && availableGuards && availableGuards.some(g => g.requiresOvertime && g.isAvailable) && (
-                        <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" />
-                    ) : (
-                      <>
-                        {(() => {
-                          // Filtra guardie: mostra solo con ore ordinarie se toggle è off
-                          const filteredGuards = availableGuards?.filter(g => 
-                            g.isAvailable && (showOvertimeGuards || !g.requiresOvertime)
-                          ) || [];
-                          
-                          return (
-                            <>
-                              <Select 
-                                value={selectedGuardId} 
-                                onValueChange={setSelectedGuardId}
-                                disabled={assignGuardMutation.isPending}
-                              >
-                                <SelectTrigger id="guard-select" data-testid="select-guard">
-                                  <SelectValue placeholder="Seleziona guardia..." />
-                                </SelectTrigger>
-                                <SelectContent>
-                                  {filteredGuards.length > 0 ? (
-                                    filteredGuards.map((guard) => (
-                                      <SelectItem key={guard.guardId} value={guard.guardId}>
-                                        {guard.guardName} ({guard.badgeNumber}) - {guard.ordinaryHoursRemaining}h ord.
-                                        {guard.requiresOvertime && ` + ${guard.overtimeHoursRemaining}h strao.`}
-                                        {guard.requiresOvertime && " 🔸"}
-                                      </SelectItem>
-                                    ))
-                                  ) : (
-                                    <SelectItem value="no-guards" disabled>
-                                      {showOvertimeGuards 
-                                        ? "Nessuna guardia disponibile" 
-                                        : "Nessuna guardia con ore ordinarie (prova 'Mostra Straordinario')"}
+                  {(() => {
+                    // Filtra guardie: mostra solo con ore ordinarie se toggle è off
+                    const filteredGuards = availableGuards?.filter(g => 
+                      g.isAvailable && (showOvertimeGuards || !g.requiresOvertime)
+                    ) || [];
+                    
+                    const hasOvertimeGuards = availableGuards?.some(g => g.requiresOvertime && g.isAvailable) || false;
+                    
+                    return (
+                      <div className="space-y-2">
+                        <div className="flex items-center justify-between">
+                          <Label htmlFor="guard-select">Guardia Disponibile</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}
+                              disabled={assignGuardMutation.isPending}
+                            >
+                              <SelectTrigger id="guard-select" data-testid="select-guard">
+                                <SelectValue placeholder="Seleziona guardia..." />
+                              </SelectTrigger>
+                              <SelectContent>
+                                {filteredGuards.length > 0 ? (
+                                  filteredGuards.map((guard) => (
+                                    <SelectItem key={guard.guardId} value={guard.guardId}>
+                                      {guard.guardName} ({guard.badgeNumber}) - {guard.ordinaryHoursRemaining}h ord.
+                                      {guard.requiresOvertime && ` + ${guard.overtimeHoursRemaining}h strao.`}
+                                      {guard.requiresOvertime && " 🔸"}
                                     </SelectItem>
-                                  )}
-                                </SelectContent>
-                              </Select>
-                              {filteredGuards.length === 0 && !showOvertimeGuards && availableGuards && availableGuards.some(g => g.isAvailable && g.requiresOvertime) && (
-                                <p className="text-xs text-muted-foreground">
-                                  ℹ️ Alcune guardie disponibili richiedono straordinario. Clicca "Mostra Straordinario" per vederle.
-                                </p>
-                              )}
-                            </>
-                          );
-                        })()}
-                      </>
-                    )}
-                    {availableGuards && availableGuards.length > 0 && selectedGuardId && (
-                      <div className="text-xs space-y-1">
-                        {(() => {
-                          const guard = availableGuards.find(g => g.guardId === selectedGuardId);
-                          if (!guard) return null;
-                          return (
-                            <>
-                              <p className="text-muted-foreground">
-                                Ore assegnate: {guard.weeklyHoursAssigned}h / {guard.weeklyHoursMax}h (rimangono {guard.weeklyHoursRemaining}h)
+                                  ))
+                                ) : (
+                                  <SelectItem value="no-guards" disabled>
+                                    {showOvertimeGuards 
+                                      ? "Nessuna guardia disponibile" 
+                                      : "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 disponibili richiedono straordinario. Clicca "Mostra Straordinario" per vederle.
                               </p>
-                              {guard.conflicts && guard.conflicts.length > 0 && (
-                                <p className="text-destructive font-medium">
-                                  ⚠️ Conflitto: {guard.conflicts.map((c: any) => 
-                                    `${c.siteName} (${new Date(c.from).toLocaleTimeString('it-IT', {hour: '2-digit', minute:'2-digit'})} - ${new Date(c.to).toLocaleTimeString('it-IT', {hour: '2-digit', minute:'2-digit'})})`
-                                  ).join(", ")}
-                                </p>
-                              )}
-                              {guard.unavailabilityReasons && guard.unavailabilityReasons.length > 0 && (
-                                <p className="text-yellow-600 dark:text-yellow-500">
-                                  {guard.unavailabilityReasons.join(", ")}
-                                </p>
-                              )}
-                            </>
-                          );
-                        })()}
+                            )}
+                            {filteredGuards.length > 0 && selectedGuardId && (
+                              <div className="text-xs space-y-1">
+                                {(() => {
+                                  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) => 
+                                            `${c.siteName} (${new Date(c.from).toLocaleTimeString('it-IT', {hour: '2-digit', minute:'2-digit'})} - ${new Date(c.to).toLocaleTimeString('it-IT', {hour: '2-digit', minute:'2-digit'})})`
+                                          ).join(", ")}
+                                        </p>
+                                      )}
+                                      {guard.unavailabilityReasons && guard.unavailabilityReasons.length > 0 && (
+                                        <p className="text-yellow-600 dark:text-yellow-500">
+                                          {guard.unavailabilityReasons.join(", ")}
+                                        </p>
+                                      )}
+                                    </>
+                                  );
+                                })()}
+                              </div>
+                            )}
+                          </>
+                        )}
                       </div>
-                    )}
-                  </div>
+                    );
+                  })()}
 
                   {/* Bottone assegna */}
                   <Button