Merge branch 'main' of ssh.catelli.it:brontomark/flux

.gitea/workflows/release.yaml

@@ -21,11 +21,27 @@ jobs:
       - name: Build Flutter Windows
         run: flutter build windows --release
 
+      # 1. FIRMA DELL'ESEGUIBILE RAW
+      - name: Firma Eseguibile Flutter
+        run: |
+          # Cerca dinamicamente signtool.exe nell'SDK di Windows per non sbagliare percorso
+          $Signtool = (Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\signtool.exe" | Sort-Object FullName -Descending | Select-Object -First 1).FullName
+          
+          # Sostituisci il percorso con dove hai salvato fisicamente il file .pfx sul PC del runner!
+          & $Signtool sign /f "C:\flux_privato.pfx" /p "${{ secrets.PFX_PASSWORD }}" /fd SHA256 "build\windows\x64\runner\Release\flux.exe"
+
       - name: Build Windows Installer
         run: |
           $TagVersion = "${{ github.ref_name }}".Substring(1)
           & "C:\Program Files (x86)\Inno Setup 6\ISCC.exe" "/DMyAppVersion=$TagVersion" "win_installer.iss"
 
+      # 2. FIRMA DELL'INSTALLER GENERATO DA INNO SETUP
+      - name: Firma Installer
+        run: |
+          $Signtool = (Get-ChildItem "C:\Program Files (x86)\Windows Kits\10\bin\*\x64\signtool.exe" | Sort-Object FullName -Descending | Select-Object -First 1).FullName
+          
+          & $Signtool sign /f "C:\flux_privato.pfx" /p "${{ secrets.PFX_PASSWORD }}" /fd SHA256 "build\windows\installer\FluxInstaller.exe"
+
       # Nel dubbio usiamo l'action per caricare l'asset
       - name: Upload Windows Asset
         uses: https://gitea.com/actions/release-action@main

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "deno.enable": true
+}

analysis_options.yaml

@@ -7,6 +7,10 @@ analyzer:
     - "lib/l10n/*.dart"
     - "**/*.g.dart" # Già che ci siamo escludiamo tutti i file generati (tipo quelli di JsonSerializable)
     - "**/*.freezed.dart"
+    - "build/**"
+    - "ios/**"
+    - "macos/**"
+    - ".dart_tool/**"
 
 linter:
   rules:

android/app/build.gradle.kts

@@ -1,5 +1,8 @@
 plugins {
     id("com.android.application")
+    // START: FlutterFire Configuration
+    id("com.google.gms.google-services")
+    // END: FlutterFire Configuration
     id("kotlin-android")
     // The Flutter Gradle Plugin must be applied after the Android and Kotlin Gradle plugins.
     id("dev.flutter.flutter-gradle-plugin")

android/app/google-services.json

@@ -0,0 +1,29 @@
+{
+  "project_info": {
+    "project_number": "249756116297",
+    "project_id": "flux-87e49",
+    "storage_bucket": "flux-87e49.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:249756116297:android:a2c3d37323752069cf2698",
+        "android_client_info": {
+          "package_name": "com.catellisrl.flux"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyA6-uX6504B3yofeo7YQwfQaS0cCDoZnvY"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/settings.gradle.kts

@@ -20,6 +20,9 @@ pluginManagement {
 plugins {
     id("dev.flutter.flutter-plugin-loader") version "1.0.0"
     id("com.android.application") version "8.11.1" apply false
+    // START: FlutterFire Configuration
+    id("com.google.gms.google-services") version("4.3.15") apply false
+    // END: FlutterFire Configuration
     id("org.jetbrains.kotlin.android") version "2.2.20" apply false
 }
 

firebase.json

@@ -0,0 +1 @@
+{"flutter":{"platforms":{"android":{"default":{"projectId":"flux-87e49","appId":"1:249756116297:android:a2c3d37323752069cf2698","fileOutput":"android/app/google-services.json"}},"ios":{"default":{"projectId":"flux-87e49","appId":"1:249756116297:ios:fe9dadca7150da16cf2698","uploadDebugSymbols":false,"fileOutput":"ios/Runner/GoogleService-Info.plist"}},"macos":{"default":{"projectId":"flux-87e49","appId":"1:249756116297:ios:fe9dadca7150da16cf2698","uploadDebugSymbols":false,"fileOutput":"macos/Runner/GoogleService-Info.plist"}},"dart":{"lib/firebase_options.dart":{"projectId":"flux-87e49","configurations":{"android":"1:249756116297:android:a2c3d37323752069cf2698","ios":"1:249756116297:ios:fe9dadca7150da16cf2698","macos":"1:249756116297:ios:fe9dadca7150da16cf2698","web":"1:249756116297:web:7c652e51004414b7cf2698","windows":"1:249756116297:web:b094277c2fedb425cf2698"}}}}}}

ios/Runner.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		101B9A4BF8F30D998DDC11D4 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D4B70082D3146D8C2B7AFA02 /* GoogleService-Info.plist */; };
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
 		331C808B294A63AB00263BE5 /* RunnerTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 331C807B294A618700263BE5 /* RunnerTests.swift */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
@@ -67,6 +68,7 @@
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		AB44F93458B7D70EE383A3A9 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		BDDDA09E437D9C0E7B65B3B1 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
+		D4B70082D3146D8C2B7AFA02 /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -126,6 +128,7 @@
 				331C8082294A63A400263BE5 /* RunnerTests */,
 				F5D002C3092D87755D552D32 /* Pods */,
 				6A991A28CCED9666CA172E00 /* Frameworks */,
+				D4B70082D3146D8C2B7AFA02 /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -267,6 +270,7 @@
 				3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */,
 				97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */,
 				97C146FC1CF9000F007C117D /* Main.storyboard in Resources */,
+				101B9A4BF8F30D998DDC11D4 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

ios/Runner/GoogleService-Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyAllwaoNyqHsZtqfMMo9DxVS6-q7yBwWow</string>
+	<key>GCM_SENDER_ID</key>
+	<string>249756116297</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.catellisrl.flux</string>
+	<key>PROJECT_ID</key>
+	<string>flux-87e49</string>
+	<key>STORAGE_BUCKET</key>
+	<string>flux-87e49.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:249756116297:ios:fe9dadca7150da16cf2698</string>
+</dict>
+</plist>

lib/core/blocs/session/session_cubit.dart

@@ -1,9 +1,15 @@
+import 'dart:async';
+import 'dart:io';
+
 import 'package:equatable/equatable.dart';
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/data/core_repository.dart';
 import 'package:flux/features/company/models/company_model.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/master_data/store/models/store_model.dart';
+import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 import 'package:collection/collection.dart'; // Per firstWhereOrNull
@@ -39,35 +45,28 @@ class SessionCubit extends Cubit<SessionState> {
     }
 
     try {
-      // 1. CHI È QUESTO UTENTE? (Vediamo se ha un profilo staff, che sia Invitato o Admin)
+      // Riportiamo lo stato su initial per far girare lo spinner se stiamo riprovando
+      emit(state.copyWith(status: SessionStatus.initial, errorMessage: null));
+
+      // WRAP DELLA LOGICA IN UN BLOCCO PROTETTO DA TIMEOUT (10 Secondi)
+      await Future(() async {
         StaffMemberModel? staff = await _repository.getStaffMemberByUserId(
           user.id,
         );
         CompanyModel? company;
+
         if (staff != null) {
-        // --- LA MAGIA DEL SENSORE ---
           if (staff.hasJoined == false) {
-          // È la primissima volta che entra! Aggiorniamo il DB.
+            await _repository.updateStaffMember(staff.id!, {
-          await _repository.updateStaffMember(staff.id!, {'has_joined': true});
+              'has_joined': true,
-          // Aggiorniamo anche il nostro modello in memoria per questa sessione
+            });
             staff = staff.copyWith(hasJoined: true);
           }
-
           company = await _repository.getCompanyById(staff.companyId);
         } else {
-        // È l'Admin in onboarding
           company = await _repository.getCompanyByOwnerId(user.id);
         }
-      // 1. Controllo Azienda
 
-      if (staff != null) {
-        // L'utente esiste già nel sistema! Carichiamo l'azienda per cui lavora
-        company = await _repository.getCompanyById(staff.companyId);
-      } else {
-        // L'utente non ha profilo. Probabilmente è l'Admin che ha appena
-        // fatto Sign Up e sta iniziando l'Onboarding
-        company = await _repository.getCompanyByOwnerId(user.id);
-      }
         if (company == null) {
           return emit(
             state.copyWith(
@@ -80,7 +79,6 @@ class SessionCubit extends Cubit<SessionState> {
           emit(state.copyWith(company: company));
         }
 
-      // 2. Controllo Negozi
         final stores = await _repository.getStoresByCompanyId(company.id!);
         if (stores.isEmpty) {
           return emit(
@@ -95,7 +93,6 @@ class SessionCubit extends Cubit<SessionState> {
           emit(state.copyWith(currentStore: stores.first));
         }
 
-      // 3. Controllo Staff (Paziente Zero)
         if (staff == null) {
           return emit(
             state.copyWith(
@@ -107,23 +104,16 @@ class SessionCubit extends Cubit<SessionState> {
           );
         }
 
-      // --- TUTTO COMPLETATO: LOGICA DEL NEGOZIO DI DEFAULT ---
-
-      // Leggiamo l'ultimo negozio dalle SharedPreferences
         final lastStoreId = _prefs.getString(_lastStoreKey);
-
-      // Cerchiamo quel negozio nella lista. Se non c'è (magari è stato eliminato), prendiamo il primo.
         final activeStore =
             stores.firstWhereOrNull((s) => s.id == lastStoreId) ?? stores.first;
 
-      // Se non avevamo il lastStoreId salvato, salviamolo ora
         if (lastStoreId != activeStore.id && activeStore.id != null) {
           await _prefs.setString(_lastStoreKey, activeStore.id!);
         }
 
         setIsSingleUserMode(_prefs.getBool('isSingleUserMode') ?? false);
 
-      // 4. BENVENUTO A BORDO
         emit(
           state.copyWith(
             status: SessionStatus.authenticated,
@@ -131,20 +121,107 @@ class SessionCubit extends Cubit<SessionState> {
             company: company,
             currentStore: activeStore,
             currentStaffMember: staff,
-          onboardingStep: OnboardingStep.none, // Svuotiamo l'onboarding
+            onboardingStep: OnboardingStep.none,
           ),
         );
+
+        // FCM è fuori dall'await principale, quindi va bene così
+        _registerFcmToken(companyId: company.id!, staffId: staff.id!);
+      }).timeout(
+        const Duration(seconds: 10), // Tempo massimo concesso al server
+        onTimeout: () {
+          throw TimeoutException(
+            'Il server di FLUX non risponde. Controlla la connessione.',
+          );
+        },
+      );
+    } on TimeoutException catch (e) {
+      // 🎯 BINGO! IL TIMEOUT È SCATTATO
+      debugPrint("Timeout Inizializzazione: ${e.message}");
+      emit(
+        state.copyWith(status: SessionStatus.error, errorMessage: e.message),
+      );
     } catch (e) {
-      // Se esplode il database, non lasciamo l'app freezata in 'initial'
+      // Altri errori generici del DB o di rete
+      debugPrint("Errore Inizializzazione: $e");
       emit(
         state.copyWith(
-          status: SessionStatus
+          status: SessionStatus.error,
-              .unauthenticated, // O un nuovo stato SessionStatus.error
+          errorMessage: "Si è verificato un errore di connessione imprevisto.",
         ),
       );
     }
   }
 
+  Future<void> _registerFcmToken({
+    required String companyId,
+    required String staffId,
+  }) async {
+    // Scudo anti-crash per lo sviluppo su Linux / Windows
+    if (!kIsWeb &&
+        !Platform.isAndroid &&
+        !Platform.isIOS &&
+        !Platform.isMacOS) {
+      return;
+    }
+
+    try {
+      final messaging = FirebaseMessaging.instance;
+
+      // 1. Richiesta permessi di notifica
+      final settings = await messaging.requestPermission(
+        alert: true,
+        badge: true,
+        sound: true,
+      );
+
+      if (settings.authorizationStatus == AuthorizationStatus.authorized) {
+        String? fcmToken;
+        if (kIsWeb) {
+          fcmToken = await messaging.getToken(
+            vapidKey:
+                'BLMUr7crlRghEW6iWtRZ7Y0a74OPAMG9Oh37ewhVP3_5YD9e5RHUeO79sDys6P-7KjOz6I6HiaPqNndmatQlu3g',
+          );
+        } else {
+          fcmToken = await messaging.getToken();
+        }
+
+        if (fcmToken != null) {
+          final supabase = GetIt.I.get<SupabaseClient>();
+
+          // Determiniamo la piattaforma in modo sicuro per Linux
+          String osPlatform = 'web';
+          if (!kIsWeb) {
+            if (Platform.isAndroid) osPlatform = 'android';
+            if (Platform.isIOS) osPlatform = 'ios';
+            if (Platform.isMacOS) osPlatform = 'macos';
+          }
+
+          // 3. UPSERT su Supabase condizionato dal vincolo 'fcm_token'
+          await supabase.from('staff_devices').upsert(
+            {
+              'company_id': companyId,
+              'staff_id': staffId,
+              'fcm_token': fcmToken,
+              'os_platform': osPlatform,
+              'updated_at': DateTime.now().toIso8601String(),
+            },
+            onConflict:
+                'fcm_token', // Se il token esiste già, aggiorna questa riga!
+          );
+
+          debugPrint(
+            'Dispositivo registrato con successo su FLUX Cloud. Platform: $osPlatform',
+          );
+        }
+      } else {
+        debugPrint('Permesso push negato dall\'utente.');
+      }
+    } catch (e) {
+      debugPrint('Errore durante la registrazione del dispositivo: $e');
+    }
+  }
+
   void updateCurrentCompany(CompanyModel newCompany) {
     emit(state.copyWith(company: newCompany));
   }
@@ -170,4 +247,13 @@ class SessionCubit extends Cubit<SessionState> {
   void setIsSingleUserMode(bool isSingleUser) {
     emit(state.copyWith(isSingleUserMode: isSingleUser));
   }
+
+  void updateCurrentStoreLocally(StoreModel updatedStore) {
+    // Verifichiamo che l'utente stia effettivamente lavorando nel negozio appena modificato
+    if (state.currentStore != null &&
+        state.currentStore!.id == updatedStore.id) {
+      // Emettiamo il nuovo stato sovrascrivendo solo il negozio corrente
+      emit(state.copyWith(currentStore: updatedStore));
+    }
+  }
 }

lib/core/blocs/session/session_state.dart

@@ -6,6 +6,7 @@ enum SessionStatus {
   unauthenticated,
   onboardingRequired,
   authenticated,
+  error,
 }
 
 /// Definisce lo step esatto dell'onboarding (Paranoia Mode)
@@ -26,6 +27,7 @@ class SessionState extends Equatable {
   final OnboardingStep onboardingStep;
   final bool isMobileDevice;
   final bool isSingleUserMode;
+  final String? errorMessage;
 
   const SessionState({
     this.status = SessionStatus.initial,
@@ -36,6 +38,7 @@ class SessionState extends Equatable {
     this.onboardingStep = OnboardingStep.none,
     this.isMobileDevice = false,
     this.isSingleUserMode = false,
+    this.errorMessage,
   });
 
   /// Metodo per creare una copia dello stato modificando solo i campi necessari
@@ -48,6 +51,7 @@ class SessionState extends Equatable {
     OnboardingStep? onboardingStep,
     bool? isMobileDevice,
     bool? isSingleUserMode,
+    String? errorMessage,
   }) {
     return SessionState(
       status: status ?? this.status,
@@ -58,6 +62,7 @@ class SessionState extends Equatable {
       onboardingStep: onboardingStep ?? this.onboardingStep,
       isMobileDevice: isMobileDevice ?? this.isMobileDevice,
       isSingleUserMode: isSingleUserMode ?? this.isSingleUserMode,
+      errorMessage: errorMessage ?? this.errorMessage,
     );
   }
 
@@ -71,6 +76,7 @@ class SessionState extends Equatable {
     onboardingStep,
     isMobileDevice,
     isSingleUserMode,
+    errorMessage,
   ];
 
   // Helper rapidi per la UI

lib/core/enums_and_consts/consts.dart

@@ -1,4 +1,5 @@
 class Tables {
+  static const String appConfig = 'app_config';
   static const String attachments = 'attachments';
   static const String brands = 'brands';
   static const String campaigns = 'campaigns';
@@ -18,6 +19,7 @@ class Tables {
   static const String stores = 'stores';
   static const String tasks = 'tasks';
   static const String taskAssignments = 'task_assignments';
+  static const String taskReminders = 'task_reminders';
   static const String tickets = 'tickets';
   static const String trackings = 'trackings';
 }

lib/core/layout/app_shell.dart

@@ -89,12 +89,18 @@ class _AppMenuState extends State<AppMenu> {
                   Icon(Icons.bolt, color: theme.colorScheme.primary, size: 32),
                   if (!effectivelyCollapsed) ...[
                     const SizedBox(width: 12),
-                    Text(
+                    TextButton(
+                      onPressed: () {
+                        if (widget.isDrawer) Navigator.pop(context);
+                        context.goNamed(Routes.home);
+                      },
+                      child: Text(
                         "FLUX",
                         style: theme.textTheme.titleLarge?.copyWith(
                           fontWeight: FontWeight.bold,
                         ),
                       ),
+                    ),
                   ],
                 ],
               ),
@@ -111,13 +117,36 @@ class _AppMenuState extends State<AppMenu> {
                     padding: const EdgeInsets.symmetric(horizontal: 8.0),
                     children: [
                       _buildRouteItem(
-                        title: context.l10n.commonDashboard,
+                        title: 'Dashboard',
                         icon: Icons.dashboard_outlined,
-                        routeName: Routes.home, // <--- Usiamo la tua costante!
+                        routeName: Routes.home,
                         pathToCheck:
                             '/', // Il path da controllare per colorarlo
                         isCollapsed: effectivelyCollapsed,
                       ),
+                      const SizedBox(height: 8),
+                      // --- SEZIONE OPERATIVA ---
+                      _buildHierarchicalItem(
+                        title: 'Operatività',
+                        icon: Icons.work_outline,
+                        basePathToCheck: '/',
+                        isCollapsed: effectivelyCollapsed,
+                        subItems: [
+                          _SubMenuItem(
+                            'Operazioni',
+                            Routes.operations,
+                            '/operations',
+                          ),
+                          _SubMenuItem(
+                            'Assistenza',
+                            Routes.tickets,
+                            '/tickets',
+                          ),
+                          _SubMenuItem('Tasks', Routes.tasks, '/tasks'),
+                          _SubMenuItem('Sticky Notes', Routes.notes, '/notes'),
+                        ],
+                      ),
+
                       const SizedBox(height: 8),
 
                       // --- IL MENU GERARCHICO (ANAGRAFICHE) ---
@@ -256,7 +285,9 @@ class _AppMenuState extends State<AppMenu> {
     required bool isCollapsed,
     required List<_SubMenuItem> subItems,
   }) {
-    final isSelected = widget.currentPath.startsWith(basePathToCheck);
+    final isSelected = subItems.any(
+      (item) => widget.currentPath.startsWith(item.pathToCheck),
+    );
     final theme = Theme.of(context);
 
     if (isCollapsed) {

lib/core/routes/app_router.dart

@@ -7,9 +7,9 @@ import 'package:flux/core/layout/app_shell.dart';
 import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/widgets/image_upload/blocs/image_upload_cubit.dart';
 import 'package:flux/core/widgets/image_upload/ui/image_upload_screen.dart';
-import 'package:flux/core/widgets/set_password_screen.dart';
 import 'package:flux/core/widgets/image_upload/ui/upload_success_screen.dart';
 import 'package:flux/features/auth/ui/auth_screen.dart';
+import 'package:flux/features/auth/ui/set_password_screen.dart';
 import 'package:flux/features/company/bloc/company_settings_cubit.dart';
 import 'package:flux/features/company/ui/company_settings_screen.dart';
 import 'package:flux/features/customers/blocs/customer_form_cubit.dart';
@@ -18,6 +18,9 @@ import 'package:flux/features/customers/models/customer_model.dart';
 import 'package:flux/features/customers/ui/customer_detail_screen.dart';
 import 'package:flux/features/customers/ui/customer_form_screen.dart';
 import 'package:flux/features/customers/ui/customers_list_screen.dart';
+import 'package:flux/features/home/dashboard_note_list/blocs/dashboard_note_list_cubit.dart';
+import 'package:flux/features/home/dashboard_store_operation_list/bloc/dashboard_store_operation_list_cubit.dart';
+import 'package:flux/features/home/dashboard_store_ticket_list/blocs/dashboard_store_ticket_list_cubit.dart';
 import 'package:flux/features/home/dashboard_task_list/blocs/dashboard_task_list_cubit.dart';
 import 'package:flux/features/home/ui/home_screen.dart';
 import 'package:flux/features/master_data/master_data_hub_content.dart';
@@ -43,8 +46,10 @@ import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
 import 'package:flux/features/operations/ui/operation_form_screen.dart';
 import 'package:flux/features/operations/ui/operation_list_screen.dart';
-import 'package:flux/features/settings/settings_screen.dart';
+import 'package:flux/features/settings/blocs/reminder_defaults_cubit.dart';
-import 'package:flux/features/settings/theme_settings_view.dart';
+import 'package:flux/features/settings/ui/reminder_settings_screen.dart';
+import 'package:flux/features/settings/ui/settings_screen.dart';
+import 'package:flux/features/settings/ui/theme_settings_view.dart';
 import 'package:flux/features/tasks/blocs/task_form_cubit.dart';
 import 'package:flux/features/tasks/blocs/task_list_cubit.dart';
 import 'package:flux/features/tasks/models/task_model.dart';
@@ -61,10 +66,16 @@ import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
 
 class AppRouter {
+  // 1. CREIAMO LA CHIAVE GLOBALE DEL NAVIGATORE
+  static final GlobalKey<NavigatorState> rootNavigatorKey =
+      GlobalKey<NavigatorState>();
+  static String? pendingRoute;
   static GoRouter createRouter(SessionCubit sessionCubit) {
     return GoRouter(
+      navigatorKey: rootNavigatorKey,
       initialLocation: '/',
       refreshListenable: GoRouterRefreshStream(sessionCubit.stream),
+
       redirect: (context, state) {
         final sessionState = sessionCubit.state;
         final isGoingToLogin = state.matchedLocation == '/login';
@@ -143,11 +154,32 @@ class AppRouter {
               builder: (context, state) {
                 return MultiBlocProvider(
                   providers: [
+                    BlocProvider<DashboardStoreOperationListCubit>(
+                      create: (context) => DashboardStoreOperationListCubit(
+                        companyId: sessionCubit.state.company?.id,
+                        storeId: sessionCubit.state.currentStore?.id,
+                      ),
+                    ),
                     BlocProvider<DashboardTaskListCubit>(
-                      create: (context) => DashboardTaskListCubit(),
+                      create: (context) => DashboardTaskListCubit(
+                        companyId: sessionCubit.state.company?.id,
+                        staffId: sessionCubit.state.currentStaffMember?.id,
+                      ),
+                    ),
+                    BlocProvider<DashboardStoreTicketListCubit>(
+                      create: (context) => DashboardStoreTicketListCubit(
+                        companyId: sessionCubit.state.company?.id,
+                        storeId: sessionCubit.state.currentStore?.id,
+                      ),
+                    ),
+                    BlocProvider<DashboardNoteListCubit>(
+                      create: (context) => DashboardNoteListCubit(
+                        companyId: sessionCubit.state.company?.id,
+                        staffId: sessionCubit.state.currentStaffMember?.id,
+                      ),
                     ),
                   ],
-                  child: HomeScreen(),
+                  child: const HomeScreen(),
                 );
               },
             ),
@@ -218,6 +250,16 @@ class AppRouter {
                   name: Routes.themeSettings,
                   builder: (context, state) => const ThemeSettingsView(),
                 ),
+                GoRoute(
+                  path: 'reminderSettings',
+                  name: Routes.reminderSettings,
+                  builder: (context, state) =>
+                      BlocProvider<ReminderDefaultsCubit>(
+                        create: (context) => ReminderDefaultsCubit(),
+
+                        child: const ReminderSettingsScreen(),
+                      ),
+                ),
               ],
             ),
 
@@ -541,16 +583,21 @@ class AppRouter {
               realTaskId = pathId;
             }
 
-            final allStaffList = context.read<StaffCubit>().state.allStaff;
+            List<StaffMemberModel>? preloadedStaff;
+            try {
+              preloadedStaff = context.read<StaffCubit>().state.allStaff;
+            } catch (_) {
+              preloadedStaff = null; // Fallback se la rotta è isolata
+            }
 
             // Creiamo il BLoC "al volo" solo per questa schermata
             return MultiBlocProvider(
               providers: [
                 BlocProvider<TaskFormCubit>(
                   create: (context) => TaskFormCubit(
-                    globalStaff: allStaffList,
+                    existingTask: task,
-                    initialTask: task,
                     initialTaskId: realTaskId,
+                    allStaff: preloadedStaff,
                   ),
                 ),
               ],

lib/core/routes/routes.dart

@@ -26,4 +26,5 @@ class Routes {
   static const String notes = 'notes';
   static const String tasks = 'tasks';
   static const String taskForm = 'task-form';
+  static const String reminderSettings = 'reminder-settings';
 }

lib/core/services/notification_service.dart

@@ -0,0 +1,36 @@
+import 'package:firebase_messaging/firebase_messaging.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flux/core/routes/app_router.dart';
+import 'package:go_router/go_router.dart';
+
+// Chiamala dopo l'autenticazione o nel main()
+Future<void> setupInteractedMessage() async {
+  // CASO A: L'app era completamente CHIUSA e viene aperta tappando la notifica
+  RemoteMessage? initialMessage = await FirebaseMessaging.instance
+      .getInitialMessage();
+  if (initialMessage != null) {
+    _handleNotificationTap(initialMessage);
+  }
+
+  // CASO B: L'app era in BACKGROUND (minimizzata) e l'utente tappa la notifica
+  FirebaseMessaging.onMessageOpenedApp.listen(_handleNotificationTap);
+}
+
+void _handleNotificationTap(RemoteMessage message) {
+  final eventType = message.data['eventType'];
+  final referenceId = message.data['referenceId'];
+
+  if (eventType == 'task_assigned' && referenceId != null) {
+    final routePath = '/tasks/form/$referenceId';
+    final context = AppRouter.rootNavigatorKey.currentContext;
+
+    if (context != null) {
+      // Scenario A: App già aperta, naviga all'istante
+      context.push(routePath);
+    } else {
+      // Scenario B: App chiusa. Il contesto non c'è ancora, congeliamo la rotta!
+      debugPrint("App in fase di avvio. Congelo la rotta: $routePath");
+      AppRouter.pendingRoute = routePath;
+    }
+  }
+}

lib/core/utils/version_check_service.dart

@@ -1,67 +1,94 @@
+import 'dart:io';
 import 'package:flutter/foundation.dart';
-import 'dart:io' show Platform;
 import 'package:package_info_plus/package_info_plus.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 
 class VersionCheckService {
-  final _supabase = Supabase.instance.client;
-
-  /// Controlla se l'app corrente deve essere bloccata o aggiornata.
-  /// Ritorna il link di download se l'aggiornamento è obbligatorio, altrimenti null.
   Future<String?> checkForceUpdate() async {
     try {
-      // 1. Determiniamo la piattaforma corrente
+      // 1. Capiamo su che piattaforma sta girando l'app in questo istante
-      String platformKey = 'web';
+      String currentPlatform = _getCurrentPlatform();
-      if (!kIsWeb) {
+
-        if (Platform.isAndroid) platformKey = 'android';
+      // 2. Recuperiamo SOLO la riga corrispondente alla nostra piattaforma
-        if (Platform.isWindows) platformKey = 'windows';
+      final dbResponse = await Supabase.instance.client
+          .from('app_config')
+          .select('min_version, download_url')
+          .eq('platform', currentPlatform)
+          .maybeSingle(); // Usiamo maybeSingle così se non c'è la riga non crasha
+
+      if (dbResponse == null) {
+        return null; // Nessuna regola per questa piattaforma
       }
 
-      // 2. Recuperiamo la configurazione minima da Supabase
+      String minVersionFromDb = dbResponse['min_version'] as String;
-      final data = await _supabase
+      String downloadUrl = dbResponse['download_url'] as String;
-          .from('app_config')
-          .select()
-          .eq('platform', platformKey)
-          .maybeSingle();
 
-      if (data == null) return null;
+      // 3. Recuperiamo la versione locale di Flutter
+      PackageInfo packageInfo = await PackageInfo.fromPlatform();
+      String localVersionRaw = packageInfo.version;
 
-      final String minVersion = data['min_version'];
+      // 🥷 TRUCCO 1: Pulizia totale dai build number (+37) o tag "v"
-      final String downloadUrl = data['download_url'];
+      String cleanLocal = localVersionRaw
+          .split('+')
+          .first
+          .replaceAll('v', '')
+          .trim();
+      String cleanDb = minVersionFromDb
+          .split('+')
+          .first
+          .replaceAll('v', '')
+          .trim();
 
-      // 3. Recuperiamo la versione attuale dell'app dal pubspec.yaml
+      // 🥷 TRUCCO 2: Confronto Semantico Reale
-      final packageInfo = await PackageInfo.fromPlatform();
+      if (_isVersionLower(current: cleanLocal, minimum: cleanDb)) {
-      final String currentVersion = packageInfo.version;
+        // Ritorna il link VERO per questa specifica piattaforma preso dal CSV!
-
+        return downloadUrl;
-      // 4. Confronto matematico semantico (es. 1.2.3 vs 1.1.9)
-      if (_isVersionLower(currentVersion, minVersion)) {
-        return downloadUrl; // Aggiornamento obbligatorio richiesto!
       }
 
       return null;
     } catch (e) {
-      debugPrint('Errore controllo versione: $e');
+      debugPrint("Errore durante il check versione: $e");
-      return null; // In caso di errore non blocchiamo l'utente
+      return null;
     }
   }
 
-  bool _isVersionLower(String current, String min) {
+  // Helper ninja per mappare le piattaforme in base alle stringhe del tuo DB
+  String _getCurrentPlatform() {
+    if (kIsWeb) return 'web';
+    if (Platform.isAndroid) return 'android';
+    if (Platform.isIOS) return 'ios';
+    if (Platform.isWindows) return 'windows';
+    if (Platform.isMacOS) return 'macos';
+    if (Platform.isLinux) return 'linux';
+    return 'unknown';
+  }
+
+  // Il motore matematico (resta invariato)
+  bool _isVersionLower({required String current, required String minimum}) {
+    if (current == minimum) return false;
+
     List<int> currentParts = current
         .split('.')
         .map((e) => int.tryParse(e) ?? 0)
         .toList();
-    List<int> minParts = min
+    List<int> minParts = minimum
         .split('.')
         .map((e) => int.tryParse(e) ?? 0)
         .toList();
 
-    for (int i = 0; i < 3; i++) {
+    while (currentParts.length < 3) {
-      int currentPart = currentParts.length > i ? currentParts[i] : 0;
+      currentParts.add(0);
-      int minPart = minParts.length > i ? minParts[i] : 0;
+    }
+    while (minParts.length < 3) {
+      minParts.add(0);
+    }
 
-      if (currentPart < minPart) return true;
+    if (currentParts[0] != minParts[0]) {
-      if (currentPart > minPart) return false;
+      return currentParts[0] < minParts[0];
     }
-    return false;
+    if (currentParts[1] != minParts[1]) {
+      return currentParts[1] < minParts[1];
+    }
+    return currentParts[2] < minParts[2];
   }
 }

lib/core/widgets/set_password_screen.dart

@@ -1,128 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/core/widgets/flux_text_field.dart';
-import 'package:get_it/get_it.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
-import 'package:go_router/go_router.dart';
-
-class SetPasswordScreen extends StatefulWidget {
-  const SetPasswordScreen({super.key});
-
-  @override
-  State<SetPasswordScreen> createState() => _SetPasswordScreenState();
-}
-
-class _SetPasswordScreenState extends State<SetPasswordScreen> {
-  final _passwordCtrl = TextEditingController();
-  bool _isLoading = false;
-
-  @override
-  void dispose() {
-    _passwordCtrl.dispose();
-    super.dispose();
-  }
-
-  Future<void> _savePassword() async {
-    final newPassword = _passwordCtrl.text.trim();
-    if (newPassword.length < 6) {
-      ScaffoldMessenger.of(context).showSnackBar(
-        SnackBar(content: Text(context.l10n.setPasswordScreenAtLeast6Chars)),
-      );
-      return;
-    }
-
-    setState(() => _isLoading = true);
-
-    try {
-      // 1. Aggiorniamo la password dell'utente (che Supabase ha già loggato grazie al link della mail)
-      await GetIt.I.get<SupabaseClient>().auth.updateUser(
-        UserAttributes(password: newPassword),
-      );
-
-      // 2. Finito! Lo mandiamo alla home o facciamo ricaricare la sessione al SessionCubit
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(
-            content: Text(context.l10n.setPasswordScreenPasswordSetWelcome),
-          ),
-        );
-        context.go('/'); // Rimandiamo al router principale
-      }
-    } on AuthException catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(context.l10n.authError(e.message))),
-        );
-      }
-    } catch (e) {
-      if (mounted) {
-        ScaffoldMessenger.of(context).showSnackBar(
-          SnackBar(content: Text(context.l10n.commonError(e.toString()))),
-        );
-      }
-    } finally {
-      if (mounted) setState(() => _isLoading = false);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: Text(context.l10n.setPasswordScreenWelcomeInFlux),
-        automaticallyImplyLeading:
-            false, // Non può tornare indietro, deve mettere la password!
-        actions: [
-          IconButton.filled(
-            onPressed: () => context.read<SessionCubit>().signOut(),
-            icon: Icon(Icons.logout),
-          ),
-        ],
-      ),
-      body: Padding(
-        padding: const EdgeInsets.all(24.0),
-        child: Column(
-          mainAxisAlignment: MainAxisAlignment.center,
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            const Icon(Icons.lock_reset, size: 80, color: Colors.blueAccent),
-            const SizedBox(height: 24),
-            Text(
-              context.l10n.setPasswordScreenSetPassword,
-              textAlign: TextAlign.center,
-              style: TextStyle(fontSize: 24, fontWeight: FontWeight.bold),
-            ),
-            const SizedBox(height: 8),
-            Text(
-              context.l10n.setPasswordInviteAcceptedChoosePassword,
-              textAlign: TextAlign.center,
-              style: TextStyle(color: Colors.grey),
-            ),
-            const SizedBox(height: 32),
-            FluxTextField(
-              controller: _passwordCtrl,
-              label: context.l10n.commonNewPassword,
-              icon: Icons.lock,
-              isPassword: true,
-            ),
-            const SizedBox(height: 32),
-            ElevatedButton(
-              onPressed: _isLoading ? null : _savePassword,
-              style: ElevatedButton.styleFrom(
-                padding: const EdgeInsets.symmetric(vertical: 16),
-              ),
-              child: _isLoading
-                  ? const CircularProgressIndicator(color: Colors.white)
-                  : Text(
-                      context.l10n.setPasswordScreenSaveAndStart,
-                      style: TextStyle(fontSize: 16),
-                    ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/core/widgets/shared_forms/attachments_section.dart

@@ -90,6 +90,32 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
 
   // --- SELEZIONE FILE DAL PC/TELEFONO ---
   Future<void> _pickFiles() async {
+    final attachmentsBloc = context.read<AttachmentsBloc>();
+    String? targetId = attachmentsBloc.state.parentId;
+
+    // 🥷 SE L'ID NON C'È (Nuova Operazione), FORZIAMO IL SALVATAGGIO PREVENTIVO!
+    if (targetId == null || targetId.isEmpty) {
+      if (widget.onGenerateIdForQr != null) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text('Salvataggio rapido scheda per allegati... ⏳'),
+            duration: Duration(seconds: 1),
+          ),
+        );
+
+        // Chiamiamo la funzione passata dal TicketForm/OperationForm
+        targetId = await widget.onGenerateIdForQr!();
+      }
+
+      // Se il salvataggio fallisce (es. form non valido), ci fermiamo per evitare file orfani
+      if (targetId == null || targetId.isEmpty) return;
+
+      // Comunichiamo immediatamente al BLoC che l'entità padre è stata salvata e ha un nuovo ID.
+      // Questo eviterà che i file finiscano nei `localFiles` temporanei.
+      attachmentsBloc.add(ParentEntitySavedEvent(targetId));
+    }
+
+    // Ora che abbiamo la certezza matematica di avere un targetId, apriamo il picker
     final result = await FilePicker.pickFiles(
       allowMultiple: true,
       type: FileType.custom,
@@ -98,8 +124,8 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
     );
 
     if (result != null && mounted) {
-      // MAGIA: Passiamo direttamente la lista di PlatformFile al tuo BLoC!
+      // Ora il BLoC eseguirà l'ambiente di "Upload immediato" (Bivio 2) perché ha l'ID aggiornato!
-      context.read<AttachmentsBloc>().add(AddAttachmentsEvent(result.files));
+      attachmentsBloc.add(AddAttachmentsEvent(result.files));
     }
   }
 

lib/features/attachments/blocs/attachments_bloc.dart

@@ -1,4 +1,6 @@
 import 'dart:async';
+import 'dart:io';
+import 'dart:typed_data';
 import 'package:file_picker/file_picker.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:equatable/equatable.dart';
@@ -14,7 +16,6 @@ part 'attachments_state.dart';
 
 class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
   final _repository = GetIt.I.get<AttachmentsRepository>();
-  final String? companyId = GetIt.I.get<SessionCubit>().state.company?.id;
 
   AttachmentsBloc({String? parentId, required AttachmentParentType parentType})
     : super(
@@ -36,8 +37,8 @@ class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
     on<SelectAllAttachmentsEvent>(_onSelectAllAttachments);
     on<ClearAttachmentSelectionEvent>(_onClearAttachmentSelection);
 
-    // Se il BLoC nasce già con un ID, carichiamo i file
+    final currentCompanyId = GetIt.I.get<SessionCubit>().state.company?.id;
-    if (parentId != null && companyId != null) {
+    if (parentId != null && currentCompanyId != null) {
       add(LoadAttachmentsEvent(parentId: parentId));
     }
   }
@@ -46,6 +47,8 @@ class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
     ParentEntitySavedEvent event,
     Emitter<AttachmentsState> emit,
   ) async {
+    final companyId = GetIt.I.get<SessionCubit>().state.company?.id;
+
     emit(
       state.copyWith(
         parentId: event.newParentId,
@@ -117,14 +120,30 @@ class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
     Emitter<AttachmentsState> emit,
   ) async {
     final currentId = state.parentId;
+    final currentCompanyId = GetIt.I.get<SessionCubit>().state.company?.id;
 
-    // BIVIO 1: PRATICA NUOVA (Salvataggio locale)
+    if (currentCompanyId == null) {
+      emit(
+        state.copyWith(
+          status: AttachmentsStatus.failure,
+          error: "Company ID non trovato nella sessione",
+        ),
+      );
+      return;
+    }
+
+    // BIVIO 1: PRATICA NUOVA (Salvataggio locale in memoria)
     if (currentId == null) {
       final newLocalFiles = event.files.map((file) {
-        // Assegniamo i campi dinamicamente in base al parentType!
+        // FISCHIO SALVAVITA PER DESKTOP: se i bytes sono nulli, li leggiamo dal path fisico!
+        Uint8List? rawBytes = file.bytes;
+        if (rawBytes == null && file.path != null) {
+          rawBytes = File(file.path!).readAsBytesSync();
+        }
+
         return AttachmentModel(
           id: null,
-          companyId: companyId!,
+          companyId: currentCompanyId,
           operationId: state.parentType == AttachmentParentType.operation
               ? ''
               : null,
@@ -136,7 +155,7 @@ class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
           extension: file.name.fileExtension(),
           storagePath: '',
           fileSize: file.size,
-          localBytes: file.bytes,
+          localBytes: rawBytes, // Ora i byte ci sono al 100% anche su Mac!
         );
       }).toList();
 
@@ -157,7 +176,7 @@ class AttachmentsBloc extends Bloc<AttachmentsEvent, AttachmentsState> {
           parentId: currentId,
           parentType: state.parentType,
           pickedFile: file,
-          companyId: companyId!,
+          companyId: currentCompanyId,
           bucket: _getBucketForParentType,
         );
       }).toList();

lib/features/auth/bloc/auth_cubit.dart

@@ -1,14 +1,15 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:flux/core/utils/app_message.dart';
+import 'package:flux/features/master_data/staff/data/staff_repository.dart';
 import 'package:get_it/get_it.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 part 'auth_state.dart';
 
 class AuthCubit extends Cubit<AuthState> {
   final _supabase = GetIt.instance<SupabaseClient>();
+  final _staffRepository = GetIt.instance<StaffRepository>();
 
   AuthCubit() : super(const AuthState());
 
@@ -95,10 +96,7 @@ class AuthCubit extends Cubit<AuthState> {
       );
       return;
     }
-    await _supabase.auth.resetPasswordForEmail(
+    await _staffRepository.resetPassword(email);
-      email,
-      redirectTo: resetPasswordUrl,
-    );
     emit(
       state.copyWith(
         status: AuthStatus.pwResetSent,

lib/features/auth/ui/auth_screen.dart

@@ -128,6 +128,30 @@ class _AuthScreenState extends State<AuthScreen> {
                             _submit(), // Se lo supporti nel tuo widget custom
                       ),
 
+                      // Link "Dimenticato password?" solo in Login mode
+                      if (state.isLoginMode) ...[
+                        const SizedBox(height: 8),
+                        Align(
+                          alignment: Alignment.centerRight,
+                          child: TextButton(
+                            onPressed: isLoading
+                                ? null
+                                : () => context
+                                      .read<AuthCubit>()
+                                      .requestPasswordReset(
+                                        _emailController.text.trim(),
+                                      ),
+                            child: Text(
+                              context.l10n.authScreenForgotPassword,
+                              style: TextStyle(
+                                color: context.accent,
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                          ),
+                        ),
+                      ],
+
                       const SizedBox(height: 40),
 
                       // --- BOTTONE PRINCIPALE ---

lib/features/auth/ui/set_password_screen.dart

@@ -0,0 +1,255 @@
+import 'package:flutter/material.dart';
+import 'package:flux/main.dart';
+import 'package:go_router/go_router.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+class SetPasswordScreen extends StatefulWidget {
+  const SetPasswordScreen({super.key});
+
+  @override
+  State<SetPasswordScreen> createState() => _SetPasswordScreenState();
+}
+
+class _SetPasswordScreenState extends State<SetPasswordScreen> {
+  final _formKey = GlobalKey<FormState>();
+  final _passwordController = TextEditingController();
+  final _confirmPasswordController = TextEditingController();
+  bool _isLoading = false;
+  bool _obscurePassword = true;
+  String? _errorMessage;
+
+  // Variabile per abilitare l'inserimento
+  bool _isSessionReady = false;
+
+  @override
+  void initState() {
+    super.initState();
+    _forceSessionRecovery();
+  }
+
+  @override
+  void dispose() {
+    _passwordController.dispose();
+    _confirmPasswordController.dispose();
+    super.dispose();
+  }
+
+  // 🎯 LA VERA MAGIA: RICOSTRUIAMO LA SESSIONE A MANO
+  Future<void> _forceSessionRecovery() async {
+    try {
+      // 1. Prendiamo il frammento dalla cassaforte
+      final fragment = initialRecoveryFragment ?? Uri.base.fragment;
+
+      if (fragment.contains('access_token=')) {
+        // 2. Dividiamo la stringa in una mappa chiave:valore
+        final params = Uri.splitQueryString(fragment);
+        final refreshToken = params['refresh_token'];
+
+        if (refreshToken != null) {
+          // 3. Forziamo Supabase a loggare l'utente col refresh token!
+          await Supabase.instance.client.auth.setSession(refreshToken);
+
+          if (mounted) {
+            setState(() {
+              _isSessionReady = true;
+              _errorMessage = null;
+            });
+          }
+          return;
+        }
+      }
+
+      // Fallback: se Supabase ce l'aveva già fatta miracolosamente
+      if (Supabase.instance.client.auth.currentSession != null) {
+        setState(() => _isSessionReady = true);
+      }
+    } catch (e) {
+      debugPrint("Errore ripristino manuale sessione: $e");
+    }
+  }
+
+  Future<void> _submitNewPassword() async {
+    if (!_formKey.currentState!.validate()) return;
+
+    if (!_isSessionReady) {
+      setState(() {
+        _errorMessage =
+            "Sincronizzazione di sicurezza fallita. Il link potrebbe essere scaduto.";
+      });
+      return;
+    }
+
+    setState(() {
+      _isLoading = true;
+      _errorMessage = null;
+    });
+
+    try {
+      // Ora questo updateUser troverà la sessione viva e vegeta!
+      await Supabase.instance.client.auth.updateUser(
+        UserAttributes(password: _passwordController.text.trim()),
+      );
+
+      if (mounted) {
+        ScaffoldMessenger.of(context).showSnackBar(
+          const SnackBar(
+            content: Text(
+              'Password impostata con successo! Benvenuto in FLUX.',
+            ),
+            backgroundColor: Colors.green,
+          ),
+        );
+        context.go('/');
+      }
+    } on AuthException catch (e) {
+      setState(() {
+        _errorMessage = e.message;
+      });
+    } catch (e) {
+      setState(() {
+        _errorMessage = "Si è verificato un errore imprevisto. Riprova.";
+      });
+    } finally {
+      if (mounted) {
+        setState(() => _isLoading = false);
+      }
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    // Rendiamo la schermata responsive ed elegante per il Web (Cloudflare)
+    final size = MediaQuery.of(context).size;
+    final isWebContainer = size.width > 600;
+
+    return Scaffold(
+      body: Center(
+        child: SingleChildScrollView(
+          child: Container(
+            width: isWebContainer ? 450 : size.width,
+            padding: const EdgeInsets.all(32.0),
+            child: Form(
+              key: _formKey,
+              child: Column(
+                mainAxisAlignment: MainAxisAlignment.center,
+                crossAxisAlignment: CrossAxisAlignment.stretch,
+                children: [
+                  // Logo o Brand FLUX
+                  Text(
+                    'FLUX',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(
+                      fontSize: 32,
+                      fontWeight: FontWeight.bold,
+                      letterSpacing: -1,
+                    ),
+                  ),
+                  const SizedBox(height: 8),
+                  Text(
+                    'Configura la tua chiave di accesso per iniziare a collaborare.',
+                    textAlign: TextAlign.center,
+                    style: TextStyle(color: Colors.grey[600], fontSize: 14),
+                  ),
+                  const SizedBox(height: 32),
+
+                  if (_errorMessage != null) ...[
+                    Container(
+                      padding: const EdgeInsets.all(12),
+                      decoration: BoxDecoration(
+                        color: Colors.red.withValues(alpha: 0.1),
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                      child: Text(
+                        _errorMessage!,
+                        style: const TextStyle(color: Colors.red, fontSize: 13),
+                        textAlign: TextAlign.center,
+                      ),
+                    ),
+                    const SizedBox(height: 16),
+                  ],
+
+                  // Campo Password
+                  TextFormField(
+                    controller: _passwordController,
+                    obscureText: _obscurePassword,
+                    decoration: InputDecoration(
+                      labelText: 'Nuova Password',
+                      prefixIcon: const Icon(Icons.lock_outline),
+                      suffixIcon: IconButton(
+                        icon: Icon(
+                          _obscurePassword
+                              ? Icons.visibility_off
+                              : Icons.visibility,
+                        ),
+                        onPressed: () => setState(
+                          () => _obscurePassword = !_obscurePassword,
+                        ),
+                      ),
+                      border: const OutlineInputBorder(),
+                    ),
+                    validator: (value) {
+                      if (value == null || value.isEmpty) {
+                        return 'Inserisci una password';
+                      }
+                      if (value.length < 6) {
+                        return 'La password deve avere almeno 6 caratteri';
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 16),
+
+                  // Campo Conferma Password
+                  TextFormField(
+                    controller: _confirmPasswordController,
+                    obscureText: _obscurePassword,
+                    decoration: const InputDecoration(
+                      labelText: 'Conferma Password',
+                      prefixIcon: Icon(Icons.lock_reset_rounded),
+                      border: OutlineInputBorder(),
+                    ),
+                    validator: (value) {
+                      if (value != _passwordController.text) {
+                        return 'Le password non coincidono';
+                      }
+                      return null;
+                    },
+                  ),
+                  const SizedBox(height: 24),
+
+                  // Bottone di Invio
+                  ElevatedButton(
+                    onPressed: _isLoading ? null : _submitNewPassword,
+                    style: ElevatedButton.styleFrom(
+                      padding: const EdgeInsets.symmetric(vertical: 16),
+                      backgroundColor: Colors.black,
+                      foregroundColor: Colors.white,
+                      shape: RoundedRectangleBorder(
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                    ),
+                    child: _isLoading
+                        ? const SizedBox(
+                            height: 20,
+                            width: 20,
+                            child: CircularProgressIndicator(
+                              strokeWidth: 2,
+                              valueColor: AlwaysStoppedAnimation<Color>(
+                                Colors.white,
+                              ),
+                            ),
+                          )
+                        : const Text(
+                            'Conferma e Accedi',
+                            style: TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                  ),
+                ],
+              ),
+            ),
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/home/dashboard_note_list/blocs/dashboard_note_list_cubit.dart

@@ -0,0 +1,74 @@
+import 'dart:async';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/features/notes/data/notes_repository.dart';
+import 'package:flux/features/notes/models/note_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'dashboard_note_list_state.dart';
+
+class DashboardNoteListCubit extends Cubit<DashboardNoteListState> {
+  final NotesRepository _repository = GetIt.I.get<NotesRepository>();
+  final String? companyId;
+  final String? staffId;
+  StreamSubscription<void>? _subscription;
+
+  DashboardNoteListCubit({required this.companyId, required this.staffId})
+    : super(DashboardNoteListState(status: DashboardNoteListStatus.initial));
+
+  void stopListening() {
+    _subscription?.cancel();
+    _subscription = null;
+  }
+
+  void startListening() {
+    stopListening();
+
+    emit(state.copyWith(status: DashboardNoteListStatus.loading));
+
+    // Primo caricamento
+    _loadNotesSilently();
+
+    // Inizio ascolto campanello
+    try {
+      _subscription = _repository
+          .notesStream(companyId: companyId!, currentStaffId: staffId!)
+          .listen((_) {
+            // Quando il campanello suona (qualcosa è cambiato a DB), ricarichiamo!
+            _loadNotesSilently();
+          });
+    } on Exception catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  Future<void> _loadNotesSilently() async {
+    try {
+      final notes = await _repository.getNotes();
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          status: DashboardNoteListStatus.success,
+          notes: notes,
+          errorMessage: null,
+        ),
+      );
+    } catch (e) {
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          status: DashboardNoteListStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  @override
+  Future<void> close() {
+    stopListening();
+    return super.close();
+  }
+}

lib/features/home/dashboard_note_list/blocs/dashboard_note_list_state.dart

@@ -0,0 +1,30 @@
+part of 'dashboard_note_list_cubit.dart';
+
+enum DashboardNoteListStatus { initial, loading, success, failure }
+
+class DashboardNoteListState extends Equatable {
+  final DashboardNoteListStatus status;
+  final List<NoteModel> notes;
+  final String? errorMessage;
+
+  const DashboardNoteListState({
+    this.status = DashboardNoteListStatus.initial,
+    this.notes = const [],
+    this.errorMessage,
+  });
+
+  DashboardNoteListState copyWith({
+    DashboardNoteListStatus? status,
+    List<NoteModel>? notes,
+    String? errorMessage,
+  }) {
+    return DashboardNoteListState(
+      status: status ?? this.status,
+      notes: notes ?? this.notes,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, notes, errorMessage];
+}

lib/features/home/dashboard_note_list/ui/dashboard_note_list_card.dart

@@ -2,12 +2,12 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/theme/theme.dart';
-import 'package:flux/features/notes/blocs/notes_bloc.dart';
+import 'package:flux/features/home/dashboard_note_list/blocs/dashboard_note_list_cubit.dart';
 import 'package:flux/features/notes/models/note_model.dart';
 import 'package:go_router/go_router.dart'; // Supponendo tu usi GoRouter per la navigazione
 
-class DashboardNotesWidget extends StatelessWidget {
+class DashboardNoteListCard extends StatelessWidget {
-  const DashboardNotesWidget({super.key});
+  const DashboardNoteListCard({super.key});
 
   @override
   Widget build(BuildContext context) {
@@ -59,14 +59,14 @@ class DashboardNotesWidget extends StatelessWidget {
               const SizedBox(height: 12),
 
               // Il corpo del widget collegato al Bloc
-              BlocBuilder<NotesBloc, NotesState>(
+              BlocBuilder<DashboardNoteListCubit, DashboardNoteListState>(
                 builder: (context, state) {
-                  if (state.status == NotesStatus.loading &&
+                  if (state.status == DashboardNoteListStatus.loading &&
                       state.notes.isEmpty) {
                     return const Center(child: CircularProgressIndicator());
                   }
 
-                  if (state.status == NotesStatus.failure) {
+                  if (state.status == DashboardNoteListStatus.failure) {
                     return const Center(
                       child: Text(
                         'Errore nel caricamento delle note.',

lib/features/home/dashboard_store_operation_list/bloc/dashboard_store_operation_list_cubit.dart

@@ -0,0 +1,84 @@
+import 'dart:async';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/features/operations/data/operations_repository.dart';
+import 'package:flux/features/operations/models/operation_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'dashboard_store_operation_list_state.dart';
+
+class DashboardStoreOperationListCubit
+    extends Cubit<DashboardStoreOperationListState> {
+  final OperationsRepository _repository = GetIt.I.get<OperationsRepository>();
+  final String? companyId;
+  final String? storeId;
+  StreamSubscription<void>? _operationsSubscription;
+  DashboardStoreOperationListCubit({
+    required this.companyId,
+    required this.storeId,
+  }) : super(
+         const DashboardStoreOperationListState(
+           status: DashboardStoreOperationListStatus.initial,
+         ),
+       );
+
+  void startListening() {
+    emit(state.copyWith(status: DashboardStoreOperationListStatus.loading));
+    stopListening();
+
+    // Primo caricamento
+    _loadOperationsSilently();
+
+    // Inizio ascolto campanello
+    try {
+      _operationsSubscription = _repository
+          .watchStoreOperations(storeId: storeId!, limit: 10)
+          .listen((_) {
+            // Quando il campanello suona (qualcosa è cambiato a DB), ricarichiamo!
+            _loadOperationsSilently();
+          });
+    } on Exception catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  void stopListening() {
+    _operationsSubscription?.cancel();
+    _operationsSubscription = null;
+  }
+
+  void _loadOperationsSilently() async {
+    try {
+      final paginatedData = await _repository.fetchPaginatedOperations(
+        companyId: companyId!,
+        storeId: storeId!,
+        page: 1,
+        itemsPerPage: 20,
+      );
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          status: DashboardStoreOperationListStatus.success,
+          operations: paginatedData.operations,
+          error: null,
+        ),
+      );
+    } catch (e) {
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          status: DashboardStoreOperationListStatus.failure,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  @override
+  Future<void> close() {
+    stopListening();
+    return super.close();
+  }
+}

lib/features/home/dashboard_store_operation_list/bloc/dashboard_store_operation_list_state.dart

@@ -0,0 +1,30 @@
+part of 'dashboard_store_operation_list_cubit.dart';
+
+enum DashboardStoreOperationListStatus { initial, loading, success, failure }
+
+class DashboardStoreOperationListState extends Equatable {
+  final DashboardStoreOperationListStatus status;
+  final String? error;
+  final List<OperationModel> operations;
+
+  const DashboardStoreOperationListState({
+    required this.status,
+    this.error,
+    this.operations = const [],
+  });
+
+  @override
+  List<Object?> get props => [status, error, operations];
+
+  DashboardStoreOperationListState copyWith({
+    DashboardStoreOperationListStatus? status,
+    String? error,
+    List<OperationModel>? operations,
+  }) {
+    return DashboardStoreOperationListState(
+      status: status ?? this.status,
+      error: error,
+      operations: operations ?? this.operations,
+    );
+  }
+}

lib/features/home/dashboard_store_operation_list/ui/latest_store_operations_card.dart

@@ -1,38 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/theme/theme.dart';
 import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/features/home/latest_store_operations/bloc/latest_store_operations_bloc.dart';
+import 'package:flux/features/home/dashboard_store_operation_list/bloc/dashboard_store_operation_list_cubit.dart';
 import 'package:go_router/go_router.dart';
 
-class LatestStoreOperationsCard extends StatelessWidget {
+class DashboardStoreOperationListCard extends StatelessWidget {
-  const LatestStoreOperationsCard({super.key});
+  const DashboardStoreOperationListCard({super.key});
 
   @override
   Widget build(BuildContext context) {
-    final currentStoreId = context.read<SessionCubit>().state.currentStore?.id;
+    return _LatestOperationsCardContent();
-
-    return BlocProvider(
-      // 1. Creiamo il Bloc e facciamo partire subito la query
-      create: (context) =>
-          LatestStoreOperationsBloc()
-            ..add(InitLatestStoreOperationsEvent(currentStoreId ?? '')),
-      child: BlocListener<SessionCubit, SessionState>(
-        // 2. MAGIA: Se l'utente cambia negozio dalla barra in alto, riavviamo lo stream!
-        listenWhen: (previous, current) =>
-            previous.currentStore?.id != current.currentStore?.id,
-        listener: (context, state) {
-          if (state.currentStore?.id != null) {
-            context.read<LatestStoreOperationsBloc>().add(
-              InitLatestStoreOperationsEvent(state.currentStore!.id!),
-            );
-          }
-        },
-        child: _LatestOperationsCardContent(),
-      ),
-    );
   }
 }
 
@@ -91,21 +70,21 @@ class _LatestOperationsCardContent extends StatelessWidget {
               Expanded(
                 child:
                     BlocBuilder<
-                      LatestStoreOperationsBloc,
+                      DashboardStoreOperationListCubit,
-                      LatestStoreOperationsState
+                      DashboardStoreOperationListState
                     >(
                       builder: (context, state) {
                         if (state.status ==
-                                LatestStoreOperationsStatus.loading ||
+                                DashboardStoreOperationListStatus.loading ||
                             state.status ==
-                                LatestStoreOperationsStatus.initial) {
+                                DashboardStoreOperationListStatus.initial) {
                           return const Center(
                             child: CircularProgressIndicator(),
                           );
                         }
 
                         if (state.status ==
-                            LatestStoreOperationsStatus.failure) {
+                            DashboardStoreOperationListStatus.failure) {
                           return Center(
                             child: Text(
                               "Errore di caricamento",

lib/features/home/dashboard_store_ticket_list/blocs/dashboard_store_ticket_list_cubit.dart

@@ -0,0 +1,86 @@
+import 'dart:async';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/features/tickets/data/ticket_repository.dart';
+import 'package:flux/features/tickets/models/ticket_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'dashboard_store_ticket_list_state.dart';
+
+class DashboardStoreTicketListCubit
+    extends Cubit<DashboardStoreTicketListState> {
+  final TicketRepository _repository = GetIt.I.get<TicketRepository>();
+  final String? companyId;
+  final String? storeId;
+  StreamSubscription<void>? _subscription;
+
+  DashboardStoreTicketListCubit({
+    required this.companyId,
+    required this.storeId,
+  }) : super(
+         const DashboardStoreTicketListState(
+           status: DashboardStoreTicketListStatus.initial,
+         ),
+       );
+
+  void stopListening() {
+    _subscription?.cancel();
+    _subscription = null;
+  }
+
+  void startListening() {
+    stopListening();
+
+    emit(state.copyWith(status: DashboardStoreTicketListStatus.loading));
+
+    // Primo caricamento
+    _loadTicketsSilently();
+
+    // Inizio ascolto campanello
+    try {
+      _subscription = _repository
+          .getLatestStoreTicketsStream(storeId: storeId!, limit: 10)
+          .listen((_) {
+            // Quando il campanello suona (qualcosa è cambiato a DB), ricarichiamo!
+            _loadTicketsSilently();
+          });
+    } on Exception catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  Future<void> _loadTicketsSilently() async {
+    try {
+      final tickets = await _repository.fetchTickets(
+        companyId: companyId!,
+        storeId: storeId,
+        limit: 10,
+        offset: 0,
+      );
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          status: DashboardStoreTicketListStatus.success,
+          tickets: tickets,
+          errorMessage: null,
+        ),
+      );
+    } catch (e) {
+      if (isClosed) return;
+      emit(
+        state.copyWith(
+          status: DashboardStoreTicketListStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  @override
+  Future<void> close() {
+    stopListening();
+    return super.close();
+  }
+}

lib/features/home/dashboard_store_ticket_list/blocs/dashboard_store_ticket_list_state.dart

@@ -0,0 +1,30 @@
+part of 'dashboard_store_ticket_list_cubit.dart';
+
+enum DashboardStoreTicketListStatus { initial, loading, success, failure }
+
+class DashboardStoreTicketListState extends Equatable {
+  final DashboardStoreTicketListStatus status;
+  final List<TicketModel> tickets;
+  final String? errorMessage;
+
+  const DashboardStoreTicketListState({
+    this.status = DashboardStoreTicketListStatus.initial,
+    this.tickets = const [],
+    this.errorMessage,
+  });
+
+  DashboardStoreTicketListState copyWith({
+    DashboardStoreTicketListStatus? status,
+    List<TicketModel>? tickets,
+    String? errorMessage,
+  }) {
+    return DashboardStoreTicketListState(
+      status: status ?? this.status,
+      tickets: tickets ?? this.tickets,
+      errorMessage: errorMessage ?? this.errorMessage,
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, tickets, errorMessage];
+}

lib/features/home/dashboard_store_ticket_list/ui/dashboard_store_ticket_list_card.dart

@@ -0,0 +1,189 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/routes/routes.dart';
+import 'package:flux/core/theme/theme.dart';
+import 'package:flux/features/home/dashboard_store_ticket_list/blocs/dashboard_store_ticket_list_cubit.dart';
+import 'package:flux/features/tickets/models/ticket_status_extension.dart';
+import 'package:go_router/go_router.dart';
+
+class DashboardStoreTicketListCard extends StatelessWidget {
+  const DashboardStoreTicketListCard({super.key});
+
+  @override
+  Widget build(BuildContext context) {
+    return _DashboardStoreTicketListCardContent();
+  }
+}
+
+class _DashboardStoreTicketListCardContent extends StatelessWidget {
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    const color = Colors.blue;
+
+    return Card(
+      elevation: 0,
+      shape: RoundedRectangleBorder(
+        borderRadius: BorderRadius.circular(16),
+        side: BorderSide(color: theme.dividerColor.withValues(alpha: 0.5)),
+      ),
+      child: InkWell(
+        onTap: () => context.pushNamed(Routes.tickets),
+        child: Padding(
+          padding: const EdgeInsets.all(16.0),
+          child: Column(
+            crossAxisAlignment: CrossAxisAlignment.start,
+            children: [
+              // --- HEADER DELLA CARD ---
+              Row(
+                children: [
+                  Container(
+                    padding: const EdgeInsets.all(8),
+                    decoration: BoxDecoration(
+                      color: color.withValues(alpha: 0.1),
+                      borderRadius: BorderRadius.circular(8),
+                    ),
+                    child: const Icon(
+                      Icons.design_services_outlined,
+                      color: color,
+                      size: 20,
+                    ),
+                  ),
+                  const SizedBox(width: 12),
+                  Expanded(
+                    child: Text(
+                      "Ticket recenti",
+                      style: TextStyle(
+                        fontWeight: FontWeight.bold,
+                        fontSize: 16,
+                        color: context.primaryText,
+                      ),
+                      maxLines: 1,
+                      overflow: TextOverflow.ellipsis,
+                    ),
+                  ),
+                ],
+              ),
+              const SizedBox(height: 12),
+
+              // --- CORPO DELLA CARD (LA LISTA REAL-TIME) ---
+              Expanded(
+                child:
+                    BlocBuilder<
+                      DashboardStoreTicketListCubit,
+                      DashboardStoreTicketListState
+                    >(
+                      builder: (context, state) {
+                        if (state.status ==
+                                DashboardStoreTicketListStatus.loading ||
+                            state.status ==
+                                DashboardStoreTicketListStatus.initial) {
+                          return const Center(
+                            child: CircularProgressIndicator(),
+                          );
+                        }
+
+                        if (state.status ==
+                            DashboardStoreTicketListStatus.failure) {
+                          return Center(
+                            child: Text(
+                              "Errore di caricamento",
+                              style: TextStyle(color: theme.colorScheme.error),
+                            ),
+                          );
+                        }
+
+                        if (state.tickets.isEmpty) {
+                          return Center(
+                            child: Text(
+                              "Nessun ticket recente.",
+                              style: TextStyle(
+                                color: context.secondaryText,
+                                fontStyle: FontStyle.italic,
+                              ),
+                            ),
+                          );
+                        }
+
+                        return ListView.separated(
+                          itemCount: state.tickets.length,
+                          separatorBuilder: (context, index) => Divider(
+                            height: 1,
+                            color: theme.dividerColor.withValues(alpha: 0.3),
+                          ),
+                          itemBuilder: (context, index) {
+                            final ticket = state.tickets[index];
+                            final statusColor = ticket.ticketStatus.color;
+                            return InkWell(
+                              onTap: () => context.pushNamed(
+                                Routes.ticketForm,
+                                extra: (createdBy: null, ticket: ticket),
+                                pathParameters: {'id': ticket.id!},
+                              ),
+                              child: Padding(
+                                padding: const EdgeInsets.symmetric(
+                                  vertical: 8.0,
+                                ),
+                                child: Row(
+                                  mainAxisAlignment:
+                                      MainAxisAlignment.spaceBetween,
+                                  children: [
+                                    Container(
+                                      width: 8,
+                                      height:
+                                          30, // Un'altezza fissa per farlo comparire!
+                                      decoration: BoxDecoration(
+                                        color: statusColor,
+                                        borderRadius: BorderRadius.circular(
+                                          4,
+                                        ), // Angoli smussati per stile
+                                      ),
+                                    ),
+                                    const SizedBox(width: 4),
+                                    Expanded(
+                                      flex: 5,
+                                      child: Text(
+                                        ticket.customer?.name ??
+                                            'Cliente sconosciuto',
+                                        style: TextStyle(
+                                          fontWeight: FontWeight.w700,
+                                          color: context.primaryText,
+                                        ),
+                                      ),
+                                    ),
+                                    Expanded(
+                                      flex: 5,
+                                      child: Text(
+                                        ticket.targetModelName ??
+                                            'Modello sconosciuto',
+                                        style: TextStyle(
+                                          fontWeight: FontWeight.w600,
+                                          color: context.primaryText,
+                                        ),
+                                        maxLines: 1,
+                                        overflow: TextOverflow.ellipsis,
+                                      ),
+                                    ),
+                                    Text(
+                                      "${ticket.createdAt?.day}/${ticket.createdAt?.month}",
+                                      style: TextStyle(
+                                        color: context.secondaryText,
+                                        fontSize: 12,
+                                      ),
+                                    ),
+                                  ],
+                                ),
+                              ),
+                            );
+                          },
+                        );
+                      },
+                    ),
+              ),
+            ],
+          ),
+        ),
+      ),
+    );
+  }
+}

lib/features/home/dashboard_task_list/blocs/dashboard_task_list_cubit.dart

@@ -1,51 +1,59 @@
+import 'dart:async';
+
 import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/features/tasks/data/task_repository.dart';
 import 'package:flux/features/tasks/models/task_model.dart';
 import 'package:flux/features/tasks/models/task_status.dart';
 import 'package:get_it/get_it.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
 
 part 'dashboard_task_list_state.dart';
 
 class DashboardTaskListCubit extends Cubit<DashboardTaskListState> {
-  final TaskRepository _repository = GetIt.I.get<TaskRepository>();
+  final TasksRepository _repository = GetIt.I.get<TasksRepository>();
-  final SupabaseClient _supabase = GetIt.I.get<SupabaseClient>();
+  final String? staffId;
-  RealtimeChannel? _taskChannel;
+  final String? companyId;
+  StreamSubscription<void>? _tasksSubscription;
 
-  DashboardTaskListCubit() : super(DashboardTaskListState());
+  DashboardTaskListCubit({required this.staffId, required this.companyId})
+    : super(const DashboardTaskListState());
+
+  void startListening() {
+    stopListening();
 
-  void startListening({required String staffId}) async {
     emit(state.copyWith(status: DashboardTaskListStatus.loading));
-    await _loadTasks(staffId: staffId);
+
-    _taskChannel?.unsubscribe();
+    // Primo caricamento
-    _taskChannel = _supabase
+    _loadTasksSilently();
-        .channel('public:tasks_staff_$staffId')
+
-        .onPostgresChanges(
+    // Inizio ascolto campanello
-          event: PostgresChangeEvent.all,
+    try {
-          schema: 'public',
+      _tasksSubscription = _repository.watchCompanyTasks(companyId!).listen((
-          table: 'tasks',
+        _,
-          filter: PostgresChangeFilter(
+      ) {
-            type: PostgresChangeFilterType.eq,
+        // Quando il campanello suona (qualcosa è cambiato a DB), ricarichiamo!
-            column: 'staff_id',
+        _loadTasksSilently();
-            value: staffId,
+      });
-          ),
+    } on Exception catch (e) {
-          callback: (payload) {
+      debugPrint(e.toString());
-            _loadTasks(staffId: staffId);
+    }
-          },
-        );
-    _taskChannel?.subscribe();
   }
 
-  Future<void> _loadTasks({required String staffId}) async {
+  void stopListening() {
+    _tasksSubscription?.cancel();
+    _tasksSubscription = null;
+  }
+
+  Future<void> _loadTasksSilently() async {
     try {
       final tasks = await _repository.getTasks(
-        companyId: GetIt.I.get<SessionCubit>().state.company!.id!,
+        companyId: companyId!,
         staffId: staffId,
         statuses: [TaskStatus.open, TaskStatus.inProgress],
+        limit: 10,
       );
-
+      if (isClosed) return;
       emit(
         state.copyWith(
           status: DashboardTaskListStatus.success,
@@ -54,6 +62,7 @@ class DashboardTaskListCubit extends Cubit<DashboardTaskListState> {
         ),
       );
     } catch (e) {
+      if (isClosed) return;
       emit(
         state.copyWith(
           status: DashboardTaskListStatus.failure,
@@ -65,7 +74,7 @@ class DashboardTaskListCubit extends Cubit<DashboardTaskListState> {
 
   @override
   Future<void> close() {
-    _taskChannel?.unsubscribe();
+    stopListening();
     return super.close();
   }
 }

lib/features/home/dashboard_task_list/ui/dashboard_task_list_card.dart

@@ -1,34 +1,17 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/theme/theme.dart';
 import 'package:flux/features/home/dashboard_task_list/blocs/dashboard_task_list_cubit.dart';
 import 'package:go_router/go_router.dart';
 import 'package:flux/features/tasks/models/task_status.dart';
 
-class DashboardTasksCard extends StatelessWidget {
+class DashboardTaskListCard extends StatelessWidget {
-  const DashboardTasksCard({super.key});
+  const DashboardTaskListCard({super.key});
 
   @override
   Widget build(BuildContext context) {
-    // Recuperiamo lo staff (o l'utente) loggato
+    return _DashboardTasksCardContent();
-    // Adatta il getter in base a come è strutturato il tuo SessionState
-    final currentStaffId = context
-        .read<SessionCubit>()
-        .state
-        .currentStaffMember
-        ?.id;
-
-    if (currentStaffId == null) {
-      return const SizedBox.shrink(); // Sicurezza se lo stato non è pronto
-    }
-
-    return BlocProvider(
-      create: (context) =>
-          DashboardTaskListCubit()..startListening(staffId: currentStaffId),
-      child: const _DashboardTasksCardContent(),
-    );
   }
 }
 

lib/features/home/latest_store_operations/bloc/latest_store_operations_bloc.dart

@@ -1,66 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flux/features/operations/data/operations_repository.dart';
-import 'package:flux/features/operations/models/operation_model.dart';
-import 'package:get_it/get_it.dart';
-
-part '../../latest_store_operations/bloc/latest_store_operations_events.dart';
-part '../../latest_store_operations/bloc/latest_store_operations_state.dart';
-
-class LatestStoreOperationsBloc
-    extends Bloc<LatestStoreOperationsEvent, LatestStoreOperationsState> {
-  final _repository = GetIt.I.get<OperationsRepository>();
-
-  LatestStoreOperationsBloc()
-    : super(
-        const LatestStoreOperationsState(
-          status: LatestStoreOperationsStatus.initial,
-        ),
-      ) {
-    on<InitLatestStoreOperationsEvent>((event, emit) async {
-      emit(state.copyWith(status: LatestStoreOperationsStatus.loading));
-      try {
-        // 1. Creiamo uno stream "intermedio" che idrata i dati
-        final hydratedStream = _repository
-            .getLatestStoreOperationsStream(storeId: event.storeId, limit: 10)
-            .asyncMap((List<OperationModel> rawOperations) async {
-              // Questo gira ad ogni "scatto" dello stream di Supabase
-              List<OperationModel> fullyHydratedOperations = [];
-
-              for (OperationModel operation in rawOperations) {
-                // Peschiamo i dati completi (incluso il cliente)
-                OperationModel fullOperation = await _repository
-                    .fetchOperationById(operation.id!);
-                fullyHydratedOperations.add(fullOperation);
-              }
-
-              // Passiamo la lista completa allo step successivo
-              return fullyHydratedOperations;
-            });
-
-        // 2. Ora passiamo lo stream idratato all'emit.forEach
-        await emit.forEach(
-          hydratedStream, // Usiamo lo stream modificato!
-          onData: (List<OperationModel> fullyHydratedOperations) {
-            // Qui ora è tutto sincrono e bellissimo
-            return state.copyWith(
-              operations: fullyHydratedOperations,
-              status: LatestStoreOperationsStatus.success,
-            );
-          },
-          onError: (error, stackTrace) => state.copyWith(
-            status: LatestStoreOperationsStatus.failure,
-            error: error.toString(),
-          ),
-        );
-      } catch (e) {
-        emit(
-          state.copyWith(
-            status: LatestStoreOperationsStatus.failure,
-            error: e.toString(),
-          ),
-        );
-      }
-    });
-  }
-}

lib/features/home/latest_store_operations/bloc/latest_store_operations_events.dart

@@ -1,17 +0,0 @@
-part of 'latest_store_operations_bloc.dart';
-
-sealed class LatestStoreOperationsEvent extends Equatable {
-  const LatestStoreOperationsEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-class InitLatestStoreOperationsEvent extends LatestStoreOperationsEvent {
-  final String storeId;
-
-  const InitLatestStoreOperationsEvent(this.storeId);
-
-  @override
-  List<Object> get props => [storeId];
-}

lib/features/home/latest_store_operations/bloc/latest_store_operations_state.dart

@@ -1,30 +0,0 @@
-part of 'latest_store_operations_bloc.dart';
-
-enum LatestStoreOperationsStatus { initial, loading, success, failure }
-
-class LatestStoreOperationsState extends Equatable {
-  final LatestStoreOperationsStatus status;
-  final String? error;
-  final List<OperationModel> operations;
-
-  const LatestStoreOperationsState({
-    required this.status,
-    this.error,
-    this.operations = const [],
-  });
-
-  @override
-  List<Object?> get props => [status, error, operations];
-
-  LatestStoreOperationsState copyWith({
-    LatestStoreOperationsStatus? status,
-    String? error,
-    List<OperationModel>? operations,
-  }) {
-    return LatestStoreOperationsState(
-      status: status ?? this.status,
-      error: error,
-      operations: operations ?? this.operations,
-    );
-  }
-}

lib/features/home/latest_store_tickets/blocs/latest_store_tickets_bloc.dart

@@ -1,57 +0,0 @@
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flux/features/tickets/data/ticket_repository.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:get_it/get_it.dart';
-
-part 'latest_store_tickets_events.dart';
-part 'latest_store_tickets_state.dart';
-
-class LatestStoreTicketsBloc
-    extends Bloc<LatestStoreTicketsEvent, LatestStoreTicketsState> {
-  final _repository = GetIt.I.get<TicketRepository>();
-  LatestStoreTicketsBloc()
-    : super(
-        const LatestStoreTicketsState(status: LatestStoreTicketsStatus.initial),
-      ) {
-    on<InitLatestStoreTicketsEvent>((event, emit) async {
-      emit(state.copyWith(status: LatestStoreTicketsStatus.loading));
-      try {
-        final hydratedStream = _repository
-            .getLatestStoreTicketsStream(storeId: event.storeId, limit: 10)
-            .asyncMap((List<TicketModel> rawTickets) async {
-              List<TicketModel> fullyHydratedTickets = [];
-
-              for (TicketModel ticket in rawTickets) {
-                TicketModel fullTicket = await _repository.getTicketById(
-                  ticket.id!,
-                );
-                fullyHydratedTickets.add(fullTicket);
-              }
-
-              return fullyHydratedTickets;
-            });
-        await emit.forEach(
-          hydratedStream,
-          onData: (List<TicketModel> fullyHydratedTickets) {
-            return state.copyWith(
-              tickets: fullyHydratedTickets,
-              status: LatestStoreTicketsStatus.success,
-            );
-          },
-          onError: (error, stackTrace) => state.copyWith(
-            status: LatestStoreTicketsStatus.failure,
-            error: error.toString(),
-          ),
-        );
-      } catch (e) {
-        emit(
-          state.copyWith(
-            status: LatestStoreTicketsStatus.failure,
-            error: e.toString(),
-          ),
-        );
-      }
-    });
-  }
-}

lib/features/home/latest_store_tickets/blocs/latest_store_tickets_events.dart

@@ -1,17 +0,0 @@
-part of 'latest_store_tickets_bloc.dart';
-
-abstract class LatestStoreTicketsEvent extends Equatable {
-  const LatestStoreTicketsEvent();
-
-  @override
-  List<Object> get props => [];
-}
-
-class InitLatestStoreTicketsEvent extends LatestStoreTicketsEvent {
-  final String storeId;
-
-  const InitLatestStoreTicketsEvent(this.storeId);
-
-  @override
-  List<Object> get props => [storeId];
-}

lib/features/home/latest_store_tickets/blocs/latest_store_tickets_state.dart

@@ -1,29 +0,0 @@
-part of 'latest_store_tickets_bloc.dart';
-
-enum LatestStoreTicketsStatus { initial, loading, success, failure }
-
-class LatestStoreTicketsState extends Equatable {
-  final LatestStoreTicketsStatus status;
-  final String? error;
-  final List<TicketModel> tickets;
-  const LatestStoreTicketsState({
-    required this.status,
-    this.error,
-    this.tickets = const [],
-  });
-
-  @override
-  List<Object?> get props => [status, error, tickets];
-
-  LatestStoreTicketsState copyWith({
-    LatestStoreTicketsStatus? status,
-    String? error,
-    List<TicketModel>? tickets,
-  }) {
-    return LatestStoreTicketsState(
-      status: status ?? this.status,
-      error: error,
-      tickets: tickets ?? this.tickets,
-    );
-  }
-}

lib/features/home/latest_store_tickets/ui/latest_store_tickets_card.dart

@@ -1,198 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/routes/routes.dart';
-import 'package:flux/core/theme/theme.dart';
-import 'package:flux/features/home/latest_store_tickets/blocs/latest_store_tickets_bloc.dart';
-import 'package:flux/features/tickets/models/ticket_status_extension.dart';
-import 'package:go_router/go_router.dart';
-
-class LatestStoreTicketsCard extends StatelessWidget {
-  const LatestStoreTicketsCard({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    final currentStoreId = context.read<SessionCubit>().state.currentStore?.id;
-
-    return BlocProvider(
-      // 1. Creiamo il Bloc e facciamo partire subito la query
-      create: (context) =>
-          LatestStoreTicketsBloc()
-            ..add(InitLatestStoreTicketsEvent(currentStoreId ?? '')),
-      child: BlocListener<SessionCubit, SessionState>(
-        // 2. MAGIA: Se l'utente cambia negozio dalla barra in alto, riavviamo lo stream!
-        listenWhen: (previous, current) =>
-            previous.currentStore?.id != current.currentStore?.id,
-        listener: (context, state) {
-          if (state.currentStore?.id != null) {
-            context.read<LatestStoreTicketsBloc>().add(
-              InitLatestStoreTicketsEvent(state.currentStore!.id!),
-            );
-          }
-        },
-        child: _LatestStoreTicketsCardContent(),
-      ),
-    );
-  }
-}
-
-class _LatestStoreTicketsCardContent extends StatelessWidget {
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    const color = Colors.blue;
-
-    return Card(
-      elevation: 0,
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-        side: BorderSide(color: theme.dividerColor.withValues(alpha: 0.5)),
-      ),
-      child: InkWell(
-        onTap: () => context.pushNamed(Routes.tickets),
-        child: Padding(
-          padding: const EdgeInsets.all(16.0),
-          child: Column(
-            crossAxisAlignment: CrossAxisAlignment.start,
-            children: [
-              // --- HEADER DELLA CARD ---
-              Row(
-                children: [
-                  Container(
-                    padding: const EdgeInsets.all(8),
-                    decoration: BoxDecoration(
-                      color: color.withValues(alpha: 0.1),
-                      borderRadius: BorderRadius.circular(8),
-                    ),
-                    child: const Icon(
-                      Icons.design_services_outlined,
-                      color: color,
-                      size: 20,
-                    ),
-                  ),
-                  const SizedBox(width: 12),
-                  Expanded(
-                    child: Text(
-                      "Ticket recenti",
-                      style: TextStyle(
-                        fontWeight: FontWeight.bold,
-                        fontSize: 16,
-                        color: context.primaryText,
-                      ),
-                      maxLines: 1,
-                      overflow: TextOverflow.ellipsis,
-                    ),
-                  ),
-                ],
-              ),
-              const SizedBox(height: 12),
-
-              // --- CORPO DELLA CARD (LA LISTA REAL-TIME) ---
-              Expanded(
-                child: BlocBuilder<LatestStoreTicketsBloc, LatestStoreTicketsState>(
-                  builder: (context, state) {
-                    if (state.status == LatestStoreTicketsStatus.loading ||
-                        state.status == LatestStoreTicketsStatus.initial) {
-                      return const Center(child: CircularProgressIndicator());
-                    }
-
-                    if (state.status == LatestStoreTicketsStatus.failure) {
-                      return Center(
-                        child: Text(
-                          "Errore di caricamento",
-                          style: TextStyle(color: theme.colorScheme.error),
-                        ),
-                      );
-                    }
-
-                    if (state.tickets.isEmpty) {
-                      return Center(
-                        child: Text(
-                          "Nessun ticket recente.",
-                          style: TextStyle(
-                            color: context.secondaryText,
-                            fontStyle: FontStyle.italic,
-                          ),
-                        ),
-                      );
-                    }
-
-                    return ListView.separated(
-                      itemCount: state.tickets.length,
-                      separatorBuilder: (context, index) => Divider(
-                        height: 1,
-                        color: theme.dividerColor.withValues(alpha: 0.3),
-                      ),
-                      itemBuilder: (context, index) {
-                        final ticket = state.tickets[index];
-                        final statusColor = ticket.ticketStatus.color;
-                        return InkWell(
-                          onTap: () => context.pushNamed(
-                            Routes.ticketForm,
-                            extra: (createdBy: null, ticket: ticket),
-                            pathParameters: {'id': ticket.id!},
-                          ),
-                          child: Padding(
-                            padding: const EdgeInsets.symmetric(vertical: 8.0),
-                            child: Row(
-                              mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                              children: [
-                                Container(
-                                  width: 8,
-                                  height:
-                                      30, // Un'altezza fissa per farlo comparire!
-                                  decoration: BoxDecoration(
-                                    color: statusColor,
-                                    borderRadius: BorderRadius.circular(
-                                      4,
-                                    ), // Angoli smussati per stile
-                                  ),
-                                ),
-                                const SizedBox(width: 4),
-                                Expanded(
-                                  flex: 5,
-                                  child: Text(
-                                    ticket.customer?.name ??
-                                        'Cliente sconosciuto',
-                                    style: TextStyle(
-                                      fontWeight: FontWeight.w700,
-                                      color: context.primaryText,
-                                    ),
-                                  ),
-                                ),
-                                Expanded(
-                                  flex: 5,
-                                  child: Text(
-                                    ticket.targetModelName ??
-                                        'Modello sconosciuto',
-                                    style: TextStyle(
-                                      fontWeight: FontWeight.w600,
-                                      color: context.primaryText,
-                                    ),
-                                    maxLines: 1,
-                                    overflow: TextOverflow.ellipsis,
-                                  ),
-                                ),
-                                Text(
-                                  "${ticket.createdAt?.day}/${ticket.createdAt?.month}",
-                                  style: TextStyle(
-                                    color: context.secondaryText,
-                                    fontSize: 12,
-                                  ),
-                                ),
-                              ],
-                            ),
-                          ),
-                        );
-                      },
-                    );
-                  },
-                ),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/features/home/ui/home_screen.dart

@@ -1,25 +1,94 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/routes/app_router.dart';
 import 'package:flux/core/routes/routes.dart';
 import 'package:flux/core/theme/theme.dart';
 import 'package:flux/core/utils/extensions.dart';
 import 'package:flux/core/widgets/staff_selector_modal.dart';
-import 'package:flux/features/home/dashboard_task_list/ui/dashboard_tasks_card.dart';
+import 'package:flux/features/home/dashboard_note_list/blocs/dashboard_note_list_cubit.dart';
-import 'package:flux/features/home/latest_store_operations/ui/latest_store_operations_card.dart';
+import 'package:flux/features/home/dashboard_store_operation_list/bloc/dashboard_store_operation_list_cubit.dart';
-import 'package:flux/features/home/latest_store_tickets/ui/latest_store_tickets_card.dart';
+import 'package:flux/features/home/dashboard_store_ticket_list/blocs/dashboard_store_ticket_list_cubit.dart';
+import 'package:flux/features/home/dashboard_store_ticket_list/ui/dashboard_store_ticket_list_card.dart';
+import 'package:flux/features/home/dashboard_task_list/blocs/dashboard_task_list_cubit.dart';
+import 'package:flux/features/home/dashboard_task_list/ui/dashboard_task_list_card.dart';
+import 'package:flux/features/home/dashboard_store_operation_list/ui/latest_store_operations_card.dart';
 import 'package:flux/features/home/ui/quick_actions_widget.dart';
 import 'package:flux/features/master_data/staff/blocs/staff_cubit.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/notes/data/notes_repository.dart';
 import 'package:flux/features/notes/models/note_model.dart';
-import 'package:flux/features/notes/ui/dashboard_notes_widget.dart';
+import 'package:flux/features/home/dashboard_note_list/ui/dashboard_note_list_card.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
 
-class HomeScreen extends StatelessWidget {
+class HomeScreen extends StatefulWidget {
   const HomeScreen({super.key});
 
+  @override
+  State<HomeScreen> createState() => _HomeScreenState();
+}
+
+class _HomeScreenState extends State<HomeScreen> {
+  late final AppLifecycleListener _lifecycleListener;
+
+  @override
+  void initState() {
+    super.initState();
+
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      if (AppRouter.pendingRoute != null) {
+        final destination = AppRouter.pendingRoute!;
+
+        // ⚠️ Svuota IMMEDIATAMENTE la variabile per evitare loop infiniti se si ruota lo schermo!
+        AppRouter.pendingRoute = null;
+
+        // Spedisci l'utente al task!
+        context.push(destination);
+      }
+    });
+
+    // Inizializziamo il sensore del ciclo di vita
+    _lifecycleListener = AppLifecycleListener(
+      onPause: () {
+        // L'utente ha messo l'app in background (es. per rispondere a un messaggio su WhatsApp)
+        // Chiudiamo i rubinetti per non sprecare risorse e prevenire crash
+        _stopListeners();
+        debugPrint('App in background: Stream sospesi.');
+      },
+      onResume: () {
+        // L'utente è tornato sull'app!
+        // Riappriamo i rubinetti, Supabase ricreerà una connessione fresca
+        _startListeners();
+        debugPrint('App in foreground: Stream riattivati.');
+      },
+    );
+
+    // Facciamo partire gli stream la primissima volta che la schermata si carica
+    _startListeners();
+  }
+
+  void _stopListeners() {
+    context.read<DashboardStoreOperationListCubit>().stopListening();
+    context.read<DashboardTaskListCubit>().stopListening();
+    context.read<DashboardStoreTicketListCubit>().stopListening();
+    context.read<DashboardNoteListCubit>().stopListening();
+  }
+
+  void _startListeners() {
+    context.read<DashboardStoreOperationListCubit>().startListening();
+    context.read<DashboardTaskListCubit>().startListening();
+    context.read<DashboardStoreTicketListCubit>().startListening();
+    context.read<DashboardNoteListCubit>().startListening();
+  }
+
+  @override
+  void dispose() {
+    // Pulizia fondamentale
+    _lifecycleListener.dispose();
+    super.dispose();
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -67,16 +136,16 @@ class HomeScreen extends StatelessWidget {
                             childAspectRatio: 1.3,
                           ),
                       delegate: SliverChildListDelegate([
-                        LatestStoreOperationsCard(),
+                        DashboardStoreOperationListCard(),
-                        LatestStoreTicketsCard(),
+                        DashboardStoreTicketListCard(),
                         _buildDashboardWidget(
                           title: context.l10n.homeExpiringContracts,
                           icon: Icons.assignment_late_outlined,
                           color: Colors.orange,
                           context: context,
                         ),
-                        DashboardNotesWidget(),
+                        DashboardNoteListCard(),
-                        DashboardTasksCard(),
+                        DashboardTaskListCard(),
                       ]),
                     ),
                   ),
@@ -93,9 +162,6 @@ class HomeScreen extends StatelessWidget {
   }
 
   // ==========================================
-  // WIDGET BUILDERS
-  // ==========================================
-
   Widget _buildHeader(BuildContext context, ThemeData theme) {
     final user = context.watch<SessionCubit>().state.currentStaffMember;
     final currentStore = context.watch<SessionCubit>().state.currentStore;
@@ -232,7 +298,7 @@ class HomeScreen extends StatelessWidget {
           QuickActionButton(
             icon: Icons.task_alt,
             label: context.l10n.commonTask,
-            color: Colors.teal,
+            color: Colors.orange,
             onTap: () {
               context.pushNamed(Routes.taskForm, pathParameters: {'id': 'new'});
             },

lib/features/master_data/providers/blocs/provider_form_cubit.dart

@@ -1,6 +1,7 @@
 import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:get_it/get_it.dart';
 import 'package:supabase_flutter/supabase_flutter.dart'; // Per estrarre gli store
 import '../models/provider_model.dart';
@@ -32,7 +33,7 @@ class ProviderFormCubit extends Cubit<ProviderFormState> {
     try {
       // 1. Scarichiamo tutti i negozi dell'azienda
       final storesResponse = await _client
-          .from('store')
+          .from(Tables.stores)
           .select('id, name')
           .eq('company_id', companyId);
 
@@ -41,7 +42,7 @@ class ProviderFormCubit extends Cubit<ProviderFormState> {
       if (existingProvider != null && existingProvider.id != null) {
         // ... (Vecchio codice di recupero)
         final links = await _client
-            .from('providers_in_stores')
+            .from(Tables.providersInStores)
             .select('store_id')
             .eq('provider_id', existingProvider.id!);
         linkedStoreIds = (links as List)
@@ -83,6 +84,7 @@ class ProviderFormCubit extends Cubit<ProviderFormState> {
     String? fiscalCode,
     String? sdiCode,
     String? emailPec,
+    String? Function()? colorHex,
   }) {
     emit(
       state.copyWith(
@@ -93,6 +95,7 @@ class ProviderFormCubit extends Cubit<ProviderFormState> {
           fiscalCode: fiscalCode,
           sdiCode: sdiCode,
           emailPec: emailPec,
+          colorHex: colorHex,
         ),
       ),
     );

lib/features/master_data/providers/models/provider_model.dart

@@ -1,4 +1,5 @@
 import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
 
 import 'provider_location_model.dart';
 import 'provider_role.dart';
@@ -8,6 +9,7 @@ class ProviderModel extends Equatable {
   final String companyId;
   final String name; // Nome "commerciale" per riconoscerlo velocemente
   final bool isActive;
+  final String? colorHex;
 
   // Dati fiscali e legali
   final String? businessName; // Ragione Sociale
@@ -29,6 +31,7 @@ class ProviderModel extends Equatable {
     required this.companyId,
     required this.name,
     this.isActive = true,
+    this.colorHex,
     this.businessName,
     this.vatNumber,
     this.fiscalCode,
@@ -42,6 +45,17 @@ class ProviderModel extends Equatable {
     this.locations,
   });
 
+  // 🥷 IL GETTER MAGICO: Converte l'esadecimale in un Color di Flutter
+  Color get displayColor {
+    if (colorHex == null || colorHex!.isEmpty) {
+      return Colors.blueGrey; // Colore di default
+    }
+
+    // Rimuove l'eventuale '#' e aggiunge 'FF' per l'opacità (Alpha)
+    final hex = colorHex!.replaceAll('#', '');
+    return Color(int.parse('FF$hex', radix: 16));
+  }
+
   factory ProviderModel.empty({required String companyId}) {
     return ProviderModel(
       companyId: companyId,
@@ -56,6 +70,7 @@ class ProviderModel extends Equatable {
     String? companyId,
     String? name,
     bool? isActive,
+    String? Function()? colorHex,
     String? businessName,
     String? vatNumber,
     String? fiscalCode,
@@ -73,6 +88,7 @@ class ProviderModel extends Equatable {
       companyId: companyId ?? this.companyId,
       name: name ?? this.name,
       isActive: isActive ?? this.isActive,
+      colorHex: colorHex != null ? colorHex() : this.colorHex,
       businessName: businessName ?? this.businessName,
       vatNumber: vatNumber ?? this.vatNumber,
       fiscalCode: fiscalCode ?? this.fiscalCode,
@@ -114,6 +130,7 @@ class ProviderModel extends Equatable {
       companyId: map['company_id'] as String,
       name: map['name'] as String,
       isActive: map['is_active'] as bool? ?? true,
+      colorHex: map['color_hex'] as String?,
       businessName: map['business_name'] as String?,
       vatNumber: map['vat_number'] as String?,
       fiscalCode: map['fiscal_code'] as String?,
@@ -134,6 +151,7 @@ class ProviderModel extends Equatable {
       'company_id': companyId,
       'name': name,
       'is_active': isActive,
+      'color_hex': colorHex,
       'business_name': businessName,
       'vat_number': vatNumber,
       'fiscal_code': fiscalCode,
@@ -155,6 +173,7 @@ class ProviderModel extends Equatable {
     companyId,
     name,
     isActive,
+    colorHex,
     businessName,
     vatNumber,
     fiscalCode,

lib/features/master_data/providers/models/provider_model_extensions.dart

@@ -0,0 +1,28 @@
+import 'package:flux/features/master_data/providers/models/provider_model.dart';
+import 'package:flux/features/master_data/providers/models/provider_role.dart';
+
+extension ProviderCompatibility on ProviderModel {
+  bool supportsOperation(String operationType) {
+    if (operationType == 'Altro') return true;
+
+    switch (operationType) {
+      case 'AL' || 'MNP':
+        return roles.contains(ProviderRole.mobile);
+      case 'NIP' || 'FWA':
+        return roles.contains(ProviderRole.landline);
+      case 'UNICA':
+        return roles.contains(ProviderRole.landline) ||
+            roles.contains(ProviderRole.mobile);
+      case 'Energy':
+        return roles.contains(ProviderRole.energy);
+      case 'Fin':
+        return roles.contains(ProviderRole.financing);
+      case 'Entertainment':
+        return roles.contains(ProviderRole.entertainment);
+      case 'TELEPASS':
+        return roles.contains(ProviderRole.telepass);
+      default:
+        return true;
+    }
+  }
+}

lib/features/master_data/providers/ui/provider_form_screen.dart

@@ -66,6 +66,17 @@ class _ProviderFormScreenState extends State<ProviderFormScreen> {
     super.dispose();
   }
 
+  final List<String> _brandColors = [
+    '#E60000', // Vodafone/Iliad (Rosso scuro)
+    '#0047BB', // TIM (Blu)
+    '#F4811F', // WINDTRE (Arancione)
+    '#FFCC00', // Fastweb (Giallo)
+    '#00A859', // Verde generico
+    '#8E44AD', // Viola
+    '#2C3E50', // Blu scuro/Nero
+    '#607D8B', // BlueGrey (Default)
+  ];
+
   void _flushControllers() {
     context.read<ProviderFormCubit>().updateFields(
       name: _nameCtrl.text.trim(),
@@ -132,6 +143,8 @@ class _ProviderFormScreenState extends State<ProviderFormScreen> {
                 children: [
                   _buildGeneralCard(context, state),
                   const SizedBox(height: 24),
+                  _buildColorPicker(),
+                  const SizedBox(height: 24),
                   _buildRolesCard(context, state),
                   const SizedBox(height: 24),
                   _buildFiscalCard(context),
@@ -392,4 +405,70 @@ class _ProviderFormScreenState extends State<ProviderFormScreen> {
       ),
     );
   }
+
+  Widget _buildColorPicker() {
+    return Column(
+      children: [
+        const Text(
+          'Colore Riconoscitivo',
+          style: TextStyle(fontWeight: FontWeight.bold, fontSize: 16),
+        ),
+        const SizedBox(height: 12),
+        BlocBuilder<ProviderFormCubit, ProviderFormState>(
+          builder: (context, state) {
+            // Se non ha un colore, usiamo il BlueGrey di default
+            final currentColorHex = state.provider.colorHex ?? '#607D8B';
+
+            return Wrap(
+              spacing: 12,
+              runSpacing: 12,
+              children: _brandColors.map((hexCode) {
+                final isSelected =
+                    currentColorHex.toUpperCase() == hexCode.toUpperCase();
+
+                // Conversione rapida per disegnare il cerchio
+                final colorValue = Color(
+                  int.parse('FF${hexCode.replaceAll('#', '')}', radix: 16),
+                );
+
+                return InkWell(
+                  borderRadius: BorderRadius.circular(24),
+                  onTap: () {
+                    // Aggiorniamo il Cubit con il nuovo colore
+                    context.read<ProviderFormCubit>().updateFields(
+                      colorHex: () => hexCode,
+                    );
+                  },
+                  child: AnimatedContainer(
+                    duration: const Duration(milliseconds: 200),
+                    width: 42,
+                    height: 42,
+                    decoration: BoxDecoration(
+                      color: colorValue,
+                      shape: BoxShape.circle,
+                      border: Border.all(
+                        color: isSelected ? Colors.black : Colors.transparent,
+                        width: isSelected ? 3 : 0,
+                      ),
+                      boxShadow: [
+                        if (isSelected)
+                          BoxShadow(
+                            color: colorValue.withValues(alpha: 0.4),
+                            blurRadius: 8,
+                            spreadRadius: 2,
+                          ),
+                      ],
+                    ),
+                    child: isSelected
+                        ? const Icon(Icons.check, color: Colors.white, size: 24)
+                        : null,
+                  ),
+                );
+              }).toList(),
+            );
+          },
+        ),
+      ],
+    );
+  }
 }

lib/features/master_data/staff/blocs/staff_cubit.dart

@@ -117,9 +117,9 @@ class StaffCubit extends Cubit<StaffState> {
     }
   }
 
-  Future<void> resetPasswordOrResendInviteLink(String email) async {
+  Future<void> resetPassword(String email) async {
     try {
-      await _repository.resetPasswordOrResendInviteLink(email);
+      await _repository.resetPassword(email);
       emit(state.copyWith(status: StaffStatus.emailSent, error: null));
     } catch (e) {
       emit(state.copyWith(status: StaffStatus.error, error: e.toString()));

lib/features/master_data/staff/data/staff_repository.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/master_data/store/models/store_model.dart';
@@ -10,8 +11,12 @@ class StaffRepository {
   // --- ANAGRAFICA PURA ---
 
   // Prende tutto lo staff della Company (per l'Hub Anagrafiche)
-  Future<List<StaffMemberModel>> getStaffMembers(String companyId) async {
+  Future<List<StaffMemberModel>> getStaffMembers(
-    final response = await _supabase
+    String companyId, {
+    String? storeId,
+  }) async {
+    try {
+      var filterBuilder = _supabase
           .from(Tables.staffMembers)
           .select('''
       *,
@@ -19,10 +24,25 @@ class StaffRepository {
         ${Tables.stores}(*)
       )
     ''')
-        .eq('company_id', companyId)
+          .eq('company_id', companyId);
-        .order('name', ascending: true);
 
-    return (response as List).map((s) => StaffMemberModel.fromMap(s)).toList();
+      if (storeId != null) {
+        filterBuilder = filterBuilder.or(
+          'store_id.eq.$storeId,store_id.is.null',
+        );
+      }
+
+      var transformBuilder = filterBuilder.order('name', ascending: true);
+
+      final response = await transformBuilder;
+
+      return (response as List)
+          .map((s) => StaffMemberModel.fromMap(s))
+          .toList();
+    } on Exception catch (e) {
+      debugPrint('Errore nel recupero della lista di staff: $e');
+      throw Exception('Errore nel recupero della lista di staff: $e');
+    }
   }
 
   Future<StaffMemberModel?> getStaffMemberById(String staffId) async {
@@ -84,12 +104,16 @@ class StaffRepository {
     }
   }
 
-  Future<void> resetPasswordOrResendInviteLink(String email) async {
+  Future<void> resetPassword(String email) async {
     try {
-      await _supabase.auth.resetPasswordForEmail(
+      final response = await Supabase.instance.client.functions.invoke(
-        email,
+        'reset_password',
-        redirectTo: resetPasswordUrl,
+        body: {'email': email.trim()},
       );
+
+      if (response.status != 200) {
+        throw Exception(response.data['error'] ?? "Errore sconosciuto");
+      }
     } catch (e) {
       throw Exception("Errore nell'invio del link: $e");
     }
@@ -129,10 +153,10 @@ class StaffRepository {
 
   // Assegna un membro a un negozio
   Future<void> assignStaffToStore(String staffId, String storeId) async {
-    await _supabase.from(Tables.staffInStores).insert({
+    await _supabase.from(Tables.staffInStores).upsert({
       'staff_member_id': staffId,
       'store_id': storeId,
-    });
+    }, onConflict: 'staff_member_id,store_id'); // Evita duplicati
   }
 
   // Rimuove l'assegnazione

lib/features/master_data/staff/ui/staff_screen.dart

@@ -90,7 +90,7 @@ class _StaffScreenState extends State<StaffScreen> {
                   return ListView.separated(
                     padding: const EdgeInsets.all(16),
                     itemCount: list.length,
-                    separatorBuilder: (_, _) => const SizedBox(height: 12),
+                    separatorBuilder: (_, _) => const SizedBox(height: 6),
                     itemBuilder: (context, index) {
                       return _buildStaffCard(list[index]);
                     },
@@ -190,16 +190,23 @@ class _StaffScreenState extends State<StaffScreen> {
                 icon: const Icon(Icons.more_vert),
                 onSelected: (value) {
                   if (value == 'invite_reset') {
-                    context.read<StaffCubit>().resetPasswordOrResendInviteLink(
+                    if (!member.hasJoined) {
-                      member.email!,
+                      context.read<StaffCubit>().inviteStaffMember(
+                        member: member,
+                        selectedStoreIds: member.assignedStores
+                            .map((s) => s.id!)
+                            .toList(),
                       );
                       ScaffoldMessenger.of(context).showSnackBar(
                         const SnackBar(
                           content: Text(
-                          'Operazione richiesta, controlla l\'email!',
+                            'Invito reinviato, controlla l\'email!',
                           ),
                         ),
                       );
+                    } else {
+                      context.read<StaffCubit>().resetPassword(member.email!);
+                    }
                   }
                 },
                 itemBuilder: (context) => [

lib/features/master_data/store/bloc/store_cubit.dart

@@ -17,14 +17,18 @@ class StoreCubit extends Cubit<StoreState> {
 
   StoreCubit() : super(const StoreState(stores: []));
 
-  Future<void> createStore(final StoreModel store) async {
+  Future<void> saveStore(final StoreModel store) async {
     emit(state.copyWith(status: StoreStatus.loading));
     try {
-      await _repository.createStore(store);
+      final savedStore = await _repository.saveStore(store);
-      emit(state.copyWith(status: StoreStatus.success));
+      emit(state.copyWith(status: StoreStatus.success, savedStore: savedStore));
     } catch (e) {
       emit(
-        state.copyWith(status: StoreStatus.failure, errorMessage: e.toString()),
+        state.copyWith(
+          status: StoreStatus.failure,
+          errorMessage: e.toString(),
+          savedStore: null,
+        ),
       );
     }
   }
@@ -70,6 +74,7 @@ class StoreCubit extends Cubit<StoreState> {
         state.copyWith(
           status: StoreStatus.failure,
           errorMessage: "Errore nel salvataggio dei provider: $e",
+          savedStore: null,
         ),
       );
     }
@@ -90,6 +95,7 @@ class StoreCubit extends Cubit<StoreState> {
         state.copyWith(
           status: StoreStatus.failure,
           errorMessage: "Errore nel salvataggio dello staff: $e",
+          savedStore: null,
         ),
       );
     }
@@ -110,6 +116,7 @@ class StoreCubit extends Cubit<StoreState> {
         state.copyWith(
           status: StoreStatus.failure,
           errorMessage: "Errore nell'associazione: $e",
+          savedStore: null,
         ),
       );
     }
@@ -130,6 +137,7 @@ class StoreCubit extends Cubit<StoreState> {
         state.copyWith(
           status: StoreStatus.failure,
           errorMessage: "Errore nella rimozione: $e",
+          savedStore: null,
         ),
       );
     }
@@ -142,7 +150,11 @@ class StoreCubit extends Cubit<StoreState> {
       loadStores();
     } catch (e) {
       emit(
-        state.copyWith(status: StoreStatus.failure, errorMessage: e.toString()),
+        state.copyWith(
+          status: StoreStatus.failure,
+          errorMessage: e.toString(),
+          savedStore: null,
+        ),
       );
     }
   }
@@ -157,6 +169,7 @@ class StoreCubit extends Cubit<StoreState> {
         state.copyWith(
           status: StoreStatus.failure,
           errorMessage: "Errore nella rimozione: $e",
+          savedStore: null,
         ),
       );
     }

lib/features/master_data/store/bloc/store_state.dart

@@ -7,6 +7,8 @@ class StoreState extends Equatable {
   final StoreModel? store;
   final String? errorMessage;
   final List<StoreModel> stores;
+  final StoreModel?
+  savedStore; // Per tenere traccia del negozio appena salvato (utile per aggiornare la sessione)
   final Map<String, List<StaffMemberModel>> staffByStore;
 
   const StoreState({
@@ -14,6 +16,7 @@ class StoreState extends Equatable {
     this.store,
     this.errorMessage,
     required this.stores,
+    this.savedStore,
     this.staffByStore = const {},
   });
 
@@ -22,6 +25,7 @@ class StoreState extends Equatable {
     StoreModel? store,
     String? errorMessage,
     List<StoreModel>? stores,
+    StoreModel? savedStore,
     Map<String, List<StaffMemberModel>>? staffByStore,
   }) {
     return StoreState(
@@ -29,6 +33,7 @@ class StoreState extends Equatable {
       store: store ?? this.store,
       errorMessage: errorMessage ?? this.errorMessage,
       stores: stores ?? this.stores,
+      savedStore: savedStore ?? this.savedStore,
       staffByStore: staffByStore ?? this.staffByStore,
     );
   }
@@ -39,6 +44,7 @@ class StoreState extends Equatable {
     store,
     errorMessage,
     stores,
+    savedStore,
     staffByStore,
   ];
 }

lib/features/master_data/store/data/store_repository.dart

@@ -9,7 +9,7 @@ class StoreRepository {
   final SupabaseClient _supabase = GetIt.I.get<SupabaseClient>();
 
   /// Crea un nuovo negozio associato alla compagnia dell'utente
-  Future<void> createStore(StoreModel store) async {
+  /* Future<void> createStore(StoreModel store) async {
     try {
       await _supabase.from(Tables.stores).insert(store.toMap());
     } on PostgrestException catch (e) {
@@ -18,7 +18,7 @@ class StoreRepository {
     } catch (e) {
       throw 'Errore imprevisto durante la creazione del negozio: $e';
     }
-  }
+  } */
 
   Future<StoreModel> saveStore(StoreModel store) async {
     try {

lib/features/master_data/store/models/store_model.dart

@@ -16,6 +16,7 @@ class StoreModel extends Equatable {
   final List<ProviderModel> associatedProviders; // Provider associati
   final List<StaffMemberModel>
   associatedStaffMembers; // Membri dello staff associati
+  final String? defaultProviderId; // ID del provider di default (opzionale)
 
   const StoreModel({
     this.id,
@@ -30,6 +31,7 @@ class StoreModel extends Equatable {
     required this.province,
     this.associatedProviders = const [],
     this.associatedStaffMembers = const [],
+    this.defaultProviderId,
   });
 
   // Fondamentale per Equatable: definisce quali proprietà determinano l'uguaglianza
@@ -47,6 +49,7 @@ class StoreModel extends Equatable {
     province,
     associatedProviders,
     associatedStaffMembers,
+    defaultProviderId,
   ];
 
   // Il mitico copyWith per creare nuove istanze modificando solo ciò che serve
@@ -63,6 +66,7 @@ class StoreModel extends Equatable {
     String? province,
     List<ProviderModel>? associatedProviders,
     List<StaffMemberModel>? associatedStaffMembers,
+    String? Function()? defaultProviderId,
   }) {
     return StoreModel(
       id: id ?? this.id,
@@ -78,6 +82,9 @@ class StoreModel extends Equatable {
       associatedProviders: associatedProviders ?? this.associatedProviders,
       associatedStaffMembers:
           associatedStaffMembers ?? this.associatedStaffMembers,
+      defaultProviderId: defaultProviderId != null
+          ? defaultProviderId()
+          : this.defaultProviderId,
     );
   }
 
@@ -131,6 +138,7 @@ class StoreModel extends Equatable {
       province: map['province'],
       associatedProviders: providers,
       associatedStaffMembers: staffMembers,
+      defaultProviderId: map['default_provider_id'] as String?,
     );
   }
 
@@ -147,6 +155,7 @@ class StoreModel extends Equatable {
       'zip_code': zipCode,
       'city': city,
       'province': province,
+      'default_provider_id': defaultProviderId,
     };
   }
 }

lib/features/master_data/store/ui/create_store_screen.dart

@@ -76,7 +76,7 @@ class _CreateStoreScreenState extends State<CreateStoreScreen> {
         province: _provinciaController.text.trim().toUpperCase(),
       );
 
-      context.read<StoreCubit>().createStore(store);
+      context.read<StoreCubit>().saveStore(store);
     }
   }
 

lib/features/master_data/store/ui/store_form.dart

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/widgets/flux_text_field.dart';
+import 'package:flux/features/master_data/providers/blocs/provider_list_cubit.dart';
 import 'package:flux/features/master_data/store/bloc/store_cubit.dart';
 import 'package:flux/features/master_data/store/models/store_model.dart';
 
@@ -19,6 +20,8 @@ class _StoreFormState extends State<StoreForm> {
   final capController = TextEditingController();
   final comuneController = TextEditingController();
   final provinciaController = TextEditingController();
+  String?
+  _selectedDefaultProviderId; // Per tenere traccia del provider di default selezionato
 
   @override
   void initState() {
@@ -29,12 +32,51 @@ class _StoreFormState extends State<StoreForm> {
       capController.text = widget.store!.zipCode;
       comuneController.text = widget.store!.city;
       provinciaController.text = widget.store!.province;
+      _selectedDefaultProviderId = widget.store!.defaultProviderId;
     }
+    context.read<ProviderListCubit>().loadProviders(
+      widget.store!.id!,
+    ); // Carichiamo i gestori per la dropdown
   }
 
   @override
   Widget build(BuildContext context) {
-    return Container(
+    return BlocListener<StoreCubit, StoreState>(
+      listener: (context, state) {
+        if (state.status == StoreStatus.success) {
+          // 1. Diciamo alla schermata di ricaricare la lista generale dei negozi (se serve)
+          context.read<StoreCubit>().loadStores();
+
+          // 🥷 2. IL TOCCO FINALE: Aggiorniamo la sessione globale se stiamo modificando il negozio attivo!
+          if (state.savedStore != null) {
+            context.read<SessionCubit>().updateCurrentStoreLocally(
+              state.savedStore!,
+            );
+          }
+
+          // 3. Chiudiamo il form
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(
+              content: Text(
+                'Negozio aggiornato con successo!',
+                style: TextStyle(color: Colors.white),
+              ),
+              backgroundColor: Colors.green,
+            ),
+          );
+          Navigator.pop(context);
+        }
+
+        if (state.status == StoreStatus.failure) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            SnackBar(
+              content: Text(state.errorMessage ?? 'Errore di salvataggio'),
+              backgroundColor: Colors.red,
+            ),
+          );
+        }
+      },
+      child: Container(
         decoration: BoxDecoration(
           color: Theme.of(context).scaffoldBackgroundColor,
           borderRadius: const BorderRadius.vertical(top: Radius.circular(24)),
@@ -51,8 +93,13 @@ class _StoreFormState extends State<StoreForm> {
             crossAxisAlignment: CrossAxisAlignment.start,
             children: [
               Text(
-              widget.store == null ? "Nuovo Punto Vendita" : "Modifica Negozio",
+                widget.store == null
-              style: const TextStyle(fontSize: 20, fontWeight: FontWeight.bold),
+                    ? "Nuovo Punto Vendita"
+                    : "Modifica Negozio",
+                style: const TextStyle(
+                  fontSize: 20,
+                  fontWeight: FontWeight.bold,
+                ),
               ),
               const SizedBox(height: 24),
 
@@ -109,6 +156,10 @@ class _StoreFormState extends State<StoreForm> {
                   ),
                 ],
               ),
+              const SizedBox(height: 16),
+
+              // --- GESTORI ---
+              _defaultProviderDropdown(),
 
               const SizedBox(height: 32),
 
@@ -137,12 +188,11 @@ class _StoreFormState extends State<StoreForm> {
                       isActive: widget.store?.isActive ?? true,
                       isPaid: widget.store?.isPaid ?? false,
                       paymentExpiration: widget.store?.paymentExpiration,
+                      defaultProviderId: _selectedDefaultProviderId,
                     );
 
                     // Chiamata al Bloc per il salvataggio
-                  context.read<StoreCubit>().createStore(storeData);
+                    context.read<StoreCubit>().saveStore(storeData);
-
-                  Navigator.pop(context);
                   },
                   child: Text(
                     widget.store == null ? "CREA NEGOZIO" : "AGGIORNA DATI",
@@ -152,6 +202,71 @@ class _StoreFormState extends State<StoreForm> {
             ],
           ),
         ),
+      ),
+    );
+  }
+
+  Widget _defaultProviderDropdown() {
+    return BlocBuilder<ProviderListCubit, ProviderListState>(
+      builder: (context, state) {
+        if (state.status == ProviderListStatus.loading) {
+          return const Center(child: CircularProgressIndicator());
+        }
+
+        final activeProviders = state.providers
+            .where((p) => p.isActive)
+            .toList();
+
+        // 🥷 SCENARIO ONBOARDING: La lista dei gestori è vuota
+        if (activeProviders.isEmpty) {
+          return TextFormField(
+            enabled: false, // Disabilitiamo il campo
+            decoration: InputDecoration(
+              labelText: 'Gestore di Default',
+              hintText: 'Configura prima i gestori nell\'hub anagrafiche',
+              hintStyle: TextStyle(color: Colors.grey[500], fontSize: 13),
+              prefixIcon: const Icon(Icons.star_border, color: Colors.grey),
+              disabledBorder: OutlineInputBorder(
+                borderRadius: BorderRadius.circular(8),
+                borderSide: BorderSide(color: Colors.grey[300]!),
+              ),
+              fillColor: Colors.grey[50],
+              filled: true,
+            ),
+          );
+        }
+
+        // SCENARIO STANDARD: Ci sono gestori censiti, mostriamo la dropdown
+        return DropdownButtonFormField<String?>(
+          initialValue: _selectedDefaultProviderId,
+          decoration: InputDecoration(
+            labelText: 'Gestore di Default (Opzionale)',
+            hintText: 'Seleziona se questo è un negozio monomarca',
+            prefixIcon: const Icon(Icons.star_border, color: Colors.amber),
+            border: OutlineInputBorder(borderRadius: BorderRadius.circular(8)),
+          ),
+          items: [
+            const DropdownMenuItem<String?>(
+              value: null,
+              child: Text(
+                'Nessun gestore (Multi-brand)',
+                style: TextStyle(fontStyle: FontStyle.italic),
+              ),
+            ),
+            ...activeProviders.map((p) {
+              return DropdownMenuItem<String?>(
+                value: p.id,
+                child: Text(p.name),
+              );
+            }),
+          ],
+          onChanged: (val) {
+            setState(() {
+              _selectedDefaultProviderId = val;
+            });
+          },
+        );
+      },
     );
   }
 }

lib/features/notes/blocs/notes_bloc.dart

@@ -1,80 +0,0 @@
-import 'dart:async';
-import 'package:flutter/foundation.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/notes/data/notes_repository.dart';
-import 'package:flux/features/notes/models/note_model.dart';
-import 'package:get_it/get_it.dart';
-part 'notes_event.dart';
-part 'notes_state.dart';
-
-class NotesBloc extends Bloc<NotesEvent, NotesState> {
-  final NotesRepository _repository = GetIt.I.get<NotesRepository>();
-  final String _companyId = GetIt.I.get<SessionCubit>().state.company!.id!;
-  final String _currentStaffId = GetIt.I
-      .get<SessionCubit>()
-      .state
-      .currentStaffMember!
-      .id!;
-
-  NotesBloc() : super(const NotesState()) {
-    on<SubscribeToNotesRequested>(_onSubscribeToNotesRequested);
-    on<NoteSavedRequested>(_onNoteSavedRequested);
-    on<NoteDeletedRequested>(_onNoteDeletedRequested);
-
-    // Facciamo partire l'ascolto in tempo reale al boot del BLoC
-    add(SubscribeToNotesRequested());
-  }
-
-  Future<void> _onSubscribeToNotesRequested(
-    SubscribeToNotesRequested event,
-    Emitter<NotesState> emit,
-  ) async {
-    emit(state.copyWith(status: NotesStatus.loading));
-
-    // Usiamo l'emit.forEach sullo stream pulito del repository
-    await emit.forEach<List<NoteModel>>(
-      _repository.notesStream(
-        companyId: _companyId,
-        currentStaffId: _currentStaffId,
-      ),
-      onData: (notesList) {
-        return state.copyWith(status: NotesStatus.success, notes: notesList);
-      },
-      onError: (error, stackTrace) {
-        return state.copyWith(
-          status: NotesStatus.failure,
-          errorMessage: 'Errore nello stream realtime: $error',
-        );
-      },
-    );
-  }
-
-  Future<void> _onNoteSavedRequested(
-    NoteSavedRequested event,
-    Emitter<NotesState> emit,
-  ) async {
-    try {
-      await _repository.saveNote(event.note);
-      // Non serve fare l'emit! Ci pensa lo stream a far rimbalzare i dati aggiornati
-    } catch (e) {
-      emit(
-        state.copyWith(status: NotesStatus.failure, errorMessage: e.toString()),
-      );
-    }
-  }
-
-  Future<void> _onNoteDeletedRequested(
-    NoteDeletedRequested event,
-    Emitter<NotesState> emit,
-  ) async {
-    try {
-      await _repository.deleteNote(event.noteId);
-      // Anche qui, lo stream rileva la cancellazione in automatico
-    } catch (e) {
-      emit(
-        state.copyWith(status: NotesStatus.failure, errorMessage: e.toString()),
-      );
-    }
-  }
-}

lib/features/notes/blocs/notes_cubit.dart

@@ -0,0 +1,94 @@
+import 'dart:async';
+
+import 'package:equatable/equatable.dart';
+import 'package:flutter/widgets.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/features/notes/data/notes_repository.dart';
+import 'package:flux/features/notes/models/note_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'notes_state.dart';
+
+class NotesCubit extends Cubit<NotesState> {
+  final NotesRepository _repository = GetIt.I.get<NotesRepository>();
+  String? get companyId => GetIt.I.get<SessionCubit>().state.company?.id;
+  String? get staffId =>
+      GetIt.I.get<SessionCubit>().state.currentStaffMember?.id;
+
+  StreamSubscription<void>? _subscription;
+
+  NotesCubit() : super(NotesState(status: NotesStatus.initial));
+
+  void stopListening() {
+    _subscription?.cancel();
+    _subscription = null;
+  }
+
+  void startListening() {
+    stopListening();
+
+    emit(state.copyWith(status: NotesStatus.loading));
+
+    // Primo caricamento
+    _loadNotesSilently();
+
+    // Inizio ascolto campanello
+    try {
+      _subscription = _repository
+          .notesStream(companyId: companyId!, currentStaffId: staffId!)
+          .listen((_) {
+            // Quando il campanello suona (qualcosa è cambiato a DB), ricarichiamo!
+            _loadNotesSilently();
+          });
+    } on Exception catch (e) {
+      debugPrint(e.toString());
+    }
+  }
+
+  Future<void> _loadNotesSilently() async {
+    try {
+      final notes = await _repository.getNotes();
+
+      emit(
+        state.copyWith(
+          status: NotesStatus.success,
+          notes: notes,
+          errorMessage: null,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(status: NotesStatus.failure, errorMessage: e.toString()),
+      );
+    }
+  }
+
+  Future<void> saveNote(NoteModel note) async {
+    try {
+      await _repository.saveNote(note);
+      // Non serve fare l'emit! Ci pensa lo stream a far rimbalzare i dati aggiornati
+    } catch (e) {
+      emit(
+        state.copyWith(status: NotesStatus.failure, errorMessage: e.toString()),
+      );
+    }
+  }
+
+  Future<void> deleteNote(String noteId) async {
+    try {
+      await _repository.deleteNote(noteId);
+      // Non serve fare l'emit
+    } catch (e) {
+      emit(
+        state.copyWith(status: NotesStatus.failure, errorMessage: e.toString()),
+      );
+    }
+  }
+
+  @override
+  Future<void> close() {
+    stopListening();
+    return super.close();
+  }
+}

lib/features/notes/blocs/notes_event.dart

@@ -1,17 +0,0 @@
-part of 'notes_bloc.dart';
-
-sealed class NotesEvent {}
-
-/// Fa partire lo stream e gestisce sia il caricamento iniziale che il realtime
-class SubscribeToNotesRequested extends NotesEvent {}
-
-class NoteDeletedRequested extends NotesEvent {
-  final String noteId;
-  NoteDeletedRequested(this.noteId);
-}
-
-/// Salva o aggiorna una nota
-class NoteSavedRequested extends NotesEvent {
-  final NoteModel note;
-  NoteSavedRequested(this.note);
-}

lib/features/notes/blocs/notes_state.dart

@@ -1,8 +1,8 @@
-part of 'notes_bloc.dart';
+part of 'notes_cubit.dart';
 
 enum NotesStatus { initial, loading, success, failure }
 
-class NotesState {
+class NotesState extends Equatable {
   final NotesStatus status;
   final List<NoteModel> notes;
   final String? errorMessage;
@@ -26,14 +26,5 @@ class NotesState {
   }
 
   @override
-  bool operator ==(Object other) {
+  List<Object?> get props => [status, notes, errorMessage];
-    if (identical(this, other)) return true;
-    return other is NotesState &&
-        other.status == status &&
-        listEquals(other.notes, notes) &&
-        other.errorMessage == errorMessage;
-  }
-
-  @override
-  int get hashCode => status.hashCode ^ notes.hashCode ^ errorMessage.hashCode;
 }

lib/features/notes/data/notes_repository.dart

@@ -1,3 +1,4 @@
+import 'package:flutter/foundation.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:flux/features/notes/models/note_model.dart';
@@ -130,13 +131,26 @@ class NotesRepository {
     await _supabase.from('note_collaborators').delete().eq('note_id', noteId);
 
     // 3. RE-INSERIMENTO DELLA LISTA AGGIORNATA
-    // Se ci sono collaboratori da inserire, li prepariamo in blocco (Bulk Insert)
     if (note.collaboratorIds.isNotEmpty) {
       final collaboratorsToInsert = note.collaboratorIds
-          .map((staffId) => {'note_id': noteId, 'staff_id': staffId})
+          .map(
+            (staffId) => {
+              'note_id': noteId,
+              'staff_id': staffId,
+              'company_id': note.companyId, // Aggiunto questo!
+            },
+          )
           .toList();
 
-      await _supabase.from('note_collaborators').insert(collaboratorsToInsert);
+      // Consiglio da pro: avvolgi l'insert in un try-catch per stampare l'errore esatto a console
+      try {
+        await _supabase
+            .from(Tables.noteCollaborators)
+            .insert(collaboratorsToInsert);
+      } catch (e) {
+        debugPrint('Errore inserimento collaboratori: $e');
+        throw Exception('Impossibile aggiungere i collaboratori alla nota.');
+      }
     }
 
     // Restituiamo l'id alla UI (fondamentale per la nostra logica Ninja di creazione)

lib/features/notes/ui/notes_form_screen.dart

@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/utils/debouncer.dart';
 import 'package:flux/features/master_data/staff/blocs/staff_cubit.dart';
-import 'package:flux/features/notes/blocs/notes_bloc.dart';
+import 'package:flux/features/notes/blocs/notes_cubit.dart';
 import 'package:flux/features/notes/models/note_model.dart';
 
 class NoteFormScreen extends StatefulWidget {
@@ -20,7 +20,7 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
   NoteModel get _note => widget.note;
   late TextEditingController _titleController;
   late TextEditingController _contentController;
-  late final NotesBloc _notesBloc;
+  late final NotesCubit _notesCubit;
   late String _selectedColor;
   late bool _isPinned;
   late bool _isSharedAll;
@@ -43,7 +43,7 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
     super.initState();
     _titleController = TextEditingController(text: widget.note.title ?? '');
     _contentController = TextEditingController(text: widget.note.content ?? '');
-    _notesBloc = context.read<NotesBloc>();
+    _notesCubit = context.read<NotesCubit>();
     _selectedColor = widget.note.color;
     _isPinned = widget.note.isPinned;
     _isSharedAll = widget.note.isSharedAll;
@@ -90,7 +90,7 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
     );
 
     // Spariamo l'evento al Bloc, che salverà silente sul DB tramite Repository
-    _notesBloc.add(NoteSavedRequested(updatedNote));
+    _notesCubit.saveNote(updatedNote);
   }
 
   /// Se l'utente esce e la nota è totalmente vuota, la eliminiamo dal DB "al secchio"
@@ -103,12 +103,12 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
     // Assumiamo che se non ha scritto testo ed è appena stata creata, sia vuota.
     if (titleEmpty && contentEmpty) {
       // Notifichiamo anche il Bloc dell'avvenuta cancellazione così pulisce lo stato locale
-      _notesBloc.add(NoteDeletedRequested(noteId));
+      _notesCubit.deleteNote(noteId);
     }
   }
 
   void _deleteNote() {
-    _notesBloc.add(NoteDeletedRequested(widget.note.id!));
+    _notesCubit.deleteNote(widget.note.id!);
     Navigator.pop(context);
   }
 
@@ -134,7 +134,9 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
       builder: (context) {
         return StatefulBuilder(
           builder: (context, setModalState) {
-            return Column(
+            return Material(
+              color: Colors.transparent,
+              child: Column(
                 children: [
                   Padding(
                     padding: const EdgeInsets.all(16.0),
@@ -201,6 +203,7 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
                     ),
                   ),
                 ],
+              ),
             );
           },
         );
@@ -403,7 +406,9 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
                   const SizedBox(height: 12),
 
                   // --- CONDIVISIONE ---
-                  SwitchListTile(
+                  Material(
+                    color: Colors.transparent,
+                    child: SwitchListTile(
                       title: const Text(
                         'Condividi con tutti',
                         style: TextStyle(
@@ -422,6 +427,7 @@ class _NoteFormScreenState extends State<NoteFormScreen> {
                         _triggerAutoSave();
                       },
                     ),
+                  ),
 
                   if (!_isSharedAll) ...[
                     const SizedBox(height: 16),

lib/features/notes/ui/notes_list_screen.dart

@@ -2,16 +2,54 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_staggered_grid_view/flutter_staggered_grid_view.dart';
 import 'package:flux/core/routes/routes.dart';
-import 'package:flux/features/notes/blocs/notes_bloc.dart';
+import 'package:flux/features/notes/blocs/notes_cubit.dart';
 import 'package:flux/features/notes/data/notes_repository.dart';
 import 'package:go_router/go_router.dart';
 import 'package:get_it/get_it.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/features/notes/models/note_model.dart';
 
-class NotesListScreen extends StatelessWidget {
+class NotesListScreen extends StatefulWidget {
   const NotesListScreen({super.key});
 
+  @override
+  State<NotesListScreen> createState() => _NotesListScreenState();
+}
+
+class _NotesListScreenState extends State<NotesListScreen> {
+  late final AppLifecycleListener _lifecycleListener;
+
+  @override
+  void initState() {
+    super.initState();
+
+    // Inizializziamo il sensore del ciclo di vita
+    _lifecycleListener = AppLifecycleListener(
+      onPause: () {
+        // L'utente ha messo l'app in background (es. per rispondere a un messaggio su WhatsApp)
+        // Chiudiamo i rubinetti per non sprecare risorse e prevenire crash
+        context.read<NotesCubit>().stopListening();
+        debugPrint('App in background: Stream sospesi.');
+      },
+      onResume: () {
+        // L'utente è tornato sull'app!
+        // Riappriamo i rubinetti, Supabase ricreerà una connessione fresca
+        context.read<NotesCubit>().startListening();
+        debugPrint('App in foreground: Stream riattivati.');
+      },
+    );
+
+    // Facciamo partire gli stream la primissima volta che la schermata si carica
+    context.read<NotesCubit>().startListening();
+  }
+
+  @override
+  void dispose() {
+    // Pulizia fondamentale
+    _lifecycleListener.dispose();
+    super.dispose();
+  }
+
   /// Logica Ninja: Crea la nota vuota, prende l'ID, e apre il form
   Future<void> _createNewNoteAndNavigate(BuildContext context) async {
     final sessionState = context.read<SessionCubit>().state;
@@ -73,7 +111,7 @@ class NotesListScreen extends StatelessWidget {
         backgroundColor: Theme.of(context).colorScheme.primary,
         foregroundColor: Colors.white,
       ),
-      body: BlocBuilder<NotesBloc, NotesState>(
+      body: BlocBuilder<NotesCubit, NotesState>(
         builder: (context, state) {
           if (state.status == NotesStatus.loading && state.notes.isEmpty) {
             return const Center(child: CircularProgressIndicator());

lib/features/operations/blocs/operation_form_cubit.dart

@@ -2,6 +2,8 @@ import 'package:equatable/equatable.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
+import 'package:flux/features/master_data/providers/models/provider_model.dart';
+import 'package:flux/features/master_data/providers/models/provider_model_extensions.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/operations/data/operations_repository.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
@@ -96,17 +98,23 @@ class OperationFormCubit extends Cubit<OperationFormState> {
 
     emit(
       state.copyWith(
-        status: OperationFormStatus.ready, // Torna ready per il nuovo form
+        status: OperationFormStatus.ready,
         operation: OperationModel(
           companyId: current.companyId,
           storeId: current.storeId,
           storeDisplayName: current.storeDisplayName,
-          batchUuid: current.batchUuid, // MANTIENE IL COLLEGAMENTO
+          // 🥷 REINSERIAMO LO STAFF (Il "colpevole" era qui)
-          customerId: current.customerId, // MANTIENE IL CLIENTE
+          staffId: current.staffId,
+          staffDisplayName: current.staffDisplayName,
+
+          batchUuid: current.batchUuid,
+          customerId: current.customerId,
           customer: current.customer,
           reference: current.reference,
           status: OperationStatus.draft,
           createdAt: DateTime.now(),
+          // Mantieni isBusiness se vuoi che rimanga coerente col cliente
+          isBusiness: current.isBusiness,
         ),
       ),
     );
@@ -209,9 +217,7 @@ class OperationFormCubit extends Cubit<OperationFormState> {
     String? reference,
     String? note,
     String? type,
-    String? providerId,
+    String? subType,
-    String? providerDisplayName,
-    String? subtype,
     String? description,
     DateTime? expirationDate,
     int? quantity,
@@ -224,7 +230,7 @@ class OperationFormCubit extends Cubit<OperationFormState> {
 
     bool clearProvider = false,
     bool clearType = false,
-    bool clearSubtype = false,
+    bool clearSubType = false,
     bool clearDescription = false,
     bool clearExpiration = false,
     bool clearQuantity = false,
@@ -240,16 +246,12 @@ class OperationFormCubit extends Cubit<OperationFormState> {
     final updated = current.copyWith(
       reference: reference ?? current.reference,
       note: note ?? current.note,
-      providerId: clearProvider ? null : (providerId ?? current.providerId),
-      providerDisplayName: clearProvider
-          ? null
-          : (providerDisplayName ?? current.providerDisplayName),
       quantity: newQuantity ?? current.quantity,
       type: clearType ? null : (type ?? current.type),
       description: clearDescription
           ? null
           : (description ?? current.description),
-      subtype: clearSubtype ? null : (subtype ?? current.subtype),
+      subType: clearSubType ? null : (subType ?? current.subType),
       expirationDate: clearExpiration
           ? null
           : (expirationDate ?? current.expirationDate),
@@ -266,6 +268,17 @@ class OperationFormCubit extends Cubit<OperationFormState> {
     emit(state.copyWith(operation: updated));
   }
 
+  void updateProvider(ProviderModel? newProvider) {
+    final current = state.operation;
+
+    final updatedOperation = current.copyWith(
+      // Se newProvider è null, passiamo una funzione che ritorna null per sbiancare i campi!
+      provider: () => newProvider,
+    );
+
+    emit(state.copyWith(operation: updatedOperation));
+  }
+
   void updateCustomer(CustomerModel customer) {
     final bool isBusiness = customer.isBusiness;
     final updatedOperation = state.operation.copyWith(
@@ -278,27 +291,101 @@ class OperationFormCubit extends Cubit<OperationFormState> {
 
   // --- UTILS ---
 
-  void setTypeWithSmartDefault(String type) {
+  void updateOperationType(
+    String newType, {
+    required List<ProviderModel> allProviders,
+    String? defaultProviderId,
+  }) {
+    // 1. Aggiorniamo il tipo nel modello in canna
+    // (Presumo tu abbia un metodo copyWith o simile)
+
+    // 2. LA LOGICA DI DEFAULT
+    if (defaultProviderId != null) {
+      // Troviamo il provider di default nella lista
+      final defaultProvider = allProviders
+          .where((p) => p.id == defaultProviderId)
+          .firstOrNull;
+
+      if (defaultProvider != null) {
+        // Usiamo l'extension appena creata!
+        if (defaultProvider.supportsOperation(newType)) {
+          updateProvider(defaultProvider);
+        } else {
+          // Se cambi tipo (es. da Mobile a Luce) e il default non lo supporta, sbianchiamo
+          updateProvider(null);
+        }
+      }
+    }
+  }
+
+  void setTypeWithSmartDefaults({
+    required String newType,
+    required List<ProviderModel> allProviders,
+    String? defaultProviderId,
+  }) {
+    final currentOp = state.operation;
+
+    // -----------------------------------------
+    // 1. SMART DATES: Calcolo Scadenze Default (Invariato)
+    // -----------------------------------------
     DateTime? defaultDate;
     final now = DateTime.now();
 
-    if (type == 'Energy') {
+    if (newType == 'Energy') {
       defaultDate = DateTime(now.year, now.month + 24, now.day);
     }
-    if (type == 'Fin') {
+    if (newType == 'Fin') {
       defaultDate = DateTime(now.year, now.month + 30, now.day);
     }
-    if (type == 'Entertainment') {
+    if (newType == 'Entertainment') {
       defaultDate = DateTime(now.year, now.month + 12, now.day);
     }
 
-    updateFields(
+    // -----------------------------------------
-      type: type,
+    // 2. SMART PROVIDER: Filtro e Auto-Selezione ad Oggetti
-      expirationDate: defaultDate,
+    // -----------------------------------------
-      clearProvider: true,
+    // Pescatore direttamente l'oggetto dal modello corrente
-      clearSubtype: true,
+    ProviderModel? targetProvider = currentOp.provider;
-      clearModel: true,
+
-      clearQuantity: true,
+    // A) Il provider attuale è ancora compatibile col nuovo tipo scelto?
+    if (targetProvider != null && !targetProvider.supportsOperation(newType)) {
+      // Non è più compatibile (es. da TIM fisso passo a Energy). Lo sbianchiamo!
+      targetProvider = null;
+    }
+
+    // B) Se non c'è un provider selezionato, proviamo ad auto-inserire quello di default del negozio
+    if (targetProvider == null && defaultProviderId != null) {
+      final defaultProvider = allProviders
+          .where((p) => p.id == defaultProviderId)
+          .firstOrNull;
+
+      // Controlliamo che il default del negozio supporti questa specifica operazione
+      if (defaultProvider != null &&
+          defaultProvider.supportsOperation(newType)) {
+        targetProvider = defaultProvider;
+      }
+    }
+
+    // -----------------------------------------
+    // 3. EMISSIONE DELLO STATO PULITO
+    // -----------------------------------------
+    emit(
+      state.copyWith(
+        operation: currentOp.copyWith(
+          type: newType,
+          subType: '', // Resettiamo il sottotipo per evitare incongruenze
+          expirationDate:
+              defaultDate, // Impostiamo la scadenza di default se calcolata
+          // 🥷 APPLICHIAMO IL TRUCCO NINJA DELLE FUNZIONI
+          // Se targetProvider è null, le funzioni ritorneranno null sbiancando il DB!
+          provider: () => targetProvider,
+
+          // Nota: Per azzerare davvero questi due, ricordati in futuro di applicare
+          // il trucco delle funzioni anche a modelId e modelDisplayName nel modello!
+          modelId: null,
+          modelDisplayName: null,
+        ),
+      ),
     );
   }
 }

lib/features/operations/blocs/operation_list_cubit.dart

@@ -12,72 +12,103 @@ class OperationListCubit extends Cubit<OperationListState> {
   final OperationsRepository _repository = GetIt.I<OperationsRepository>();
   final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
 
-  OperationListCubit() : super(const OperationListState()) {
+  OperationListCubit() : super(const OperationListState());
-    loadOperations(refresh: true);
-  }
 
-  Future<void> loadOperations({bool refresh = false}) async {
+  // 🥷 MOTORE 1: DESKTOP (Sostituisce la lista)
+  Future<void> loadSpecificPageDesktop(int page) async {
     if (state.status == OperationListStatus.loading) return;
-    if (!refresh && state.hasReachedMax) return;
+    emit(state.copyWith(status: OperationListStatus.loading));
-
-    emit(
-      state.copyWith(
-        status: OperationListStatus.loading,
-        errorMessage: null,
-        operations: refresh ? [] : state.operations,
-        hasReachedMax: refresh ? false : state.hasReachedMax,
-      ),
-    );
 
     try {
-      final currentOffset = refresh ? 0 : state.operations.length;
       final companyId = _sessionCubit.state.company?.id;
-
+      final paginatedData = await _repository.fetchPaginatedOperations(
-      if (companyId == null) {
+        companyId: companyId!,
-        throw Exception("Company ID non trovato nella sessione");
+        page: page,
-      }
+        itemsPerPage: state.itemsPerPage,
-
-      final newOperations = await _repository.fetchOperations(
-        companyId: companyId,
-        offset: currentOffset,
-        limit: 50,
-        searchTerm: state.query,
-        dateRange: state.dateRange,
       );
 
-      final bool reachedMax = newOperations.length < 50;
-
       emit(
         state.copyWith(
           status: OperationListStatus.success,
-          operations: refresh
+          operations: paginatedData.operations, // 🎯 SOSTITUISCE I DATI
-              ? newOperations
+          totalItems: paginatedData.totalCount,
-              : [...state.operations, ...newOperations],
+          currentPage: page,
-          hasReachedMax: reachedMax,
+          hasReachedMax: paginatedData.operations.length < state.itemsPerPage,
         ),
       );
     } catch (e) {
       emit(
         state.copyWith(
           status: OperationListStatus.failure,
-          errorMessage: "Errore nel caricamento operazioni: $e",
+          errorMessage: e.toString(),
         ),
       );
     }
   }
 
-  void updateFilters({String? query, DateTimeRange? range}) {
+  // 🥷 MOTORE 2: MOBILE (Accoda alla lista)
+  Future<void> loadNextPageMobile({bool refresh = false}) async {
+    if (state.status == OperationListStatus.loading) return;
+    if (state.hasReachedMax && !refresh) return;
+
+    // Se stiamo pullando verso il basso (refresh), ripartiamo da pagina 1
+    final targetPage = refresh ? 1 : state.currentPage + 1;
+
+    // Mostriamo il loading solo se è un refresh totale, altrimenti manteniamo lo stato success
+    // per non far sparire la UI mentre carica in fondo
+    if (refresh) emit(state.copyWith(status: OperationListStatus.loading));
+
+    try {
+      final companyId = _sessionCubit.state.company?.id;
+      final paginatedData = await _repository.fetchPaginatedOperations(
+        companyId: companyId!,
+        page: targetPage,
+        itemsPerPage: state.itemsPerPage,
+      );
+
       emit(
         state.copyWith(
-        query: query ?? state.query,
+          status: OperationListStatus.success,
-        dateRange: range ?? state.dateRange,
+          // 🎯 ACCODA I DATI SE NON È REFRESH, ALTRIMENTI SOSTITUISCE
+          operations:
+              refresh ? paginatedData.operations : List.of(state.operations)
+                ..addAll(paginatedData.operations),
+          totalItems: paginatedData.totalCount,
+          currentPage: targetPage,
+          hasReachedMax: paginatedData.operations.length < state.itemsPerPage,
         ),
       );
-    loadOperations(refresh: true);
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationListStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  void updateFilters({String? text, DateTimeRange? range}) {
+    emit(
+      state.copyWith(
+        // 🥷 FORZIAMO IL TIPO: Diciamo a Dart che il risultato del ternario è proprio una funzione
+        searchTerm: text != null ? () => text : null,
+        dateRange: range != null ? () => range : null,
+
+        currentPage: 1, // Reset obbligatorio alla prima pagina
+        hasReachedMax: false,
+      ),
+    );
+
+    // Ricarichiamo la pagina 1 con i nuovi filtri applicati
+    loadSpecificPageDesktop(1);
   }
 
   void clearFilters() {
-    emit(const OperationListState()); // Resetta tutto allo stato iniziale
+    // Invece di un const vuoto che potrebbe bruciarti l'impostazione itemsPerPage,
-    loadOperations(refresh: true);
+    // creiamo uno stato pulito ma manteniamo la preferenza di paginazione.
+    emit(OperationListState(itemsPerPage: state.itemsPerPage));
+
+    loadSpecificPageDesktop(1);
   }
 }

lib/features/operations/blocs/operation_list_state.dart

@@ -5,35 +5,57 @@ enum OperationListStatus { initial, loading, success, failure }
 class OperationListState extends Equatable {
   final OperationListStatus status;
   final List<OperationModel> operations;
-  final bool hasReachedMax;
   final String? errorMessage;
-  final String query;
+
+  // Paginazione Ibrida
+  final int currentPage;
+  final int itemsPerPage;
+  final int totalItems;
+  final bool hasReachedMax;
+
+  // 🥷 I FILTRI MANCANTI (Riparati!)
+  final String? searchTerm;
   final DateTimeRange? dateRange;
 
   const OperationListState({
     this.status = OperationListStatus.initial,
     this.operations = const [],
-    this.hasReachedMax = false,
     this.errorMessage,
-    this.query = '',
+    this.currentPage = 1,
+    this.itemsPerPage = 25,
+    this.totalItems = 0,
+    this.hasReachedMax = false,
+    this.searchTerm,
     this.dateRange,
   });
 
+  int get totalPages => (totalItems / itemsPerPage).ceil();
+
+  // 🥷 COPYWITH AVANZATO: Gestisce lo sbiancamento dei filtri alla perfezione
   OperationListState copyWith({
     OperationListStatus? status,
     List<OperationModel>? operations,
-    bool? hasReachedMax,
     String? errorMessage,
-    String? query,
+    int? currentPage,
-    DateTimeRange? dateRange,
+    int? itemsPerPage,
+    int? totalItems,
+    bool? hasReachedMax,
+    String? Function()? searchTerm, // Callback per gestire il null esplicito
+    DateTimeRange? Function()?
+    dateRange, // Callback per gestire il null esplicito
   }) {
     return OperationListState(
       status: status ?? this.status,
       operations: operations ?? this.operations,
+      errorMessage: errorMessage ?? this.errorMessage,
+      currentPage: currentPage ?? this.currentPage,
+      itemsPerPage: itemsPerPage ?? this.itemsPerPage,
+      totalItems: totalItems ?? this.totalItems,
       hasReachedMax: hasReachedMax ?? this.hasReachedMax,
-      errorMessage: errorMessage,
+
-      query: query ?? this.query,
+      // Se passi la funzione la eseguiamo, altrimenti teniamo il valore corrente
-      dateRange: dateRange ?? this.dateRange,
+      searchTerm: searchTerm != null ? searchTerm() : this.searchTerm,
+      dateRange: dateRange != null ? dateRange() : this.dateRange,
     );
   }
 
@@ -41,9 +63,12 @@ class OperationListState extends Equatable {
   List<Object?> get props => [
     status,
     operations,
-    hasReachedMax,
     errorMessage,
-    query,
+    currentPage,
+    itemsPerPage,
+    totalItems,
+    hasReachedMax,
+    searchTerm,
     dateRange,
   ];
 }

lib/features/operations/data/operations_repository.dart

@@ -35,22 +35,31 @@ class OperationsRepository {
     }
   }
 
-  // --- RECUPERO PAGINATO CON FILTRI E JOIN ---
+  // 🥷 2. RECUPERO PAGINATO ASSOLUTO CON CONTEGGIO TOTALI
-  Future<List<OperationModel>> fetchOperations({
+  Future<PaginatedOperations> fetchPaginatedOperations({
     required String companyId,
-    required int offset,
+    String? storeId,
-    int limit = 50,
+    String? staffId,
+    String? providerId,
+    required int page, // Usiamo 'page' (1, 2, 3...) invece di 'offset'
+    int itemsPerPage = 25, // Default a 25 elementi per pagina
     String? searchTerm,
     DateTimeRange? dateRange,
   }) async {
     try {
+      // Calcoliamo il range di partenza e fine per Supabase
+      // Es. Pagina 1, 25 items -> range(0, 24)
+      // Es. Pagina 2, 25 items -> range(25, 49)
+      final from = (page - 1) * itemsPerPage;
+      final to = from + itemsPerPage - 1;
+
       var query = _supabase
           .from(Tables.operations)
           .select('''
             *,
             ${Tables.customers}(*), 
             ${Tables.stores}(name),
-            ${Tables.providers}(name),
+            ${Tables.providers}(*),
             ${Tables.models}(name_with_brand),
             ${Tables.staffMembers}(name),
             ${Tables.attachments}(*)
@@ -64,8 +73,19 @@ class OperationsRepository {
             .lte('created_at', dateRange.end.toIso8601String());
       }
 
+      if (storeId != null) {
+        query = query.or('store_id.eq.$storeId,store_id.is.null');
+      }
+
+      if (staffId != null) {
+        query = query.or('staff_id.eq.$staffId,staff_id.is.null');
+      }
+
+      if (providerId != null) {
+        query = query.or('provider_id.eq.$providerId,provider_id.is.null');
+      }
+
       if (searchTerm != null && searchTerm.isNotEmpty) {
-        // Filtra sui campi della tabella principale O su quelli della tabella joinata
         query = query.or(
           'reference.ilike.%$searchTerm%,note.ilike.%$searchTerm%,customer.name.ilike.%$searchTerm%',
         );
@@ -73,17 +93,25 @@ class OperationsRepository {
 
       final response = await query
           .order('created_at', ascending: false)
-          .range(offset, offset + limit - 1);
+          .range(from, to)
-
+          .count(CountOption.exact);
-      return (response as List)
+      // 3. Estrazione dei dati
+      final List<OperationModel> operations = (response.data as List)
           .map((map) => OperationModel.fromMap(map))
           .toList();
+
+      final int totalCount = response.count;
+
+      return PaginatedOperations(
+        operations: operations,
+        totalCount: totalCount,
+      );
     } catch (e) {
-      throw Exception('$e');
+      throw Exception('Errore nel recupero della pagina $page: $e');
     }
   }
 
-  Stream<List<OperationModel>> getLatestStoreOperationsStream({
+  Stream<List<Map<String, dynamic>>> watchStoreOperations({
     required String storeId,
     required int limit,
   }) {
@@ -92,11 +120,7 @@ class OperationsRepository {
         .stream(primaryKey: ['id'])
         .eq('store_id', storeId)
         .order('created_at', ascending: false)
-        .limit(limit)
+        .limit(limit);
-        .map(
-          (listOfMaps) =>
-              listOfMaps.map((map) => OperationModel.fromMap(map)).toList(),
-        );
   }
 
   // --- SALVATAGGIO COMPLETO (PRIMA PADRE, POI FIGLI) ---
@@ -310,3 +334,10 @@ class OperationsRepository {
     }
   }
 }
+
+class PaginatedOperations {
+  final List<OperationModel> operations;
+  final int totalCount;
+
+  PaginatedOperations({required this.operations, required this.totalCount});
+}

lib/features/operations/models/operation_model.dart

@@ -3,6 +3,7 @@ import 'package:flux/core/enums_and_consts/consts.dart';
 import 'package:flux/core/utils/extensions.dart';
 import 'package:flux/features/attachments/models/attachment_model.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
+import 'package:flux/features/master_data/providers/models/provider_model.dart';
 
 enum OperationStatus {
   success('success', 'OK'),
@@ -28,9 +29,7 @@ class OperationModel extends Equatable {
   final String? id;
   final DateTime? createdAt;
   final String type;
-  final String? subtype;
+  final String? subType;
-  final String? providerId;
-  final String? providerDisplayName;
   final String? modelId;
   final String? modelDisplayName;
   final String? description;
@@ -50,6 +49,7 @@ class OperationModel extends Equatable {
   final CustomerModel? customer;
   final String reference;
   final bool isBusiness;
+  final ProviderModel? provider;
 
   // ALLEGATI (Aggiunto)
   final List<AttachmentModel> attachments;
@@ -58,9 +58,7 @@ class OperationModel extends Equatable {
     this.id,
     this.createdAt,
     this.type = '',
-    this.subtype,
+    this.subType,
-    this.providerId,
-    this.providerDisplayName,
     this.modelId,
     this.modelDisplayName,
     this.description,
@@ -81,15 +79,16 @@ class OperationModel extends Equatable {
     this.reference = '',
     this.attachments = const [],
     this.isBusiness = false,
+    this.provider,
   });
 
   OperationModel copyWith({
     String? id,
     DateTime? createdAt,
     String? type,
-    String? subtype,
+    String? subType,
-    String? providerId,
+    // 🥷 TRUCCO APPLICATO ANCHE QUI:
-    String? providerDisplayName,
+    ProviderModel? Function()? provider,
     String? modelId,
     String? modelDisplayName,
     String? description,
@@ -114,9 +113,10 @@ class OperationModel extends Equatable {
     id: id ?? this.id,
     createdAt: createdAt ?? this.createdAt,
     type: type ?? this.type,
-    subtype: subtype ?? this.subtype,
+    subType: subType ?? this.subType,
-    providerId: providerId ?? this.providerId,
+    // Se la funzione è passata, la eseguiamo (anche se ritorna null), altrimenti teniamo il vecchio
-    providerDisplayName: providerDisplayName ?? this.providerDisplayName,
+    provider: provider != null ? provider() : this.provider,
+
     modelId: modelId ?? this.modelId,
     modelDisplayName: modelDisplayName ?? this.modelDisplayName,
     description: description ?? this.description,
@@ -144,9 +144,8 @@ class OperationModel extends Equatable {
     id,
     createdAt,
     type,
-    subtype,
+    subType,
-    providerId,
+    provider,
-    providerDisplayName,
     modelId,
     modelDisplayName,
     description,
@@ -180,13 +179,12 @@ class OperationModel extends Equatable {
           ? DateTime.parse(map['created_at'])
           : null,
       type: map['type'] as String? ?? '',
-      subtype: map['sub_type'] as String?,
+      subType: map['sub_type'] as String?,
 
       // I campi relazionali nullabili restano rigorosamente null!
-      providerId: map['provider_id'] as String?,
+      provider: (map[Tables.providers] != null)
-      // MAGIA ANTI-CRASH: Usiamo ?['chiave'] per non far esplodere i join vuoti
+          ? ProviderModel.fromMap(map[Tables.providers] as Map<String, dynamic>)
-      providerDisplayName: (map[Tables.providers]?['name'] as String?)
+          : null,
-          ?.myFormat(),
 
       modelId: map['model_id'] as String?,
       modelDisplayName: (map[Tables.models]?['name_with_brand'] as String?)
@@ -237,8 +235,8 @@ class OperationModel extends Equatable {
     return {
       if (id != null) 'id': id,
       'type': type,
-      'sub_type': subtype,
+      'sub_type': subType,
-      'provider_id': providerId,
+      'provider_id': provider?.id,
       'model_id': modelId,
       'description': description,
       if (expirationDate != null)

lib/features/operations/ui/operation_form_screen.dart

@@ -1,7 +1,9 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/widgets/shared_forms/attachments_section.dart';
 import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
+import 'package:flux/features/master_data/providers/blocs/provider_list_cubit.dart';
 import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
 import 'package:flux/core/widgets/shared_forms/customer_section.dart';
@@ -77,7 +79,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
       _noteController.text = model.note;
     }
     if (_freeTextSubtypeController.text.isEmpty) {
-      _freeTextSubtypeController.text = model.subtype ?? '';
+      _freeTextSubtypeController.text = model.subType ?? '';
     }
     if (_freeTextDescriptionController.text.isEmpty) {
       _freeTextDescriptionController.text = model.description ?? '';
@@ -89,7 +91,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
     context.read<OperationFormCubit>().updateFields(
       reference: _referenceController.text,
       note: _noteController.text,
-      subtype: _freeTextSubtypeController.text,
+      subType: _freeTextSubtypeController.text,
       description: _freeTextDescriptionController.text,
     );
   }
@@ -398,8 +400,6 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
             labelText: 'Riferimento (es. Telefono, Targa...)',
             prefixIcon: Icon(Icons.tag),
           ),
-          validator: (v) =>
-              v == null || v.isEmpty ? 'Inserisci un riferimento' : null,
         ),
       ],
     );
@@ -527,8 +527,24 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
               selected: state.operation.type == type,
               onSelected: (selected) {
                 if (selected) {
-                  context.read<OperationFormCubit>().setTypeWithSmartDefault(
+                  // 1. Recuperiamo i provider caricati in memoria
-                    type,
+                  final allProviders = context
+                      .read<ProviderListCubit>()
+                      .state
+                      .providers;
+
+                  // 2. Recuperiamo il provider di default del negozio dalla sessione
+                  final defaultProviderId = context
+                      .read<SessionCubit>()
+                      .state
+                      .currentStore
+                      ?.defaultProviderId;
+
+                  // 3. Spariamo tutto nel metodo "tuttofare"
+                  context.read<OperationFormCubit>().setTypeWithSmartDefaults(
+                    newType: type,
+                    allProviders: allProviders,
+                    defaultProviderId: defaultProviderId,
                   );
                 }
               },

lib/features/operations/ui/operation_list_screen.dart

@@ -6,7 +6,6 @@ import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
 import 'package:flux/features/operations/blocs/operation_list_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
 import 'package:go_router/go_router.dart';
-// Importa i tuoi modelli e cubit
 
 class OperationListScreen extends StatefulWidget {
   const OperationListScreen({super.key});
@@ -17,17 +16,39 @@ class OperationListScreen extends StatefulWidget {
 
 class _OperationListScreenState extends State<OperationListScreen> {
   final ScrollController _scrollController = ScrollController();
+  final TextEditingController _searchController = TextEditingController();
+
+  // Set per gestire le Bulk Actions (Selezione multipla)
+  final Set<String> _selectedOperationIds = {};
+  bool get _isSelectionMode => _selectedOperationIds.isNotEmpty;
+
+  // Flag per mostrare/nascondere la barra di ricerca integrata nell'AppBar
+  bool _showSearchBar = false;
 
   @override
   void initState() {
     super.initState();
-    // Agganciamo il listener per la paginazione (Scroll Infinito)
     _scrollController.addListener(_onScroll);
+
+    // Primo caricamento: partiamo da pagina 1
+    // (Il Cubit deciderà se fare il boot iniziale o se c'era già roba in cache)
+    WidgetsBinding.instance.addPostFrameCallback((_) {
+      final isDesktop = MediaQuery.sizeOf(context).width >= 900;
+      if (isDesktop) {
+        context.read<OperationListCubit>().loadSpecificPageDesktop(1);
+      } else {
+        context.read<OperationListCubit>().loadNextPageMobile(refresh: true);
+      }
+    });
   }
 
   void _onScroll() {
+    final isDesktop = MediaQuery.sizeOf(context).width >= 900;
+    // 🥷 COMPORTAMENTO IBRIDO: Lo scroll infinito si attiva SOLO su mobile
+    if (isDesktop) return;
+
     if (_isBottom) {
-      context.read<OperationListCubit>().loadOperations();
+      context.read<OperationListCubit>().loadNextPageMobile();
     }
   }
 
@@ -35,66 +56,170 @@ class _OperationListScreenState extends State<OperationListScreen> {
     if (!_scrollController.hasClients) return false;
     final maxScroll = _scrollController.position.maxScrollExtent;
     final currentScroll = _scrollController.offset;
-    // Carica quando mancano 200px alla fine
     return currentScroll >= (maxScroll * 0.9);
   }
 
   @override
   void dispose() {
     _scrollController.dispose();
+    _searchController.dispose();
     super.dispose();
   }
 
+  void _toggleSelection(String id) {
+    setState(() {
+      if (_selectedOperationIds.contains(id)) {
+        _selectedOperationIds.remove(id);
+      } else {
+        _selectedOperationIds.add(id);
+      }
+    });
+  }
+
+  void _clearSelection() {
+    setState(() {
+      _selectedOperationIds.clear();
+    });
+  }
+
   @override
   Widget build(BuildContext context) {
+    final isDesktop = MediaQuery.sizeOf(context).width >= 900;
+
     return Scaffold(
-      appBar: AppBar(
+      // --- APP BAR DINAMICA E INTEGRATA ---
-        title: const Text("Gestione Servizi"),
+      appBar: _isSelectionMode
+          ? AppBar(
+              backgroundColor: Theme.of(context).colorScheme.primaryContainer,
+              leading: IconButton(
+                icon: const Icon(Icons.close),
+                onPressed: _clearSelection,
+              ),
+              title: Text("${_selectedOperationIds.length} selezionate"),
+              actions: [
+                IconButton(
+                  icon: const Icon(Icons.edit_note),
+                  tooltip: 'Cambia Stato Massivo',
+                  onPressed: () {
+                    // TODO: Integrare bottom sheet per azioni massive
+                  },
+                ),
+              ],
+            )
+          : AppBar(
+              title: _showSearchBar
+                  ? TextField(
+                      controller: _searchController,
+                      autofocus: true,
+                      decoration: const InputDecoration(
+                        hintText: 'Cerca per cliente, nota o riferimento...',
+                        border: InputBorder.none,
+                      ),
+                      style: const TextStyle(fontSize: 16),
+                      onChanged: (text) {
+                        context.read<OperationListCubit>().updateFilters(
+                          text: text,
+                        );
+                      },
+                    )
+                  : const Text("Gestione Servizi"),
               elevation: 0,
               actions: [
                 IconButton(
-            icon: const Icon(Icons.search),
+                  icon: Icon(_showSearchBar ? Icons.close : Icons.search),
                   onPressed: () {
-              // Qui potrai implementare una barra di ricerca
+                    setState(() {
+                      _showSearchBar = !_showSearchBar;
+                      if (!_showSearchBar) {
+                        _searchController.clear();
+                        context.read<OperationListCubit>().clearFilters();
+                      }
+                    });
+                  },
+                ),
+                if (!isDesktop) // Il pull-to-refresh c'è già su mobile, su desktop mettiamo un tasto manuale
+                  IconButton(
+                    icon: const Icon(Icons.filter_list),
+                    onPressed: () {
+                      // TODO: Bottone Filtri Avanzati (es. DateRange Picker)
                     },
                   ),
               ],
             ),
+
+      // --- CORPO RESPONSIVO ---
       body: BlocBuilder<OperationListCubit, OperationListState>(
         builder: (context, state) {
-          // 1. Stato di caricamento iniziale
           if (state.status == OperationListStatus.loading &&
               state.operations.isEmpty) {
             return const Center(child: CircularProgressIndicator());
           }
 
-          // 2. Lista vuota
           if (state.operations.isEmpty) {
             return Center(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
                 children: [
                   const Text("Nessuna pratica trovata."),
-                  const SizedBox(height: 10),
+                  const SizedBox(height: 12),
                   ElevatedButton(
-                    onPressed: () => context
+                    onPressed: () => isDesktop
+                        ? context
                               .read<OperationListCubit>()
-                        .loadOperations(refresh: true),
+                              .loadSpecificPageDesktop(1)
-                    child: const Text("Riprova"),
+                        : context.read<OperationListCubit>().loadNextPageMobile(
+                            refresh: true,
+                          ),
+                    child: const Text("Ricarica"),
                   ),
                 ],
               ),
             );
           }
 
-          // 3. La Lista (con Pull-to-refresh)
+          // 🥷 SCENARIO DESKTOP: Griglia + Barra di Paginazione Gmail-Style
-          return RefreshIndicator(
+          if (isDesktop) {
-            onRefresh: () => context.read<OperationListCubit>().loadOperations(
+            return Column(
-              refresh: true,
+              children: [
+                Expanded(
+                  child: GridView.builder(
+                    controller: _scrollController,
+                    padding: const EdgeInsets.all(16),
+                    gridDelegate: const SliverGridDelegateWithMaxCrossAxisExtent(
+                      maxCrossAxisExtent:
+                          420, // Larghezza bilanciata per le card su desktop
+                      mainAxisExtent:
+                          175, // Altezza controllata per evitare buchi bianchi
+                      crossAxisSpacing: 16,
+                      mainAxisSpacing: 16,
                     ),
+                    itemCount: state.operations.length,
+                    itemBuilder: (context, index) {
+                      final operation = state.operations[index];
+                      return _buildResponsiveCard(operation);
+                    },
+                  ),
+                ),
+                _buildDesktopPaginationFooter(
+                  state,
+                ), // La barra in fondo stile Gmail
+              ],
+            );
+          }
+
+          // 🥷 SCENARIO MOBILE: ListView con Infinite Scroll e Pull-to-Refresh
+          return RefreshIndicator(
+            onRefresh: () => context
+                .read<OperationListCubit>()
+                .loadNextPageMobile(refresh: true),
             child: ListView.builder(
               controller: _scrollController,
-              padding: const EdgeInsets.only(bottom: 80), // Spazio per il FAB
+              padding: const EdgeInsets.only(
+                bottom: 80,
+                left: 8,
+                right: 8,
+                top: 8,
+              ),
               itemCount: state.hasReachedMax
                   ? state.operations.length
                   : state.operations.length + 1,
@@ -109,13 +234,19 @@ class _OperationListScreenState extends State<OperationListScreen> {
                 }
 
                 final operation = state.operations[index];
-                return _buildOperationCard(context, operation);
+                return Padding(
+                  padding: const EdgeInsets.symmetric(vertical: 4.0),
+                  child: _buildResponsiveCard(operation),
+                );
               },
             ),
           );
         },
       ),
-      floatingActionButton: FloatingActionButton(
+
+      floatingActionButton: _isSelectionMode
+          ? null
+          : FloatingActionButton(
               onPressed: () async {
                 StaffMemberModel? createdBy = await getStaffMember(context);
                 if (createdBy == null || !context.mounted) return;
@@ -130,77 +261,426 @@ class _OperationListScreenState extends State<OperationListScreen> {
     );
   }
 
-  Widget _buildOperationCard(BuildContext context, OperationModel operation) {
+  // --- COSTRUZIONE DELLA COMPONENTISTICA DETTAGLIATA ---
+
+  Widget _buildResponsiveCard(OperationModel operation) {
+    final isSelected = _selectedOperationIds.contains(operation.id);
+    return _RichOperationCard(
+      operation: operation,
+      isSelected: isSelected,
+      isSelectionMode: _isSelectionMode,
+      onTap: () {
+        if (_isSelectionMode) {
+          _toggleSelection(operation.id!);
+        } else {
+          context.pushNamed(
+            Routes.operationForm,
+            extra: (createdBy: null, operation: operation),
+            pathParameters: {'id': operation.id!},
+          );
+        }
+      },
+      onLongPress: () => _toggleSelection(operation.id!),
+    );
+  }
+
+  // 🥷 LA BARRA DI PAGINAZIONE DESKTOP (Stile Gmail / Typesense)
+  Widget _buildDesktopPaginationFooter(OperationListState state) {
+    final theme = Theme.of(context);
+    final cubit = context.read<OperationListCubit>();
+
+    // Calcolo intervallo visualizzato (es. 1-25 di 140)
+    final fromItem = ((state.currentPage - 1) * state.itemsPerPage) + 1;
+    final toItem =
+        DateUtils.isSameDay(DateTime.now(), DateTime.now()) // segnaposto logico
+        ? (fromItem + state.operations.length - 1)
+        : fromItem;
+
+    return Container(
+      height: 56,
+      padding: const EdgeInsets.symmetric(horizontal: 24),
+      decoration: BoxDecoration(
+        color: theme.colorScheme.surface,
+        border: Border(top: BorderSide(color: theme.dividerColor, width: 0.5)),
+      ),
+      child: Row(
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
+        children: [
+          // Info totali a sinistra
+          Text(
+            "$fromItem-$toItem di ${state.totalItems} pratiche totali",
+            style: theme.textTheme.bodyMedium?.copyWith(
+              color: Colors.grey[700],
+            ),
+          ),
+
+          // Controlli di navigazione a destra
+          Row(
+            children: [
+              // Prima Pagina
+              IconButton(
+                icon: const Icon(Icons.first_page),
+                onPressed: state.currentPage > 1
+                    ? () => cubit.loadSpecificPageDesktop(1)
+                    : null,
+              ),
+              // Pagina Precedente
+              IconButton(
+                icon: const Icon(Icons.chevron_left),
+                onPressed: state.currentPage > 1
+                    ? () => cubit.loadSpecificPageDesktop(state.currentPage - 1)
+                    : null,
+              ),
+
+              // Indicatore numerico centrale impacchettato
+              Padding(
+                padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                child: Text(
+                  "Pagina ${state.currentPage} di ${state.totalPages}",
+                  style: const TextStyle(fontWeight: FontWeight.bold),
+                ),
+              ),
+
+              // Pagina Successiva
+              IconButton(
+                icon: const Icon(Icons.chevron_right),
+                onPressed: state.currentPage < state.totalPages
+                    ? () => cubit.loadSpecificPageDesktop(state.currentPage + 1)
+                    : null,
+              ),
+              // Ultima Pagina
+              IconButton(
+                icon: const Icon(Icons.last_page),
+                onPressed: state.currentPage < state.totalPages
+                    ? () => cubit.loadSpecificPageDesktop(state.totalPages)
+                    : null,
+              ),
+            ],
+          ),
+        ],
+      ),
+    );
+  }
+}
+
+// =========================================================================
+// 🥷 3. LA CARD RICCA, REATTIVA E DEFINITIVA (Quella revisionata insieme)
+// =========================================================================
+class _RichOperationCard extends StatelessWidget {
+  final OperationModel operation;
+  final bool isSelected;
+  final bool isSelectionMode;
+  final VoidCallback onTap;
+  final VoidCallback onLongPress;
+
+  const _RichOperationCard({
+    required this.operation,
+    required this.isSelected,
+    required this.isSelectionMode,
+    required this.onTap,
+    required this.onLongPress,
+  });
+
+  Color _getStatusColor(OperationStatus status) {
+    switch (status) {
+      case OperationStatus.success:
+        return Colors.green;
+      case OperationStatus.waitingForAction:
+      case OperationStatus.draft:
+        return Colors.orange;
+      case OperationStatus.waitingForSupport:
+        return Colors.blue;
+      case OperationStatus.failure:
+        return Colors.grey.shade800;
+    }
+  }
+
+  Color _getTypeColor(String type) {
+    switch (type) {
+      case 'FIN':
+        return Colors.deepPurple;
+      case 'TELEPASS':
+        return Colors.yellow.shade700;
+      case 'ENERGY':
+        return Colors.amber.shade700;
+      case 'ENTERTAINMENT':
+        return Colors.pinkAccent;
+      case 'AL':
+      case 'MNP':
+        return Colors.indigo;
+      case 'NIP':
+      case 'FWA':
+        return Colors.cyan;
+      default:
+        return Colors.blueGrey;
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    final theme = Theme.of(context);
+    final statusColor = _getStatusColor(operation.status);
+    final typeColor = _getTypeColor(operation.type);
+
     return Card(
-      margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
+      margin: EdgeInsets.zero, // Gestito dai margini dei padri (griglia/lista)
-      elevation: 2,
+      elevation: isSelected ? 4 : 1,
-      shape: RoundedRectangleBorder(borderRadius: BorderRadius.circular(12)),
+      shape: RoundedRectangleBorder(
-      child: ListTile(
+        borderRadius: BorderRadius.circular(12),
-        contentPadding: const EdgeInsets.all(12),
+        side: BorderSide(
-        title: Row(
+          color: isSelected ? theme.colorScheme.primary : Colors.transparent,
+          width: 2,
+        ),
+      ),
+      child: InkWell(
+        borderRadius: BorderRadius.circular(12),
+        onTap: onTap,
+        onLongPress: onLongPress,
+        child: ClipRRect(
+          borderRadius: BorderRadius.circular(12),
+          child: Container(
+            decoration: BoxDecoration(
+              color: isSelected
+                  ? theme.colorScheme.primaryContainer.withValues(alpha: 0.15)
+                  : null,
+              // 🥷 COERENZA 100%: Banda laterale legata allo status per eliminare i malintesi cromatici
+              border: Border(left: BorderSide(color: statusColor, width: 6)),
+            ),
+            padding: const EdgeInsets.all(12),
+            child: Column(
+              crossAxisAlignment: CrossAxisAlignment.start,
+              children: [
+                // --- LINEA HEADER ---
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
+                    if (isSelectionMode)
+                      Padding(
+                        padding: const EdgeInsets.only(right: 8.0),
+                        child: SizedBox(
+                          height: 18,
+                          width: 18,
+                          child: Checkbox(
+                            value: isSelected,
+                            onChanged: (_) => onTap(),
+                          ),
+                        ),
+                      ),
+                    Expanded(
+                      child: Text(
+                        (operation.reference.isEmpty)
+                            ? 'Senza Riferimento'
+                            : operation.reference,
+                        style: theme.textTheme.labelSmall?.copyWith(
+                          color: Colors.grey[600],
+                        ),
+                        maxLines: 1,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    Text(
+                      operation.createdAt != null
+                          ? "${operation.createdAt!.day.toString().padLeft(2, '0')}/${operation.createdAt!.month.toString().padLeft(2, '0')}/${operation.createdAt!.year}"
+                          : '',
+                      style: theme.textTheme.labelSmall?.copyWith(
+                        color: Colors.grey[600],
+                      ),
+                    ),
+                  ],
+                ),
+                const SizedBox(height: 8),
+
+                // --- LINEA CENTRALE: CLIENTE + INSERTO OPERATIVO ---
+                Row(
+                  crossAxisAlignment: CrossAxisAlignment.start,
                   children: [
                     Expanded(
                       child: Text(
                         operation.customer?.name ?? "Cliente sconosciuto",
                         style: const TextStyle(
                           fontWeight: FontWeight.bold,
-                  fontSize: 16,
+                          fontSize: 15,
                         ),
+                        maxLines: 2,
+                        overflow: TextOverflow.ellipsis,
+                      ),
+                    ),
+                    const SizedBox(width: 8),
+
+                    // 🥷 IL RE DEL SERVICE: Il tipo operazione svetta con box e contrasto ad hoc
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 4,
+                      ),
+                      decoration: BoxDecoration(
+                        color: typeColor.withValues(alpha: 0.12),
+                        borderRadius: BorderRadius.circular(6),
+                        border: Border.all(
+                          color: typeColor.withValues(alpha: 0.25),
+                        ),
+                      ),
+                      child: Row(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          if (_getIconForType(
+                                operation.type,
+                                operation.subType,
+                              ) !=
+                              null) ...[
+                            Icon(
+                              _getIconForType(
+                                operation.type,
+                                operation.subType,
+                              ),
+                              size: 13,
+                              color: typeColor,
+                            ),
+                            const SizedBox(width: 4),
+                          ],
+                          Text(
+                            (operation.subType != null &&
+                                    operation.subType!.isNotEmpty)
+                                ? operation.subType!
+                                : operation.type,
+                            style: TextStyle(
+                              color: typeColor,
+                              fontWeight: FontWeight.bold,
+                              fontSize: 11,
                             ),
                           ),
                         ],
                       ),
-        subtitle: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            const SizedBox(height: 4),
-            Text(
-              "Pratica: ${operation.reference} • ${operation.createdAt?.day}/${operation.createdAt?.month}/${operation.createdAt?.year}",
                     ),
-            const SizedBox(height: 8),
+                  ],
+                ),
+                const SizedBox(height: 10),
+
+                // --- LINEA DEI TAG TECNICI ---
+                Wrap(
+                  spacing: 6,
+                  runSpacing: 4,
+                  children: [
+                    // Tag Target Espanso (Privato / Business)
+                    _MiniChip(
+                      label: operation.isBusiness ? 'Business' : 'Privato',
+                      icon: operation.isBusiness
+                          ? Icons.business
+                          : Icons.person,
+                      color: operation.isBusiness ? Colors.indigo : Colors.teal,
+                    ),
+
+                    // Tag Gestore (Agganciato dinamicamente al displayColor generato dall'esadecimale del DB!)
+                    if (operation.provider != null)
+                      _MiniChip(
+                        label: operation.provider?.name ?? 'Gestore',
+                        color:
+                            operation.provider?.displayColor ?? Colors.blueGrey,
+                      ),
+
+                    // Specifiche addizionali del Finanziamento
+                    if (operation.type == 'Fin' && operation.modelId != null)
+                      _MiniChip(
+                        label: operation.modelDisplayName ?? 'Prodotto',
+                        icon: Icons.devices,
+                        color: Colors.deepPurple,
+                      ),
+                  ],
+                ),
+
+                const Spacer(),
+
+                // --- FOOTER CARD: AGENTE + CHIP STATO ---
+                Row(
+                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                  children: [
                     Row(
                       children: [
-                Text(operation.type),
+                        const Icon(
-                const SizedBox(width: 8),
+                          Icons.support_agent,
-                _buildOperationStatus(operation.status),
+                          size: 14,
+                          color: Colors.grey,
+                        ),
+                        const SizedBox(width: 4),
+                        Text(
+                          operation.staffDisplayName ?? 'Assegnato',
+                          style: theme.textTheme.labelSmall?.copyWith(
+                            color: Colors.grey[700],
+                          ),
+                        ),
+                      ],
+                    ),
+                    Container(
+                      padding: const EdgeInsets.symmetric(
+                        horizontal: 8,
+                        vertical: 4,
+                      ),
+                      decoration: BoxDecoration(
+                        color: statusColor,
+                        borderRadius: BorderRadius.circular(6),
+                      ),
+                      child: Text(
+                        operation.status.displayName,
+                        style: const TextStyle(
+                          fontSize: 10,
+                          color: Colors.white,
+                          fontWeight: FontWeight.bold,
+                        ),
+                      ),
+                    ),
                   ],
                 ),
               ],
             ),
-        trailing: const Icon(Icons.chevron_right),
+          ),
-        onTap: () => context.pushNamed(
-          Routes.operationForm,
-          extra: (createdBy: null, operation: operation),
-          pathParameters: {'id': operation.id!},
         ),
       ),
     );
   }
 
-  Widget _buildOperationStatus(OperationStatus status) {
+  IconData? _getIconForType(String type, String? subtype) {
-    Color color;
+    if (type == 'Energy') {
-    switch (status) {
+      if (subtype?.toLowerCase() == 'luce') return Icons.bolt;
-      case OperationStatus.failure:
+      if (subtype?.toLowerCase() == 'gas') return Icons.local_fire_department;
-        color = Colors.grey.shade800;
+    }
-        break;
+    return null;
-      case OperationStatus.waitingForAction || OperationStatus.draft:
-        color = Colors.orange;
-        break;
-      case OperationStatus.success:
-        color = Colors.green;
-        break;
-      case OperationStatus.waitingForSupport:
-        color = Colors.blue;
-        break;
   }
-    return Chip(
-      label: Text("BOZZA", style: TextStyle(fontSize: 10, color: Colors.white)),
-      backgroundColor: color,
-      visualDensity: VisualDensity.compact,
-    );
 }
 
-  void startNewOperation(BuildContext context) {
+// Micro Widget di supporto per i tag interni
-    context.pushNamed('operation-form', pathParameters: {'id': 'new'});
+class _MiniChip extends StatelessWidget {
+  final String label;
+  final IconData? icon;
+  final Color color;
+
+  const _MiniChip({required this.label, this.icon, required this.color});
+
+  @override
+  Widget build(BuildContext context) {
+    return Container(
+      padding: const EdgeInsets.symmetric(horizontal: 6, vertical: 3),
+      decoration: BoxDecoration(
+        color: color.withValues(alpha: 0.08),
+        border: Border.all(color: color.withValues(alpha: 0.25)),
+        borderRadius: BorderRadius.circular(4),
+      ),
+      child: Row(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          if (icon != null) ...[
+            Icon(icon, size: 11, color: color),
+            const SizedBox(width: 4),
+          ],
+          Text(
+            label,
+            style: TextStyle(
+              fontSize: 10,
+              color: color,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+        ],
+      ),
+    );
   }
 }

lib/features/operations/ui/widgets/details_section.dart

@@ -2,8 +2,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/widgets/shared_forms/model_section.dart';
 import 'package:flux/features/master_data/providers/blocs/provider_list_cubit.dart';
-import 'package:flux/features/master_data/providers/models/provider_model.dart';
+import 'package:flux/features/master_data/providers/models/provider_model_extensions.dart';
-import 'package:flux/features/master_data/providers/models/provider_role.dart';
 import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
 
@@ -23,34 +22,6 @@ class OperationDetailsSection extends StatelessWidget {
     required this.durationQuickPicks,
   });
 
-  bool _doesProviderMatchOperationType(
-    ProviderModel provider,
-    String operationType,
-  ) {
-    if (operationType == 'Altro') return true;
-
-    // Controlliamo che il fornitore abbia il ruolo specifico nel suo array
-    switch (operationType) {
-      case 'AL' || 'MNP':
-        return provider.roles.contains(ProviderRole.mobile);
-      case 'NIP' || 'FWA':
-        return provider.roles.contains(ProviderRole.landline);
-      case 'UNICA':
-        return provider.roles.contains(ProviderRole.landline) ||
-            provider.roles.contains(ProviderRole.mobile);
-      case 'Energy':
-        return provider.roles.contains(ProviderRole.energy);
-      case 'Fin':
-        return provider.roles.contains(ProviderRole.financing);
-      case 'Entertainment':
-        return provider.roles.contains(ProviderRole.entertainment);
-      case 'TELEPASS':
-        return provider.roles.contains(ProviderRole.telepass);
-      default:
-        return true;
-    }
-  }
-
   void _showProviderModal(BuildContext context, String operationType) {
     final OperationFormCubit cubit = context.read<OperationFormCubit>();
     showModalBottomSheet(
@@ -92,14 +63,9 @@ class OperationDetailsSection extends StatelessWidget {
                         return const Center(child: CircularProgressIndicator());
                       }
 
-                      // Prendiamo i provider e li filtriamo per ruolo e per stato attivo
+                      // 🥷 IL TOCCO DEL NINJA: Filtriamo usando direttamente l'Extension sul Modello!
                       final filteredProviders = state.providers.where((p) {
-                        final isMatch = _doesProviderMatchOperationType(
+                        return p.supportsOperation(operationType) && p.isActive;
-                          p,
-                          operationType,
-                        );
-                        return isMatch &&
-                            p.isActive; // Mostriamo solo quelli attivi!
                       }).toList();
 
                       if (filteredProviders.isEmpty) {
@@ -136,10 +102,9 @@ class OperationDetailsSection extends StatelessWidget {
                                 overflow: TextOverflow.ellipsis,
                               ),
                               onTap: () {
-                                context.read<OperationFormCubit>().updateFields(
+                                context
-                                  providerId: provider.id,
+                                    .read<OperationFormCubit>()
-                                  providerDisplayName: provider.name,
+                                    .updateProvider(provider);
-                                );
                                 Navigator.pop(modalContext);
                               },
                             );
@@ -168,19 +133,18 @@ class OperationDetailsSection extends StatelessWidget {
         ListTile(
           title: const Text('Seleziona Gestore'),
           subtitle: Text(
-            (currentOp?.providerDisplayName != null &&
+            (currentOp?.provider != null)
-                    currentOp!.providerDisplayName!.isNotEmpty)
+                ? currentOp!.provider!.name
-                ? currentOp!.providerDisplayName!
                 : 'Nessun gestore selezionato',
             style: TextStyle(
               color:
-                  (currentOp?.providerId == null ||
+                  (currentOp?.provider == null ||
-                      currentOp!.providerId!.isEmpty)
+                      currentOp!.provider!.name.isEmpty)
                   ? Colors.grey
                   : null,
               fontWeight:
-                  (currentOp?.providerId == null ||
+                  (currentOp?.provider == null ||
-                      currentOp!.providerId!.isEmpty)
+                      currentOp!.provider!.name.isEmpty)
                   ? FontWeight.normal
                   : FontWeight.bold,
             ),
@@ -198,8 +162,8 @@ class OperationDetailsSection extends StatelessWidget {
         if (currentType == 'Energy') ...[
           DropdownButtonFormField<String>(
             initialValue:
-                (currentOp?.subtype != null && currentOp!.subtype!.isNotEmpty)
+                (currentOp?.subType != null && currentOp!.subType!.isNotEmpty)
-                ? currentOp!.subtype
+                ? currentOp!.subType
                 : null,
             decoration: const InputDecoration(labelText: 'Dettaglio Fornitura'),
             items: [
@@ -208,7 +172,7 @@ class OperationDetailsSection extends StatelessWidget {
             ].map((s) => DropdownMenuItem(value: s, child: Text(s))).toList(),
             onChanged: (val) {
               if (val != null) {
-                context.read<OperationFormCubit>().updateFields(subtype: val);
+                context.read<OperationFormCubit>().updateFields(subType: val);
               }
             },
           ),

lib/features/settings/blocs/reminder_defaults_cubit.dart

@@ -0,0 +1,108 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/features/settings/data/settings_repository.dart'; // O dove hai messo i metodi del DB
+import 'package:flux/features/tasks/models/reminder_default_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'reminder_defaults_state.dart';
+
+class ReminderDefaultsCubit extends Cubit<ReminderDefaultsState> {
+  final SettingsRepository _repository = GetIt.I.get<SettingsRepository>();
+  final SessionCubit _sessionCubit = GetIt.I.get<SessionCubit>();
+
+  ReminderDefaultsCubit() : super(const ReminderDefaultsState());
+
+  String get _companyId => _sessionCubit.state.company!.id!;
+  String get _staffId => _sessionCubit.state.currentStaffMember!.id!;
+
+  Future<void> loadReminders() async {
+    emit(state.copyWith(status: ReminderDefaultsStatus.loading));
+    try {
+      final reminders = await _repository.getMyReminderDefaults(
+        companyId: _companyId,
+        staffId: _staffId,
+      );
+      emit(
+        state.copyWith(
+          status: ReminderDefaultsStatus.success,
+          reminders: reminders,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: ReminderDefaultsStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  Future<void> addReminder({
+    required int minutesBefore,
+    required String channel,
+  }) async {
+    emit(state.copyWith(status: ReminderDefaultsStatus.loading));
+    try {
+      final newReminder = ReminderDefaultModel(
+        companyId: _companyId,
+        staffId: _staffId,
+        minutesBefore: minutesBefore,
+        channel: channel,
+      );
+
+      final savedReminder = await _repository.addReminderDefault(newReminder);
+
+      // Aggiungiamo alla lista locale e ordiniamo per minuti
+      final updatedList = List<ReminderDefaultModel>.from(state.reminders)
+        ..add(savedReminder);
+      updatedList.sort((a, b) => a.minutesBefore.compareTo(b.minutesBefore));
+
+      emit(
+        state.copyWith(
+          status: ReminderDefaultsStatus.success,
+          reminders: updatedList,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: ReminderDefaultsStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+      // Ricarichiamo per sicurezza lo stato precedente
+      loadReminders();
+    }
+  }
+
+  Future<void> deleteReminder(String reminderId) async {
+    // Salviamo la lista vecchia nel caso fallisca la cancellazione
+    final oldList = List<ReminderDefaultModel>.from(state.reminders);
+
+    // Aggiornamento ottimistico (rimuoviamo subito dalla UI)
+    final optimisticList = state.reminders
+        .where((r) => r.id != reminderId)
+        .toList();
+    emit(
+      state.copyWith(
+        status: ReminderDefaultsStatus.success,
+        reminders: optimisticList,
+      ),
+    );
+
+    try {
+      await _repository.deleteReminderDefault(reminderId);
+    } catch (e) {
+      // Rollback se il DB fallisce
+      emit(
+        state.copyWith(
+          status: ReminderDefaultsStatus.failure,
+          errorMessage: e.toString(),
+          reminders: oldList,
+        ),
+      );
+    }
+  }
+}

lib/features/settings/blocs/reminder_defaults_state.dart

@@ -0,0 +1,33 @@
+part of 'reminder_defaults_cubit.dart';
+
+enum ReminderDefaultsStatus { initial, loading, success, failure }
+
+class ReminderDefaultsState extends Equatable {
+  final ReminderDefaultsStatus status;
+  final List<ReminderDefaultModel> reminders;
+  final String? errorMessage;
+
+  const ReminderDefaultsState({
+    this.status = ReminderDefaultsStatus.initial,
+    this.reminders = const [],
+    this.errorMessage,
+  });
+
+  ReminderDefaultsState copyWith({
+    ReminderDefaultsStatus? status,
+    List<ReminderDefaultModel>? reminders,
+    String? errorMessage,
+  }) {
+    return ReminderDefaultsState(
+      status: status ?? this.status,
+      reminders: reminders ?? this.reminders,
+      // Se passiamo un nuovo status di successo o loading, puliamo l'errore
+      errorMessage:
+          errorMessage ??
+          (status != ReminderDefaultsStatus.failure ? null : this.errorMessage),
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, reminders, errorMessage];
+}

lib/features/settings/data/settings_repository.dart

@@ -0,0 +1,63 @@
+import 'package:flux/features/tasks/models/reminder_default_model.dart';
+import 'package:get_it/get_it.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+class SettingsRepository {
+  final _supabase = GetIt.I.get<SupabaseClient>();
+
+  // --- PREFERENZE REMINDER ---
+
+  /// Legge i default dell'utente corrente
+  Future<List<ReminderDefaultModel>> getMyReminderDefaults({
+    required String companyId,
+    required String staffId,
+  }) async {
+    try {
+      final response = await _supabase
+          .from('staff_task_reminder_defaults')
+          .select()
+          .eq('company_id', companyId)
+          .eq('staff_id', staffId)
+          .order('minutes_before', ascending: true);
+
+      return (response as List)
+          .map((map) => ReminderDefaultModel.fromMap(map))
+          .toList();
+    } catch (e) {
+      throw Exception('Errore nel caricamento delle preferenze notifiche: $e');
+    }
+  }
+
+  /// Aggiunge una nuova regola (es. Push 15 min prima)
+  Future<ReminderDefaultModel> addReminderDefault(
+    ReminderDefaultModel reminder,
+  ) async {
+    try {
+      final response = await _supabase
+          .from('staff_task_reminder_defaults')
+          .insert(reminder.toMap())
+          .select()
+          .single();
+
+      return ReminderDefaultModel.fromMap(response);
+    } catch (e) {
+      // Catturiamo l'errore UNIQUE se l'utente prova ad aggiungere due volte la stessa identica regola
+      if (e is PostgrestException && e.code == '23505') {
+        throw Exception('Hai già impostato questo identico promemoria.');
+      }
+      throw Exception('Errore salvataggio promemoria: $e');
+    }
+  }
+
+  /// Elimina una regola
+  Future<void> deleteReminderDefault(String reminderId) async {
+    try {
+      await _supabase
+          .from('staff_task_reminder_defaults')
+          .delete()
+          .eq('id', reminderId);
+    } catch (e) {
+      throw Exception('Errore durante l\'eliminazione: $e');
+    }
+  }
+}

lib/features/settings/ui/reminder_settings_screen.dart

@@ -0,0 +1,272 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/features/settings/blocs/reminder_defaults_cubit.dart';
+
+class ReminderSettingsScreen extends StatefulWidget {
+  const ReminderSettingsScreen({super.key});
+
+  @override
+  State<ReminderSettingsScreen> createState() => _ReminderSettingsScreenState();
+}
+
+class _ReminderSettingsScreenState extends State<ReminderSettingsScreen> {
+  @override
+  void initState() {
+    super.initState();
+    // Carichiamo i dati all'avvio
+    context.read<ReminderDefaultsCubit>().loadReminders();
+  }
+
+  void _showAddReminderBottomSheet(BuildContext context) {
+    final cubit = context.read<ReminderDefaultsCubit>();
+    // Valori preselezionati
+    int selectedMinutes = 15;
+    String selectedChannel = 'push';
+
+    showModalBottomSheet(
+      context: context,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(20)),
+      ),
+      builder: (bottomSheetContext) {
+        return StatefulBuilder(
+          builder: (context, setModalState) {
+            return SafeArea(
+              child: Padding(
+                padding: const EdgeInsets.all(24.0),
+                child: Column(
+                  mainAxisSize: MainAxisSize.min,
+                  crossAxisAlignment: CrossAxisAlignment.stretch,
+                  children: [
+                    const Text(
+                      'Nuova Regola di Avviso',
+                      style: TextStyle(
+                        fontSize: 20,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const SizedBox(height: 24),
+
+                    // --- SELEZIONE TEMPO ---
+                    DropdownButtonFormField<int>(
+                      decoration: const InputDecoration(
+                        labelText: 'Quando vuoi essere avvisato?',
+                        border: OutlineInputBorder(),
+                      ),
+                      initialValue: selectedMinutes,
+                      items: const [
+                        DropdownMenuItem(
+                          value: 5,
+                          child: Text('5 minuti prima'),
+                        ),
+                        DropdownMenuItem(
+                          value: 15,
+                          child: Text('15 minuti prima'),
+                        ),
+                        DropdownMenuItem(value: 60, child: Text('1 ora prima')),
+                        DropdownMenuItem(
+                          value: 120,
+                          child: Text('2 ore prima'),
+                        ),
+                        DropdownMenuItem(
+                          value: 1440,
+                          child: Text('1 giorno prima'),
+                        ),
+                      ],
+                      onChanged: (val) {
+                        if (val != null) {
+                          setModalState(() => selectedMinutes = val);
+                        }
+                      },
+                    ),
+                    const SizedBox(height: 16),
+
+                    // --- SELEZIONE CANALE ---
+                    DropdownButtonFormField<String>(
+                      decoration: const InputDecoration(
+                        labelText: 'Come vuoi essere avvisato?',
+                        border: OutlineInputBorder(),
+                      ),
+                      initialValue: selectedChannel,
+                      items: const [
+                        DropdownMenuItem(
+                          value: 'push',
+                          child: Row(
+                            children: [
+                              Icon(
+                                Icons.notifications_active,
+                                size: 20,
+                                color: Colors.orange,
+                              ),
+                              SizedBox(width: 8),
+                              Text('Notifica App (Push)'),
+                            ],
+                          ),
+                        ),
+                        DropdownMenuItem(
+                          value: 'email',
+                          child: Row(
+                            children: [
+                              Icon(Icons.email, size: 20, color: Colors.blue),
+                              SizedBox(width: 8),
+                              Text('Email'),
+                            ],
+                          ),
+                        ),
+                      ],
+                      onChanged: (val) {
+                        if (val != null) {
+                          setModalState(() => selectedChannel = val);
+                        }
+                      },
+                    ),
+                    const SizedBox(height: 32),
+
+                    // --- SALVATAGGIO ---
+                    FilledButton(
+                      style: FilledButton.styleFrom(
+                        padding: const EdgeInsets.symmetric(vertical: 16),
+                      ),
+                      onPressed: () {
+                        cubit.addReminder(
+                          minutesBefore: selectedMinutes,
+                          channel: selectedChannel,
+                        );
+                        Navigator.pop(context);
+                      },
+                      child: const Text('Aggiungi Regola'),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          },
+        );
+      },
+    );
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(title: const Text('Preferenze Promemoria')),
+      floatingActionButton: FloatingActionButton.extended(
+        onPressed: () => _showAddReminderBottomSheet(context),
+        icon: const Icon(Icons.add_alert),
+        label: const Text('Aggiungi'),
+        backgroundColor: Colors.orange,
+      ),
+      body: BlocConsumer<ReminderDefaultsCubit, ReminderDefaultsState>(
+        listener: (context, state) {
+          if (state.status == ReminderDefaultsStatus.failure &&
+              state.errorMessage != null) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(state.errorMessage!),
+                backgroundColor: Theme.of(context).colorScheme.error,
+              ),
+            );
+          }
+        },
+        builder: (context, state) {
+          if (state.status == ReminderDefaultsStatus.loading &&
+              state.reminders.isEmpty) {
+            return const Center(child: CircularProgressIndicator());
+          }
+
+          if (state.reminders.isEmpty) {
+            return Center(
+              child: Padding(
+                padding: const EdgeInsets.all(32.0),
+                child: Column(
+                  mainAxisAlignment: MainAxisAlignment.center,
+                  children: [
+                    Icon(
+                      Icons.notifications_off_outlined,
+                      size: 64,
+                      color: Theme.of(context).dividerColor,
+                    ),
+                    const SizedBox(height: 16),
+                    const Text(
+                      'Nessun promemoria predefinito.',
+                      style: TextStyle(
+                        fontSize: 18,
+                        fontWeight: FontWeight.bold,
+                      ),
+                    ),
+                    const SizedBox(height: 8),
+                    const Text(
+                      'Aggiungi una regola per ricevere in automatico le notifiche quando ti viene assegnato un task.',
+                      textAlign: TextAlign.center,
+                      style: TextStyle(color: Colors.grey),
+                    ),
+                  ],
+                ),
+              ),
+            );
+          }
+
+          return ListView.builder(
+            padding: const EdgeInsets.only(
+              top: 16,
+              bottom: 80,
+              left: 16,
+              right: 16,
+            ),
+            itemCount: state.reminders.length,
+            itemBuilder: (context, index) {
+              final reminder = state.reminders[index];
+              final isPush = reminder.channel == 'push';
+
+              return Card(
+                elevation: 0,
+                margin: const EdgeInsets.only(bottom: 12),
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(12),
+                  side: BorderSide(
+                    color: Theme.of(
+                      context,
+                    ).dividerColor.withValues(alpha: 0.5),
+                  ),
+                ),
+                child: ListTile(
+                  contentPadding: const EdgeInsets.symmetric(
+                    horizontal: 20,
+                    vertical: 8,
+                  ),
+                  leading: CircleAvatar(
+                    backgroundColor: isPush
+                        ? Colors.orange.withValues(alpha: 0.1)
+                        : Colors.blue.withValues(alpha: 0.1),
+                    child: Icon(
+                      isPush ? Icons.notifications_active : Icons.email,
+                      color: isPush ? Colors.orange : Colors.blue,
+                    ),
+                  ),
+                  title: Text(
+                    reminder.friendlyTime, // Usiamo l'helper del Model!
+                    style: const TextStyle(fontWeight: FontWeight.bold),
+                  ),
+                  subtitle: Text(
+                    isPush ? 'Tramite Notifica App' : 'Tramite Email',
+                  ),
+                  trailing: IconButton(
+                    icon: const Icon(
+                      Icons.delete_outline,
+                      color: Colors.redAccent,
+                    ),
+                    onPressed: () {
+                      context.read<ReminderDefaultsCubit>().deleteReminder(
+                        reminder.id!,
+                      );
+                    },
+                  ),
+                ),
+              );
+            },
+          );
+        },
+      ),
+    );
+  }
+}

lib/features/settings/ui/settings_screen.dart

@@ -18,6 +18,15 @@ class SettingsScreen extends StatelessWidget {
       body: ListView(
         padding: const EdgeInsets.all(16),
         children: [
+          _settingsSection('Utente', [
+            _settingsTile(
+              title: 'Impostazioni Promemoria',
+              icon: Icons.notifications,
+              subtitle: 'Notifiche predefinite',
+              context: context,
+              onTap: () => context.pushNamed(Routes.reminderSettings),
+            ),
+          ]),
           _settingsSection('Azienda', [
             _settingsTile(
               title: 'Impostazioni Azienda',
@@ -83,6 +92,7 @@ class SettingsScreen extends StatelessWidget {
               onTap: () => context.pushNamed(Routes.themeSettings),
             ),
           ]),
+
           const SizedBox(height: 24),
           TextButton.icon(
             onPressed: () => context.read<SessionCubit>().signOut(),

lib/features/tasks/blocs/task_form_cubit.dart

@@ -1,211 +1,306 @@
 import 'package:equatable/equatable.dart';
+import 'package:flutter/foundation.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/features/master_data/staff/data/staff_repository.dart';
 import 'package:flux/features/master_data/staff/models/staff_member_model.dart';
+import 'package:flux/features/settings/data/settings_repository.dart';
 import 'package:flux/features/tasks/data/task_repository.dart';
 import 'package:flux/features/tasks/models/task_model.dart';
+import 'package:flux/features/tasks/models/task_reminder_config.dart';
 import 'package:flux/features/tasks/models/task_status.dart';
 import 'package:get_it/get_it.dart';
 part 'task_form_state.dart';
 
 class TaskFormCubit extends Cubit<TaskFormState> {
-  final TaskRepository _taskRepository = GetIt.I.get<TaskRepository>();
+  final TasksRepository _repository = GetIt.I.get<TasksRepository>();
-  final List<StaffMemberModel> _globalStaff;
+  final SettingsRepository _settingsRepository = GetIt.I
-  final String currentCompanyId = GetIt.I<SessionCubit>().state.company!.id!;
+      .get<SettingsRepository>();
-  final String? currentStoreId = GetIt.I<SessionCubit>().state.currentStore?.id;
+  final _staffRepository = GetIt.I.get<StaffRepository>();
+  final SessionCubit _sessionCubit = GetIt.I.get<SessionCubit>();
+  final List<StaffMemberModel>? _preloadedStaff;
 
   TaskFormCubit({
-    required List<StaffMemberModel> globalStaff,
+    String? initialTaskId, // <-- RIPRISTINATO PER DEEP LINK
-
+    TaskModel? existingTask,
-    TaskModel? initialTask, // Arriva dalla navigazione interna (extra)
+    List<StaffMemberModel>? allStaff,
-    String? initialTaskId, // Arriva dal Deep Link (parametro URL)
+  }) : _preloadedStaff = allStaff,
-  }) : _globalStaff = globalStaff,
        super(const TaskFormState()) {
-    _initForm(initialTask, initialTaskId);
+    // Avviamo l'inizializzazione centralizzata (gestisce sia mem, sia deep link, sia nuovo)
+    initForm(initialTaskId: initialTaskId, existingTask: existingTask);
   }
 
-  Future<void> _initForm(TaskModel? task, String? taskId) async {
+  String get _companyId => _sessionCubit.state.company!.id!;
-    // 1. Mettiamo subito il form in caricamento
+  StaffMemberModel get _currentUser => _sessionCubit.state.currentStaffMember!;
+  String? get _currentStoreId => _sessionCubit.state.currentStore?.id;
+
+  // --- ARMED INITIALIZATION (Nuovo, Esistente o Deep Link) ---
+  Future<void> initForm({
+    String? initialTaskId,
+    TaskModel? existingTask,
+  }) async {
     emit(state.copyWith(status: TaskFormStatus.loading));
-
-    TaskModel? taskToLoad = task;
-
-    // 2. SCENARIO DEEP LINK: Non abbiamo l'oggetto, ma abbiamo un ID valido
-    if (taskToLoad == null && taskId != null && taskId != 'new') {
     try {
-        taskToLoad = await _taskRepository.getTaskById(taskId);
+      TaskModel? task = existingTask;
+
+      // 1. Se arriviamo da Deep Link col solo ID, lo scarichiamo dal DB
+      if (initialTaskId != null && task == null) {
+        task = await _repository.fetchTaskById(initialTaskId);
+      }
+
+      if (task != null) {
+        // CASO: TASK ESISTENTE (Modifica o Deep Link pronto)
+        emit(
+          state.copyWith(
+            id: task.id,
+            title: task.title,
+            description: task.description,
+            dueDate: task.dueDate,
+            isGlobal: task.isGlobal, // Sfrutta il tuo getter storeId == null
+            selectedStaffIds: task.assignedToIds,
+            taskStatus: task.status,
+          ),
+        );
+        await _loadExistingTaskReminders(task.id!);
+      } else {
+        // CASO: NUOVO TASK
+        await _initializeNewTaskReminders();
+      }
+
+      // 2. Carichiamo e raggruppiamo il personale (Global o Store)
+      await _loadAndGroupStaff();
+
+      // Mandiamo lo status a 'initial' così il FormScreen sincronizza i controller di testo!
+      emit(state.copyWith(status: TaskFormStatus.initial));
     } catch (e) {
       emit(
         state.copyWith(
           status: TaskFormStatus.failure,
-            errorMessage: 'Impossibile caricare il task dal link: $e',
+          errorMessage: e.toString(),
         ),
       );
-        return; // Ci fermiamo qui
     }
   }
 
-    // 3. Popoliamo lo stato con i dati (sia che arrivino dall'extra, sia dal DB, sia nulli)
+  // --- LOGICA GESTIONE STAFF (GLOBAL STAFF / STORE STAFF) ---
-    final isGlobalMode = taskToLoad != null
+  Future<void> _loadAndGroupStaff() async {
-        ? taskToLoad.storeId == null
+    final List<StaffMemberModel> staffList;
-        : currentStoreId == null;
-    final existingStaffIds =
-        taskToLoad?.assignedToStaff.map((s) => s.id!).toList() ??
-        taskToLoad?.assignedToIds ??
-        [];
 
-    emit(
+    // SE C'È LO STAFF PASCIUTO DALL'APP USA QUELLO, ALTRIMENTI CHIAMA IL REPO
-      state.copyWith(
+    if (_preloadedStaff != null && _preloadedStaff.isNotEmpty) {
-        id: taskToLoad?.id,
+      staffList = _preloadedStaff;
-        title: taskToLoad?.title ?? '',
+    } else {
-        description: taskToLoad?.description ?? '',
+      staffList = await _staffRepository.getStaffMembers(_companyId);
-        dueDate: taskToLoad?.dueDate,
+    }
-        taskStatus: taskToLoad?.status ?? TaskStatus.open,
+
-        isGlobal: isGlobalMode,
+    final Map<String, List<StaffMemberModel>> grouped = {};
-        selectedStaffIds: existingStaffIds,
+
-        status: TaskFormStatus.initial, // Caricamento finito, form pronto!
+    for (var staff in staffList) {
-      ),
+      if (!state.isGlobal) {
+        final belongsToCurrentStore = staff.assignedStores.any(
+          (store) => store.id == _currentStoreId,
         );
-
+        if (!belongsToCurrentStore) continue;
-    _updateStaffScope(isGlobalMode);
       }
 
-  // --- 2. SWITCH SCOPE E RAGGRUPPAMENTO ---
-  void toggleGlobalScope(bool isGlobal) {
-    emit(
-      state.copyWith(
-        isGlobal: isGlobal,
-        selectedStaffIds: [], // Resettiamo la selezione se si cambia scope
-      ),
-    );
-    _updateStaffScope(isGlobal);
-  }
-
-  void _updateStaffScope(bool isGlobal) {
-    // 1. Filtriamo in memoria: cerchiamo nell'array degli ID!
-    final filteredStaff = isGlobal
-        ? _globalStaff
-        : _globalStaff
-              .where((s) => s.assignedStoreIds.contains(currentStoreId))
-              .toList();
-
-    // 2. Raggruppamento M2M (Ciclo manuale)
-    final Map<String, List<StaffMemberModel>> groupedStaff = {};
-
-    for (final staff in filteredStaff) {
-      // Se non ha nessun negozio assegnato, finisce in Direzione
       if (staff.assignedStores.isEmpty) {
-        groupedStaff.putIfAbsent('Direzione / HQ', () => []).add(staff);
+        grouped.putIfAbsent('Direzione / Senza Sede', () => []).add(staff);
       } else {
-        // Se ha più negozi, clona la sua presenza in ogni gruppo!
+        for (var store in staff.assignedStores) {
-        for (final store in staff.assignedStores) {
+          if (!state.isGlobal && store.id != _currentStoreId) continue;
           final storeName = store.name;
-          groupedStaff.putIfAbsent(storeName, () => []).add(staff);
+          grouped.putIfAbsent(storeName, () => []).add(staff);
         }
       }
     }
 
-    // 3. Emettiamo il nuovo stato all'istante
+    emit(state.copyWith(groupedAvailableStaff: grouped));
+  }
+
+  // Se l'utente switcha su "Globale Aziendale", ricarichiamo lo staff di conseguenza
+  void toggleGlobalScope(bool g) async {
+    emit(state.copyWith(isGlobal: g, status: TaskFormStatus.loading));
+    await _loadAndGroupStaff();
+    emit(
+      state.copyWith(status: TaskFormStatus.initial),
+    ); // Ri-notifichiamo la UI
+  }
+
+  // --- INIT REMINDER ---
+  Future<void> _initializeNewTaskReminders() async {
+    try {
+      final defaults = await _settingsRepository.getMyReminderDefaults(
+        companyId: _companyId,
+        staffId: _currentUser.id!,
+      );
+      final initialReminders = defaults
+          .map(
+            (d) => TaskReminderConfig(
+              minutesBefore: d.minutesBefore,
+              channel: d.channel,
+            ),
+          )
+          .toList();
+      emit(state.copyWith(reminders: initialReminders));
+    } catch (e) {
       emit(
         state.copyWith(
-        status: TaskFormStatus.initial,
+          reminders: const [
-        groupedAvailableStaff: groupedStaff,
+            TaskReminderConfig(minutesBefore: 15, channel: 'push'),
+          ],
         ),
       );
     }
-
-  // --- 3. SELEZIONE AVANZATA (SINGOLA E PER NEGOZIO) ---
-  void toggleStaffSelection(String staffId) {
-    final currentList = List<String>.from(state.selectedStaffIds);
-    if (currentList.contains(staffId)) {
-      currentList.remove(staffId);
-    } else {
-      currentList.add(staffId);
   }
-    emit(state.copyWith(selectedStaffIds: currentList));
+
+  Future<void> _loadExistingTaskReminders(String taskId) async {
+    try {
+      final existingConfigs = await _repository.fetchPersonalReminders(
+        taskId: taskId,
+        staffId: _currentUser.id!,
+      );
+      emit(state.copyWith(reminders: existingConfigs));
+    } catch (e) {
+      debugPrint('Errore caricamento reminder: $e');
+    }
+  }
+
+  // --- AGGIORNAMENTO CAMPI ---
+  void updateTitle(String t) => emit(state.copyWith(title: t));
+  void updateDescription(String d) => emit(state.copyWith(description: d));
+  void updateDueDate(DateTime? d) => emit(state.copyWith(dueDate: d));
+
+  void toggleStaffSelection(String staffId) {
+    final updated = List<String>.from(state.selectedStaffIds);
+    updated.contains(staffId) ? updated.remove(staffId) : updated.add(staffId);
+    emit(state.copyWith(selectedStaffIds: updated));
   }
 
   void toggleStoreSelection(String storeName, bool selectAll) {
-    // Recupera tutti i membri di quel gruppo
+    final updated = List<String>.from(state.selectedStaffIds);
-    final staffInStore = state.groupedAvailableStaff[storeName] ?? [];
+    final storeStaff = state.groupedAvailableStaff[storeName] ?? [];
-    final idsInStore = staffInStore.map((s) => s.id!).toList();
-
-    final currentSelection = Set<String>.from(state.selectedStaffIds);
 
+    for (var staff in storeStaff) {
+      if (staff.id == null) continue;
       if (selectAll) {
-      currentSelection.addAll(idsInStore);
+        if (!updated.contains(staff.id)) updated.add(staff.id!);
       } else {
-      currentSelection.removeAll(idsInStore);
+        updated.remove(staff.id);
+      }
+    }
+    emit(state.copyWith(selectedStaffIds: updated));
   }
 
-    emit(state.copyWith(selectedStaffIds: currentSelection.toList()));
+  // --- AZIONI REMINDER ---
-  }
+  void addReminderRule(int minutesBefore, String channel) {
-
+    final updated = List<TaskReminderConfig>.from(state.reminders);
-  // --- 4. AGGIORNAMENTO CAMPI STANDARD ---
+    final newConfig = TaskReminderConfig(
-  void updateTitle(String title) => emit(state.copyWith(title: title));
+      minutesBefore: minutesBefore,
-
+      channel: channel,
-  void updateDescription(String desc) =>
-      emit(state.copyWith(description: desc));
-
-  void updateDueDate(DateTime? date) =>
-      emit(state.copyWith(dueDate: date, clearDueDate: date == null));
-
-  void updateLinkedTicket(String? ticketId) =>
-      emit(state.copyWith(linkedTicketId: ticketId));
-
-  // --- 5. LOGICA DEI REMINDER FINTI ---
-  void addMockReminder(String type, int minutes) {
-    final currentReminders = List<TaskReminder>.from(state.reminders);
-    currentReminders.add(TaskReminder(type: type, minutesBefore: minutes));
-    emit(state.copyWith(reminders: currentReminders));
-  }
-
-  void removeMockReminder(int index) {
-    final currentReminders = List<TaskReminder>.from(state.reminders);
-    currentReminders.removeAt(index);
-    emit(state.copyWith(reminders: currentReminders));
-  }
-
-  // --- 6. SALVATAGGIO FINALE ---
-  Future<void> saveTask({required String currentUserId}) async {
-    if (!state.isFormValid) return;
-
-    emit(state.copyWith(status: TaskFormStatus.submitting));
-
-    try {
-      final taskToSave = TaskModel(
-        id: state.id,
-        companyId: currentCompanyId,
-        storeId: state.isGlobal
-            ? null
-            : currentStoreId, // La vera discriminante Globale/Store!
-        createdById: state.id == null
-            ? currentUserId
-            : null, // Lo settiamo solo alla creazione
-        title: state.title.trim(),
-        description: state.description.trim().isEmpty
-            ? null
-            : state.description.trim(),
-        dueDate: state.dueDate,
-        status: state.taskStatus,
-        assignedToIds: state
-            .selectedStaffIds, // L'array che andrà a popolare la tabella di giunzione
     );
 
-      if (state.id == null) {
+    if (!updated.contains(newConfig)) {
-        await _taskRepository.createTask(taskToSave);
+      updated.add(newConfig);
-      } else {
+      updated.sort((a, b) => a.minutesBefore.compareTo(b.minutesBefore));
-        await _taskRepository.updateTask(taskToSave);
+      emit(state.copyWith(reminders: updated));
+    }
   }
 
+  void removeReminderRule(int index) {
+    final updated = List<TaskReminderConfig>.from(state.reminders)
+      ..removeAt(index);
+    emit(state.copyWith(reminders: updated));
+  }
+
+  // --- SALVATAGGIO ---
+  Future<void> saveTask() async {
+    if (!state.isFormValid) return;
+    emit(state.copyWith(status: TaskFormStatus.submitting));
+
+    final taskToSave = TaskModel(
+      id: state.id,
+      companyId: _companyId,
+      createdBy: _currentUser,
+      title: state.title.trim(),
+      description: state.description.trim(),
+      dueDate: state.dueDate,
+      storeId: state.isGlobal
+          ? null
+          : _currentStoreId, // Gestione nativa basata sulla tua logica
+      assignedToIds: state.selectedStaffIds,
+    );
+
+    try {
+      if (state.id == null) {
+        await _repository.createTask(
+          task: taskToSave,
+          assignedStaffIds: state.selectedStaffIds,
+          currentUserId: _currentUser.id!,
+          currentUserCustomReminders: state.reminders,
+        );
+      } else {
+        await _repository.updateTask(
+          task: taskToSave,
+          assignedStaffIds: state.selectedStaffIds,
+          currentUserId: _currentUser.id!,
+          currentUserCustomReminders: state.reminders,
+        );
+      }
       emit(state.copyWith(status: TaskFormStatus.success));
     } catch (e) {
       emit(
         state.copyWith(
           status: TaskFormStatus.failure,
-          errorMessage: 'Errore durante il salvataggio: $e',
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  Future<void> deleteTask() async {
+    if (state.id == null) return;
+    emit(state.copyWith(status: TaskFormStatus.submitting));
+    try {
+      await _repository.deleteTask(state.id!);
+      emit(state.copyWith(status: TaskFormStatus.success));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: TaskFormStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  Future<void> updateTaskLocalStatus(TaskStatus newStatus) async {
+    emit(state.copyWith(taskStatus: newStatus));
+  }
+
+  Future<void> updateTaskStatus(TaskStatus newStatus) async {
+    try {
+      // Chiamiamo il repo passando il task aggiornato
+      await _repository.updateTaskStatus(
+        taskId: state.id!,
+        newStatus: newStatus,
+        updatedById: _currentUser.id!,
+      );
+
+      if (!isClosed) {
+        // Se l'update va a buon fine, aggiorniamo lo stato locale del cubit
+        emit(
+          state.copyWith(status: TaskFormStatus.success, taskStatus: newStatus),
+        );
+      }
+    } catch (e) {
+      if (!isClosed) {
+        emit(
+          state.copyWith(
+            status: TaskFormStatus.failure,
+            errorMessage: e.toString(),
           ),
         );
       }
     }
   }
+}

lib/features/tasks/blocs/task_form_state.dart

@@ -2,108 +2,76 @@ part of 'task_form_cubit.dart';
 
 enum TaskFormStatus { initial, loading, submitting, success, failure }
 
-/// Placeholder finto per i futuri reminder (pg_cron)
-class TaskReminder extends Equatable {
-  final String type; // es. 'email', 'push'
-  final int minutesBefore;
-  const TaskReminder({required this.type, required this.minutesBefore});
-  @override
-  List<Object?> get props => [type, minutesBefore];
-}
-
 class TaskFormState extends Equatable {
+  final String? id;
   final TaskFormStatus status;
-  final String? id; // Null se stiamo creando un nuovo task
   final String title;
   final String description;
   final DateTime? dueDate;
-  final TaskStatus taskStatus;
-
-  // --- SCOPING & ASSIGNMENTS ---
   final bool isGlobal;
   final List<String> selectedStaffIds;
-  final List<StaffMemberModel> availableStaff;
+  final List<TaskReminderConfig> reminders;
   final Map<String, List<StaffMemberModel>> groupedAvailableStaff;
-
-  // --- FUTURI ANCORAGGI ---
-  final List<TaskReminder> reminders;
-  final String? linkedTicketId;
-  final String? linkedEmailId;
-
   final String? errorMessage;
+  final TaskStatus taskStatus;
 
   const TaskFormState({
-    this.status = TaskFormStatus.initial,
     this.id,
+    this.status = TaskFormStatus.initial,
     this.title = '',
     this.description = '',
     this.dueDate,
-    this.taskStatus = TaskStatus.open,
     this.isGlobal = false,
     this.selectedStaffIds = const [],
-    this.availableStaff = const [],
-    this.groupedAvailableStaff = const {},
     this.reminders = const [],
-    this.linkedTicketId,
+    this.groupedAvailableStaff = const {},
-    this.linkedEmailId,
     this.errorMessage,
+    this.taskStatus = TaskStatus.open,
   });
 
-  // MAGIA: Il form è valido solo se c'è un titolo e, opzionalmente, altre regole.
   bool get isFormValid => title.trim().isNotEmpty;
 
   TaskFormState copyWith({
-    TaskFormStatus? status,
     String? id,
+    TaskFormStatus? status,
     String? title,
     String? description,
     DateTime? dueDate,
-    bool clearDueDate = false, // Trucco Ninja per rimettere a null una data!
-    TaskStatus? taskStatus,
     bool? isGlobal,
     List<String>? selectedStaffIds,
-    List<StaffMemberModel>? availableStaff,
+    List<TaskReminderConfig>? reminders,
     Map<String, List<StaffMemberModel>>? groupedAvailableStaff,
-    List<TaskReminder>? reminders,
-    String? linkedTicketId,
-    String? linkedEmailId,
     String? errorMessage,
+    TaskStatus? taskStatus,
   }) {
     return TaskFormState(
-      status: status ?? this.status,
       id: id ?? this.id,
+      status: status ?? this.status,
       title: title ?? this.title,
       description: description ?? this.description,
-      dueDate: clearDueDate ? null : (dueDate ?? this.dueDate),
+      dueDate: dueDate ?? this.dueDate,
-      taskStatus: taskStatus ?? this.taskStatus,
       isGlobal: isGlobal ?? this.isGlobal,
       selectedStaffIds: selectedStaffIds ?? this.selectedStaffIds,
-      availableStaff: availableStaff ?? this.availableStaff,
+      reminders: reminders ?? this.reminders,
       groupedAvailableStaff:
           groupedAvailableStaff ?? this.groupedAvailableStaff,
-      reminders: reminders ?? this.reminders,
+      errorMessage: errorMessage,
-      linkedTicketId: linkedTicketId ?? this.linkedTicketId,
+      taskStatus: taskStatus ?? this.taskStatus,
-      linkedEmailId: linkedEmailId ?? this.linkedEmailId,
-      errorMessage:
-          errorMessage, // Se copyWith è chiamato senza errore, lo pulisce in automatico
     );
   }
 
   @override
   List<Object?> get props => [
-    status,
     id,
+    status,
     title,
     description,
     dueDate,
-    taskStatus,
     isGlobal,
     selectedStaffIds,
-    availableStaff,
-    groupedAvailableStaff,
     reminders,
-    linkedTicketId,
+    groupedAvailableStaff,
-    linkedEmailId,
     errorMessage,
+    taskStatus,
   ];
 }

lib/features/tasks/blocs/task_list_cubit.dart

@@ -8,7 +8,7 @@ import 'package:get_it/get_it.dart';
 part 'task_list_state.dart';
 
 class TaskListCubit extends Cubit<TaskListState> {
-  final TaskRepository _repository = GetIt.I.get<TaskRepository>();
+  final TasksRepository _repository = GetIt.I.get<TasksRepository>();
   final String currentCompanyId;
   final String? currentStoreId;
 

lib/features/tasks/data/task_repository.dart

@@ -1,51 +1,47 @@
 import 'dart:async';
 
+import 'package:flutter/foundation.dart';
 import 'package:flux/core/enums_and_consts/consts.dart';
+import 'package:flux/features/tasks/models/task_reminder_config.dart';
 import 'package:flux/features/tasks/models/task_status.dart';
+import 'package:get_it/get_it.dart';
 import 'package:supabase_flutter/supabase_flutter.dart';
 // Sostituisci con i percorsi corretti di FLUX
 import 'package:flux/features/tasks/models/task_model.dart';
 
-class TaskRepository {
+class TasksRepository {
-  final SupabaseClient _supabase;
+  final _supabase = GetIt.I.get<SupabaseClient>();
 
-  TaskRepository({SupabaseClient? supabase})
+  // =========================================================================
-    : _supabase = supabase ?? Supabase.instance.client;
+  // LETTURA REMINDER (Per il form in edit)
+  // =========================================================================
+  Future<List<TaskReminderConfig>> fetchPersonalReminders({
+    required String taskId,
+    required String staffId,
+  }) async {
+    try {
+      final response = await _supabase
+          .from(Tables.taskReminders)
+          .select()
+          .eq('task_id', taskId)
+          .eq('staff_id', staffId)
+          .eq(
+            'is_forced',
+            false,
+          ); // Peschiamo SOLO quelli modificabili dall'utente
 
-  // --- LOGICA REAL-TIME (Il Campanello) ---
+      return (response as List)
-  Stream<void> watchCompanyTasks(String companyId) {
+          .map(
-    // Usiamo un broadcast nel caso più bloc volessero ascoltarlo in futuro
+            (r) => TaskReminderConfig(
-    final controller = StreamController<void>.broadcast();
+              minutesBefore: r['minutes_before'],
-
+              channel: r['channel'],
-    final channel = _supabase.channel('public:tasks_company_$companyId');
-
-    channel
-        .onPostgresChanges(
-          event: PostgresChangeEvent.all,
-          schema: 'public',
-          table: Tables.tasks,
-          filter: PostgresChangeFilter(
-            type: PostgresChangeFilterType.eq,
-            column: 'company_id',
-            value: companyId,
             ),
-          callback: (payload) {
-            if (!controller.isClosed) {
-              controller.add(
-                null,
-              ); // Suoniamo il campanello! Nessun dato, solo il "ding"
-            }
-          },
           )
-        .subscribe();
+          .toList();
-
+    } catch (e) {
-    // Quando il Cubit smette di ascoltare, puliamo il canale Supabase in automatico
+      debugPrint('Errore fetch personal reminders: $e');
-    controller.onCancel = () {
+      throw Exception('Errore fetch personal reminders: $e');
-      channel.unsubscribe();
+    }
-      controller.close();
-    };
-
-    return controller.stream;
   }
 
   // --- RECUPERO DEI TASK FILTRATI ---
@@ -57,13 +53,17 @@ class TaskRepository {
     int? limit,
   }) async {
     try {
-      // 1. FASE FILTRI: Usa il join esplicito stile "Notes"
+      // 1. FASE FILTRI: Disambiguazione completa su Tasks e Assignments
       var filterBuilder = _supabase
           .from(Tables.tasks)
           .select('''
             *,
+            creator:${Tables.staffMembers}!created_by_id(*),
+            updater:${Tables.staffMembers}!updated_by_id(*),
             task_assignments:${Tables.taskAssignments} (
-              ${Tables.staffMembers} (*)
+              *,
+              assignee:${Tables.staffMembers}!staff_id(*),
+              assigner:${Tables.staffMembers}!assigned_by_id(*)
             )
           ''')
           .eq('company_id', companyId);
@@ -75,7 +75,6 @@ class TaskRepository {
       }
 
       if (staffId != null) {
-        // Grazie al trigger, hai l'array pronto per il filtro senza impazzire!
         filterBuilder = filterBuilder.contains('assigned_to_ids', [staffId]);
       }
 
@@ -103,109 +102,344 @@ class TaskRepository {
     }
   }
 
-  // --- 2. CREAZIONE DEL TASK ---
+  Future<TaskModel?> fetchTaskById(String taskId) async {
-  Future<TaskModel> createTask(TaskModel task) async {
-    try {
-      final taskData = task.toMap();
-
-      // Rimuoviamo l'array prima di inviare i dati alla tabella principale,
-      // la "Strada C" impone che la verità assoluta derivi dalla tabella di giunzione!
-      taskData.remove('assigned_to_ids');
-
-      // 1. Inseriamo il record base nella tabella tasks
-      final response = await _supabase
-          .from(Tables.tasks)
-          .insert(taskData)
-          .select()
-          .single();
-
-      final newTask = TaskModel.fromMap(response);
-
-      // 2. Se l'utente ha assegnato il task a qualcuno, popoliamo la giunzione
-      if (task.assignedToIds.isNotEmpty && newTask.id != null) {
-        await _syncAssignments(newTask.id!, task.assignedToIds);
-
-        // 3. Ricarichiamo il task appena creato per ottenere l'array e il JOIN aggiornati dal trigger!
-        return await getTaskById(newTask.id!);
-      }
-
-      return newTask;
-    } catch (e) {
-      throw Exception('Errore nella creazione del task: $e');
-    }
-  }
-
-  // --- 3. AGGIORNAMENTO DEL TASK ---
-  Future<TaskModel> updateTask(TaskModel task) async {
-    if (task.id == null) {
-      throw Exception('ID Task mancante. Impossibile aggiornare.');
-    }
-
-    try {
-      final taskData = task.toMap();
-      taskData.remove(
-        'assigned_to_ids',
-      ); // Sempre via l'array dal body principale
-
-      // 1. Aggiorniamo i dati base del task (titolo, stato, scadenza, ecc.)
-      await _supabase.from(Tables.tasks).update(taskData).eq('id', task.id!);
-
-      // 2. Sincronizziamo in modo distruttivo gli assegnatari nella tabella di giunzione
-      await _syncAssignments(task.id!, task.assignedToIds);
-
-      // 3. Ritorniamo il modello fresco di DB
-      return await getTaskById(task.id!);
-    } catch (e) {
-      throw Exception('Errore nell\'aggiornamento del task: $e');
-    }
-  }
-
-  // --- 4. ELIMINAZIONE DEL TASK ---
-  Future<void> deleteTask(String taskId) async {
-    try {
-      // Eliminando il task, se la Foreign Key su Supabase ha "ON DELETE CASCADE",
-      // le righe nella tabella di giunzione si distruggeranno da sole in automatico!
-      await _supabase.from(Tables.tasks).delete().eq('id', taskId);
-    } catch (e) {
-      throw Exception('Errore nell\'eliminazione del task: $e');
-    }
-  }
-
-  // --- HELPER: RECUPERO SINGOLO TASK ---
-  Future<TaskModel> getTaskById(String taskId) async {
     try {
       final response = await _supabase
           .from(Tables.tasks)
           .select('''
             *,
+            creator:${Tables.staffMembers}!created_by_id(*),
+            updater:${Tables.staffMembers}!updated_by_id(*),
             task_assignments:${Tables.taskAssignments} (
-              ${Tables.staffMembers} (*)
+              *,
+              assignee:${Tables.staffMembers}!staff_id(*),
+              assigner:${Tables.staffMembers}!assigned_by_id(*)
             )
           ''')
           .eq('id', taskId)
           .single();
+
       return TaskModel.fromMap(response);
     } catch (e) {
-      throw Exception('Errore nel recupero del singolo task: $e');
+      debugPrint('Errore fetch task by id: $e');
+      throw Exception('Errore fetch task by id: $e');
     }
   }
 
-  // --- HELPER: SINCRONIZZAZIONE DELLA TABELLA DI GIUNZIONE ---
+  // =========================================================================
-  Future<void> _syncAssignments(String taskId, List<String> staffIds) async {
+  // REALTIME STREAM (La sentinella per la bacheca)
-    // TECNICA "WIPE & REPLACE":
+  // =========================================================================
-    // Invece di capire chi è stato aggiunto e chi tolto, eliminiamo tutti i record
+  Stream<List<Map<String, dynamic>>> watchCompanyTasks(String companyId) {
-    // di questo task e li reinseriamo. È fulmineo ed esclude a priori bug di disallineamento.
+    return _supabase
+        .from('tasks')
+        .stream(primaryKey: ['id'])
+        .eq('company_id', companyId);
+  }
 
-    // 1. Facciamo piazza pulita
+  // =========================================================================
-    await _supabase.from(Tables.taskAssignments).delete().eq('task_id', taskId);
+  // CREAZIONE (Insert)
+  // =========================================================================
+  Future<void> createTask({
+    required TaskModel task,
+    required List<String> assignedStaffIds,
+    required String currentUserId,
+    required List<TaskReminderConfig> currentUserCustomReminders,
+    TaskReminderConfig? managerForcedOverride,
+  }) async {
+    try {
+      // 1. Inseriamo il Task principale per farci generare l'ID dal DB
+      final taskResponse = await _supabase
+          .from('tasks')
+          .insert(task.toMap()) // Assicurati che toMap() escluda l'id se è null
+          .select('id')
+          .single();
 
-    // 2. Inseriamo le nuove assegnazioni (se ce ne sono)
+      final String taskId = taskResponse['id'];
-    if (staffIds.isNotEmpty) {
+
-      final List<Map<String, dynamic>> assignments = staffIds
+      // 2. Inseriamo le Assegnazioni (tabella task_assignments)
-          .map((staffId) => {'task_id': taskId, 'staff_id': staffId})
+      if (assignedStaffIds.isNotEmpty) {
+        final assignmentsToInsert = assignedStaffIds
+            .map(
+              (staffId) => {
+                'task_id': taskId,
+                'staff_id': staffId,
+                'company_id': task.companyId,
+                'assigned_by_id': currentUserId,
+              },
+            )
+            .toList();
+        await _supabase.from('task_assignments').insert(assignmentsToInsert);
+      }
+
+      // Se non c'è data di scadenza, niente promemoria a tempo
+      if (task.dueDate == null || assignedStaffIds.isEmpty) return;
+
+      // 3. Setup Reminder: Peschiamo i default degli ALTRI dipendenti coinvolti
+      final otherStaffIds = assignedStaffIds
+          .where((id) => id != currentUserId)
+          .toList();
+      List<dynamic> otherDefaults = [];
+      if (otherStaffIds.isNotEmpty) {
+        otherDefaults = await _supabase
+            .from('staff_task_reminder_defaults')
+            .select()
+            .inFilter('staff_id', otherStaffIds);
+      }
+
+      // 4. Creiamo la lista Bulk Insert per la tabella task_reminders
+      List<Map<String, dynamic>> remindersToInsert = [];
+
+      for (var staffId in assignedStaffIds) {
+        // A) Se è l'utente loggato -> usa i reminder configurati nel form
+        if (staffId == currentUserId) {
+          for (var config in currentUserCustomReminders) {
+            final triggerAt = task.dueDate!.subtract(
+              Duration(minutes: config.minutesBefore),
+            );
+            if (triggerAt.isAfter(DateTime.now())) {
+              remindersToInsert.add(
+                _buildReminderRow(
+                  task,
+                  taskId,
+                  staffId,
+                  config,
+                  triggerAt,
+                  false,
+                ),
+              );
+            }
+          }
+        }
+        // B) Se è un collega -> eredita i suoi default preimpostati
+        else {
+          final staffRules = otherDefaults.where(
+            (row) => row['staff_id'] == staffId,
+          );
+          for (var rule in staffRules) {
+            final config = TaskReminderConfig(
+              minutesBefore: rule['minutes_before'],
+              channel: rule['channel'],
+            );
+            final triggerAt = task.dueDate!.subtract(
+              Duration(minutes: config.minutesBefore),
+            );
+            if (triggerAt.isAfter(DateTime.now())) {
+              remindersToInsert.add(
+                _buildReminderRow(
+                  task,
+                  taskId,
+                  staffId,
+                  config,
+                  triggerAt,
+                  false,
+                ),
+              );
+            }
+          }
+        }
+
+        // C) Override forzato del manager (per tutti)
+        if (managerForcedOverride != null) {
+          final triggerAt = task.dueDate!.subtract(
+            Duration(minutes: managerForcedOverride.minutesBefore),
+          );
+          if (triggerAt.isAfter(DateTime.now())) {
+            remindersToInsert.add(
+              _buildReminderRow(
+                task,
+                taskId,
+                staffId,
+                managerForcedOverride,
+                triggerAt,
+                true,
+              ),
+            );
+          }
+        }
+      }
+
+      // 5. Inserimento massivo finale
+      if (remindersToInsert.isNotEmpty) {
+        await _supabase.from('task_reminders').insert(remindersToInsert);
+      }
+    } catch (e) {
+      throw Exception('Errore durante la creazione del task: $e');
+    }
+  }
+
+  // =========================================================================
+  // AGGIORNAMENTO (Update)
+  // =========================================================================
+  Future<void> updateTask({
+    required TaskModel task,
+    required List<String> assignedStaffIds,
+    required String currentUserId,
+    required List<TaskReminderConfig> currentUserCustomReminders,
+  }) async {
+    try {
+      final taskId = task.id!;
+
+      // 1. Aggiornamento dati Task Base
+      await _supabase
+          .from(Tables.tasks)
+          .update({
+            'title': task.title,
+            'description': task.description,
+            'due_date': task.dueDate?.toIso8601String(),
+            'store_id': task.storeId,
+            'updated_at': DateTime.now().toIso8601String(),
+          })
+          .eq('id', taskId);
+
+      // 🥷 2. GESTIONE CHIRURGICA DELLE ASSEGNAZIONI (Addio spam!)
+
+      // A) Recuperiamo chi è GIÀ assegnato a questo task
+      final existingAssignmentsResponse = await _supabase
+          .from('task_assignments')
+          .select('staff_id')
+          .eq('task_id', taskId);
+
+      final List<String> existingStaffIds =
+          (existingAssignmentsResponse as List)
+              .map((row) => row['staff_id'] as String)
               .toList();
 
-      await _supabase.from(Tables.taskAssignments).insert(assignments);
+      // B) Calcoliamo i Delta con i Set di Dart (Pura magia matematica)
+      final newStaffIdsSet = assignedStaffIds.toSet();
+      final existingStaffIdsSet = existingStaffIds.toSet();
+
+      // Quelli da inserire (presenti nei nuovi, ma non nei vecchi)
+      final toInsertIds = newStaffIdsSet
+          .difference(existingStaffIdsSet)
+          .toList();
+
+      // Quelli da eliminare (presenti nei vecchi, ma non nei nuovi)
+      final toDeleteIds = existingStaffIdsSet
+          .difference(newStaffIdsSet)
+          .toList();
+
+      // C) Eseguiamo solo lo stretto necessario
+      if (toDeleteIds.isNotEmpty) {
+        await _supabase
+            .from('task_assignments')
+            .delete()
+            .eq('task_id', taskId)
+            .inFilter('staff_id', toDeleteIds);
+      }
+
+      if (toInsertIds.isNotEmpty) {
+        final assignmentsToInsert = toInsertIds
+            .map(
+              (staffId) => {
+                'task_id': taskId,
+                'staff_id': staffId,
+                'company_id': task.companyId,
+                'assigned_by_id':
+                    currentUserId, // Il nostro salvavita anti-fantasma
+              },
+            )
+            .toList();
+        await _supabase.from('task_assignments').insert(assignmentsToInsert);
+      }
+
+      // Se non c'è una data, eliminiamo tutti i vecchi promemoria dell'utente loggato per pulizia
+      if (task.dueDate == null) {
+        await _supabase
+            .from('task_reminders')
+            .delete()
+            .eq('task_id', taskId)
+            .eq('staff_id', currentUserId)
+            .eq('is_forced', false);
+        return;
+      }
+
+      // 3. GESTIONE REMINDER: Puliamo SOLO quelli modificabili dall'utente loggato
+      await _supabase
+          .from('task_reminders')
+          .delete()
+          .eq('task_id', taskId)
+          .eq('staff_id', currentUserId)
+          .eq('is_forced', false); // NON tocchiamo quelli forzati dal manager!
+
+      // 4. Inseriamo le nuove configurazioni salvate dal Cubit (solo se è ancora tra gli assegnatari)
+      if (assignedStaffIds.contains(currentUserId) &&
+          currentUserCustomReminders.isNotEmpty) {
+        final List<Map<String, dynamic>> toInsert = [];
+
+        for (var config in currentUserCustomReminders) {
+          final triggerAt = task.dueDate!.subtract(
+            Duration(minutes: config.minutesBefore),
+          );
+          if (triggerAt.isAfter(DateTime.now())) {
+            toInsert.add(
+              _buildReminderRow(
+                task,
+                taskId,
+                currentUserId,
+                config,
+                triggerAt,
+                false,
+              ),
+            );
           }
         }
+
+        if (toInsert.isNotEmpty) {
+          await _supabase.from('task_reminders').insert(toInsert);
+        }
+      }
+    } catch (e) {
+      throw Exception('Errore durante l\'aggiornamento del task: $e');
+    }
+  }
+
+  Future<void> updateTaskStatus({
+    required String taskId,
+    required TaskStatus newStatus,
+    required String? updatedById,
+  }) async {
+    try {
+      await _supabase
+          .from(Tables.tasks)
+          .update({
+            'status': newStatus.toValue,
+            'updated_by_id': updatedById,
+            'updated_at': DateTime.now().toIso8601String(),
+          })
+          .eq('id', taskId);
+    } catch (e) {
+      throw Exception(
+        'Errore durante l\'aggiornamento dello stato del task: $e',
+      );
+    }
+  }
+
+  Future<void> deleteTask(String taskId) async {
+    try {
+      await _supabase.from(Tables.tasks).delete().eq('id', taskId);
+    } catch (e) {
+      throw Exception('Errore durante la cancellazione del task: $e');
+    }
+  }
+
+  // --- HELPER PRIVATO PER LA MAPPA DEL REMINDER ---
+  Map<String, dynamic> _buildReminderRow(
+    TaskModel task,
+    String taskId,
+    String staffId,
+    TaskReminderConfig config,
+    DateTime triggerAt,
+    bool isForced,
+  ) {
+    return {
+      'company_id': task.companyId,
+      'task_id': taskId,
+      'staff_id': staffId,
+      'minutes_before': config.minutesBefore,
+      'channel': config.channel,
+      'trigger_at': triggerAt.toIso8601String(),
+      'is_forced': isForced,
+      'is_sent': false,
+    };
+  }
 }

lib/features/tasks/models/reminder_default_model.dart

@@ -0,0 +1,65 @@
+import 'package:equatable/equatable.dart';
+
+class ReminderDefaultModel extends Equatable {
+  final String? id;
+  final String companyId;
+  final String staffId;
+  final int minutesBefore;
+  final String channel; // 'push' o 'email'
+
+  const ReminderDefaultModel({
+    this.id,
+    required this.companyId,
+    required this.staffId,
+    required this.minutesBefore,
+    required this.channel,
+  });
+
+  ReminderDefaultModel copyWith({
+    String? id,
+    String? companyId,
+    String? staffId,
+    int? minutesBefore,
+    String? channel,
+  }) {
+    return ReminderDefaultModel(
+      id: id ?? this.id,
+      companyId: companyId ?? this.companyId,
+      staffId: staffId ?? this.staffId,
+      minutesBefore: minutesBefore ?? this.minutesBefore,
+      channel: channel ?? this.channel,
+    );
+  }
+
+  Map<String, dynamic> toMap() {
+    return {
+      if (id != null) 'id': id,
+      'company_id': companyId,
+      'staff_id': staffId,
+      'minutes_before': minutesBefore,
+      'channel': channel,
+    };
+  }
+
+  factory ReminderDefaultModel.fromMap(Map<String, dynamic> map) {
+    return ReminderDefaultModel(
+      id: map['id'] as String?,
+      companyId: map['company_id'] as String,
+      staffId: map['staff_id'] as String,
+      minutesBefore: map['minutes_before'] as int,
+      channel: map['channel'] as String,
+    );
+  }
+
+  @override
+  List<Object?> get props => [id, companyId, staffId, minutesBefore, channel];
+
+  // Helper per la UI: formatta i minuti in qualcosa di leggibile (es. "1 ora prima")
+  String get friendlyTime {
+    if (minutesBefore < 60) return '$minutesBefore minuti prima';
+    if (minutesBefore == 60) return '1 ora prima';
+    if (minutesBefore < 1440) return '${minutesBefore ~/ 60} ore prima';
+    if (minutesBefore == 1440) return '1 giorno prima';
+    return '${minutesBefore ~/ 1440} giorni prima';
+  }
+}

lib/features/tasks/models/task_model.dart

@@ -9,11 +9,12 @@ class TaskModel extends Equatable {
   final String? description;
   final List<String> assignedToIds;
   final List<StaffMemberModel> assignedToStaff; // I dati completi dal JOIN
-  final String? createdById;
+  final StaffMemberModel? createdBy;
   final DateTime? dueDate;
   final TaskStatus status;
   final DateTime? createdAt;
   final String? storeId;
+  final StaffMemberModel? updatedBy;
 
   const TaskModel({
     this.id,
@@ -22,22 +23,25 @@ class TaskModel extends Equatable {
     this.description,
     this.assignedToIds = const [],
     this.assignedToStaff = const [],
-    this.createdById,
+    this.createdBy,
     this.dueDate,
     this.status = TaskStatus.open,
     this.createdAt,
     this.storeId,
+    this.updatedBy,
   });
 
+  bool get isGlobal => storeId == null;
+
   // --- FACTORY: MODELLO VUOTO (Per le creazioni) ---
-  factory TaskModel.empty({String? companyId, String? createdById}) {
+  factory TaskModel.empty({String? companyId, StaffMemberModel? createdBy}) {
     return TaskModel(
       companyId: companyId,
       title: '',
       description: '',
       assignedToIds: const [],
       assignedToStaff: const [],
-      createdById: createdById,
+      createdBy: createdBy,
       status: TaskStatus.open,
       createdAt: DateTime.now(),
     );
@@ -52,11 +56,12 @@ class TaskModel extends Equatable {
     description,
     assignedToIds,
     assignedToStaff,
-    createdById,
+    createdBy,
     dueDate,
     status,
     createdAt,
     storeId,
+    updatedBy,
   ];
 
   // --- COPY WITH ---
@@ -67,13 +72,15 @@ class TaskModel extends Equatable {
     String? description,
     List<String>? assignedToIds,
     List<StaffMemberModel>? assignedToStaff,
-    String? createdById,
+    StaffMemberModel? createdBy,
     DateTime? dueDate,
     bool clearDueDate = false, // Flag ninja per resettare la scadenza
     TaskStatus? status,
     DateTime? createdAt,
     String? storeId,
     bool clearStoreId = false,
+    StaffMemberModel? updatedBy,
+    String? updatedByDisplayName,
   }) {
     return TaskModel(
       id: id ?? this.id,
@@ -82,11 +89,12 @@ class TaskModel extends Equatable {
       description: description ?? this.description,
       assignedToIds: assignedToIds ?? this.assignedToIds,
       assignedToStaff: assignedToStaff ?? this.assignedToStaff,
-      createdById: createdById ?? this.createdById,
+      createdBy: createdBy ?? this.createdBy,
       dueDate: clearDueDate ? null : (dueDate ?? this.dueDate),
       status: status ?? this.status,
       createdAt: createdAt ?? this.createdAt,
       storeId: clearStoreId ? null : (storeId ?? this.storeId),
+      updatedBy: updatedBy ?? this.updatedBy,
     );
   }
 
@@ -122,7 +130,9 @@ class TaskModel extends Equatable {
       description: map['description'] as String?,
       assignedToIds: parsedAssignedToIds,
       assignedToStaff: staffList,
-      createdById: map['created_by_id'] as String?,
+      createdBy: map['created_by_id'] != null
+          ? StaffMemberModel.fromMap(map['creator'])
+          : null,
       dueDate: map['due_date'] != null
           ? DateTime.parse(map['due_date'] as String).toLocal()
           : null,
@@ -131,6 +141,9 @@ class TaskModel extends Equatable {
           ? DateTime.parse(map['created_at'] as String).toLocal()
           : null,
       storeId: map['store_id'] as String?,
+      updatedBy: map['updated_by_id'] != null
+          ? StaffMemberModel.fromMap(map['updater'])
+          : null,
     );
   }
 
@@ -143,10 +156,11 @@ class TaskModel extends Equatable {
       if (description != null) 'description': description,
       // Passiamo l'array vuoto se non ci sono assegnazioni
       'assigned_to_ids': assignedToIds.isEmpty ? null : assignedToIds,
-      if (createdById != null) 'created_by_id': createdById,
+      if (createdBy != null) 'created_by_id': createdBy!.id,
       'due_date': dueDate?.toUtc().toIso8601String(),
       'status': status.toValue,
       'store_id': storeId,
+      if (updatedBy != null) 'updated_by_id': updatedBy!.id,
     };
   }
 }

lib/features/tasks/models/task_reminder_config.dart

@@ -0,0 +1,22 @@
+import 'package:equatable/equatable.dart';
+
+class TaskReminderConfig extends Equatable {
+  final int minutesBefore;
+  final String channel; // 'push' o 'email'
+
+  const TaskReminderConfig({
+    required this.minutesBefore,
+    required this.channel,
+  });
+
+  String get friendlyTime {
+    if (minutesBefore < 60) return '$minutesBefore minuti prima';
+    if (minutesBefore == 60) return '1 ora prima';
+    if (minutesBefore < 1440) return '${minutesBefore ~/ 60} ore prima';
+    if (minutesBefore == 1440) return '1 giorno prima';
+    return '${minutesBefore ~/ 1440} giorni prima';
+  }
+
+  @override
+  List<Object?> get props => [minutesBefore, channel];
+}

lib/features/tasks/models/task_status.dart

@@ -2,7 +2,7 @@
 enum TaskStatus { open, inProgress, completed }
 
 extension TaskStatusExtension on TaskStatus {
-  String get name {
+  String get displayName {
     switch (this) {
       case TaskStatus.open:
         return 'Da Iniziare';

lib/features/tasks/ui/task_form_screen.dart

@@ -1,6 +1,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/features/tasks/blocs/task_form_cubit.dart';
+import 'package:flux/features/tasks/models/task_status.dart';
 import 'package:go_router/go_router.dart';
 
 class TaskFormScreen extends StatefulWidget {
@@ -31,6 +32,62 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
     super.dispose();
   }
 
+  void _showAddReminderDialog(BuildContext context, TaskFormCubit cubit) {
+    int minutes = 15;
+    String channel = 'push';
+
+    showDialog(
+      context: context,
+      builder: (dialogContext) {
+        return AlertDialog(
+          title: const Text('Aggiungi Promemoria'),
+          content: Column(
+            mainAxisSize: MainAxisSize.min,
+            children: [
+              DropdownButtonFormField<int>(
+                initialValue: minutes,
+                decoration: const InputDecoration(labelText: 'Preavviso'),
+                items: const [
+                  DropdownMenuItem(value: 5, child: Text('5 minuti prima')),
+                  DropdownMenuItem(value: 15, child: Text('15 minuti prima')),
+                  DropdownMenuItem(value: 60, child: Text('1 ora prima')),
+                  DropdownMenuItem(value: 1440, child: Text('1 giorno prima')),
+                ],
+                onChanged: (v) => {if (v != null) minutes = v},
+              ),
+              const SizedBox(height: 16),
+              DropdownButtonFormField<String>(
+                initialValue: channel,
+                decoration: const InputDecoration(labelText: 'Canale'),
+                items: const [
+                  DropdownMenuItem(value: 'push', child: Text('Notifica Push')),
+                  DropdownMenuItem(value: 'email', child: Text('Email')),
+                ],
+                onChanged: (v) => {if (v != null) channel = v},
+              ),
+            ],
+          ),
+          actions: [
+            TextButton(
+              onPressed: () => Navigator.pop(dialogContext),
+              child: const Text('Annulla'),
+            ),
+            TextButton(
+              onPressed: () {
+                cubit.addReminderRule(minutes, channel);
+                Navigator.pop(dialogContext);
+              },
+              child: const Text(
+                'Inserisci',
+                style: TextStyle(color: Colors.orange),
+              ),
+            ),
+          ],
+        );
+      },
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return BlocConsumer<TaskFormCubit, TaskFormState>(
@@ -67,6 +124,30 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
           appBar: AppBar(
             title: Text(isEditing ? 'Modifica Task' : 'Nuovo Task'),
             actions: [
+              // 🥷 1. BOTTONE COMPLETAMENTO RAPIDO (Solo se in edit e non già completato)
+              if (isEditing && state.taskStatus != TaskStatus.completed)
+                Padding(
+                  padding: const EdgeInsets.symmetric(
+                    horizontal: 8.0,
+                    vertical: 8.0,
+                  ),
+                  child: ElevatedButton.icon(
+                    onPressed: () {
+                      context.read<TaskFormCubit>().updateTaskStatus(
+                        TaskStatus.completed,
+                      );
+                    },
+                    icon: const Icon(Icons.check_circle_outline),
+                    label: const Text('Completa'),
+                    style: ElevatedButton.styleFrom(
+                      backgroundColor: Colors.green.shade600,
+                      foregroundColor: Colors.white,
+                      elevation: 0,
+                    ),
+                  ),
+                ),
+
+              // 🥷 2. LOADER O BOTTONE SALVA
               if (state.status == TaskFormStatus.submitting)
                 const Padding(
                   padding: EdgeInsets.all(16.0),
@@ -77,9 +158,11 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
                   ),
                 )
               else
-                TextButton.icon(
+                Padding(
+                  padding: const EdgeInsets.only(right: 8.0),
+                  child: TextButton.icon(
                     onPressed: state.isFormValid
-                      ? () => cubit.saveTask(currentUserId: 'TODO_USER_ID')
+                        ? () => cubit.saveTask()
                         : null,
                     icon: const Icon(Icons.save),
                     label: const Text('Salva'),
@@ -88,6 +171,7 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
                       disabledForegroundColor: Colors.grey,
                     ),
                   ),
+                ),
             ],
           ),
           body: state.status == TaskFormStatus.loading
@@ -162,7 +246,8 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
     TaskFormState state,
     TaskFormCubit cubit,
   ) {
-    return Column(
+    return FocusTraversalGroup(
+      child: Column(
         crossAxisAlignment: CrossAxisAlignment.start,
         children: [
           Card(
@@ -209,6 +294,45 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
             ),
             onChanged: cubit.updateDescription,
           ),
+          if (state.id != null) ...[
+            const SizedBox(height: 16),
+            DropdownButtonFormField<TaskStatus>(
+              // Leggiamo lo stato attuale dal Cubit (o usiamo un default per i nuovi task)
+              initialValue: state.taskStatus,
+
+              decoration: InputDecoration(
+                labelText: 'Stato Attuale',
+                prefixIcon: const Icon(Icons.flag_outlined),
+                border: OutlineInputBorder(
+                  borderRadius: BorderRadius.circular(12),
+                ),
+                filled: true,
+                fillColor: Theme.of(context).colorScheme.surface,
+              ),
+
+              // Mappiamo tutti i valori dell'enum in elementi della tendina
+              items: TaskStatus.values.map((TaskStatus status) {
+                return DropdownMenuItem<TaskStatus>(
+                  value: status,
+                  child: Text(
+                    status
+                        .displayName, // Usa la property displayName del tuo enum!
+                    style: TextStyle(
+                      fontWeight: status == state.taskStatus
+                          ? FontWeight.bold
+                          : FontWeight.normal,
+                    ),
+                  ),
+                );
+              }).toList(),
+
+              onChanged: (TaskStatus? newStatus) {
+                if (newStatus != null && newStatus != state.taskStatus) {
+                  context.read<TaskFormCubit>().updateTaskStatus(newStatus);
+                }
+              },
+            ),
+          ],
           const SizedBox(height: 24),
 
           // --- SCADENZA ---
@@ -220,7 +344,8 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
             leading: const Icon(Icons.calendar_today, color: Colors.orange),
             title: Text(
               state.dueDate != null
-                ? 'Scadenza: ${state.dueDate!.day}/${state.dueDate!.month}/${state.dueDate!.year}'
+                  // Formattiamo aggiungendo gli zeri (es. 05/09/2026 alle 09:05)
+                  ? 'Scadenza: ${state.dueDate!.day.toString().padLeft(2, '0')}/${state.dueDate!.month.toString().padLeft(2, '0')}/${state.dueDate!.year} alle ${state.dueDate!.hour.toString().padLeft(2, '0')}:${state.dueDate!.minute.toString().padLeft(2, '0')}'
                   : 'Nessuna scadenza impostata',
             ),
             trailing: state.dueDate != null
@@ -230,16 +355,111 @@ class _TaskFormScreenState extends State<TaskFormScreen> {
                   )
                 : null,
             onTap: () async {
+              // 1. Chiediamo prima la Data
               final date = await showDatePicker(
                 context: context,
                 initialDate: state.dueDate ?? DateTime.now(),
                 firstDate: DateTime.now(),
                 lastDate: DateTime(2100),
               );
-            if (date != null) cubit.updateDueDate(date);
+
+              // Se l'utente chiude il calendario senza scegliere, ci fermiamo
+              if (date == null || !context.mounted) return;
+
+              // 2. Chiediamo subito dopo l'Orario
+              final time = await showTimePicker(
+                context: context,
+                initialTime: state.dueDate != null
+                    ? TimeOfDay.fromDateTime(state.dueDate!)
+                    : const TimeOfDay(hour: 9, minute: 0), // Default ore 09:00
+              );
+
+              // Se l'utente chiude l'orologio senza scegliere, ci fermiamo
+              if (time == null) return;
+
+              // 3. Fondiamo Data e Ora in un nuovo oggetto DateTime
+              final finalDateTime = DateTime(
+                date.year,
+                date.month,
+                date.day,
+                time.hour,
+                time.minute,
+              );
+
+              // Aggiorniamo lo stato tramite il Cubit
+              cubit.updateDueDate(finalDateTime);
             },
           ),
+          if (state.dueDate != null) ...[
+            const SizedBox(height: 24),
+            Text(
+              'Promemoria del Task',
+              style: Theme.of(
+                context,
+              ).textTheme.titleMedium?.copyWith(fontWeight: FontWeight.bold),
+            ),
+            const SizedBox(height: 8),
+            Card(
+              elevation: 0,
+              shape: RoundedRectangleBorder(
+                borderRadius: BorderRadius.circular(12),
+                side: BorderSide(
+                  color: Theme.of(context).dividerColor.withValues(alpha: 0.3),
+                ),
+              ),
+              child: Padding(
+                padding: const EdgeInsets.all(12.0),
+                child: Column(
+                  children: [
+                    // Elenco dei promemoria attuali del form
+                    ListView.builder(
+                      shrinkWrap: true,
+                      physics: const NeverScrollableScrollPhysics(),
+                      itemCount: state.reminders.length,
+                      itemBuilder: (context, index) {
+                        final reminder = state.reminders[index];
+                        final isPush = reminder.channel == 'push';
+
+                        return ListTile(
+                          dense: true,
+                          leading: Icon(
+                            isPush
+                                ? Icons.notifications_active_outlined
+                                : Icons.mail_outline,
+                            color: isPush ? Colors.orange : Colors.blue,
+                          ),
+                          title: Text(
+                            reminder.friendlyTime,
+                            style: const TextStyle(fontWeight: FontWeight.w600),
+                          ),
+                          trailing: IconButton(
+                            icon: const Icon(
+                              Icons.close,
+                              size: 18,
+                              color: Colors.redAccent,
+                            ),
+                            onPressed: () => cubit.removeReminderRule(index),
+                          ),
+                        );
+                      },
+                    ),
+                    const Divider(),
+                    // Tasto di aggiunta rapida promemoria
+                    TextButton.icon(
+                      onPressed: () => _showAddReminderDialog(context, cubit),
+                      icon: const Icon(Icons.add, size: 18),
+                      label: const Text('Aggiungi un promemoria a questo task'),
+                      style: TextButton.styleFrom(
+                        foregroundColor: Colors.orange,
+                      ),
+                    ),
                   ],
+                ),
+              ),
+            ),
+          ],
+        ],
+      ),
     );
   }
 

lib/features/tickets/blocs/ticket_form_cubit.dart

@@ -367,4 +367,22 @@ class TicketFormCubit extends Cubit<TicketFormState> {
       );
     }
   }
+
+  Future<void> deleteTicket() async {
+    final currentTicket = state.ticket;
+
+    if (currentTicket.id == null || currentTicket.id!.isEmpty) return;
+
+    try {
+      await _repository.deleteTicket(currentTicket.id!);
+      emit(state.copyWith(status: TicketFormStatus.deleted));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: TicketFormStatus.failure,
+          errorMessage: 'Errore durante l\'eliminazione: $e',
+        ),
+      );
+    }
+  }
 }

lib/features/tickets/blocs/ticket_form_state.dart

@@ -2,7 +2,16 @@ import 'package:equatable/equatable.dart';
 import 'package:flux/features/tickets/models/ticket_model.dart';
 // Adatta gli import al tuo progetto!
 
-enum TicketFormStatus { initial, ready, loading, saving, success, pop, failure }
+enum TicketFormStatus {
+  initial,
+  ready,
+  loading,
+  saving,
+  success,
+  pop,
+  failure,
+  deleted,
+}
 
 class TicketFormState extends Equatable {
   final TicketModel ticket;

lib/features/tickets/blocs/ticket_list_cubit.dart

@@ -158,4 +158,19 @@ class TicketListCubit extends Cubit<TicketListState> {
     // Opzionale: Se vuoi comunque riallinearti al server in modo silenzioso dopo l'animazione
     // loadTickets(refresh: true);
   }
+
+  Future<void> deleteTickets(List<TicketModel> tickets) async {
+    try {
+      for (final ticket in tickets) {
+        await _repository.deleteTicket(ticket.id!);
+      }
+      // Rimuoviamo i ticket localmente senza ricaricare tutto
+      final remainingTickets = state.tickets
+          .where((t) => !tickets.any((toDelete) => toDelete.id == t.id))
+          .toList();
+      emit(state.copyWith(tickets: remainingTickets, selectedTickets: {}));
+    } catch (e) {
+      emit(state.copyWith(errorMessage: e.toString()));
+    }
+  }
 }

lib/features/tickets/data/ticket_repository.dart

@@ -75,7 +75,9 @@ class TicketRepository {
   }
 
   // --- RECUPERO PAGINATO CON FILTRI E JOIN DEI TICKET DI TUTTA L'AZIENDA ---
-  Future<List<TicketModel>> fetchCompanyTickets({
+  Future<List<TicketModel>> fetchTickets({
+    required String? companyId,
+    String? storeId,
     required int offset,
     int limit = 50,
     String? searchTerm,
@@ -96,7 +98,7 @@ class TicketRepository {
             target_model:${Tables.models}!ticket_model_id_1_fkey (*),
             source_model:${Tables.models}!ticket_model_id_2_fkey (*)
           ''')
-          .eq('company_id', GetIt.I.get<SessionCubit>().state.company!.id!);
+          .eq('company_id', companyId!);
 
       // Filtro Range Date
       if (dateRange != null) {
@@ -105,6 +107,10 @@ class TicketRepository {
             .lte('created_at', dateRange.end.toIso8601String());
       }
 
+      if (storeId != null) {
+        query = query.or('store_id.eq.$storeId,store_id.is.null');
+      }
+
       if (ticketStatusFilter != null) {
         query = query.eq('status', ticketStatusFilter.value);
       }

lib/features/tickets/ui/ticket_form_screen.dart

@@ -348,6 +348,32 @@ class _TicketFormScreenState extends State<TicketFormScreen> {
     trackingCubit.loadTrackings(ticketId, TrackingParentType.ticket);
   }
 
+  void _deleteTicket(TicketModel ticket, {Color color = Colors.red}) {
+    showDialog(
+      context: context,
+      builder: (context) => AlertDialog(
+        title: const Text('Conferma Cancellazione'),
+        content: Text(
+          'Sei sicuro di voler cancellare il ticket "${ticket.referenceId}"? Questa azione è irreversibile.',
+        ),
+        actions: [
+          TextButton(
+            onPressed: () => Navigator.of(context).pop(),
+            child: const Text('Annulla'),
+          ),
+          ElevatedButton(
+            style: ElevatedButton.styleFrom(backgroundColor: color),
+            onPressed: () {
+              context.read<TicketFormCubit>().deleteTicket();
+              Navigator.of(context).pop(); // Chiude il dialog
+            },
+            child: const Text('Cancella Ticket'),
+          ),
+        ],
+      ),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
@@ -359,6 +385,10 @@ class _TicketFormScreenState extends State<TicketFormScreen> {
           _syncTextControllers(state.ticket);
         }
 
+        if (state.status == TicketFormStatus.deleted) {
+          Navigator.of(context).pop();
+        }
+
         if (state.status == TicketFormStatus.success) {
           context.read<TicketListCubit>().loadTickets(refresh: true);
           _showSuccessActions(
@@ -388,32 +418,33 @@ class _TicketFormScreenState extends State<TicketFormScreen> {
                   : 'Modifica Ticket - Operatore: ${state.ticket.createdByName}',
             ),
             actions: [
-              BlocBuilder<TicketFormCubit, TicketFormState>(
+              if (ticket.id != null) ...[
-                builder: (context, state) {
+                Padding(
-                  final ticket = state.ticket;
+                  padding: const EdgeInsets.symmetric(
-
+                    horizontal: 16.0,
-                  // Se il ticket non è ancora salvato, niente azioni rapide
+                    vertical: 8.0,
-                  if (ticket.id == null || ticket.id!.isEmpty) {
+                  ),
-                    return const SizedBox.shrink();
+                  child: FilledButton.icon(
-                  }
+                    onPressed: () => _deleteTicket(ticket, color: Colors.red),
-
+                    icon: const Icon(Icons.delete),
-                  // CONDIZIONE A: Da iniziare
+                    label: const Text('Cancella Ticket'),
+                  ),
+                ),
+              ],
               if (ticket.ticketStatus == TicketStatus.open ||
-                      ticket.ticketStatus == TicketStatus.waitingForParts) {
+                  ticket.ticketStatus == TicketStatus.waitingForParts) ...[
-                    return Padding(
+                // CONDIZIONE A: Da iniziare
+                Padding(
                   padding: const EdgeInsets.symmetric(
                     horizontal: 16.0,
                     vertical: 8.0,
                   ),
                   child: FilledButton.icon(
                     style: FilledButton.styleFrom(
-                          backgroundColor:
+                      backgroundColor: Colors.amber.shade700, // Colore Action
-                              Colors.amber.shade700, // Colore Action
                     ),
                     onPressed: () async {
-                          StaffMemberModel? takenBy = await getStaffMember(
+                      StaffMemberModel? takenBy = await getStaffMember(context);
-                            context,
-                          );
                       if (takenBy == null || !context.mounted) return;
                       context.read<TicketFormCubit>().takeInCharge(
                         staffId: takenBy.id!,
@@ -427,11 +458,10 @@ class _TicketFormScreenState extends State<TicketFormScreen> {
                       style: TextStyle(color: Colors.white),
                     ),
                   ),
-                    );
+                ),
-                  }
+              ],
-                  // CONDIZIONE B: Già in lavorazione
+              if (ticket.ticketStatus == TicketStatus.inProgress) ...[
-                  else if (ticket.ticketStatus == TicketStatus.inProgress) {
+                Padding(
-                    return Padding(
                   padding: const EdgeInsets.symmetric(
                     horizontal: 16.0,
                     vertical: 8.0,
@@ -441,13 +471,8 @@ class _TicketFormScreenState extends State<TicketFormScreen> {
                     icon: const Icon(Icons.handyman),
                     label: const Text('Vai a Lavorazione'),
                   ),
-                    );
-                  }
-
-                  // Se è chiuso o in altri stati strani, nascondiamo il bottone
-                  return const SizedBox.shrink();
-                },
                 ),
+              ],
               Padding(
                 padding: const EdgeInsets.only(right: 16.0),
                 child: Chip(

lib/features/tickets/ui/widgets/ticket_list.dart

@@ -78,6 +78,12 @@ class TicketList extends StatelessWidget {
     }
   }
 
+  void _deleteTickets(BuildContext context) {
+    context.read<TicketListCubit>().deleteTickets(
+      state.selectedTickets.toList(),
+    );
+  }
+
   @override
   Widget build(BuildContext context) {
     return Stack(
@@ -178,6 +184,11 @@ class TicketList extends StatelessWidget {
                           runSpacing: 8.0,
                           alignment: WrapAlignment.end,
                           children: [
+                            IconButton.filled(
+                              tooltip: 'Elimina',
+                              onPressed: () => _deleteTickets(context),
+                              icon: const Icon(Icons.delete),
+                            ),
                             IconButton.filled(
                               tooltip: 'Riconsegna',
                               onPressed: () => _setStatusClosed(context),

lib/firebase_options.dart

@@ -0,0 +1,89 @@
+// File generated by FlutterFire CLI.
+// ignore_for_file: type=lint
+import 'package:firebase_core/firebase_core.dart' show FirebaseOptions;
+import 'package:flutter/foundation.dart'
+    show defaultTargetPlatform, kIsWeb, TargetPlatform;
+
+/// Default [FirebaseOptions] for use with your Firebase apps.
+///
+/// Example:
+/// ```dart
+/// import 'firebase_options.dart';
+/// // ...
+/// await Firebase.initializeApp(
+///   options: DefaultFirebaseOptions.currentPlatform,
+/// );
+/// ```
+class DefaultFirebaseOptions {
+  static FirebaseOptions get currentPlatform {
+    if (kIsWeb) {
+      return web;
+    }
+    switch (defaultTargetPlatform) {
+      case TargetPlatform.android:
+        return android;
+      case TargetPlatform.iOS:
+        return ios;
+      case TargetPlatform.macOS:
+        return macos;
+      case TargetPlatform.windows:
+        return windows;
+      case TargetPlatform.linux:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions have not been configured for linux - '
+          'you can reconfigure this by running the FlutterFire CLI again.',
+        );
+      default:
+        throw UnsupportedError(
+          'DefaultFirebaseOptions are not supported for this platform.',
+        );
+    }
+  }
+
+  static const FirebaseOptions web = FirebaseOptions(
+    apiKey: 'AIzaSyACOLz2mY8fHd5RWfJmDvN53LCd5_TxI6o',
+    appId: '1:249756116297:web:7c652e51004414b7cf2698',
+    messagingSenderId: '249756116297',
+    projectId: 'flux-87e49',
+    authDomain: 'flux-87e49.firebaseapp.com',
+    storageBucket: 'flux-87e49.firebasestorage.app',
+    measurementId: 'G-6V4VN8GWWZ',
+  );
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyA6-uX6504B3yofeo7YQwfQaS0cCDoZnvY',
+    appId: '1:249756116297:android:a2c3d37323752069cf2698',
+    messagingSenderId: '249756116297',
+    projectId: 'flux-87e49',
+    storageBucket: 'flux-87e49.firebasestorage.app',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyAllwaoNyqHsZtqfMMo9DxVS6-q7yBwWow',
+    appId: '1:249756116297:ios:fe9dadca7150da16cf2698',
+    messagingSenderId: '249756116297',
+    projectId: 'flux-87e49',
+    storageBucket: 'flux-87e49.firebasestorage.app',
+    iosBundleId: 'com.catellisrl.flux',
+  );
+
+  static const FirebaseOptions macos = FirebaseOptions(
+    apiKey: 'AIzaSyAllwaoNyqHsZtqfMMo9DxVS6-q7yBwWow',
+    appId: '1:249756116297:ios:fe9dadca7150da16cf2698',
+    messagingSenderId: '249756116297',
+    projectId: 'flux-87e49',
+    storageBucket: 'flux-87e49.firebasestorage.app',
+    iosBundleId: 'com.catellisrl.flux',
+  );
+
+  static const FirebaseOptions windows = FirebaseOptions(
+    apiKey: 'AIzaSyACOLz2mY8fHd5RWfJmDvN53LCd5_TxI6o',
+    appId: '1:249756116297:web:b094277c2fedb425cf2698',
+    messagingSenderId: '249756116297',
+    projectId: 'flux-87e49',
+    authDomain: 'flux-87e49.firebaseapp.com',
+    storageBucket: 'flux-87e49.firebasestorage.app',
+    measurementId: 'G-8E29KT6RWX',
+  );
+
+}

lib/main.dart

@@ -1,15 +1,19 @@
+import 'dart:async';
 import 'dart:io';
 
+import 'package:firebase_core/firebase_core.dart';
 import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flutter_dotenv/flutter_dotenv.dart';
+import 'package:flux/core/services/notification_service.dart';
 import 'package:flux/core/utils/version_check_service.dart';
 import 'package:flux/features/attachments/data/attachments_repository.dart';
 import 'package:flux/features/auth/bloc/auth_cubit.dart';
 import 'package:flux/features/company/data/company_repository.dart';
-import 'package:flux/features/notes/blocs/notes_bloc.dart';
+import 'package:flux/features/notes/blocs/notes_cubit.dart';
 import 'package:flux/features/notes/data/notes_repository.dart';
+import 'package:flux/features/settings/data/settings_repository.dart';
 import 'package:flux/features/tasks/data/task_repository.dart';
 import 'package:flux/features/tickets/data/tickets_shipping_repository.dart';
 import 'package:flux/features/master_data/providers/blocs/provider_list_cubit.dart';
@@ -21,6 +25,7 @@ import 'package:flux/features/tickets/blocs/ticket_list_cubit.dart';
 import 'package:flux/features/tickets/data/ticket_repository.dart';
 import 'package:flux/features/tracking/blocs/tracking_cubit.dart';
 import 'package:flux/features/tracking/data/tracking_repository.dart';
+import 'package:flux/firebase_options.dart';
 import 'package:flux/l10n/app_localizations.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
@@ -40,18 +45,35 @@ import 'package:flux/features/master_data/staff/blocs/staff_cubit.dart';
 import 'package:flux/features/master_data/staff/data/staff_repository.dart';
 import 'package:flux/features/master_data/store/bloc/store_cubit.dart';
 import 'package:flux/features/master_data/store/data/store_repository.dart';
-import 'package:flux/features/settings/settings.dart';
+import 'package:flux/features/settings/ui/settings.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
 import 'package:url_launcher/url_launcher.dart';
+import 'package:universal_html/html.dart' as html;
 
+String? initialRecoveryFragment;
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
+  final initialUri = Uri.base;
+  if (initialUri.fragment.contains('access_token=')) {
+    initialRecoveryFragment = initialUri.fragment;
+  }
   await dotenv.load(fileName: ".env");
 
   // Inizializza le dipendenze PRIMA di lanciare l'app
   await setupLocator();
   // RIMUOVE IL CARATTERE # DAGLI URL WEB!
   usePathUrlStrategy();
+  // Lo Scudo Ninja: Inizializziamo Firebase SOLO sulle piattaforme supportate
+  if (kIsWeb || Platform.isAndroid || Platform.isIOS || Platform.isMacOS) {
+    try {
+      await Firebase.initializeApp(
+        options: DefaultFirebaseOptions.currentPlatform,
+      );
+      await setupInteractedMessage();
+    } catch (e) {
+      debugPrint('Errore inizializzazione Firebase: $e');
+    }
+  }
   runApp(
     MultiBlocProvider(
       providers: [
@@ -78,7 +100,7 @@ void main() async {
         BlocProvider<TicketListCubit>(create: (_) => TicketListCubit()),
         BlocProvider<OperationListCubit>(create: (_) => OperationListCubit()),
         BlocProvider<TrackingCubit>(create: (_) => TrackingCubit()),
-        BlocProvider<NotesBloc>(create: (_) => NotesBloc()),
+        BlocProvider<NotesCubit>(create: (_) => NotesCubit()),
       ],
       child: const FluxApp(),
     ),
@@ -137,7 +159,8 @@ Future<void> setupLocator() async {
     () => TicketsShippingRepository(),
   );
   getIt.registerLazySingleton<NotesRepository>(() => NotesRepository());
-  getIt.registerLazySingleton<TaskRepository>(() => TaskRepository());
+  getIt.registerLazySingleton<TasksRepository>(() => TasksRepository());
+  getIt.registerLazySingleton<SettingsRepository>(() => SettingsRepository());
 }
 
 class FluxApp extends StatefulWidget {
@@ -180,6 +203,13 @@ class _FluxAppState extends State<FluxApp> {
           return _buildLoadingScreen();
         }
 
+        if (sessionState.status == SessionStatus.error) {
+          return _buildSessionErrorScreen(
+            state: sessionState,
+            context: context,
+          );
+        }
+
         return BlocBuilder<ThemeBloc, ThemeState>(
           builder: (context, themeState) {
             return MaterialApp.router(
@@ -231,6 +261,42 @@ class _FluxAppState extends State<FluxApp> {
   }
 }
 
+Widget _buildSessionErrorScreen({
+  required SessionState state,
+  required BuildContext context,
+}) {
+  return MaterialApp(
+    home: Scaffold(
+      body: Center(
+        child: Padding(
+          padding: const EdgeInsets.all(24.0),
+          child: Column(
+            mainAxisAlignment: MainAxisAlignment.center,
+            children: [
+              const Icon(Icons.wifi_off_rounded, size: 64, color: Colors.grey),
+              const SizedBox(height: 16),
+              Text(
+                state.errorMessage ?? 'Errore nella connessione',
+                textAlign: TextAlign.center,
+                style: const TextStyle(fontSize: 16),
+              ),
+              const SizedBox(height: 24),
+              ElevatedButton.icon(
+                onPressed: () {
+                  // Il ninja riprova a lanciare l'inizializzazione
+                  context.read<SessionCubit>().initializeSession();
+                },
+                icon: const Icon(Icons.refresh),
+                label: const Text("Riprova a connetterti"),
+              ),
+            ],
+          ),
+        ),
+      ),
+    ),
+  );
+}
+
 // --- IL WIDGET GUARDIANO DEGLI AGGIORNAMENTI ---
 class GlobalUpdateChecker extends StatefulWidget {
   final Widget child;
@@ -240,21 +306,69 @@ class GlobalUpdateChecker extends StatefulWidget {
   State<GlobalUpdateChecker> createState() => _GlobalUpdateCheckerState();
 }
 
-class _GlobalUpdateCheckerState extends State<GlobalUpdateChecker> {
+class _GlobalUpdateCheckerState extends State<GlobalUpdateChecker>
+    with WidgetsBindingObserver {
   bool _mustUpdate = false;
   String? _updateUrl;
+  StreamSubscription? _versionSubscription;
 
   @override
   void initState() {
     super.initState();
-    _checkVersionAndBlock();
+    // 🥷 1. Registriamo questo widget per ascoltare i cicli vitali dell'app
+    WidgetsBinding.instance.addObserver(this);
+    _startRealtimeVersionCheck();
   }
 
-  Future<void> _checkVersionAndBlock() async {
+  @override
+  void dispose() {
+    // 🥷 2. Rimuoviamo l'observer quando il widget muore (mai, in questo caso, ma è buona norma)
+    WidgetsBinding.instance.removeObserver(this);
+    _stopRealtimeVersionCheck();
+    super.dispose();
+  }
+
+  // 🥷 3. IL VERO GESTORE DEL CICLO VITALE
+  @override
+  void didChangeAppLifecycleState(AppLifecycleState state) {
+    super.didChangeAppLifecycleState(state);
+
+    if (state == AppLifecycleState.resumed) {
+      // L'app è tornata attiva: riaccendiamo il radar
+      _startRealtimeVersionCheck();
+    } else if (state == AppLifecycleState.paused ||
+        state == AppLifecycleState.hidden) {
+      // L'app è andata in background: spegniamo il socket per evitare crash
+      _stopRealtimeVersionCheck();
+    }
+  }
+
+  void _startRealtimeVersionCheck() {
+    // Sicurezza: cancelliamo eventuali vecchi abbonamenti rimasti appesi
+    _stopRealtimeVersionCheck();
+
+    // Facciamo un check immediato non appena rientriamo in app
+    _checkVersion();
+
+    // Riapriamo il rubinetto di Supabase
+    _versionSubscription = GetIt.I<SupabaseClient>()
+        .from('app_config') // <-- Sostituisci col nome reale della tua tabella
+        .stream(primaryKey: ['id'])
+        .listen((_) {
+          _checkVersion();
+        });
+  }
+
+  void _stopRealtimeVersionCheck() {
+    // Chiudiamo gentilmente il socket
+    _versionSubscription?.cancel();
+    _versionSubscription = null;
+  }
+
+  Future<void> _checkVersion() async {
     final updateUrl = await VersionCheckService().checkForceUpdate();
 
     if (updateUrl != null && mounted) {
-      // Invece di aprire un dialog, cambiamo lo stato e attiviamo lo "Scudo"
       setState(() {
         _mustUpdate = true;
         _updateUrl = updateUrl;
@@ -264,21 +378,15 @@ class _GlobalUpdateCheckerState extends State<GlobalUpdateChecker> {
 
   @override
   Widget build(BuildContext context) {
-    // 1. Se l'app è aggiornata, mostriamo solo l'app normale
     if (!_mustUpdate) return widget.child;
 
-    // 2. Se l'app è vecchia, sovrapponiamo il blocco con uno Stack
     return Stack(
       children: [
-        // L'app sotto continua ad esistere, ma è inaccessibile
         widget.child,
-
-        // IL BLOCCO INVALICABILE SOPRA A TUTTO
         Positioned.fill(
           child: Container(
-            color: Colors.black.withValues(alpha: 0.85), // Sfondo oscurante
+            color: Colors.black.withValues(alpha: 0.85),
             child: Center(
-              // Usiamo Material per ereditare correttamente temi, font e colori
               child: Material(
                 color: Colors.transparent,
                 child: Container(
@@ -322,7 +430,7 @@ class _GlobalUpdateCheckerState extends State<GlobalUpdateChecker> {
                       const SizedBox(height: 16),
                       Text(
                         kIsWeb
-                            ? "È stata rilasciata una nuova versione dell'applicazione. Ricarica la pagina per continuare."
+                            ? "È stata rilasciata una nuova versione dell'applicazione. Ricarica la pagina per scaricare il nuovo codice."
                             : "Per continuare ad utilizzare l'applicazione è necessario scaricare e installare l'ultimo aggiornamento.",
                         textAlign: TextAlign.center,
                         style: const TextStyle(fontSize: 16),
@@ -335,18 +443,14 @@ class _GlobalUpdateCheckerState extends State<GlobalUpdateChecker> {
                           style: FilledButton.styleFrom(
                             minimumSize: const Size(double.infinity, 50),
                           ),
-                          onPressed: () async {
+                          onPressed: () {
-                            // Trick cross-platform per fare il reload
+                            // Hard reload aggirando la cache!
-                            await launchUrl(
+                            html.window.location.reload();
-                              Uri.parse(Uri.base.toString()),
-                              webOnlyWindowName: '_self',
-                            );
                           },
                         )
                       else
                         FilledButton.icon(
                           icon: const Icon(Icons.download),
-
                           label: const Text("SCARICA AGGIORNAMENTO"),
                           style: FilledButton.styleFrom(
                             minimumSize: const Size(double.infinity, 50),

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -8,6 +8,8 @@ import Foundation
 import app_links
 import file_picker
 import file_selector_macos
+import firebase_core
+import firebase_messaging
 import package_info_plus
 import pdfx
 import printing
@@ -18,6 +20,8 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
+  FLTFirebaseMessagingPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseMessagingPlugin"))
   FPPPackageInfoPlusPlugin.register(with: registry.registrar(forPlugin: "FPPPackageInfoPlusPlugin"))
   PdfxPlugin.register(with: registry.registrar(forPlugin: "PdfxPlugin"))
   PrintingPlugin.register(with: registry.registrar(forPlugin: "PrintingPlugin"))

macos/Podfile.lock

@@ -1,27 +1,159 @@
 PODS:
+  - app_links (6.4.1):
+    - FlutterMacOS
+  - file_picker (0.0.1):
+    - FlutterMacOS
+  - file_selector_macos (0.0.1):
+    - FlutterMacOS
+  - Firebase/CoreOnly (12.13.0):
+    - FirebaseCore (~> 12.13.0)
+  - Firebase/Messaging (12.13.0):
+    - Firebase/CoreOnly
+    - FirebaseMessaging (~> 12.13.0)
+  - firebase_core (4.9.0):
+    - Firebase/CoreOnly (~> 12.13.0)
+    - FlutterMacOS
+  - firebase_messaging (16.2.2):
+    - Firebase/CoreOnly (~> 12.13.0)
+    - Firebase/Messaging (~> 12.13.0)
+    - firebase_core
+    - FlutterMacOS
+  - FirebaseCore (12.13.0):
+    - FirebaseCoreInternal (~> 12.13.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Logger (~> 8.1)
+  - FirebaseCoreInternal (12.13.0):
+    - "GoogleUtilities/NSData+zlib (~> 8.1)"
+  - FirebaseInstallations (12.13.0):
+    - FirebaseCore (~> 12.13.0)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - PromisesObjC (~> 2.4)
+  - FirebaseMessaging (12.13.0):
+    - FirebaseCore (~> 12.13.0)
+    - FirebaseInstallations (~> 12.13.0)
+    - GoogleDataTransport (~> 10.1)
+    - GoogleUtilities/AppDelegateSwizzler (~> 8.1)
+    - GoogleUtilities/Environment (~> 8.1)
+    - GoogleUtilities/Reachability (~> 8.1)
+    - GoogleUtilities/UserDefaults (~> 8.1)
+    - nanopb (~> 3.30910.0)
   - FlutterMacOS (1.0.0)
+  - GoogleDataTransport (10.1.0):
+    - nanopb (~> 3.30910.0)
+    - PromisesObjC (~> 2.4)
+  - GoogleUtilities/AppDelegateSwizzler (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Network
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Environment (8.1.0):
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Logger (8.1.0):
+    - GoogleUtilities/Environment
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Network (8.1.0):
+    - GoogleUtilities/Logger
+    - "GoogleUtilities/NSData+zlib"
+    - GoogleUtilities/Privacy
+    - GoogleUtilities/Reachability
+  - "GoogleUtilities/NSData+zlib (8.1.0)":
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/Privacy (8.1.0)
+  - GoogleUtilities/Reachability (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - GoogleUtilities/UserDefaults (8.1.0):
+    - GoogleUtilities/Logger
+    - GoogleUtilities/Privacy
+  - nanopb (3.30910.0):
+    - nanopb/decode (= 3.30910.0)
+    - nanopb/encode (= 3.30910.0)
+  - nanopb/decode (3.30910.0)
+  - nanopb/encode (3.30910.0)
+  - package_info_plus (0.0.1):
+    - FlutterMacOS
   - pdfx (1.0.0):
     - FlutterMacOS
   - printing (1.0.0):
     - FlutterMacOS
+  - PromisesObjC (2.4.0)
+  - shared_preferences_foundation (0.0.1):
+    - Flutter
+    - FlutterMacOS
+  - url_launcher_macos (0.0.1):
+    - FlutterMacOS
 
 DEPENDENCIES:
+  - app_links (from `Flutter/ephemeral/.symlinks/plugins/app_links/macos`)
+  - file_picker (from `Flutter/ephemeral/.symlinks/plugins/file_picker/macos`)
+  - file_selector_macos (from `Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos`)
+  - firebase_core (from `Flutter/ephemeral/.symlinks/plugins/firebase_core/macos`)
+  - firebase_messaging (from `Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos`)
   - FlutterMacOS (from `Flutter/ephemeral`)
+  - package_info_plus (from `Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos`)
   - pdfx (from `Flutter/ephemeral/.symlinks/plugins/pdfx/macos`)
   - printing (from `Flutter/ephemeral/.symlinks/plugins/printing/macos`)
+  - shared_preferences_foundation (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin`)
+  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
+
+SPEC REPOS:
+  trunk:
+    - Firebase
+    - FirebaseCore
+    - FirebaseCoreInternal
+    - FirebaseInstallations
+    - FirebaseMessaging
+    - GoogleDataTransport
+    - GoogleUtilities
+    - nanopb
+    - PromisesObjC
 
 EXTERNAL SOURCES:
+  app_links:
+    :path: Flutter/ephemeral/.symlinks/plugins/app_links/macos
+  file_picker:
+    :path: Flutter/ephemeral/.symlinks/plugins/file_picker/macos
+  file_selector_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/file_selector_macos/macos
+  firebase_core:
+    :path: Flutter/ephemeral/.symlinks/plugins/firebase_core/macos
+  firebase_messaging:
+    :path: Flutter/ephemeral/.symlinks/plugins/firebase_messaging/macos
   FlutterMacOS:
     :path: Flutter/ephemeral
+  package_info_plus:
+    :path: Flutter/ephemeral/.symlinks/plugins/package_info_plus/macos
   pdfx:
     :path: Flutter/ephemeral/.symlinks/plugins/pdfx/macos
   printing:
     :path: Flutter/ephemeral/.symlinks/plugins/printing/macos
+  shared_preferences_foundation:
+    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_foundation/darwin
+  url_launcher_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
 
 SPEC CHECKSUMS:
+  app_links: 05a6ec2341985eb05e9f97dc63f5837c39895c3f
+  file_picker: 7584aae6fa07a041af2b36a2655122d42f578c1a
+  file_selector_macos: 9e9e068e90ebee155097d00e89ae91edb2374db7
+  Firebase: 7d62445aeabdaea36f7d372f33052fed9a72514f
+  firebase_core: 8a780c7f989df0ca42dcd55332fc1b203f11f848
+  firebase_messaging: 3cb926039fe036f6b92834334d6e23ab33007f1f
+  FirebaseCore: 58905958aa00a061397a0fd759ae4b55bddb3576
+  FirebaseCoreInternal: 37bee58388fc6d183f0ab1b32d69ae44f2cf8aad
+  FirebaseInstallations: 134bde50e477628ded76070efdb12d515d53f948
+  FirebaseMessaging: 30564b85d2f81a96f9d312bd23acf8186ff092ae
   FlutterMacOS: d0db08ddef1a9af05a5ec4b724367152bb0500b1
+  GoogleDataTransport: aae35b7ea0c09004c3797d53c8c41f66f219d6a7
+  GoogleUtilities: 00c88b9a86066ef77f0da2fab05f65d7768ed8e1
+  nanopb: fad817b59e0457d11a5dfbde799381cd727c1275
+  package_info_plus: f0052d280d17aa382b932f399edf32507174e870
   pdfx: 1e79f57f7a6ce2f4a4c30f21fa54d3dc82441b51
   printing: c4cf83c78fd684f9bc318e6aadc18972aa48f617
+  PromisesObjC: f5707f49cb48b9636751c5b2e7d227e43fba9f47
+  shared_preferences_foundation: 7036424c3d8ec98dfe75ff1667cb0cd531ec82bb
+  url_launcher_macos: f87a979182d112f911de6820aefddaf56ee9fbfd
 
 PODFILE CHECKSUM: 54d867c82ac51cbd61b565781b9fada492027009
 

macos/Runner.xcodeproj/project.pbxproj

@@ -28,8 +28,9 @@
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
 		47B861EC08643C31319819EE /* Pods_RunnerTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9AD6F0633B38D7C51DB0A44A /* Pods_RunnerTests.framework */; };
-		BC7B14BF366111D5491A16DE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C1847336C291D2358A2A03 /* Pods_Runner.framework */; };
+		654626D9777B906635ABD770 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 5541A1B1FDEB6E0619C1BD7E /* GoogleService-Info.plist */; };
 		78A318202AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage in Frameworks */ = {isa = PBXBuildFile; productRef = 78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */; };
+		BC7B14BF366111D5491A16DE /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F9C1847336C291D2358A2A03 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -79,7 +80,9 @@
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
+		5541A1B1FDEB6E0619C1BD7E /* GoogleService-Info.plist */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.plist.xml; name = "GoogleService-Info.plist"; path = "Runner/GoogleService-Info.plist"; sourceTree = "<group>"; };
 		64CEA5375FF158D0C9BAC5E3 /* Pods-RunnerTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.debug.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.debug.xcconfig"; sourceTree = "<group>"; };
+		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		7B4E4499661A94FDCB94A882 /* Pods-RunnerTests.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.profile.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.profile.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
@@ -89,7 +92,6 @@
 		EF12DE99A4F7A47E54D9243F /* Pods-RunnerTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-RunnerTests.release.xcconfig"; path = "Target Support Files/Pods-RunnerTests/Pods-RunnerTests.release.xcconfig"; sourceTree = "<group>"; };
 		F673AA005B814BAB5FA49C69 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		F9C1847336C291D2358A2A03 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
-		78E0A7A72DC9AD7400C4905E /* FlutterGeneratedPluginSwiftPackage */ = {isa = PBXFileReference; lastKnownFileType = wrapper; name = FlutterGeneratedPluginSwiftPackage; path = ephemeral/Packages/FlutterGeneratedPluginSwiftPackage; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -141,6 +143,7 @@
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
 				BABCD4273B81B107DD58605D /* Pods */,
+				5541A1B1FDEB6E0619C1BD7E /* GoogleService-Info.plist */,
 			);
 			sourceTree = "<group>";
 		};
@@ -235,9 +238,6 @@
 			productType = "com.apple.product-type.bundle.unit-test";
 		};
 		33CC10EC2044A3C60003C045 /* Runner */ = {
-			packageProductDependencies = (
-				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
-			);
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
@@ -248,6 +248,7 @@
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
 				E13C7961A1538309550A7824 /* [CP] Embed Pods Frameworks */,
+				AC0584CA1EFD6A4D37AEE7BD /* [CP] Copy Pods Resources */,
 			);
 			buildRules = (
 			);
@@ -255,6 +256,9 @@
 				33CC11202044C79F0003C045 /* PBXTargetDependency */,
 			);
 			name = Runner;
+			packageProductDependencies = (
+				78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */,
+			);
 			productName = Runner;
 			productReference = 33CC10ED2044A3C60003C045 /* flux.app */;
 			productType = "com.apple.product-type.application";
@@ -263,9 +267,6 @@
 
 /* Begin PBXProject section */
 		33CC10E52044A3C60003C045 /* Project object */ = {
-			packageReferences = (
-				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */,
-			);
 			isa = PBXProject;
 			attributes = {
 				BuildIndependentTargetsInParallel = YES;
@@ -302,6 +303,9 @@
 				Base,
 			);
 			mainGroup = 33CC10E42044A3C60003C045;
+			packageReferences = (
+				781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */,
+			);
 			productRefGroup = 33CC10EE2044A3C60003C045 /* Products */;
 			projectDirPath = "";
 			projectRoot = "";
@@ -327,6 +331,7 @@
 			files = (
 				33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */,
 				33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */,
+				654626D9777B906635ABD770 /* GoogleService-Info.plist in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -393,6 +398,23 @@
 			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
 			showEnvVarsInLog = 0;
 		};
+		AC0584CA1EFD6A4D37AEE7BD /* [CP] Copy Pods Resources */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Copy Pods Resources";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-resources.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 		E13C7961A1538309550A7824 /* [CP] Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -806,12 +828,14 @@
 			defaultConfigurationName = Release;
 		};
 /* End XCConfigurationList section */
+
 /* Begin XCLocalSwiftPackageReference section */
-		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage" */ = {
+		781AD8BC2B33823900A9FFBB /* XCLocalSwiftPackageReference "FlutterGeneratedPluginSwiftPackage" */ = {
 			isa = XCLocalSwiftPackageReference;
 			relativePath = Flutter/ephemeral/Packages/FlutterGeneratedPluginSwiftPackage;
 		};
 /* End XCLocalSwiftPackageReference section */
+
 /* Begin XCSwiftPackageProductDependency section */
 		78A3181F2AECB46A00862997 /* FlutterGeneratedPluginSwiftPackage */ = {
 			isa = XCSwiftPackageProductDependency;

macos/Runner/DebugProfile.entitlements

@@ -6,26 +6,19 @@
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
-	<key>com.apple.security.network.server</key>
+	<key>com.apple.security.device.audio-input</key>
-	<true/>
-	<key>com.apple.security.network.client</key>
-	<true/>
-	<key>com.apple.security.files.user-selected.read-write</key>
-    <true/>
-    
-    <key>com.apple.security.files.downloads.read-write</key>
-    <true/>
-
-    <key>com.apple.security.network.client</key>
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
-
-	<key>com.apple.security.device.audio-input</key>
-	<true/>
-	<key>com.apple.security.print</key>
 	<key>com.apple.security.files.downloads.read-write</key>
 	<true/>
+	<key>com.apple.security.files.user-selected.read-write</key>
+	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+	<key>com.apple.security.print</key>
 	<true/>
 </dict>
 </plist>

macos/Runner/GoogleService-Info.plist

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>API_KEY</key>
+	<string>AIzaSyAllwaoNyqHsZtqfMMo9DxVS6-q7yBwWow</string>
+	<key>GCM_SENDER_ID</key>
+	<string>249756116297</string>
+	<key>PLIST_VERSION</key>
+	<string>1</string>
+	<key>BUNDLE_ID</key>
+	<string>com.catellisrl.flux</string>
+	<key>PROJECT_ID</key>
+	<string>flux-87e49</string>
+	<key>STORAGE_BUCKET</key>
+	<string>flux-87e49.firebasestorage.app</string>
+	<key>IS_ADS_ENABLED</key>
+	<false></false>
+	<key>IS_ANALYTICS_ENABLED</key>
+	<false></false>
+	<key>IS_APPINVITE_ENABLED</key>
+	<true></true>
+	<key>IS_GCM_ENABLED</key>
+	<true></true>
+	<key>IS_SIGNIN_ENABLED</key>
+	<true></true>
+	<key>GOOGLE_APP_ID</key>
+	<string>1:249756116297:ios:fe9dadca7150da16cf2698</string>
+</dict>
+</plist>

macos/Runner/Release.entitlements

@@ -4,25 +4,17 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
-	<key>com.apple.security.network.client</key>
-	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
-    
+	<key>com.apple.security.device.audio-input</key>
-    <key>com.apple.security.files.downloads.read-write</key>
 	<true/>
 	<key>com.apple.security.device.camera</key>
 	<true/>
-
-    <key>com.apple.security.device.audio-input</key>
-    <true/>
-
 	<key>com.apple.security.files.user-selected.read-write</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 	<key>com.apple.security.print</key>
-    <key>com.apple.security.files.downloads.read-write</key>
 	<true/>
-<true/>
-    
 </dict>
 </plist>