ticket migration

.gitignore

@@ -6,7 +6,7 @@
 *.env
 .DS_Store
 .atom/
-.build/*
+.build/
 .buildlog/
 .history
 .svn/

.wrangler/cache/pages.json

@@ -1,4 +0,0 @@
-{
-  "account_id": "6badf20faeef39fa5c99283f46f07508",
-  "project_name": "flux"
-}

.wrangler/cache/wrangler-account.json

@@ -1,6 +0,0 @@
-{
-  "account": {
-    "id": "6badf20faeef39fa5c99283f46f07508",
-    "name": "Marco@catelli.it's Account"
-  }
-}

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,86 @@
+{
+  "project_info": {
+    "project_number": "872447580790",
+    "project_id": "assistenza-catelli",
+    "storage_bucket": "assistenza-catelli.firebasestorage.app"
+  },
+  "client": [
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:193235afcc2920ce5d9d57",
+        "android_client_info": {
+          "package_name": "com.catelli.scans2"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:9c6172d77b1d2cae5d9d57",
+        "android_client_info": {
+          "package_name": "com.catellisrl.assistenza"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:425d21710d7682005d9d57",
+        "android_client_info": {
+          "package_name": "com.catellisrl.catelli_energy_comparator"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    },
+    {
+      "client_info": {
+        "mobilesdk_app_id": "1:872447580790:android:a1d8d57960451f935d9d57",
+        "android_client_info": {
+          "package_name": "com.catellisrl.flux"
+        }
+      },
+      "oauth_client": [],
+      "api_key": [
+        {
+          "current_key": "AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8"
+        }
+      ],
+      "services": {
+        "appinvite_service": {
+          "other_platform_oauth_client": []
+        }
+      }
+    }
+  ],
+  "configuration_version": "1"
+}

android/app/src/main/AndroidManifest.xml

@@ -24,11 +24,11 @@
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
-            <intent-filter>
+            <intent-filter android:label="flux_deep_link">
                 <action android:name="android.intent.action.VIEW" />
                 <category android:name="android.intent.category.DEFAULT" />
                 <category android:name="android.intent.category.BROWSABLE" />
-                <data android:scheme="flux" />
+                <data android:scheme="fluxapp" />
             </intent-filter>
         </activity>
         <!-- Don't delete the meta-data below.

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":"assistenza-catelli","appId":"1:872447580790:android:a1d8d57960451f935d9d57","fileOutput":"android/app/google-services.json"}},"dart":{"lib/firebase_options.dart":{"projectId":"assistenza-catelli","configurations":{"android":"1:872447580790:android:a1d8d57960451f935d9d57","ios":"1:872447580790:ios:a87d56c718aa61e05d9d57","macos":"1:872447580790:ios:a87d56c718aa61e05d9d57","web":"1:872447580790:web:10745e7f9afb447d5d9d57","windows":"1:872447580790:web:3b1623eda6abdac75d9d57"}}}}}}

lib/core/blocs/session/session_cubit.dart

@@ -143,10 +143,6 @@ class SessionCubit extends Cubit<SessionState> {
     }
   }
 
-  void updateCurrentCompany(CompanyModel newCompany) {
-    emit(state.copyWith(company: newCompany));
-  }
-
   // --- FUNZIONE EXTRA: CAMBIO NEGOZIO DALLA DASHBOARD ---
   Future<void> changeStore(StoreModel newStore) async {
     if (newStore.id != null) {

lib/core/routes/app_router.dart

@@ -4,15 +4,14 @@ import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/data/core_repository.dart';
 import 'package:flux/core/layout/app_shell.dart';
+import 'package:flux/core/utils/extensions.dart';
 import 'package:flux/core/widgets/set_password_screen.dart';
-import 'package:flux/core/widgets/shared_forms/mobile_upload_screen.dart';
-import 'package:flux/core/widgets/shared_forms/upload_success_screen.dart';
 import 'package:flux/features/auth/ui/auth_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_files_bloc.dart';
 import 'package:flux/features/customers/blocs/customers_cubit.dart';
 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_mobile_upload_screen.dart';
 import 'package:flux/features/customers/ui/customers_content.dart';
 import 'package:flux/features/home/ui/home_screen.dart';
 import 'package:flux/features/master_data/master_data_hub_content.dart';
@@ -25,18 +24,11 @@ import 'package:flux/features/master_data/staff/ui/staff_screen.dart';
 import 'package:flux/features/master_data/store/ui/stores_screen.dart';
 import 'package:flux/features/onboarding/blocs/onboarding_cubit.dart';
 import 'package:flux/features/onboarding/ui/onboarding_screen.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
+import 'package:flux/features/operations/blocs/operation_files_bloc.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_view.dart';
-import 'package:flux/features/settings/theme_settings_view.dart';
-import 'package:flux/features/tickets/blocs/ticket_form_cubit.dart';
-import 'package:flux/features/tickets/blocs/ticket_list_cubit.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:flux/features/tickets/ui/ticket_form_screen.dart';
-import 'package:flux/features/tickets/ui/ticket_list_screen.dart';
+import 'package:flux/features/operations/ui/operation_mobile_upload_screen.dart';
+import 'package:flux/features/operations/ui/operations_screen.dart';
 import 'package:get_it/get_it.dart';
 import 'package:go_router/go_router.dart';
 
@@ -56,35 +48,18 @@ class AppRouter {
         final isGoingToOnboarding = state.matchedLocation == '/onboarding';
         final isGoingToSetPassword = state.matchedLocation == '/set-password';
 
-        // 1. LA PASSATOIA VIP (DEVE ESSERE IN CIMA)
-        // Usiamo state.uri.path perché state.matchedLocation a volte fa i capricci coi deep link iniziali
-        final isPublicRoute = state.uri.path.startsWith('/upload');
-
-        if (isPublicRoute) {
-          // Ritorna null esplicitamente per dire al router "Rimani qui e non fare altri controlli"
-          return null;
-        }
-
-        // 2. CONTROLLO INIZIALE
-        // Se la sessione sta ancora caricando la primissima volta (es. splash screen logico)
         if (sessionState.status == SessionStatus.initial) return null;
 
-        // 3. UTENTE NON LOGGATO (Ma ci arriva solo se non è su /upload)
         if (sessionState.status == SessionStatus.unauthenticated) {
-          // Se sta già andando alle uniche altre pagine pubbliche, lascialo andare
           if (isGoingToLogin || isGoingToSetPassword) return null;
-          // Altrimenti bloccalo e mandalo al login
           return '/login';
         }
 
-        // 4. UTENTE LOGGATO MA DEVE COMPLETARE L'ONBOARDING
         if (sessionState.status == SessionStatus.onboardingRequired) {
           return isGoingToOnboarding ? null : '/onboarding';
         }
 
-        // 5. UTENTE PERFETTAMENTE LOGGATO E OPERATIVO
         if (sessionState.status == SessionStatus.authenticated) {
-          // Se per sbaglio cerca di tornare al login o all'onboarding, ributtalo in dashboard
           if (isGoingToLogin || isGoingToOnboarding) return '/';
           return null;
         }
@@ -132,13 +107,6 @@ class AppRouter {
                     return const ProductsScreen();
                   },
                 ),
-                GoRoute(
-                  path: 'company-settings',
-                  builder: (context, state) => BlocProvider(
-                    create: (context) => CompanySettingsCubit(),
-                    child: const CompanySettingsScreen(),
-                  ),
-                ),
                 GoRoute(
                   path: 'staff', // Diventa /master-data/staff
                   builder: (context, state) => const StaffScreen(),
@@ -158,96 +126,60 @@ class AppRouter {
             // 3. IMPOSTAZIONI
             GoRoute(
               path: '/settings',
-              builder: (context, state) => const SettingsView(),
-              routes: [
-                GoRoute(
-                  path: 'theme',
-                  builder: (context, state) => const ThemeSettingsView(),
+              builder: (context, state) => Scaffold(
+                appBar: AppBar(title: Text(context.l10n.commonSettings)),
+                body: Center(
+                  child: ElevatedButton.icon(
+                    onPressed: () => context.read<SessionCubit>().signOut(),
+                    icon: const Icon(Icons.logout),
+                    label: const Text("Esci da FLUX"),
+                  ),
+                ),
               ),
-              ],
             ),
             GoRoute(
               path: '/operations',
-              builder: (context, state) => const OperationListScreen(),
+              builder: (context, state) => const OperationsScreen(),
             ),
             GoRoute(
               path: '/customers',
               builder: (context, state) =>
                   const CustomersContent(), // O come si chiama il tuo widget della lista!
             ),
-            GoRoute(
-              path: '/tickets',
-              builder: (context, state) => BlocProvider(
-                create: (context) => TicketListCubit(),
-                child: const TicketListScreen(),
-              ),
-            ),
           ],
         ),
 
         // --- DETTAGLI E OPERATIVITÀ (FUORI DALLA SHELL - TUTTO SCHERMO) ---
-        GoRoute(
-          // Il path sarà es. /tickets/form/123 oppure /tickets/form/new
-          path: '/tickets/form/:id',
-          builder: (context, state) {
-            // 1. Leggiamo l'ID dall'URL
-            final String pathId = state.pathParameters['id'] ?? 'new';
-
-            // 2. Leggiamo l'oggetto dalla RAM (se arriviamo da un tap interno all'app)
-            final TicketModel? ticketFromExtra = state.extra as TicketModel?;
-
-            // 3. Capiamo se è un nuovo ticket o una modifica
-            final String? realTicketId = pathId == 'new' ? null : pathId;
-            context.read<StaffCubit>().loadStaffForStore(
-              GetIt.I.get<SessionCubit>().state.currentStore!.id!,
-            );
-            context.read<CustomersCubit>().loadCustomers();
-            context.read<ProductsCubit>().loadModels();
-            context.read<ProductsCubit>().loadBrands();
-
-            return MultiBlocProvider(
-              providers: [
-                BlocProvider(
-                  create: (context) => AttachmentsBloc(
-                    parentType: AttachmentParentType.ticket,
-                    parentId: realTicketId,
-                  ),
-                ),
-                BlocProvider(create: (context) => TicketFormCubit()),
-              ],
-
-              child: TicketFormScreen(
-                ticketId: realTicketId,
-                existingTicket: ticketFromExtra,
-              ),
-            );
-          },
-        ),
-        GoRoute(
-          path: '/upload-success',
-          builder: (context, state) => const UploadSuccessScreen(),
-        ),
         GoRoute(
           path: '/customer/:id',
           builder: (context, state) {
             final customer = state.extra as CustomerModel;
             return BlocProvider(
-              create: (context) => AttachmentsBloc(
-                parentType: AttachmentParentType.customer,
-                parentId: customer.id,
-              ),
+              create: (context) => CustomerFilesBloc(customer.id!),
               child: CustomerDetailScreen(customer: customer),
             );
           },
         ),
-
         GoRoute(
-          path: '/operations/form/:id',
+          path: '/customer/:id/upload',
           builder: (context, state) {
-            final String pathId = state.pathParameters['id'] ?? 'new';
-            final OperationModel? operationFromExtra =
-                state.extra as OperationModel?;
-            final String? realOperationId = pathId == 'new' ? null : pathId;
+            final customerId = state.pathParameters['id']!;
+            final customerName = state.uri.queryParameters['name'] ?? 'Cliente';
+            return BlocProvider(
+              create: (context) => CustomerFilesBloc(customerId),
+              child: CustomerMobileUploadScreen(
+                customerId: customerId,
+                customerName: customerName,
+              ),
+            );
+          },
+        ),
+        GoRoute(
+          path: '/operation-form',
+          name: 'operation-form',
+          builder: (context, state) {
+            final existingOperation = state.extra as OperationModel?;
+            final operationId = state.uri.queryParameters['operationId'];
             final currentStoreId = GetIt.I
                 .get<SessionCubit>()
                 .state
@@ -261,45 +193,40 @@ class AppRouter {
             context.read<ProductsCubit>().loadBrands();
             context.read<StaffCubit>().loadStaffForStore(currentStoreId);
 
-            return MultiBlocProvider(
-              providers: [
-                BlocProvider(
-                  create: (context) => AttachmentsBloc(
-                    parentId: realOperationId,
-                    parentType: AttachmentParentType.operation,
+            return BlocProvider(
+              create: (context) => OperationFilesBloc(
+                operationId: operationId ?? existingOperation?.id,
               ),
-                ),
-                BlocProvider(create: (context) => OperationFormCubit()),
-              ],
               child: OperationFormScreen(
-                operationId: realOperationId,
-                existingOperation: operationFromExtra,
+                operationId: operationId ?? existingOperation?.id,
+                existingOperation: existingOperation,
               ),
             );
           },
         ),
-
         GoRoute(
-          path: '/upload/:type/:id',
+          path: '/operation/:id/upload',
           builder: (context, state) {
-            final typeString = state.pathParameters['type']!;
-            final id = state.pathParameters['id']!;
-            final companyId = state.uri.queryParameters['companyId']!;
-
-            // Trasformiamo la stringa dell'URL nel nostro amato Enum!
-            final parentType = AttachmentParentType.values.firstWhere(
-              (e) => e.name == typeString,
-              orElse: () =>
-                  AttachmentParentType.ticket, // Fallback di sicurezza
+            final operationId = state.pathParameters['id']!;
+            final operationName =
+                state.uri.queryParameters['name'] ?? 'Pratica';
+            final currentStoreId = GetIt.I
+                .get<SessionCubit>()
+                .state
+                .currentStore!
+                .id!;
+            context.read<CustomersCubit>().loadCustomers();
+            context.read<ProvidersCubit>().loadActiveProvidersForStore(
+              currentStoreId,
             );
-
-            // Creiamo il BLoC "al volo" solo per questa schermata
+            context.read<ProductsCubit>().loadModels();
+            context.read<ProductsCubit>().loadBrands();
+            context.read<StaffCubit>().loadStaffForStore(currentStoreId);
             return BlocProvider(
-              create: (context) =>
-                  AttachmentsBloc(parentId: id, parentType: parentType),
-              child: SharedMobileUploadScreen(
-                title: 'Caricamento Rapido',
-                companyId: companyId,
+              create: (context) => OperationFilesBloc(operationId: operationId),
+              child: OperationMobileUploadScreen(
+                operationId: operationId,
+                operationName: operationName,
               ),
             );
           },

lib/core/widgets/shared_forms/model_section.dart

@@ -1,165 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/master_data/products/blocs/product_cubit.dart';
-import 'package:flux/features/master_data/products/ui/quick_product_dialog.dart';
-
-class SharedModelSection extends StatelessWidget {
-  final String? modelId;
-  final String? modelName;
-  final String label;
-
-  // Usiamo una callback che passa direttamente ID e Nome
-  // così non dobbiamo preoccuparci di importare la classe esatta del modello ovunque
-  final void Function(String id, String name) onModelSelected;
-
-  const SharedModelSection({
-    super.key,
-    required this.modelId,
-    required this.modelName,
-    required this.onModelSelected,
-    this.label = 'Seleziona Modello',
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-    final hasModel = modelId != null && modelId!.isNotEmpty;
-
-    return ListTile(
-      title: Text(label),
-      subtitle: Text(
-        hasModel ? modelName! : 'Nessun modello selezionato',
-        style: TextStyle(
-          color: hasModel ? null : Colors.grey,
-          fontWeight: hasModel ? FontWeight.bold : FontWeight.normal,
-        ),
-      ),
-      trailing: const Icon(Icons.arrow_drop_down),
-      shape: RoundedRectangleBorder(
-        side: BorderSide(color: theme.dividerColor),
-        borderRadius: BorderRadius.circular(8),
-      ),
-      onTap: () => _showModelModal(context),
-    );
-  }
-
-  void _showModelModal(BuildContext context) {
-    showModalBottomSheet(
-      context: context,
-      isScrollControlled: true,
-      shape: const RoundedRectangleBorder(
-        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
-      ),
-      builder: (modalContext) {
-        return DraggableScrollableSheet(
-          initialChildSize: 0.6,
-          minChildSize: 0.4,
-          maxChildSize: 0.9,
-          expand: false,
-          builder: (_, scrollController) {
-            return Column(
-              children: [
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: Row(
-                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                    children: [
-                      Text(
-                        'Seleziona Modello',
-                        style: Theme.of(context).textTheme.titleLarge,
-                      ),
-                      IconButton(
-                        icon: const Icon(Icons.close),
-                        onPressed: () => Navigator.pop(modalContext),
-                      ),
-                    ],
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
-                  child: TextField(
-                    decoration: InputDecoration(
-                      hintText: 'Cerca modello (es. iPhone 15...)',
-                      prefixIcon: const Icon(Icons.search),
-                      border: OutlineInputBorder(
-                        borderRadius: BorderRadius.circular(8),
-                      ),
-                    ),
-                    onChanged: (query) =>
-                        context.read<ProductsCubit>().searchModels(query),
-                  ),
-                ),
-                Padding(
-                  padding: const EdgeInsets.all(16.0),
-                  child: ElevatedButton.icon(
-                    style: ElevatedButton.styleFrom(
-                      minimumSize: const Size.fromHeight(48),
-                    ),
-                    icon: const Icon(Icons.add),
-                    label: const Text('Aggiungi Modello al Volo'),
-                    onPressed: () async {
-                      // Leggiamo i brand dal Cubit per passarli alla dialog
-                      final existingBrands = context
-                          .read<ProductsCubit>()
-                          .state
-                          .brands;
-
-                      final newModel = await showDialog(
-                        context: context,
-                        builder: (dialogContext) {
-                          return BlocProvider.value(
-                            value: context.read<ProductsCubit>(),
-                            child: QuickProductDialog(
-                              existingBrands: existingBrands,
-                            ),
-                          );
-                        },
-                      );
-
-                      if (newModel != null) {
-                        // CHIAMIAMO LA CALLBACK!
-                        onModelSelected(newModel.id, newModel.nameWithBrand);
-                        if (context.mounted) Navigator.pop(modalContext);
-                      }
-                    },
-                  ),
-                ),
-                const Divider(),
-                Expanded(
-                  child: BlocBuilder<ProductsCubit, ProductState>(
-                    builder: (context, state) {
-                      return ListView.builder(
-                        controller: scrollController,
-                        itemCount: state.models.length,
-                        itemBuilder: (context, index) {
-                          final deviceModel = state.models[index];
-                          return ListTile(
-                            leading: const Icon(Icons.devices),
-                            title: Text(
-                              deviceModel.nameWithBrand,
-                              style: const TextStyle(
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                            onTap: () {
-                              // CHIAMIAMO LA CALLBACK!
-                              onModelSelected(
-                                deviceModel.id!,
-                                deviceModel.nameWithBrand,
-                              );
-                              Navigator.pop(modalContext);
-                            },
-                          );
-                        },
-                      );
-                    },
-                  ),
-                ),
-              ],
-            );
-          },
-        );
-      },
-    );
-  }
-}

lib/core/widgets/shared_forms/shared_files_section.dart

@@ -1,242 +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/widgets/qr_upload_dialog.dart';
-import 'package:flux/core/widgets/shared_forms/mobile_upload_screen.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:get_it/get_it.dart';
-
-class SharedFilesSection extends StatelessWidget {
-  final String titleNameForUpload;
-  // LA NOSTRA CALLBACK MAGICA
-  final Future<String?> Function()? onGenerateIdForQr;
-
-  const SharedFilesSection({
-    super.key,
-    required this.titleNameForUpload,
-    this.onGenerateIdForQr,
-  });
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return Column(
-      crossAxisAlignment: CrossAxisAlignment.start,
-      children: [
-        Row(
-          mainAxisAlignment: MainAxisAlignment.spaceBetween,
-          children: [
-            const Text(
-              'Allegati e Foto',
-              style: TextStyle(fontWeight: FontWeight.bold),
-            ),
-
-            BlocBuilder<AttachmentsBloc, AttachmentsState>(
-              builder: (context, state) {
-                return Row(
-                  children: [
-                    // --- IL TASTO QR CODE (Ora sempre attivo!) ---
-                    Tooltip(
-                      message: 'Carica foto con lo smartphone',
-                      child: IconButton(
-                        icon: const Icon(Icons.qr_code_scanner),
-                        color: theme.colorScheme.primary, // Sempre colorato!
-                        onPressed: () async {
-                          String? targetId = state.parentId;
-
-                          // SE L'ID NON C'È, CHIAMIAMO IL SALVATAGGIO IN BACKGROUND!
-                          if (targetId == null) {
-                            if (onGenerateIdForQr != null) {
-                              ScaffoldMessenger.of(context).showSnackBar(
-                                const SnackBar(
-                                  content: Text(
-                                    'Salvataggio rapido scheda in corso... ⏳',
-                                  ),
-                                  duration: Duration(seconds: 1),
-                                ),
-                              );
-
-                              // Aspettiamo che il TicketFormCubit faccia il suo lavoro
-                              targetId = await onGenerateIdForQr!();
-                            }
-
-                            // Se fallisce (es. validazione form non passata), ci fermiamo
-                            if (targetId == null) return;
-                          }
-
-                          // GENERAZIONE DEL DEEP LINK AGNOSTICO
-                          final companyId = GetIt.I
-                              .get<SessionCubit>()
-                              .state
-                              .company!
-                              .id!;
-                          final deepLink =
-                              'https://flux.catelli.it/upload/${state.parentType.name}/$targetId?companyId=$companyId';
-
-                          if (context.mounted) {
-                            showDialog(
-                              context: context,
-                              builder: (_) => QrUploadDialog(
-                                deepLinkUrl: deepLink,
-                                title: 'Carica File: $titleNameForUpload',
-                              ),
-                            );
-                          }
-                        },
-                      ),
-                    ),
-                    const SizedBox(width: 8),
-
-                    // --- IL TASTO AGGIUNGI CLASSICO (da PC) ---
-                    TextButton.icon(
-                      icon: const Icon(Icons.add_a_photo),
-                      label: const Text('Aggiungi'),
-                      onPressed: () {
-                        final bloc = context.read<AttachmentsBloc>();
-                        Navigator.of(context).push(
-                          MaterialPageRoute(
-                            builder: (_) => BlocProvider.value(
-                              value: bloc,
-                              child: SharedMobileUploadScreen(
-                                title: titleNameForUpload,
-                                companyId: GetIt.I
-                                    .get<SessionCubit>()
-                                    .state
-                                    .company!
-                                    .id!,
-                              ),
-                            ),
-                          ),
-                        );
-                      },
-                    ),
-                  ],
-                );
-              },
-            ),
-          ],
-        ),
-        const SizedBox(height: 8),
-
-        // --- LA VETRINA DEI FILE (Identica a prima) ---
-        BlocBuilder<AttachmentsBloc, AttachmentsState>(
-          builder: (context, state) {
-            final files = state.allFiles;
-
-            if (state.status == AttachmentsStatus.loading) {
-              return const Center(child: CircularProgressIndicator());
-            }
-
-            if (files.isEmpty) {
-              return Container(
-                width: double.infinity,
-                padding: const EdgeInsets.all(24),
-                decoration: BoxDecoration(
-                  color: theme.colorScheme.surface,
-                  border: Border.all(
-                    color: theme.dividerColor,
-                    style: BorderStyle.solid,
-                  ),
-                  borderRadius: BorderRadius.circular(12),
-                ),
-                child: const Column(
-                  children: [
-                    Icon(
-                      Icons.image_not_supported_outlined,
-                      color: Colors.grey,
-                      size: 32,
-                    ),
-                    SizedBox(height: 8),
-                    Text(
-                      'Nessun file allegato',
-                      style: TextStyle(color: Colors.grey),
-                    ),
-                  ],
-                ),
-              );
-            }
-
-            return Wrap(
-              spacing: 12,
-              runSpacing: 12,
-              children: files.map((file) {
-                final isImage = [
-                  'jpg',
-                  'jpeg',
-                  'png',
-                  'webp',
-                ].contains(file.extension.toLowerCase());
-
-                return Container(
-                  width: 100,
-                  height: 100,
-                  decoration: BoxDecoration(
-                    color: theme.colorScheme.surface,
-                    borderRadius: BorderRadius.circular(12),
-                    border: Border.all(color: theme.dividerColor),
-                  ),
-                  child: Stack(
-                    children: [
-                      Center(
-                        child: isImage
-                            ? const Icon(
-                                Icons.image,
-                                color: Colors.blue,
-                                size: 40,
-                              )
-                            : const Icon(
-                                Icons.picture_as_pdf,
-                                color: Colors.red,
-                                size: 40,
-                              ),
-                      ),
-                      if (file.id == null)
-                        Positioned(
-                          bottom: 4,
-                          left: 4,
-                          right: 4,
-                          child: Container(
-                            padding: const EdgeInsets.symmetric(vertical: 2),
-                            decoration: BoxDecoration(
-                              color: Colors.orange,
-                              borderRadius: BorderRadius.circular(4),
-                            ),
-                            child: const Text(
-                              'Da salvare',
-                              textAlign: TextAlign.center,
-                              style: TextStyle(
-                                color: Colors.white,
-                                fontSize: 8,
-                                fontWeight: FontWeight.bold,
-                              ),
-                            ),
-                          ),
-                        ),
-                      Positioned(
-                        top: -8,
-                        right: -8,
-                        child: IconButton(
-                          icon: const Icon(
-                            Icons.cancel,
-                            color: Colors.redAccent,
-                            size: 20,
-                          ),
-                          onPressed: () {
-                            context.read<AttachmentsBloc>().add(
-                              DeleteSpecificAttachmentEvent(file),
-                            );
-                          },
-                        ),
-                      ),
-                    ],
-                  ),
-                );
-              }).toList(),
-            );
-          },
-        ),
-      ],
-    );
-  }
-}

lib/core/widgets/shared_forms/upload_success_screen.dart

@@ -1,52 +0,0 @@
-import 'package:flutter/material.dart';
-
-class UploadSuccessScreen extends StatelessWidget {
-  const UploadSuccessScreen({super.key});
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      backgroundColor: Colors.green.shade50,
-      body: Center(
-        child: Padding(
-          padding: const EdgeInsets.all(24.0),
-          child: Column(
-            mainAxisAlignment: MainAxisAlignment.center,
-            children: [
-              Container(
-                padding: const EdgeInsets.all(24),
-                decoration: BoxDecoration(
-                  color: Colors.green,
-                  shape: BoxShape.circle,
-                  boxShadow: [
-                    BoxShadow(
-                      color: Colors.green.withValues(alpha: 0.3),
-                      blurRadius: 20,
-                      spreadRadius: 5,
-                    ),
-                  ],
-                ),
-                child: const Icon(Icons.check, size: 80, color: Colors.white),
-              ),
-              const SizedBox(height: 32),
-              const Text(
-                "Upload Completato!",
-                style: TextStyle(
-                  fontSize: 28,
-                  fontWeight: FontWeight.bold,
-                  color: Colors.green,
-                ),
-              ),
-              const SizedBox(height: 16),
-              const Text(
-                "I file sono stati caricati con successo sulla pratica.\nPuoi chiudere questa pagina o finestra del browser.",
-                textAlign: TextAlign.center,
-                style: TextStyle(fontSize: 16, color: Colors.black54),
-              ),
-            ],
-          ),
-        ),
-      ),
-    );
-  }
-}

lib/features/attachments/blocs/attachments_bloc.dart

@@ -1,395 +0,0 @@
-import 'dart:async';
-import 'package:file_picker/file_picker.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:equatable/equatable.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/utils/extensions.dart';
-import 'package:flux/features/attachments/data/attachments_repository.dart';
-import 'package:flux/features/attachments/models/attachment_model.dart';
-import 'package:get_it/get_it.dart';
-import 'package:image_picker/image_picker.dart';
-
-part 'attachments_events.dart';
-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(
-        AttachmentsState(
-          status: AttachmentsStatus.initial,
-          parentId: parentId,
-          parentType: parentType,
-        ),
-      ) {
-    on<ParentEntitySavedEvent>(_onParentEntitySaved);
-    on<LoadAttachmentsEvent>(_onLoadAttachments);
-    on<AddAttachmentsEvent>(_onAddAttachments);
-    on<UploadAttachmentsEvent>(_onUploadAttachments);
-    on<DeleteAttachmentsEvent>(_onDeleteAttachments);
-    on<ToggleAttachmentSelectionEvent>(_onToggleAttachmentSelection);
-    on<LinkAttachmentsToEntityEvent>(_onLinkAttachmentsToEntity);
-    on<RenameAttachmentEvent>(_onRenameAttachment);
-    on<DeleteSpecificAttachmentEvent>(_onDeleteSpecificAttachment);
-    on<SelectAllAttachmentsEvent>(_onSelectAllAttachments);
-    on<ClearAttachmentSelectionEvent>(_onClearAttachmentSelection);
-
-    // Se il BLoC nasce già con un ID, carichiamo i file
-    if (parentId != null && companyId != null) {
-      add(LoadAttachmentsEvent(parentId: parentId));
-    }
-  }
-  FutureOr<void> _onParentEntitySaved(
-    ParentEntitySavedEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    emit(
-      state.copyWith(
-        parentId: event.newParentId,
-        status: AttachmentsStatus.uploading,
-      ),
-    );
-
-    if (state.localFiles.isNotEmpty) {
-      try {
-        final List<Future<void>> uploadTasks = state.localFiles.map((file) {
-          final fakePlatformFile = PlatformFile(
-            name: '${file.name}.${file.extension}',
-            size: file.fileSize,
-            bytes: file.localBytes,
-          );
-
-          // Chiamiamo il metodo generico passando il parentId e il TYPE
-          return _repository.uploadAndRegisterFile(
-            parentId: event.newParentId,
-            parentType: state.parentType,
-            pickedFile: fakePlatformFile,
-            companyId: companyId!,
-          );
-        }).toList();
-
-        await Future.wait(uploadTasks);
-      } catch (e) {
-        emit(
-          state.copyWith(
-            status: AttachmentsStatus.failure,
-            error: "Errore upload post-salvataggio: $e",
-          ),
-        );
-        return;
-      }
-    }
-
-    emit(state.copyWith(localFiles: [], status: AttachmentsStatus.success));
-    add(LoadAttachmentsEvent(parentId: event.newParentId));
-  }
-
-  FutureOr<void> _onLoadAttachments(
-    LoadAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    final currentId = event.parentId ?? state.parentId;
-
-    if (currentId != null) {
-      emit(state.copyWith(status: AttachmentsStatus.loading));
-
-      await emit.forEach(
-        _repository.getFilesStream(
-          currentId,
-          state.parentType,
-        ), // Passiamo il tipo!
-        onData: (List<AttachmentModel> data) => state.copyWith(
-          status: AttachmentsStatus.success,
-          remoteFiles: data,
-        ),
-        onError: (error, stackTrace) => state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: error.toString(),
-        ),
-      );
-    }
-  }
-
-  void _onAddAttachments(
-    AddAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    final currentId = state.parentId;
-
-    // BIVIO 1: PRATICA NUOVA (Salvataggio locale)
-    if (currentId == null) {
-      final newLocalFiles = event.files.map((file) {
-        // Assegniamo i campi dinamicamente in base al parentType!
-        return AttachmentModel(
-          id: null,
-          companyId: companyId!,
-          operationId: state.parentType == AttachmentParentType.operation
-              ? ''
-              : null,
-          ticketId: state.parentType == AttachmentParentType.ticket ? '' : null,
-          customerId: state.parentType == AttachmentParentType.customer
-              ? ''
-              : null,
-          name: file.name.fileNameWithoutExtension(),
-          extension: file.name.fileExtension(),
-          storagePath: '',
-          fileSize: file.size,
-          localBytes: file.bytes,
-        );
-      }).toList();
-
-      emit(
-        state.copyWith(
-          localFiles: [...state.localFiles, ...newLocalFiles],
-          status: AttachmentsStatus.success,
-        ),
-      );
-      return;
-    }
-
-    // BIVIO 2: PRATICA ESISTENTE (Upload immediato)
-    emit(state.copyWith(status: AttachmentsStatus.uploading));
-    try {
-      final List<Future<void>> uploadTasks = event.files.map((file) {
-        return _repository.uploadAndRegisterFile(
-          parentId: currentId,
-          parentType: state.parentType,
-          pickedFile: file,
-          companyId: companyId!,
-        );
-      }).toList();
-
-      await Future.wait(uploadTasks);
-      emit(state.copyWith(status: AttachmentsStatus.success));
-    } catch (e) {
-      emit(
-        state.copyWith(status: AttachmentsStatus.failure, error: e.toString()),
-      );
-    }
-  }
-
-  FutureOr<void> _onUploadAttachments(
-    UploadAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    if ((event.pickedFiles == null || event.pickedFiles!.isEmpty) &&
-        (event.photos == null || event.photos!.isEmpty)) {
-      return;
-    }
-
-    if (state.parentId == null) return;
-
-    emit(state.copyWith(status: AttachmentsStatus.uploading));
-    try {
-      final List<Future<void>> uploadTasks = [];
-
-      // 1. Gestione Documenti normali (PlatformFile)
-      if (event.pickedFiles != null) {
-        for (var file in event.pickedFiles!) {
-          uploadTasks.add(
-            _repository.uploadAndRegisterFile(
-              parentId: state.parentId!,
-              parentType: state.parentType,
-              pickedFile: file,
-              companyId: event.companyId,
-            ),
-          );
-        }
-      }
-
-      // 2. Gestione Foto Fotocamera (XFile)
-      if (event.photos != null) {
-        for (var photo in event.photos!) {
-          // Leggiamo i byte asincronamente
-          final bytes = await photo.readAsBytes();
-          final fileSize = await photo.length();
-
-          // Lo travestiamo da PlatformFile per passarlo al Repository!
-          final fakePlatformFile = PlatformFile(
-            name: photo.name,
-            size: fileSize,
-            bytes: bytes,
-            path: photo.path,
-          );
-
-          uploadTasks.add(
-            _repository.uploadAndRegisterFile(
-              parentId: state.parentId!,
-              parentType: state.parentType,
-              pickedFile: fakePlatformFile,
-              companyId: event.companyId,
-            ),
-          );
-        }
-      }
-
-      // Esecuzione parallela di tutti i documenti e foto
-      await Future.wait(uploadTasks);
-      emit(state.copyWith(status: AttachmentsStatus.success));
-    } catch (e) {
-      emit(
-        state.copyWith(status: AttachmentsStatus.failure, error: e.toString()),
-      );
-    }
-  }
-
-  FutureOr<void> _onDeleteAttachments(
-    DeleteAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    emit(state.copyWith(status: AttachmentsStatus.loading));
-    try {
-      await _repository.deleteFiles(
-        files: state.selectedFiles,
-        currentContextType: state.parentType,
-      );
-      emit(
-        state.copyWith(status: AttachmentsStatus.success, selectedFiles: []),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(status: AttachmentsStatus.failure, error: e.toString()),
-      );
-    }
-  }
-
-  FutureOr<void> _onToggleAttachmentSelection(
-    ToggleAttachmentSelectionEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    final selectedFiles = List<AttachmentModel>.from(state.selectedFiles);
-    if (selectedFiles.contains(event.file)) {
-      selectedFiles.remove(event.file);
-    } else {
-      selectedFiles.add(event.file);
-    }
-    emit(state.copyWith(selectedFiles: selectedFiles));
-  }
-
-  void _onSelectAllAttachments(
-    SelectAllAttachmentsEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    // Prendiamo TUTTI i file (locali e remoti) e li buttiamo nei selezionati
-    emit(state.copyWith(selectedFiles: state.allFiles));
-  }
-
-  void _onClearAttachmentSelection(
-    ClearAttachmentSelectionEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    // Svuotiamo brutalmente la lista
-    emit(state.copyWith(selectedFiles: []));
-  }
-
-  FutureOr<void> _onLinkAttachmentsToEntity(
-    LinkAttachmentsToEntityEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    if (state.selectedFiles.isEmpty) return;
-
-    // BIVIO 1: PRATICA/TICKET NON ANCORA SALVATA (Modalità Locale)
-    if (state.parentId == null) {
-      final updatedLocalFiles = state.localFiles.map((file) {
-        if (state.selectedFiles.contains(file)) {
-          // Assegniamo dinamicamente l'ID in base all'entità scelta
-          switch (event.targetType) {
-            case AttachmentParentType.customer:
-              return file.copyWith(customerId: event.targetId);
-            case AttachmentParentType.ticket:
-              return file.copyWith(ticketId: event.targetId);
-            case AttachmentParentType.operation:
-              return file.copyWith(operationId: event.targetId);
-          }
-        }
-        return file;
-      }).toList();
-
-      emit(
-        state.copyWith(
-          localFiles: updatedLocalFiles,
-          selectedFiles: [], // Svuotiamo la selezione
-          status: AttachmentsStatus.success,
-        ),
-      );
-      return;
-    }
-
-    // BIVIO 2: PRATICA/TICKET ESISTENTE (Modalità Remota su DB)
-    emit(state.copyWith(status: AttachmentsStatus.loading));
-    try {
-      final List<Future<void>> linkTasks = [];
-
-      for (var file in state.selectedFiles) {
-        if (file.id != null) {
-          linkTasks.add(
-            _repository.linkFileToEntity(
-              fileId: file.id!,
-              targetType: event.targetType,
-              targetId: event.targetId,
-            ),
-          );
-        }
-      }
-
-      await Future.wait(linkTasks);
-
-      // Lo stream aggiornerà automaticamente la UI
-      emit(
-        state.copyWith(status: AttachmentsStatus.success, selectedFiles: []),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: "Errore durante il collegamento: $e",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onRenameAttachment(
-    RenameAttachmentEvent event,
-    Emitter<AttachmentsState> emit,
-  ) async {
-    // BIVIO 1: File Locale (Bozza)
-    if (event.file.localBytes != null) {
-      final updatedLocalFiles = state.localFiles.map((f) {
-        if (f == event.file) {
-          return f.copyWith(name: event.newName);
-        }
-        return f;
-      }).toList();
-      emit(state.copyWith(localFiles: updatedLocalFiles));
-      return;
-    }
-
-    // BIVIO 2: File Remoto (Salvato su DB)
-    emit(state.copyWith(status: AttachmentsStatus.loading));
-    try {
-      await _repository.renameAttachment(event.file.id!, event.newName);
-      emit(state.copyWith(status: AttachmentsStatus.success));
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: AttachmentsStatus.failure,
-          error: "Errore rinomina: $e",
-        ),
-      );
-    }
-  }
-
-  FutureOr<void> _onDeleteSpecificAttachment(
-    DeleteSpecificAttachmentEvent event,
-    Emitter<AttachmentsState> emit,
-  ) {
-    if (event.file.localBytes != null) {
-      final updatedLocalFiles = state.localFiles
-          .where((f) => f != event.file)
-          .toList();
-      emit(state.copyWith(localFiles: updatedLocalFiles));
-    }
-  }
-}

lib/features/attachments/blocs/attachments_events.dart

@@ -1,73 +0,0 @@
-part of 'attachments_bloc.dart';
-
-abstract class AttachmentsEvent extends Equatable {
-  const AttachmentsEvent();
-
-  @override
-  List<Object?> get props => [];
-}
-
-/// Chiamato quando l'entità "padre" (es. il Ticket) viene salvata per la prima volta
-class ParentEntitySavedEvent extends AttachmentsEvent {
-  final String newParentId;
-  const ParentEntitySavedEvent(this.newParentId);
-
-  @override
-  List<Object?> get props => [newParentId];
-}
-
-class LoadAttachmentsEvent extends AttachmentsEvent {
-  final String? parentId;
-  const LoadAttachmentsEvent({this.parentId});
-}
-
-class AddAttachmentsEvent extends AttachmentsEvent {
-  final List<PlatformFile> files;
-  const AddAttachmentsEvent(this.files);
-}
-
-class UploadAttachmentsEvent extends AttachmentsEvent {
-  final List<PlatformFile>? pickedFiles;
-  final List<XFile>? photos;
-  final String companyId;
-  const UploadAttachmentsEvent({
-    this.pickedFiles,
-    this.photos,
-    required this.companyId,
-  });
-}
-
-class DeleteAttachmentsEvent extends AttachmentsEvent {}
-
-class ToggleAttachmentSelectionEvent extends AttachmentsEvent {
-  final AttachmentModel file;
-  const ToggleAttachmentSelectionEvent(this.file);
-}
-
-class SelectAllAttachmentsEvent extends AttachmentsEvent {}
-
-class ClearAttachmentSelectionEvent extends AttachmentsEvent {}
-
-class LinkAttachmentsToEntityEvent extends AttachmentsEvent {
-  final AttachmentParentType targetType;
-  final String targetId;
-
-  const LinkAttachmentsToEntityEvent({
-    required this.targetType,
-    required this.targetId,
-  });
-
-  @override
-  List<Object?> get props => [targetType, targetId];
-}
-
-class RenameAttachmentEvent extends AttachmentsEvent {
-  final AttachmentModel file;
-  final String newName;
-  const RenameAttachmentEvent(this.file, this.newName);
-}
-
-class DeleteSpecificAttachmentEvent extends AttachmentsEvent {
-  final AttachmentModel file;
-  const DeleteSpecificAttachmentEvent(this.file);
-}

lib/features/attachments/data/attachments_repository.dart

@@ -1,202 +1,23 @@
 import 'dart:typed_data';
-import 'package:file_picker/file_picker.dart';
-import 'package:flux/features/attachments/models/attachment_model.dart';
+
 import 'package:supabase_flutter/supabase_flutter.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
 
 class AttachmentsRepository {
   final _supabase = Supabase.instance.client;
-  static const String _bucketName = 'documents';
-  static const String _tableName =
-      'attachment'; // Cambia col vero nome della tua tabella se diverso!
 
   /// Scarica i byte di un file direttamente da Supabase Storage
   Future<Uint8List> downloadAttachmentBytes(String storagePath) async {
     try {
+      // ATTENZIONE: Sostituisci 'attachments' con il nome VERO del tuo bucket su Supabase!
+      // Se il tuo storagePath contiene già il nome del bucket all'inizio,
+      // assicurati di passargli solo il percorso interno.
       final Uint8List bytes = await _supabase.storage
-          .from(_bucketName)
+          .from('attachments') // <--- NOME DEL TUO BUCKET
           .download(storagePath);
+
       return bytes;
     } catch (e) {
       throw Exception("Impossibile scaricare il documento dal cloud: $e");
     }
   }
-
-  /// RESTITUISCE IL NOME DELLA COLONNA DB IN BASE AL TIPO
-  String _getColumnNameForParent(AttachmentParentType parentType) {
-    switch (parentType) {
-      case AttachmentParentType.operation:
-        return 'operation_id';
-      case AttachmentParentType.ticket:
-        return 'ticket_id';
-      case AttachmentParentType.customer:
-        return 'customer_id';
-    }
-  }
-
-  /// RECUPERA I FILE IN TEMPO REALE
-  Stream<List<AttachmentModel>> getFilesStream(
-    String parentId,
-    AttachmentParentType parentType,
-  ) {
-    final columnName = _getColumnNameForParent(parentType);
-
-    return _supabase
-        .from(_tableName)
-        .stream(primaryKey: ['id'])
-        .eq(columnName, parentId)
-        .map(
-          (listOfMaps) =>
-              listOfMaps.map((map) => AttachmentModel.fromMap(map)).toList(),
-        );
-  }
-
-  /// CARICA IL FILE NELLO STORAGE E LO REGISTRA NEL DB
-  Future<void> uploadAndRegisterFile({
-    required String parentId,
-    required AttachmentParentType parentType,
-    required PlatformFile pickedFile,
-    required String companyId,
-  }) async {
-    try {
-      if (pickedFile.bytes == null) {
-        throw Exception(
-          "I bytes del file sono vuoti! Ricarica la pagina senza cache.",
-        );
-      }
-
-      final extension = pickedFile.extension ?? pickedFile.name.split('.').last;
-      final cleanName = pickedFile.name
-          .replaceAll(RegExp(r'[^\w\s\.-]'), '')
-          .replaceAll(' ', '_');
-
-      // Creiamo un path ordinato: idAzienda/tipoEntita/idEntita/timestamp_nomefile
-      final timestamp = DateTime.now().millisecondsSinceEpoch;
-      final storagePath =
-          '$companyId/${parentType.name}/$parentId/${timestamp}_$cleanName';
-
-      // 1. Upload su Supabase Storage
-      await _supabase.storage
-          .from(_bucketName)
-          .uploadBinary(
-            storagePath,
-            pickedFile.bytes!,
-            fileOptions: FileOptions(
-              upsert: true,
-              contentType: _guessContentType(extension),
-            ),
-          );
-
-      // 2. Creiamo la mappa per il DB dinamicamente
-      final Map<String, dynamic> insertData = {
-        'company_id': companyId,
-        'name': pickedFile.name.replaceAll('.$extension', ''),
-        'extension': extension,
-        'file_size': pickedFile.size,
-        'storage_path': storagePath,
-      };
-
-      // Inseriamo l'ID nella colonna giusta!
-      final columnName = _getColumnNameForParent(parentType);
-      insertData[columnName] = parentId;
-
-      // 3. Salviamo su Postgres
-      await _supabase.from(_tableName).insert(insertData);
-    } catch (e) {
-      throw Exception("Errore caricamento: $e");
-    }
-  }
-
-  /// ELIMINA IL FILE (Scollegamento intelligente)
-  Future<void> deleteFiles({
-    required List<AttachmentModel> files,
-    required AttachmentParentType currentContextType,
-  }) async {
-    if (files.isEmpty) return;
-
-    try {
-      for (var file in files) {
-        if (file.id == null) continue;
-
-        // 1. Capiamo quali collegamenti ha questo file attualmente
-        final currentLinks = {
-          AttachmentParentType.operation: file.operationId,
-          AttachmentParentType.ticket: file.ticketId,
-          AttachmentParentType.customer: file.customerId,
-        };
-
-        // 2. Simuliamo la rimozione del collegamento per il contesto attuale
-        currentLinks[currentContextType] = null;
-
-        // 3. Controlliamo se rimangono altri ID valorizzati
-        final hasOtherActiveLinks = currentLinks.values.any(
-          (id) => id != null && id.isNotEmpty,
-        );
-
-        if (hasOtherActiveLinks) {
-          // A. Ci sono ancora altre entità che usano questo file!
-          // Scolleghiamolo SOLO dal contesto attuale mettendo a NULL la sua colonna
-          await _supabase
-              .from(_tableName)
-              .update({currentContextType.dbColumn: null})
-              .eq('id', file.id!);
-        } else {
-          // B. Nessuno usa più questo file! ELIMINAZIONE FISICA TOTALE.
-          await _supabase.from(_tableName).delete().eq('id', file.id!);
-
-          if (file.storagePath != null) {
-            await _supabase.storage.from(_bucketName).remove([
-              file.storagePath!,
-            ]);
-          }
-        }
-      }
-    } catch (e) {
-      throw Exception("Errore nell'eliminazione dei file: $e");
-    }
-  }
-
-  /// RINOMINA UN FILE (Solo nel DB, non cambiamo il file fisico)
-  Future<void> renameAttachment(String fileId, String newName) async {
-    try {
-      await _supabase
-          .from(_tableName)
-          .update({'name': newName})
-          .eq('id', fileId);
-    } catch (e) {
-      throw Exception("Errore nella rinomina del file: $e");
-    }
-  }
-
-  /// ASSOCIA UN FILE A UN'ALTRA ENTITÀ (Modifica il record esistente)
-  Future<void> linkFileToEntity({
-    required String fileId,
-    required AttachmentParentType targetType,
-    required String targetId,
-  }) async {
-    try {
-      // Facciamo un semplice UPDATE aggiungendo l'ID nella colonna giusta
-      await _supabase
-          .from(_tableName)
-          .update({targetType.dbColumn: targetId})
-          .eq('id', fileId);
-    } catch (e) {
-      throw Exception("Errore nel collegamento del file: $e");
-    }
-  }
-
-  // Helper per indovinare il content-type base
-  String _guessContentType(String extension) {
-    switch (extension.toLowerCase()) {
-      case 'pdf':
-        return 'application/pdf';
-      case 'png':
-        return 'image/png';
-      case 'jpg':
-      case 'jpeg':
-        return 'image/jpeg';
-      default:
-        return 'application/octet-stream';
-    }
-  }
 }

lib/features/attachments/models/attachment_model.dart

@@ -7,7 +7,6 @@ class AttachmentModel extends Equatable {
   final DateTime? createdAt;
   final String? customerId;
   final String? operationId;
-  final String? ticketId;
   final String name;
   final String extension;
   final String? storagePath;
@@ -20,7 +19,6 @@ class AttachmentModel extends Equatable {
     this.createdAt,
     this.customerId,
     this.operationId,
-    this.ticketId,
     required this.name,
     required this.extension,
     this.storagePath,
@@ -35,7 +33,6 @@ class AttachmentModel extends Equatable {
     createdAt,
     customerId,
     operationId,
-    ticketId,
     name,
     extension,
     storagePath,
@@ -62,7 +59,6 @@ class AttachmentModel extends Equatable {
     DateTime? createdAt,
     String? customerId,
     String? operationId,
-    String? ticketId,
     String? name,
     String? extension,
     String? storagePath,
@@ -74,7 +70,6 @@ class AttachmentModel extends Equatable {
     createdAt: createdAt ?? this.createdAt,
     customerId: customerId ?? this.customerId,
     operationId: operationId ?? this.operationId,
-    ticketId: ticketId ?? this.ticketId,
     name: name ?? this.name,
     extension: extension ?? this.extension,
     storagePath: storagePath ?? this.storagePath,
@@ -91,7 +86,6 @@ class AttachmentModel extends Equatable {
           : null,
       customerId: map['customer_id'] as String?,
       operationId: map['operation_id'] as String?,
-      ticketId: map['ticket_id'] as String?,
       name: map['name'] as String,
       extension: map['extension'] as String,
       storagePath: map['storage_path'] as String?,
@@ -110,7 +104,6 @@ class AttachmentModel extends Equatable {
       'storage_path': storagePath,
       'customer_id': customerId,
       'operation_id': operationId,
-      'ticket_id': ticketId,
       'file_size': fileSize,
       'company_id': companyId,
     };

lib/features/company/bloc/company_bloc.dart

@@ -0,0 +1,33 @@
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flux/features/company/data/company_repository.dart';
+import 'package:flux/features/company/models/company_model.dart';
+import 'package:get_it/get_it.dart';
+
+part 'company_events.dart';
+part 'company_state.dart';
+
+class CompanyBloc extends Bloc<CompanyEvent, CompanyState> {
+  final CompanyRepository _repository = GetIt.I<CompanyRepository>();
+  CompanyBloc() : super(const CompanyState(status: CompanyStatus.initial)) {
+    on<CreateCompanyRequested>((event, emit) async {
+      emit(const CompanyState(status: CompanyStatus.loading));
+      try {
+        final createdCompany = await _repository.createCompany(event.company);
+        emit(
+          state.copyWith(
+            status: CompanyStatus.success,
+            company: createdCompany,
+          ),
+        );
+      } catch (e) {
+        emit(
+          state.copyWith(
+            status: CompanyStatus.failure,
+            errorMessage: e.toString(),
+          ),
+        );
+      }
+    });
+  }
+}

lib/features/company/bloc/company_events.dart

@@ -0,0 +1,19 @@
+part of 'company_bloc.dart';
+
+// lib/blocs/company/company_event.dart
+
+abstract class CompanyEvent extends Equatable {
+  const CompanyEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class CreateCompanyRequested extends CompanyEvent {
+  final CompanyModel company;
+
+  const CreateCompanyRequested({required this.company});
+
+  @override
+  List<Object?> get props => [company];
+}

lib/features/company/bloc/company_settings_cubit.dart

@@ -1,121 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter/foundation.dart'; // Per kIsWeb
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/company/data/company_repository.dart';
-import 'package:flux/features/company/models/company_model.dart';
-import 'package:get_it/get_it.dart';
-
-part 'company_settings_state.dart';
-
-class CompanySettingsCubit extends Cubit<CompanySettingsState> {
-  final CompanyRepository _repository = GetIt.I<CompanyRepository>();
-  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
-
-  CompanySettingsCubit() : super(const CompanySettingsState());
-
-  void initSettings() {
-    final currentCompany = _sessionCubit.state.company;
-    if (currentCompany != null) {
-      emit(
-        state.copyWith(
-          company: currentCompany,
-          status: CompanySettingsStatus.ready,
-        ),
-      );
-    }
-  }
-
-  void updateFields({
-    String? name,
-    String? vatId, // Modificato da vatNumber a vatId
-    String? fiscalCode, // Aggiunto
-    String? sdi, // Aggiunto
-    String? address,
-    String? city,
-    String? province, // Aggiunto
-    String? zipCode,
-    String? phone,
-    String? email,
-  }) {
-    if (state.company == null) return;
-
-    final updated = state.company!.copyWith(
-      name: name ?? state.company!.name,
-      vatId: vatId ?? state.company!.vatId,
-      fiscalCode: fiscalCode ?? state.company!.fiscalCode,
-      sdi: sdi ?? state.company!.sdi,
-      address: address ?? state.company!.address,
-      city: city ?? state.company!.city,
-      province: province ?? state.company!.province,
-      zipCode: zipCode ?? state.company!.zipCode,
-      phone: phone ?? state.company!.phone,
-      email: email ?? state.company!.email,
-    );
-    emit(state.copyWith(company: updated));
-  }
-
-  Future<void> saveSettings() async {
-    if (state.company == null) return;
-    emit(
-      state.copyWith(status: CompanySettingsStatus.saving, errorMessage: null),
-    );
-
-    try {
-      // 1. Salva i dati su Supabase
-      final updatedCompany = await _repository.updateCompany(state.company!);
-
-      // 2. Aggiorna la sessione globale per riflettere i cambiamenti in tutta l'app
-      _sessionCubit.updateCurrentCompany(updatedCompany);
-
-      emit(
-        state.copyWith(
-          status: CompanySettingsStatus.success,
-          company: updatedCompany,
-        ),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CompanySettingsStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  // Metodo per gestire l'upload del logo
-  Future<void> uploadLogo(Uint8List bytes, String fileName) async {
-    if (state.company == null) return;
-    emit(state.copyWith(status: CompanySettingsStatus.uploadingLogo));
-
-    try {
-      // Usa il tuo repository per caricare il file nel bucket 'company_logos'
-      // Il file può essere Uint8List (se sei su Web) o File (se sei su Mobile/Desktop)
-      final publicUrl = await _repository.uploadCompanyLogo(
-        companyId: state.company!.id!,
-        fileBytes: bytes,
-        fileName: fileName,
-      );
-
-      final updatedCompany = state.company!.copyWith(logoUrl: publicUrl);
-
-      emit(
-        state.copyWith(
-          company: updatedCompany,
-          status: CompanySettingsStatus.ready,
-        ),
-      );
-
-      // Chiamiamo il salvataggio per rendere definitivo l'URL nel record della compagnia
-      await saveSettings();
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: CompanySettingsStatus.failure,
-          errorMessage: "Errore caricamento logo: $e",
-        ),
-      );
-    }
-  }
-}

lib/features/company/bloc/company_settings_state.dart

@@ -1,37 +0,0 @@
-part of 'company_settings_cubit.dart';
-
-class CompanySettingsState extends Equatable {
-  final CompanySettingsStatus status;
-  final CompanyModel? company;
-  final String? errorMessage;
-
-  const CompanySettingsState({
-    this.status = CompanySettingsStatus.initial,
-    this.company,
-    this.errorMessage,
-  });
-
-  CompanySettingsState copyWith({
-    CompanySettingsStatus? status,
-    CompanyModel? company,
-    String? errorMessage,
-  }) {
-    return CompanySettingsState(
-      status: status ?? this.status,
-      company: company ?? this.company,
-      errorMessage: errorMessage,
-    );
-  }
-
-  @override
-  List<Object?> get props => [status, company, errorMessage];
-}
-
-enum CompanySettingsStatus {
-  initial,
-  ready,
-  saving,
-  uploadingLogo,
-  success,
-  failure,
-}

lib/features/company/bloc/company_state.dart

@@ -0,0 +1,26 @@
+part of 'company_bloc.dart';
+
+enum CompanyStatus { initial, loading, success, failure }
+
+class CompanyState extends Equatable {
+  final CompanyStatus status;
+  final String? errorMessage;
+  final CompanyModel? company;
+
+  const CompanyState({required this.status, this.errorMessage, this.company});
+
+  CompanyState copyWith({
+    CompanyStatus? status,
+    String? errorMessage,
+    CompanyModel? company,
+  }) {
+    return CompanyState(
+      status: status ?? this.status,
+      errorMessage: errorMessage ?? this.errorMessage,
+      company: company ?? this.company,
+    );
+  }
+
+  @override
+  List<Object?> get props => [status, errorMessage, company];
+}

lib/features/company/data/company_repository.dart

@@ -1,5 +1,3 @@
-import 'dart:typed_data';
-
 import 'package:supabase_flutter/supabase_flutter.dart';
 import '../models/company_model.dart';
 
@@ -23,62 +21,6 @@ class CompanyRepository {
     }
   }
 
-  Future<CompanyModel> updateCompany(CompanyModel company) async {
-    try {
-      final response = await _supabase
-          .from('company')
-          .update(company.toMap())
-          .eq('id', company.id!)
-          .select()
-          .single();
-
-      return CompanyModel.fromMap(response);
-    } on PostgrestException catch (e) {
-      throw e.message;
-    } catch (e) {
-      throw e.toString();
-    }
-  }
-
-  Future<String> uploadCompanyLogo({
-    required String companyId,
-    required Uint8List fileBytes,
-    required String fileName,
-  }) async {
-    try {
-      // 1. Prepariamo il path.
-      // Organizziamo per companyId e aggiungiamo un timestamp per evitare cache del browser
-      // quando l'utente cambia logo più volte.
-      final extension = fileName.split('.').last;
-      final timestamp = DateTime.now().millisecondsSinceEpoch;
-      final filePath = '$companyId/logo_$timestamp.$extension';
-
-      // 2. Caricamento fisico dei bytes
-      // Usiamo uploadBinary che è perfetto per Uint8List
-      await _supabase.storage
-          .from('company_logos')
-          .uploadBinary(
-            filePath,
-            fileBytes,
-            fileOptions: const FileOptions(
-              cacheControl: '3600',
-              upsert:
-                  true, // Se esiste già un file con lo stesso nome, lo sovrascrive
-            ),
-          );
-
-      // 3. Otteniamo l'URL pubblico.
-      // Nota: il bucket 'company_logos' deve essere impostato come PUBLIC su Supabase
-      final String publicUrl = _supabase.storage
-          .from('company_logos')
-          .getPublicUrl(filePath);
-
-      return publicUrl;
-    } catch (e) {
-      throw Exception("Errore durante l'upload del logo: $e");
-    }
-  }
-
   Future<CompanyModel?> getCompany() async {
     try {
       final userId = _supabase.auth.currentUser?.id;

lib/features/company/models/company_model.dart

@@ -53,9 +53,7 @@ class CompanyModel extends Equatable {
   final String vatId;
   final String fiscalCode;
   final String sdi;
-  final String? phone;
-  final String? email;
-  final String? logoUrl;
+  final String companyLogo;
 
   // Stato Pagamenti (Ibride: manuale + Stripe)
   final bool isPaid;
@@ -80,9 +78,7 @@ class CompanyModel extends Equatable {
     required this.vatId,
     required this.fiscalCode,
     required this.sdi,
-    this.phone,
-    this.email,
-    this.logoUrl,
+    this.companyLogo = '',
     this.isPaid = false,
     this.paymentExpiration,
     this.subscriptionTier = SubscriptionTier.free,
@@ -104,9 +100,7 @@ class CompanyModel extends Equatable {
     String? vatId,
     String? fiscalCode,
     String? sdi,
-    String? logoUrl,
-    String? phone,
-    String? email,
+    String? companyLogo,
     bool? isPaid,
     DateTime? paymentExpiration,
     SubscriptionTier? subscriptionTier,
@@ -127,9 +121,7 @@ class CompanyModel extends Equatable {
       vatId: vatId ?? this.vatId,
       fiscalCode: fiscalCode ?? this.fiscalCode,
       sdi: sdi ?? this.sdi,
-      logoUrl: logoUrl ?? this.logoUrl,
-      phone: phone ?? this.phone,
-      email: email ?? this.email,
+      companyLogo: companyLogo ?? this.companyLogo,
       isPaid: isPaid ?? this.isPaid,
       paymentExpiration: paymentExpiration ?? this.paymentExpiration,
       subscriptionTier: subscriptionTier ?? this.subscriptionTier,
@@ -171,9 +163,7 @@ class CompanyModel extends Equatable {
       vatId: map['vat_id'] ?? '',
       fiscalCode: map['fiscal_code'] ?? '',
       sdi: map['sdi'] ?? '',
-      logoUrl: map['company_logo'],
-      phone: map['phone'] ?? '',
-      email: map['email'] ?? '',
+      companyLogo: map['company_logo'] ?? '',
       isPaid: map['is_paid'] ?? false,
       paymentExpiration: map['payment_expiration'] != null
           ? DateTime.tryParse(map['payment_expiration'])
@@ -203,9 +193,7 @@ class CompanyModel extends Equatable {
       'vat_id': vatId,
       'fiscal_code': fiscalCode,
       'sdi': sdi,
-      'company_logo': logoUrl,
-      'phone': phone,
-      'email': email,
+      'company_logo': companyLogo,
       'is_paid': isPaid,
       if (paymentExpiration != null)
         'payment_expiration': paymentExpiration!.toIso8601String(),
@@ -233,9 +221,7 @@ class CompanyModel extends Equatable {
     vatId,
     fiscalCode,
     sdi,
-    logoUrl,
-    phone,
-    email,
+    companyLogo,
     isPaid,
     paymentExpiration,
     subscriptionTier,

lib/features/company/ui/company_settings_screen.dart

@@ -1,356 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/company/bloc/company_settings_cubit.dart';
-import 'package:flux/features/company/models/company_model.dart';
-import 'package:image_picker/image_picker.dart';
-
-class CompanySettingsScreen extends StatefulWidget {
-  const CompanySettingsScreen({super.key});
-
-  @override
-  State<CompanySettingsScreen> createState() => _CompanySettingsScreenState();
-}
-
-class _CompanySettingsScreenState extends State<CompanySettingsScreen> {
-  final _formKey = GlobalKey<FormState>();
-
-  final _nameCtrl = TextEditingController();
-  final _vatCtrl = TextEditingController();
-  final _fiscalCodeCtrl = TextEditingController(); // Nuovo
-  final _sdiCtrl = TextEditingController(); // Nuovo
-  final _addressCtrl = TextEditingController();
-  final _cityCtrl = TextEditingController();
-  final _provinceCtrl = TextEditingController(); // Nuovo
-  final _zipCtrl = TextEditingController();
-  final _phoneCtrl = TextEditingController();
-  final _emailCtrl = TextEditingController();
-
-  bool _isInitialized = false;
-
-  @override
-  void initState() {
-    super.initState();
-    final cubit = context.read<CompanySettingsCubit>();
-    cubit.initSettings();
-    if (cubit.state.status == CompanySettingsStatus.ready &&
-        cubit.state.company != null) {
-      _syncControllers(cubit.state.company!);
-    }
-  }
-
-  @override
-  void dispose() {
-    _nameCtrl.dispose();
-    _vatCtrl.dispose();
-    _fiscalCodeCtrl.dispose(); // Nuovo
-    _sdiCtrl.dispose(); // Nuovo
-    _addressCtrl.dispose();
-    _cityCtrl.dispose();
-    _provinceCtrl.dispose(); // Nuovo
-    _zipCtrl.dispose();
-    _phoneCtrl.dispose();
-    _emailCtrl.dispose();
-    super.dispose();
-  }
-
-  void _syncControllers(CompanyModel company) {
-    if (_nameCtrl.text.isEmpty) _nameCtrl.text = company.name;
-    if (_vatCtrl.text.isEmpty) _vatCtrl.text = company.vatId;
-    if (_fiscalCodeCtrl.text.isEmpty) {
-      _fiscalCodeCtrl.text = company.fiscalCode; // Nuovo
-    }
-    if (_sdiCtrl.text.isEmpty) _sdiCtrl.text = company.sdi; // Nuovo
-    if (_provinceCtrl.text.isEmpty) {
-      _provinceCtrl.text = company.province; // Nuovo
-    }
-    if (_addressCtrl.text.isEmpty) _addressCtrl.text = company.address;
-    if (_cityCtrl.text.isEmpty) _cityCtrl.text = company.city;
-    if (_zipCtrl.text.isEmpty) _zipCtrl.text = company.zipCode;
-    if (_phoneCtrl.text.isEmpty) _phoneCtrl.text = company.phone ?? '';
-    if (_emailCtrl.text.isEmpty) _emailCtrl.text = company.email ?? '';
-    _isInitialized = true;
-  }
-
-  void _flushToCubit() {
-    context.read<CompanySettingsCubit>().updateFields(
-      name: _nameCtrl.text,
-      vatId: _vatCtrl.text,
-      fiscalCode: _fiscalCodeCtrl.text, // Nuovo
-      sdi: _sdiCtrl.text, // Nuovo
-      province: _provinceCtrl.text,
-      address: _addressCtrl.text,
-      city: _cityCtrl.text,
-      zipCode: _zipCtrl.text,
-      phone: _phoneCtrl.text,
-      email: _emailCtrl.text,
-    );
-  }
-
-  Future<void> _pickAndUploadLogo() async {
-    final picker = ImagePicker();
-    final companySettingsCubit = context.read<CompanySettingsCubit>();
-
-    final pickedFile = await picker.pickImage(source: ImageSource.gallery);
-
-    if (pickedFile != null && mounted) {
-      // Passiamo i bytes per compatibilità totale con Flutter Web
-      final bytes = await pickedFile.readAsBytes();
-      companySettingsCubit.uploadLogo(bytes, pickedFile.name);
-    }
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return Scaffold(
-      appBar: AppBar(title: const Text('Impostazioni Azienda')),
-      body: BlocConsumer<CompanySettingsCubit, CompanySettingsState>(
-        listener: (context, state) {
-          if (state.status == CompanySettingsStatus.ready && !_isInitialized) {
-            _syncControllers(state.company!);
-          }
-          if (state.status == CompanySettingsStatus.success) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(
-                content: Text('Impostazioni salvate con successo!'),
-                backgroundColor: Colors.green,
-              ),
-            );
-          }
-          if (state.status == CompanySettingsStatus.failure) {
-            ScaffoldMessenger.of(context).showSnackBar(
-              SnackBar(
-                content: Text(state.errorMessage ?? 'Errore'),
-                backgroundColor: Colors.red,
-              ),
-            );
-          }
-        },
-        builder: (context, state) {
-          if (state.company == null) {
-            return const Center(child: CircularProgressIndicator());
-          }
-
-          final company = state.company!;
-
-          return Center(
-            child: ConstrainedBox(
-              constraints: const BoxConstraints(maxWidth: 800),
-              child: Form(
-                key: _formKey,
-                child: ListView(
-                  padding: const EdgeInsets.all(24.0),
-                  children: [
-                    // --- SEZIONE LOGO ---
-                    Center(
-                      child: Stack(
-                        alignment: Alignment.bottomRight,
-                        children: [
-                          Container(
-                            height: 120,
-                            width: 120,
-                            decoration: BoxDecoration(
-                              color: theme.colorScheme.surfaceContainerHighest,
-                              shape: BoxShape.circle,
-                              border: Border.all(color: theme.dividerColor),
-                              image: company.logoUrl != null
-                                  ? DecorationImage(
-                                      image: NetworkImage(company.logoUrl!),
-                                      fit: BoxFit.contain,
-                                    )
-                                  : null,
-                            ),
-                            child: company.logoUrl == null
-                                ? const Icon(
-                                    Icons.business,
-                                    size: 50,
-                                    color: Colors.grey,
-                                  )
-                                : null,
-                          ),
-                          if (state.status ==
-                              CompanySettingsStatus.uploadingLogo)
-                            const Positioned.fill(
-                              child: Center(child: CircularProgressIndicator()),
-                            ),
-                          FloatingActionButton.small(
-                            onPressed:
-                                state.status ==
-                                    CompanySettingsStatus.uploadingLogo
-                                ? null
-                                : _pickAndUploadLogo,
-                            child: const Icon(Icons.camera_alt),
-                          ),
-                        ],
-                      ),
-                    ),
-                    const SizedBox(height: 32),
-
-                    // --- SEZIONE DATI PRINCIPALI ---
-                    Text(
-                      'Dati Legali',
-                      style: theme.textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const Divider(),
-                    const SizedBox(height: 16),
-                    TextFormField(
-                      controller: _nameCtrl,
-                      decoration: const InputDecoration(
-                        labelText: 'Ragione Sociale',
-                        prefixIcon: Icon(Icons.badge),
-                      ),
-                      validator: (val) => val == null || val.isEmpty
-                          ? 'Campo obbligatorio'
-                          : null,
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      children: [
-                        Expanded(
-                          child: TextFormField(
-                            controller: _vatCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Partita IVA',
-                              prefixIcon: Icon(Icons.receipt_long),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          child: TextFormField(
-                            controller: _fiscalCodeCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Codice Fiscale',
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          child: TextFormField(
-                            controller: _sdiCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Codice SDI',
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-
-                    // --- SEZIONE INDIRIZZO E CONTATTI ---
-                    Text(
-                      'Sede e Contatti',
-                      style: theme.textTheme.titleLarge?.copyWith(
-                        fontWeight: FontWeight.bold,
-                      ),
-                    ),
-                    const Divider(),
-                    const SizedBox(height: 16),
-                    TextFormField(
-                      controller: _addressCtrl,
-                      decoration: const InputDecoration(
-                        labelText: 'Indirizzo (Via e numero civico)',
-                        prefixIcon: Icon(Icons.location_on),
-                      ),
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      children: [
-                        Expanded(
-                          flex: 2,
-                          child: TextFormField(
-                            controller: _cityCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Città',
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          flex: 1,
-                          child: TextFormField(
-                            controller: _provinceCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Provincia (es. MI)',
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          flex: 1,
-                          child: TextFormField(
-                            controller: _zipCtrl,
-                            decoration: const InputDecoration(labelText: 'CAP'),
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 16),
-                    Row(
-                      children: [
-                        Expanded(
-                          child: TextFormField(
-                            controller: _phoneCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Telefono',
-                              prefixIcon: Icon(Icons.phone),
-                            ),
-                          ),
-                        ),
-                        const SizedBox(width: 16),
-                        Expanded(
-                          child: TextFormField(
-                            controller: _emailCtrl,
-                            decoration: const InputDecoration(
-                              labelText: 'Email',
-                              prefixIcon: Icon(Icons.email),
-                            ),
-                          ),
-                        ),
-                      ],
-                    ),
-                    const SizedBox(height: 48),
-
-                    // --- PULSANTE SALVATAGGIO ---
-                    SizedBox(
-                      height: 50,
-                      child: ElevatedButton.icon(
-                        onPressed: state.status == CompanySettingsStatus.saving
-                            ? null
-                            : () {
-                                if (_formKey.currentState!.validate()) {
-                                  _flushToCubit();
-                                  context
-                                      .read<CompanySettingsCubit>()
-                                      .saveSettings();
-                                }
-                              },
-                        icon: state.status == CompanySettingsStatus.saving
-                            ? const SizedBox(
-                                width: 20,
-                                height: 20,
-                                child: CircularProgressIndicator(
-                                  color: Colors.white,
-                                  strokeWidth: 2,
-                                ),
-                              )
-                            : const Icon(Icons.save),
-                        label: const Text(
-                          'Salva Impostazioni',
-                          style: TextStyle(fontSize: 16),
-                        ),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          );
-        },
-      ),
-    );
-  }
-}

lib/features/company/ui/create_company_screen.dart

@@ -0,0 +1,328 @@
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/utils/extensions.dart';
+import 'package:flux/features/company/bloc/company_bloc.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/theme/theme.dart';
+import 'package:flux/core/widgets/flux_text_field.dart';
+import 'package:flux/features/company/models/company_model.dart';
+
+class CreateCompanyScreen extends StatefulWidget {
+  const CreateCompanyScreen({super.key});
+
+  @override
+  State<CreateCompanyScreen> createState() => _CreateCompanyScreenState();
+}
+
+// lib/ui/setup/create_company_screen.dart
+
+class _CreateCompanyScreenState extends State<CreateCompanyScreen> {
+  final _formKey = GlobalKey<FormState>();
+
+  // Controller per i campi obbligatori
+  final _ragioneSocialeController = TextEditingController();
+  final _indirizzoController = TextEditingController();
+  final _capController = TextEditingController();
+  final _cittaController = TextEditingController();
+  final _provinciaController = TextEditingController();
+  final _pIvaController = TextEditingController();
+  final _cfController = TextEditingController();
+  final _univocoController = TextEditingController();
+
+  @override
+  void dispose() {
+    // Ricordati sempre di chiuderli!
+    _ragioneSocialeController.dispose();
+    _indirizzoController.dispose();
+    _capController.dispose();
+    _cittaController.dispose();
+    _provinciaController.dispose();
+    _pIvaController.dispose();
+    _cfController.dispose();
+    _univocoController.dispose();
+    super.dispose();
+  }
+
+  void _onSave() {
+    if (_formKey.currentState!.validate()) {
+      // Recuperiamo l'ID utente attuale da Supabase o dal SessionBloc
+      final userId = context.read<SessionCubit>().state.user!.id;
+
+      final company = CompanyModel(
+        userId: userId,
+        name: _ragioneSocialeController.text.trim(),
+        address: _indirizzoController.text.trim(),
+        zipCode: _capController.text.trim(),
+        city: _cittaController.text.trim(),
+        province: _provinciaController.text.trim(),
+        vatId: _pIvaController.text.trim(),
+        fiscalCode: _cfController.text.trim(),
+        sdi: _univocoController.text.trim().toUpperCase(),
+        // Gli altri campi hanno i default nel modello
+      );
+
+      // Spariamo l'evento al Bloc
+      context.read<CompanyBloc>().add(CreateCompanyRequested(company: company));
+    }
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: Text(context.l10n.createCompanyScreenCompanyConfiguration),
+        actions: [
+          IconButton(
+            icon: const Icon(Icons.logout_rounded),
+            onPressed: () {
+              // Qui chiami il tuo Bloc dell'autenticazione per fare logout
+              // Esempio se hai un AuthBloc o SessionBloc:
+              //context.read<AuthBloc>().add(LogoutRequested());
+
+              // Se vuoi solo tornare brutalmente alla login per testare il logo:
+              // Navigator.of(context).pushReplacementNamed('/login');
+            },
+          ),
+        ],
+      ),
+      body: BlocConsumer<CompanyBloc, CompanyState>(
+        listener: (context, state) {
+          if (state.status == CompanyStatus.success && state.company != null) {
+            // 1. Aggiorniamo la singleton con i dati reali (ID incluso)
+            //GetIt.I.get<AppSettings>().setCurrentCompany(state.company);
+
+            // 2. Notifichiamo il SessionBloc per cambiare pagina
+            //context.read<SessionCubit>().add(AppStarted());
+          }
+
+          if (state.status == CompanyStatus.failure) {
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(
+                content: Text(
+                  state.errorMessage ?? context.l10n.commonSavingError,
+                ),
+                backgroundColor: Colors.redAccent,
+              ),
+            );
+          }
+        },
+        builder: (context, state) {
+          return SafeArea(
+            child: SingleChildScrollView(
+              padding: const EdgeInsets.all(24.0),
+              child: Form(
+                key: _formKey,
+                child: Column(
+                  crossAxisAlignment: CrossAxisAlignment.start,
+                  children: [
+                    _buildHeader(context),
+                    const SizedBox(height: 32),
+
+                    // --- SEZIONE 1: IDENTITÀ FISCALE ---
+                    _SectionTitle(
+                      title: context.l10n.createCompanyScreenFiscalData,
+                    ),
+                    const SizedBox(height: 16),
+                    FluxTextField(
+                      label: context.l10n.createCompanyScreenCompanyName,
+                      icon: Icons.business,
+                      controller: _ragioneSocialeController,
+                    ),
+                    const SizedBox(height: 16),
+                    Row(
+                      children: [
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.createCompanyScreenVatId,
+                            icon: Icons.numbers,
+                            controller: _pIvaController,
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.createCompanyScreenFiscalCode,
+                            icon: Icons.badge_outlined,
+                            controller: _cfController,
+                          ),
+                        ),
+                      ],
+                    ),
+                    const SizedBox(height: 16),
+                    FluxTextField(
+                      label: context.l10n.createCompanyScreenSdiPec,
+                      icon: Icons.send_and_archive_outlined,
+                      controller: _univocoController,
+                    ),
+
+                    const SizedBox(height: 32),
+
+                    // --- SEZIONE 2: SEDE LEGALE ---
+                    _SectionTitle(
+                      title:
+                          context.l10n.createCompanyScreenCompanyLegalAddress,
+                    ),
+                    const SizedBox(height: 16),
+                    FluxTextField(
+                      label: context.l10n.commonAddress,
+                      icon: Icons.home_work_outlined,
+                      controller: _indirizzoController,
+                    ),
+                    const SizedBox(height: 16),
+                    Row(
+                      children: [
+                        Expanded(
+                          flex: 2,
+                          child: FluxTextField(
+                            label: context.l10n.commonCity,
+                            icon: Icons.location_city,
+                            controller: _cittaController,
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.commonZipCode,
+                            icon: Icons.map_outlined,
+                            controller: _capController,
+                          ),
+                        ),
+                        const SizedBox(width: 12),
+                        Expanded(
+                          child: FluxTextField(
+                            label: context.l10n.commonProvince,
+                            icon: Icons.explore_outlined,
+                            controller: _provinciaController,
+                          ),
+                        ),
+                      ],
+                    ),
+
+                    const SizedBox(height: 32),
+
+                    // --- SEZIONE 3: LOGO AZIENDALE ---
+                    _SectionTitle(title: 'BRANDING'),
+                    const SizedBox(height: 16),
+                    _buildLogoPicker(context),
+
+                    const SizedBox(height: 48),
+
+                    // --- BOTTONE INVIO ---
+                    _buildSubmitButton(context, state),
+                  ],
+                ),
+              ),
+            ),
+          );
+        },
+      ),
+    );
+  }
+
+  // Placeholder per il futuro caricamento logo
+  Widget _buildLogoPicker(BuildContext context) {
+    return Container(
+      width: double.infinity,
+      padding: const EdgeInsets.all(24),
+      decoration: BoxDecoration(
+        color: context.accent.withValues(alpha: 0.05),
+        borderRadius: BorderRadius.circular(16),
+        // Bordo continuo ma sottile e semitrasparente per un look pulito
+        border: Border.all(
+          color: context.accent.withValues(alpha: 0.3),
+          width: 1,
+        ),
+      ),
+      child: Column(
+        children: [
+          Icon(Icons.cloud_upload_outlined, color: context.accent, size: 32),
+          const SizedBox(height: 12),
+          Text(
+            context.l10n.createCompanyScreenUploadLogo,
+            style: TextStyle(
+              color: context.primaryText,
+              fontWeight: FontWeight.bold,
+            ),
+          ),
+          const SizedBox(height: 4),
+          Text(
+            context.l10n.createCompanyScreenWillBeUsedForReceipts,
+            textAlign: TextAlign.center,
+            style: TextStyle(color: context.secondaryText, fontSize: 12),
+          ),
+        ],
+      ),
+    );
+  }
+
+  Widget _buildSubmitButton(BuildContext context, CompanyState state) {
+    return SizedBox(
+      width: double.infinity,
+      height: 56,
+      child: ElevatedButton(
+        onPressed: state.status == CompanyStatus.loading
+            ? null
+            : () => _onSave(),
+        child: state.status == CompanyStatus.loading
+            ? const CircularProgressIndicator()
+            : Text(context.l10n.createCompanyScreenSaveCompany),
+      ),
+    );
+  }
+
+  Widget _buildHeader(BuildContext context) {
+    return Column(
+      crossAxisAlignment: CrossAxisAlignment.start,
+      children: [
+        Container(
+          padding: const EdgeInsets.all(12),
+          decoration: BoxDecoration(
+            color: context.accent.withValues(alpha: 0.1),
+            borderRadius: BorderRadius.circular(16),
+          ),
+          child: Icon(
+            Icons.domain_add_rounded,
+            color: context.accent,
+            size: 32,
+          ),
+        ),
+        const SizedBox(height: 24),
+        Text(
+          context.l10n.createCompanyScreenSetupYourCompany,
+          style: Theme.of(context).textTheme.headlineMedium?.copyWith(
+            fontWeight: FontWeight.bold,
+            color: context.primaryText,
+          ),
+        ),
+        const SizedBox(height: 12),
+        Text(
+          context.l10n.createCompanyScreenFluxNeedsYourFiscalData,
+          style: TextStyle(
+            color: context.secondaryText,
+            fontSize: 15,
+            height: 1.5,
+          ),
+        ),
+      ],
+    );
+  }
+}
+
+// Widget di supporto per i titoli delle sezioni
+class _SectionTitle extends StatelessWidget {
+  final String title;
+  const _SectionTitle({required this.title});
+
+  @override
+  Widget build(BuildContext context) {
+    return Text(
+      title,
+      style: TextStyle(
+        color: context.accent,
+        fontWeight: FontWeight.w800,
+        letterSpacing: 1.2,
+        fontSize: 13,
+      ),
+    );
+  }
+}

lib/features/customers/blocs/customer_files_bloc.dart

@@ -0,0 +1,139 @@
+import 'dart:async';
+import 'dart:io';
+
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flux/features/attachments/models/attachment_model.dart';
+import 'package:flux/features/customers/data/customer_repository.dart';
+import 'package:get_it/get_it.dart';
+
+part 'customer_files_events.dart';
+part 'customer_files_state.dart';
+
+class CustomerFilesBloc extends Bloc<CustomerFilesEvent, CustomerFilesState> {
+  final CustomerRepository _repository = GetIt.I<CustomerRepository>();
+  final String customerId;
+  CustomerFilesBloc(this.customerId)
+    : super(const CustomerFilesState(status: CustomerFilesStatus.initial)) {
+    on<LoadCustomerFilesEvent>(_loadCustomerFiles);
+    on<UploadCustomerFileEvent>(_uploadCustomerFile);
+    on<UploadMultipleCustomerFilesEvent>(_uploadMultipleCustomerFiles);
+    on<DeleteCustomerFilesEvent>(_deleteCustomerFiles);
+    on<ToggleCustomerFileSelectionEvent>(_toggleCustomerFileSelection);
+  }
+  void _loadCustomerFiles(
+    LoadCustomerFilesEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    await emit.forEach<List<AttachmentModel>>(
+      _repository.getCustomerFilesStream(customerId),
+      onData: (customerFiles) => CustomerFilesState(
+        status: CustomerFilesStatus.success,
+        customerFiles: customerFiles,
+      ),
+      onError: (error, stackTrace) => CustomerFilesState(
+        status: CustomerFilesStatus.failure,
+        error: error.toString(),
+      ),
+    );
+  }
+
+  Future<void> _uploadCustomerFile(
+    UploadCustomerFileEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    emit(state.copyWith(status: CustomerFilesStatus.uploading));
+    if (event.pickedFile != null) {
+      try {
+        await _repository.uploadAndRegisterFile(
+          customerId: customerId,
+          pickedFile: event.pickedFile!,
+        );
+        emit(state.copyWith(status: CustomerFilesStatus.success));
+      } catch (e) {
+        emit(
+          state.copyWith(
+            status: CustomerFilesStatus.failure,
+            error: e.toString(),
+          ),
+        );
+      }
+    }
+  }
+
+  FutureOr<void> _uploadMultipleCustomerFiles(
+    UploadMultipleCustomerFilesEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    if (event.files.isEmpty) {
+      emit(
+        state.copyWith(
+          status: CustomerFilesStatus.failure,
+          error: "Nessun file selezionato",
+        ),
+      );
+      return;
+    }
+    emit(state.copyWith(status: CustomerFilesStatus.uploading, error: null));
+    try {
+      // 2. Creiamo una lista di "Promesse" (Futures) per il repository
+      final List<Future<void>> uploadTasks = [];
+      for (var file in event.files) {
+        // Aggiungiamo il task alla lista, ma NON usiamo await qui dentro!
+        uploadTasks.add(
+          _repository.uploadAndRegisterFile(
+            customerId: customerId,
+            pickedFile: file,
+          ),
+        );
+      }
+      // 3. ESECUZIONE PARALLELA!
+      // Aspettiamo che tutti i file siano caricati contemporaneamente.
+      await Future.wait(uploadTasks);
+      // 4. GRAN FINALE: Tutto caricato, emettiamo il success!
+      emit(state.copyWith(status: CustomerFilesStatus.success));
+    } catch (e) {
+      // Se anche un solo file fallisce, catturiamo l'errore
+      emit(
+        state.copyWith(
+          status: CustomerFilesStatus.failure,
+          error: "Errore durante l'upload multiplo: $e",
+        ),
+      );
+    }
+  }
+
+  Future<void> _deleteCustomerFiles(
+    DeleteCustomerFilesEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) async {
+    emit(state.copyWith(status: CustomerFilesStatus.loading));
+    try {
+      await _repository.deleteDocuments(state.selectedFiles);
+      emit(
+        state.copyWith(status: CustomerFilesStatus.success, selectedFiles: []),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: CustomerFilesStatus.failure,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  void _toggleCustomerFileSelection(
+    ToggleCustomerFileSelectionEvent event,
+    Emitter<CustomerFilesState> emit,
+  ) {
+    List<AttachmentModel> selectedFiles = List.from(state.selectedFiles);
+    if (selectedFiles.contains(event.file)) {
+      selectedFiles.remove(event.file);
+    } else {
+      selectedFiles.add(event.file);
+    }
+    emit(state.copyWith(selectedFiles: selectedFiles));
+  }
+}

lib/features/customers/blocs/customer_files_events.dart

@@ -0,0 +1,30 @@
+part of 'customer_files_bloc.dart';
+
+abstract class CustomerFilesEvent extends Equatable {
+  const CustomerFilesEvent();
+
+  @override
+  List<Object> get props => [];
+}
+
+class LoadCustomerFilesEvent extends CustomerFilesEvent {}
+
+class UploadCustomerFileEvent extends CustomerFilesEvent {
+  final PlatformFile? pickedFile;
+  final File? photo;
+  const UploadCustomerFileEvent({this.pickedFile, this.photo});
+}
+
+class UploadMultipleCustomerFilesEvent extends CustomerFilesEvent {
+  final List<PlatformFile> files;
+  const UploadMultipleCustomerFilesEvent(this.files);
+  @override
+  List<Object> get props => [files];
+}
+
+class DeleteCustomerFilesEvent extends CustomerFilesEvent {}
+
+class ToggleCustomerFileSelectionEvent extends CustomerFilesEvent {
+  final AttachmentModel file;
+  const ToggleCustomerFileSelectionEvent(this.file);
+}

lib/features/customers/blocs/customer_files_state.dart

@@ -0,0 +1,34 @@
+part of 'customer_files_bloc.dart';
+
+enum CustomerFilesStatus { initial, loading, uploading, success, failure }
+
+class CustomerFilesState extends Equatable {
+  const CustomerFilesState({
+    required this.status,
+    this.error,
+    this.customerFiles = const [],
+    this.selectedFiles = const [],
+  });
+
+  final CustomerFilesStatus status;
+  final String? error;
+  final List<AttachmentModel> customerFiles;
+  final List<AttachmentModel> selectedFiles;
+
+  @override
+  List<Object?> get props => [status, error, customerFiles, selectedFiles];
+
+  CustomerFilesState copyWith({
+    CustomerFilesStatus? status,
+    String? error,
+    List<AttachmentModel>? customerFiles,
+    List<AttachmentModel>? selectedFiles,
+  }) {
+    return CustomerFilesState(
+      status: status ?? this.status,
+      error: error,
+      customerFiles: customerFiles ?? this.customerFiles,
+      selectedFiles: selectedFiles ?? this.selectedFiles,
+    );
+  }
+}

lib/features/customers/ui/customer_detail_screen.dart

@@ -6,10 +6,9 @@ import 'package:flux/core/theme/theme.dart';
 import 'package:flux/core/widgets/image_viewer_widget.dart';
 import 'package:flux/core/widgets/pdf_viewer_widget.dart';
 import 'package:flux/core/widgets/qr_upload_dialog.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
 import 'package:flux/features/attachments/models/attachment_model.dart';
+import 'package:flux/features/customers/blocs/customer_files_bloc.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
-import 'package:get_it/get_it.dart';
 
 class CustomerDetailScreen extends StatefulWidget {
   final CustomerModel customer;
@@ -27,13 +26,11 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
   }
 
   void _loadFiles() {
-    context.read<AttachmentsBloc>().add(
-      LoadAttachmentsEvent(parentId: widget.customer.id),
-    );
+    context.read<CustomerFilesBloc>().add(LoadCustomerFilesEvent());
   }
 
   Future<void> _pickAndUpload() async {
-    AttachmentsBloc attachmentsBloc = context.read<AttachmentsBloc>();
+    CustomerFilesBloc customerFilesBloc = context.read<CustomerFilesBloc>();
 
     // Chiamata statica pulita
     FilePickerResult? result = await FilePicker.pickFiles(
@@ -43,18 +40,17 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
     );
 
     if (result != null) {
+      for (var pickedFile in result.files) {
         try {
-        attachmentsBloc.add(
-          UploadAttachmentsEvent(
-            pickedFiles: result.files,
-            companyId: GetIt.I.get<SessionCubit>().state.company!.id!,
-          ),
+          customerFilesBloc.add(
+            UploadCustomerFileEvent(pickedFile: pickedFile),
           );
         } catch (e) {
           if (mounted) {
-          ScaffoldMessenger.of(
-            context,
-          ).showSnackBar(SnackBar(content: Text("$e")));
+            ScaffoldMessenger.of(context).showSnackBar(
+              SnackBar(content: Text("Errore upload ${pickedFile.name}: $e")),
+            );
+          }
         }
       }
     }
@@ -147,7 +143,7 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
   }
 
   Widget _buildDocumentSection() {
-    return BlocBuilder<AttachmentsBloc, AttachmentsState>(
+    return BlocBuilder<CustomerFilesBloc, CustomerFilesState>(
       builder: (context, state) {
         return Column(
           crossAxisAlignment: CrossAxisAlignment.start,
@@ -217,9 +213,9 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
               ],
             ),
             const SizedBox(height: 20),
-            if (state.status == AttachmentsStatus.loading)
+            if (state.status == CustomerFilesStatus.loading)
               const Center(child: CircularProgressIndicator())
-            else if (state.allFiles.isEmpty)
+            else if (state.customerFiles.isEmpty)
               const Center(child: Text("Nessun documento presente"))
             else
               Expanded(
@@ -230,9 +226,9 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
                     crossAxisSpacing: 16,
                     childAspectRatio: 1.2,
                   ),
-                  itemCount: state.allFiles.length,
+                  itemCount: state.customerFiles.length,
                   itemBuilder: (context, index) =>
-                      _FileCard(file: state.allFiles[index], state: state),
+                      _FileCard(file: state.customerFiles[index], state: state),
                 ),
               ),
           ],
@@ -272,14 +268,14 @@ class _CustomerDetailScreenState extends State<CustomerDetailScreen> {
 
 class _FileCard extends StatelessWidget {
   final AttachmentModel file;
-  final AttachmentsState state;
+  final CustomerFilesState state;
   const _FileCard({required this.file, required this.state});
 
   @override
   Widget build(BuildContext context) {
     return GestureDetector(
-      onTap: () => context.read<AttachmentsBloc>().add(
-        ToggleAttachmentSelectionEvent(file),
+      onTap: () => context.read<CustomerFilesBloc>().add(
+        ToggleCustomerFileSelectionEvent(file),
       ),
       onDoubleTap: () => _handleDoubleClickOnFile(context, file),
       child: Stack(

lib/features/customers/ui/customer_mobile_upload_screen.dart

@@ -1,27 +1,27 @@
 import 'dart:io';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:go_router/go_router.dart';
 import 'package:image_picker/image_picker.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
+import 'package:flux/features/customers/blocs/customer_files_bloc.dart';
 
-class SharedMobileUploadScreen extends StatefulWidget {
-  final String title;
-  final String companyId;
+class CustomerMobileUploadScreen extends StatefulWidget {
+  final String customerId;
+  final String customerName;
 
-  const SharedMobileUploadScreen({
+  const CustomerMobileUploadScreen({
     super.key,
-    required this.title,
-    required this.companyId,
+    required this.customerId,
+    required this.customerName,
   });
 
   @override
-  State<SharedMobileUploadScreen> createState() =>
-      _SharedMobileUploadScreenState();
+  State<CustomerMobileUploadScreen> createState() =>
+      _CustomerMobileUploadScreenState();
 }
 
-class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
+class _CustomerMobileUploadScreenState
+    extends State<CustomerMobileUploadScreen> {
   // 1. LA NOSTRA STAGING AREA (Il "Carrello")
   final List<PlatformFile> _stagedFiles = [];
 
@@ -36,25 +36,18 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
 
   @override
   Widget build(BuildContext context) {
-    return BlocListener<AttachmentsBloc, AttachmentsState>(
+    return BlocListener<CustomerFilesBloc, CustomerFilesState>(
       listener: (context, state) {
         // Quando il BLoC ci dice che ha finito l'upload (Success), chiudiamo la pagina!
-        if (state.status == AttachmentsStatus.success && _isUploading) {
-          // CONTROLLO MAGICO: C'è una pagina dietro di noi?
-          if (Navigator.of(context).canPop()) {
-            // Modalità "App Nativa": siamo entrati dal tasto "Aggiungi"
+        if (state.status == CustomerFilesStatus.success && _isUploading) {
           ScaffoldMessenger.of(context).showSnackBar(
-              const SnackBar(content: Text("File caricati con successo! ✅")),
+            const SnackBar(
+              content: Text("Tutti i file caricati con successo! ✅"),
+            ),
           );
           Navigator.of(context).pop();
-          } else {
-            // Modalità "Web/QR Code": Navighiamo alla pagina di successo!
-            // Assicurati di aver importato go_router in questo file
-
-            context.go('/upload-success');
         }
-        }
-        if (state.status == AttachmentsStatus.failure) {
+        if (state.status == CustomerFilesStatus.failure) {
           setState(() => _isUploading = false);
           ScaffoldMessenger.of(
             context,
@@ -63,8 +56,8 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
       },
       child: Scaffold(
         appBar: AppBar(
-          title: Text("Upload: ${widget.title}"),
-          // Togliamo la freccia indietro se stiamo caricando per evitare macelli
+          title: Text("Upload: ${widget.customerName}"),
+          // Togliamo la freccia indietro se stiamo caricando per evitare disastri
           automaticallyImplyLeading: !_isUploading,
         ),
         body: Stack(
@@ -117,7 +110,8 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
                           padding: const EdgeInsets.all(16),
                           gridDelegate:
                               const SliverGridDelegateWithFixedCrossAxisCount(
-                                crossAxisCount: 3, // 3 colonne stile galleria
+                                crossAxisCount:
+                                    3, // 3 colonne come la galleria dell'iPhone
                                 crossAxisSpacing: 12,
                                 mainAxisSpacing: 12,
                               ),
@@ -143,17 +137,10 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
                                   child: ClipRRect(
                                     borderRadius: BorderRadius.circular(12),
                                     child: isImg
-                                        ? (file.bytes != null
-                                              // Se abbiamo i bytes (es. scatto da fotocamera) usiamo quelli (a prova di Web!)
-                                              ? Image.memory(
-                                                  file.bytes!,
-                                                  fit: BoxFit.cover,
-                                                )
-                                              // Altrimenti andiamo di file fisico
-                                              : Image.file(
+                                        ? Image.file(
                                             File(file.path!),
                                             fit: BoxFit.cover,
-                                                ))
+                                          )
                                         : const Column(
                                             mainAxisAlignment:
                                                 MainAxisAlignment.center,
@@ -241,10 +228,9 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
               ],
             ),
 
-            // --- OVERLAY DI CARICAMENTO ---
+            // --- OVERLAY DI CARICAMENTO (Impedisce tap multipli) ---
             if (_isUploading)
               Container(
-                // Usa il metodo non deprecato che hai giustamente suggerito!
                 color: Colors.black.withValues(alpha: 0.5),
                 child: const Center(
                   child: Card(
@@ -279,7 +265,7 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
       imageQuality: 80,
     );
     if (photo != null) {
-      final photoBytes = await photo.readAsBytes();
+      final photoBytes = await photo.readAsBytes(); // Sicuro anche per Web!
       final photoSize = await photo.length();
 
       final platformFile = PlatformFile(
@@ -289,16 +275,14 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
         bytes: photoBytes, // I bytes ci salvano la vita su Supabase!
       );
       setState(() {
-        _stagedFiles.add(platformFile);
+        _stagedFiles.add(platformFile); // Unifichiamo tutto in un dart:io File
       });
     }
   }
 
   Future<void> _handleFilePicker() async {
-    final result = await FilePicker.pickFiles(
-      allowMultiple: true,
-      withData: true,
-    );
+    // allowMultiple: true permette di pescare 5 foto dalla galleria in un colpo solo!
+    final result = await FilePicker.pickFiles(allowMultiple: true);
     if (result != null) {
       setState(() {
         _stagedFiles.addAll(result.files);
@@ -310,12 +294,11 @@ class _SharedMobileUploadScreenState extends State<SharedMobileUploadScreen> {
   void _submitAllFiles() {
     setState(() => _isUploading = true);
 
-    // Lanciamo l'evento del nostro nuovo AttachmentsBloc Agnostico!
-    context.read<AttachmentsBloc>().add(
-      UploadAttachmentsEvent(
-        pickedFiles: _stagedFiles,
-        companyId: widget.companyId,
-      ),
-    );
+    // Diciamo al BLoC di caricare tutti i file.
+    // Usiamo il tuo evento esistente per ogni file (il BLoC li metterà in coda)
+    final bloc = context.read<CustomerFilesBloc>();
+    bloc.add(UploadMultipleCustomerFilesEvent(_stagedFiles));
+
+    // N.B: Il Navigator.pop() viene chiamato dal BlocListener in alto quando lo stato diventa "success"!
   }
 }

lib/features/customers/ui/customers_content.dart

@@ -1,10 +1,12 @@
 import 'package:flutter/material.dart';
+import 'package:flutter/services.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.dart';
 import 'package:flux/core/theme/theme.dart';
 import 'package:flux/features/customers/blocs/customers_cubit.dart';
 import 'package:flux/features/customers/models/customer_model.dart';
 import 'package:flux/features/customers/ui/customer_form.dart';
+import 'package:flux/temp/migration_tools.dart';
 import 'package:go_router/go_router.dart';
 
 class CustomersContent extends StatefulWidget {
@@ -84,6 +86,42 @@ class _CustomersContentState extends State<CustomersContent> {
             ),
           ),
 
+          //TODO cancella quando import finito
+          ElevatedButton(
+            onPressed: () async {
+              try {
+                // 1. Mostra un loading (opzionale ma utile)
+                ScaffoldMessenger.of(context).showSnackBar(
+                  const SnackBar(content: Text('Caricamento JSON in corso...')),
+                );
+
+                // 2. Legge tutto il file come stringa
+                final String jsonString = await rootBundle.loadString(
+                  'assets/schedeRiparazione-1778021345.json',
+                );
+
+                // 3. Lancia lo script (sostituisci l'UUID con l'ID della tua azienda su Supabase)
+                await TicketMigrationScript().runMigration(jsonString);
+
+                // 4. Successo!
+                if (context.mounted) {
+                  ScaffoldMessenger.of(context).showSnackBar(
+                    const SnackBar(
+                      content: Text('Migrazione Completata! Guarda i log.'),
+                    ),
+                  );
+                }
+              } catch (e) {
+                if (context.mounted) {
+                  ScaffoldMessenger.of(
+                    context,
+                  ).showSnackBar(SnackBar(content: Text('Errore: $e')));
+                }
+              }
+            },
+            child: const Text('migra clienti'),
+          ),
+
           // LISTA CLIENTI
           Expanded(
             child: BlocBuilder<CustomersCubit, CustomersState>(

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

@@ -47,8 +47,6 @@ class _LatestOperationsCardContent extends StatelessWidget {
         borderRadius: BorderRadius.circular(16),
         side: BorderSide(color: theme.dividerColor.withValues(alpha: 0.5)),
       ),
-      child: InkWell(
-        onTap: () => context.push('/operations'),
       child: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
@@ -71,6 +69,8 @@ class _LatestOperationsCardContent extends StatelessWidget {
                 ),
                 const SizedBox(width: 12),
                 Expanded(
+                  child: TextButton(
+                    onPressed: () => context.push('/operations'),
                     child: Text(
                       context.l10n.homeLatestOperations,
                       style: TextStyle(
@@ -82,6 +82,7 @@ class _LatestOperationsCardContent extends StatelessWidget {
                       overflow: TextOverflow.ellipsis,
                     ),
                   ),
+                ),
               ],
             ),
             const SizedBox(height: 12),
@@ -94,17 +95,12 @@ class _LatestOperationsCardContent extends StatelessWidget {
                     LatestStoreOperationsState
                   >(
                     builder: (context, state) {
-                        if (state.status ==
-                                LatestStoreOperationsStatus.loading ||
-                            state.status ==
-                                LatestStoreOperationsStatus.initial) {
-                          return const Center(
-                            child: CircularProgressIndicator(),
-                          );
+                      if (state.status == LatestStoreOperationsStatus.loading ||
+                          state.status == LatestStoreOperationsStatus.initial) {
+                        return const Center(child: CircularProgressIndicator());
                       }
 
-                        if (state.status ==
-                            LatestStoreOperationsStatus.failure) {
+                      if (state.status == LatestStoreOperationsStatus.failure) {
                         return Center(
                           child: Text(
                             "Errore di caricamento",
@@ -188,7 +184,6 @@ class _LatestOperationsCardContent extends StatelessWidget {
           ],
         ),
       ),
-      ),
     );
   }
 }

lib/features/home/ui/home_screen.dart

@@ -77,13 +77,12 @@ class HomeScreen extends StatelessWidget {
                           context: context,
                         ),
                         LatestStoreOperationsCard(),
+
                         _buildDashboardWidget(
                           title: context.l10n.homeLatestOperationTickets,
                           icon: Icons.support_agent_outlined,
                           color: Colors.purple,
                           context: context,
-                          onTap: () =>
-                              context.push('/tickets'), // <-- Aggiunto!
                         ),
                       ]),
                     ),
@@ -186,7 +185,7 @@ class HomeScreen extends StatelessWidget {
             color: Colors.blue,
             onTap: () {
               // Entriamo nel form! Nessun parametro extra = Nuovo Servizio
-              context.push('/operations/form/new');
+              context.push('/operation-form');
             },
           ),
           const SizedBox(width: 12),
@@ -195,8 +194,8 @@ class HomeScreen extends StatelessWidget {
             label: context.l10n.homeNewOperationTicket,
             color: Colors.redAccent,
             onTap: () {
-              // Andiamo alla lista! (Da lì poi aggiungeremo il tasto "+" per il form)
-              context.push('/tickets/form/new');
+              // TODO: Quando avrai la rotta per la nuova assistenza
+              // context.push('/assistance-form');
             },
           ),
           const SizedBox(width: 12),
@@ -227,19 +226,15 @@ class HomeScreen extends StatelessWidget {
     required String title,
     required IconData icon,
     required Color color,
-    VoidCallback? onTap,
   }) {
     final theme = Theme.of(context);
 
     return Card(
       elevation: 0,
-      clipBehavior: Clip.antiAlias,
       shape: RoundedRectangleBorder(
         borderRadius: BorderRadius.circular(16),
         side: BorderSide(color: theme.dividerColor.withValues(alpha: 0.5)),
       ),
-      child: InkWell(
-        onTap: onTap,
       child: Padding(
         padding: const EdgeInsets.all(16.0),
         child: Column(
@@ -295,7 +290,6 @@ class HomeScreen extends StatelessWidget {
           ],
         ),
       ),
-      ),
     );
   }
 

lib/features/operations/blocs/operation_files_bloc.dart

@@ -0,0 +1,389 @@
+import 'dart:async';
+import 'package:file_picker/file_picker.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:equatable/equatable.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/core/utils/extensions.dart';
+import 'package:flux/features/attachments/models/attachment_model.dart';
+import 'package:flux/features/operations/data/operations_repository.dart';
+import 'package:get_it/get_it.dart';
+import 'package:image_picker/image_picker.dart';
+
+part 'operation_files_events.dart';
+part 'operation_files_state.dart';
+
+class OperationFilesBloc
+    extends Bloc<OperationFilesEvent, OperationFilesState> {
+  final _repository = GetIt.I.get<OperationsRepository>();
+  final String? operationId;
+
+  OperationFilesBloc({this.operationId})
+    : super(
+        OperationFilesState(
+          status: OperationFilesStatus.initial,
+          operationId: operationId,
+        ),
+      ) {
+    on<OperationsavedEvent>(_onOperationsaved);
+    on<LoadOperationFilesEvent>(_onLoadOperationFiles);
+    on<AddOperationFilesEvent>(_onAddOperationFiles);
+    on<UploadOperationFilesEvent>(_onUploadOperationFiles);
+    on<DeleteOperationFilesEvent>(_onDeleteOperationFiles);
+    on<ToggleOperationFileSelectionEvent>(_onToggleOperationFileSelection);
+    on<LinkFilesToCustomerEvent>(_onLinkFilesToCustomer);
+    on<RenameOperationFileEvent>(_onRenameOperationFile);
+    on<DeleteSpecificOperationFileEvent>(_onDeleteSpecificOperationFiles);
+    on<SelectAllOperationFilesEvent>(_onSelectAllOperationFiles);
+    on<ClearOperationFileSelectionEvent>(_onClearOperationFileSelection);
+
+    // Se il BLoC nasce con un ID, accendiamo subito lo stream!
+    if (operationId != null) {
+      add(LoadOperationFilesEvent(operationId: operationId));
+    }
+  }
+
+  FutureOr<void> _onOperationsaved(
+    OperationsavedEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    // 1. Aggiorniamo l'ID e mettiamo in loading
+    emit(
+      state.copyWith(
+        operationId: event.operationId,
+        status: OperationFilesStatus.uploading,
+      ),
+    );
+
+    // 2. RECUPERO E UPLOAD DEI FILE "PARCHEGGIATI" (Pratica Nuova)
+    if (state.localFiles.isNotEmpty) {
+      try {
+        final List<Future<void>> uploadTasks = [];
+
+        for (var file in state.localFiles) {
+          // Ricreiamo il PlatformFile dal nostro AttachmentModel
+          // così il repository lo accetta senza fare storie!
+          final fakePlatformFile = PlatformFile(
+            name: '${file.name}.${file.extension}',
+            size: file.fileSize,
+            bytes: file.localBytes,
+          );
+
+          uploadTasks.add(
+            _repository.uploadAndRegisterOperationFile(
+              operationId: event.operationId, // L'ID APPENA NATO!
+              pickedFile: fakePlatformFile,
+            ),
+          );
+        }
+
+        // Lanciamo tutti gli upload in parallelo
+        await Future.wait(uploadTasks);
+      } catch (e) {
+        emit(
+          state.copyWith(
+            status: OperationFilesStatus.failure,
+            error: "Errore upload post-salvataggio: $e",
+          ),
+        );
+        return; // Ci fermiamo qui se esplode qualcosa
+      }
+    }
+
+    // 3. FINE DEI GIOCHI! Svuotiamo i locali, passiamo a success e accendiamo lo Stream
+    emit(state.copyWith(localFiles: [], status: OperationFilesStatus.success));
+
+    add(LoadOperationFilesEvent(operationId: event.operationId));
+  }
+
+  FutureOr<void> _onLoadOperationFiles(
+    LoadOperationFilesEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    final currentId = event.operationId ?? state.operationId;
+
+    if (currentId != null) {
+      emit(state.copyWith(status: OperationFilesStatus.loading));
+
+      await emit.forEach(
+        _repository.getOperationFilesStream(currentId),
+        onData: (List<AttachmentModel> data) => state.copyWith(
+          status: OperationFilesStatus.success,
+          remoteFiles: data,
+        ),
+        onError: (error, stackTrace) => state.copyWith(
+          status: OperationFilesStatus.failure,
+          error: error.toString(),
+        ),
+      );
+    }
+  }
+
+  void _onAddOperationFiles(
+    AddOperationFilesEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    final currentId = state.operationId;
+
+    // BIVIO 1: PRATICA NUOVA (Nessun ID - salvataggio locale)
+    if (currentId == null) {
+      final companyId = GetIt.I.get<SessionCubit>().state.company!.id!;
+      final newLocalFiles = event.files.map((file) {
+        return AttachmentModel(
+          id: null,
+          companyId: companyId,
+          operationId: '', // Sarà riempito al salvataggio
+          name: file.name.fileNameWithoutExtension(),
+          extension: file.name.fileExtension(),
+          storagePath: '',
+          fileSize: file.size,
+          localBytes: file.bytes,
+        );
+      }).toList();
+
+      emit(
+        state.copyWith(
+          localFiles: [...state.localFiles, ...newLocalFiles],
+          status: OperationFilesStatus.success,
+        ),
+      );
+      return;
+    }
+
+    // BIVIO 2: PRATICA ESISTENTE (Abbiamo l'ID - Upload immediato)
+    emit(state.copyWith(status: OperationFilesStatus.uploading));
+    try {
+      final List<Future<void>> uploadTasks = [];
+      for (var file in event.files) {
+        uploadTasks.add(
+          _repository.uploadAndRegisterOperationFile(
+            operationId: currentId,
+            pickedFile: file,
+          ),
+        );
+      }
+      await Future.wait(uploadTasks);
+      emit(state.copyWith(status: OperationFilesStatus.success));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationFilesStatus.failure,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onUploadOperationFiles(
+    UploadOperationFilesEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    if ((event.pickedFiles == null || event.pickedFiles!.isEmpty) &&
+        (event.photos == null || event.photos!.isEmpty)) {
+      return;
+    }
+
+    if (state.operationId == null) return;
+
+    emit(state.copyWith(status: OperationFilesStatus.uploading));
+    try {
+      final List<Future<void>> uploadTasks = [];
+
+      // 1. Gestione Documenti normali (PlatformFile)
+      if (event.pickedFiles != null) {
+        for (var file in event.pickedFiles!) {
+          uploadTasks.add(
+            _repository.uploadAndRegisterOperationFile(
+              operationId: state.operationId!,
+              pickedFile: file,
+            ),
+          );
+        }
+      }
+
+      // 2. Gestione Foto Fotocamera (XFile)
+      if (event.photos != null) {
+        for (var photo in event.photos!) {
+          // Leggiamo i byte asincronamente
+          final bytes = await photo.readAsBytes();
+          final fileSize = await photo.length();
+
+          // Lo travestiamo da PlatformFile per passarlo al Repository!
+          final fakePlatformFile = PlatformFile(
+            name: photo.name,
+            size: fileSize,
+            bytes: bytes,
+            path: photo.path,
+          );
+
+          uploadTasks.add(
+            _repository.uploadAndRegisterOperationFile(
+              operationId: state.operationId!,
+              pickedFile: fakePlatformFile,
+            ),
+          );
+        }
+      }
+
+      // Esecuzione parallela di tutti i documenti e foto
+      await Future.wait(uploadTasks);
+      emit(state.copyWith(status: OperationFilesStatus.success));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationFilesStatus.failure,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onDeleteOperationFiles(
+    DeleteOperationFilesEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    emit(state.copyWith(status: OperationFilesStatus.loading));
+    try {
+      await _repository.deleteOperationFiles(state.selectedFiles);
+      emit(
+        state.copyWith(status: OperationFilesStatus.success, selectedFiles: []),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationFilesStatus.failure,
+          error: e.toString(),
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onToggleOperationFileSelection(
+    ToggleOperationFileSelectionEvent event,
+    Emitter<OperationFilesState> emit,
+  ) {
+    final selectedFiles = List<AttachmentModel>.from(state.selectedFiles);
+    if (selectedFiles.contains(event.file)) {
+      selectedFiles.remove(event.file);
+    } else {
+      selectedFiles.add(event.file);
+    }
+    emit(state.copyWith(selectedFiles: selectedFiles));
+  }
+
+  void _onSelectAllOperationFiles(
+    SelectAllOperationFilesEvent event,
+    Emitter<OperationFilesState> emit,
+  ) {
+    // Prendiamo TUTTI i file (locali e remoti) e li buttiamo nei selezionati
+    emit(state.copyWith(selectedFiles: state.allFiles));
+  }
+
+  void _onClearOperationFileSelection(
+    ClearOperationFileSelectionEvent event,
+    Emitter<OperationFilesState> emit,
+  ) {
+    // Svuotiamo brutalmente la lista
+    emit(state.copyWith(selectedFiles: []));
+  }
+
+  FutureOr<void> _onLinkFilesToCustomer(
+    LinkFilesToCustomerEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    if (state.selectedFiles.isEmpty) return;
+
+    // BIVIO 1: PRATICA NUOVA (Modalità Locale)
+    if (state.operationId == null) {
+      // Mappiamo i file locali: se sono tra quelli selezionati, iniettiamo il customerId
+      final updatedLocalFiles = state.localFiles.map((file) {
+        if (state.selectedFiles.contains(file)) {
+          return file.copyWith(customerId: event.customerId);
+        }
+        return file;
+      }).toList();
+
+      emit(
+        state.copyWith(
+          localFiles: updatedLocalFiles,
+          selectedFiles: [], // Svuotiamo la selezione dopo averli associati
+          status: OperationFilesStatus.success, // o un toast di feedback
+        ),
+      );
+      return;
+    }
+
+    // BIVIO 2: PRATICA ESISTENTE (Modalità Remota su DB)
+    emit(state.copyWith(status: OperationFilesStatus.loading));
+    try {
+      final List<Future<void>> linkTasks = [];
+
+      for (var file in state.selectedFiles) {
+        linkTasks.add(
+          _repository.copyFileToCustomer(
+            file: file,
+            customerId: event.customerId,
+          ),
+        );
+      }
+
+      await Future.wait(linkTasks);
+
+      // Svuotiamo la selezione.
+      // NON serve aggiornare la lista a mano, perché il DB si aggiorna
+      // e lo Stream di Supabase spingerà automaticamente in UI i file aggiornati!
+      emit(
+        state.copyWith(status: OperationFilesStatus.success, selectedFiles: []),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationFilesStatus.failure,
+          error: "Errore associazione: $e",
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onRenameOperationFile(
+    RenameOperationFileEvent event,
+    Emitter<OperationFilesState> emit,
+  ) async {
+    // BIVIO 1: File Locale (Bozza)
+    if (event.file.localBytes != null) {
+      final updatedLocalFiles = state.localFiles.map((f) {
+        if (f == event.file) {
+          return f.copyWith(name: event.newName);
+        }
+        return f;
+      }).toList();
+      emit(state.copyWith(localFiles: updatedLocalFiles));
+      return;
+    }
+
+    // BIVIO 2: File Remoto (Salvato su DB)
+    emit(state.copyWith(status: OperationFilesStatus.loading));
+    try {
+      await _repository.renameAttachment(event.file.id!, event.newName);
+      emit(state.copyWith(status: OperationFilesStatus.success));
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationFilesStatus.failure,
+          error: "Errore rinomina: $e",
+        ),
+      );
+    }
+  }
+
+  FutureOr<void> _onDeleteSpecificOperationFiles(
+    DeleteSpecificOperationFileEvent event,
+    Emitter<OperationFilesState> emit,
+  ) {
+    if (event.file.localBytes != null) {
+      final updatedLocalFiles = state.localFiles
+          .where((f) => f != event.file)
+          .toList();
+      emit(state.copyWith(localFiles: updatedLocalFiles));
+    }
+  }
+}

lib/features/operations/blocs/operation_files_events.dart

@@ -0,0 +1,81 @@
+part of 'operation_files_bloc.dart';
+
+abstract class OperationFilesEvent extends Equatable {
+  const OperationFilesEvent();
+
+  @override
+  List<Object?> get props => [];
+}
+
+class OperationsavedEvent extends OperationFilesEvent {
+  final String operationId;
+  const OperationsavedEvent(this.operationId);
+
+  @override
+  List<Object?> get props => [operationId];
+}
+
+class LoadOperationFilesEvent extends OperationFilesEvent {
+  final String? operationId;
+  final AttachmentModel? operation;
+  const LoadOperationFilesEvent({this.operationId, this.operation});
+
+  @override
+  List<Object?> get props => [operationId, operation];
+}
+
+class AddOperationFilesEvent extends OperationFilesEvent {
+  final List<PlatformFile> files;
+  const AddOperationFilesEvent(this.files);
+
+  @override
+  List<Object?> get props => [files];
+}
+
+class UploadOperationFilesEvent extends OperationFilesEvent {
+  final List<PlatformFile>? pickedFiles;
+  final List<XFile>? photos;
+  const UploadOperationFilesEvent({this.pickedFiles, this.photos});
+
+  @override
+  List<Object?> get props => [pickedFiles, photos];
+}
+
+class LinkFilesToCustomerEvent extends OperationFilesEvent {
+  final String customerId;
+
+  const LinkFilesToCustomerEvent({required this.customerId});
+
+  @override
+  List<Object?> get props => [customerId];
+}
+
+class DeleteOperationFilesEvent extends OperationFilesEvent {}
+
+class ToggleOperationFileSelectionEvent extends OperationFilesEvent {
+  final AttachmentModel file;
+  const ToggleOperationFileSelectionEvent(this.file);
+}
+
+class RenameOperationFileEvent extends OperationFilesEvent {
+  final AttachmentModel file;
+  final String newName;
+
+  const RenameOperationFileEvent(this.file, this.newName);
+
+  @override
+  List<Object?> get props => [file, newName];
+}
+
+class DeleteSpecificOperationFileEvent extends OperationFilesEvent {
+  final AttachmentModel file;
+
+  const DeleteSpecificOperationFileEvent(this.file);
+
+  @override
+  List<Object?> get props => [file];
+}
+
+class SelectAllOperationFilesEvent extends OperationFilesEvent {}
+
+class ClearOperationFileSelectionEvent extends OperationFilesEvent {}

lib/features/operations/blocs/operation_files_state.dart

@@ -1,29 +1,10 @@
-part of 'attachments_bloc.dart';
+part of 'operation_files_bloc.dart';
 
-enum AttachmentsStatus { initial, loading, uploading, success, failure }
+enum OperationFilesStatus { initial, loading, uploading, success, failure }
 
-enum AttachmentParentType {
-  operation('operation_id'),
-  ticket('ticket_id'),
-  customer('customer_id');
-
-  final String dbColumn;
-  const AttachmentParentType(this.dbColumn);
-}
-
-class AttachmentsState extends Equatable {
-  final String? parentId;
-  final AttachmentParentType parentType;
-  final AttachmentsStatus status;
-  final String? error;
-
-  final List<AttachmentModel> localFiles;
-  final List<AttachmentModel> remoteFiles;
-  final List<AttachmentModel> selectedFiles;
-
-  const AttachmentsState({
-    this.parentId,
-    required this.parentType,
+class OperationFilesState extends Equatable {
+  const OperationFilesState({
+    this.operationId,
     required this.status,
     this.error,
     this.localFiles = const [],
@@ -31,10 +12,17 @@ class AttachmentsState extends Equatable {
     this.selectedFiles = const [],
   });
 
+  final String? operationId;
+  final OperationFilesStatus status;
+  final String? error;
+  final List<AttachmentModel> localFiles;
+  final List<AttachmentModel> remoteFiles;
+
+  final List<AttachmentModel> selectedFiles;
+
   @override
   List<Object?> get props => [
-    parentId,
-    parentType,
+    operationId,
     status,
     error,
     localFiles,
@@ -44,18 +32,16 @@ class AttachmentsState extends Equatable {
 
   List<AttachmentModel> get allFiles => [...remoteFiles, ...localFiles];
 
-  AttachmentsState copyWith({
-    String? parentId,
-    AttachmentParentType? parentType,
-    AttachmentsStatus? status,
+  OperationFilesState copyWith({
+    String? operationId,
+    OperationFilesStatus? status,
     String? error,
     List<AttachmentModel>? localFiles,
     List<AttachmentModel>? remoteFiles,
     List<AttachmentModel>? selectedFiles,
   }) {
-    return AttachmentsState(
-      parentId: parentId ?? this.parentId,
-      parentType: parentType ?? this.parentType,
+    return OperationFilesState(
+      operationId: operationId ?? this.operationId,
       status: status ?? this.status,
       error: error,
       localFiles: localFiles ?? this.localFiles,

lib/features/operations/blocs/operation_form_cubit.dart

@@ -1,270 +0,0 @@
-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/operations/data/operations_repository.dart';
-import 'package:flux/features/operations/models/operation_model.dart';
-import 'package:get_it/get_it.dart';
-import 'package:uuid/uuid.dart';
-
-part 'operation_form_state.dart';
-
-class OperationFormCubit extends Cubit<OperationFormState> {
-  final OperationsRepository _repository = GetIt.I<OperationsRepository>();
-  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
-  final Uuid _uuid = const Uuid();
-
-  OperationFormCubit()
-    : super(
-        OperationFormState(
-          // Inizializziamo con un modello vuoto di sicurezza
-          operation: OperationModel(
-            storeId: '',
-            companyId: '',
-            reference: '',
-            status: OperationStatus.draft,
-            createdAt: DateTime.now(),
-          ),
-        ),
-      );
-
-  Future<void> initForm({
-    OperationModel? existingOperation,
-    String? operationId,
-  }) async {
-    emit(state.copyWith(status: OperationFormStatus.loading));
-
-    try {
-      if (existingOperation != null) {
-        emit(
-          state.copyWith(
-            operation: existingOperation,
-            status: OperationFormStatus.ready,
-          ),
-        );
-      } else if (operationId != null) {
-        // Avendo separato i cubit, se ci passano solo l'ID lo scarichiamo dal DB
-        final operation = await _repository.fetchOperationById(operationId);
-        emit(
-          state.copyWith(
-            operation: operation,
-            status: OperationFormStatus.ready,
-          ),
-        );
-      } else {
-        // NUOVA PRATICA: Creiamo un nuovo Batch UUID
-        emit(
-          state.copyWith(
-            operation: OperationModel(
-              storeId: _sessionCubit.state.currentStore?.id ?? '',
-              reference: '',
-              createdAt: DateTime.now(),
-              companyId: _sessionCubit.state.company!.id!,
-              status: OperationStatus.draft,
-              batchUuid: _uuid.v4(),
-            ),
-            status: OperationFormStatus.ready,
-          ),
-        );
-      }
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: OperationFormStatus.failure,
-          errorMessage: "Errore inizializzazione form: $e",
-        ),
-      );
-    }
-  }
-
-  // --- LOGICA BATCH ---
-
-  void _prepareNextOperationInBatch() {
-    final current = state.operation;
-
-    emit(
-      state.copyWith(
-        status: OperationFormStatus.ready, // Torna ready per il nuovo form
-        operation: OperationModel(
-          companyId: current.companyId,
-          storeId: current.storeId,
-          storeDisplayName: current.storeDisplayName,
-          batchUuid: current.batchUuid, // MANTIENE IL COLLEGAMENTO
-          customerId: current.customerId, // MANTIENE IL CLIENTE
-          customerDisplayName: current.customerDisplayName,
-          status: OperationStatus.draft,
-          createdAt: DateTime.now(),
-        ),
-      ),
-    );
-  }
-
-  // --- SALVATAGGIO ---
-
-  Future<void> saveOperation({
-    required OperationStatus targetStatus,
-    required bool keepAdding,
-  }) async {
-    emit(
-      state.copyWith(status: OperationFormStatus.saving, errorMessage: null),
-    );
-
-    try {
-      final operationToSave = state.operation.copyWith(status: targetStatus);
-      final savedOperation = await _repository.saveFullOperation(
-        operation: operationToSave,
-      );
-
-      if (keepAdding) {
-        // Salviamo nella "memoria" del batch le pratiche create finora
-        final updatedBatchList = List<OperationModel>.from(
-          state.savedBatchOperations,
-        )..add(savedOperation);
-
-        emit(
-          state.copyWith(
-            status: OperationFormStatus.successAndAddAnother,
-            savedBatchOperations: updatedBatchList,
-          ),
-        );
-
-        // Pulisce i campi per la prossima operazione
-        _prepareNextOperationInBatch();
-      } else {
-        emit(
-          state.copyWith(
-            status: OperationFormStatus.success,
-            operation: savedOperation, // Aggiorniamo con l'ID restituito dal DB
-          ),
-        );
-      }
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: OperationFormStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  Future<String?> saveOperationDraft() async {
-    try {
-      final operationToSave = state.operation;
-      if (operationToSave.customerId == null ||
-          operationToSave.customerId!.isEmpty) {
-        throw Exception('Seleziona un cliente prima di poter usare il QR');
-      }
-      final savedOperation = await _repository.saveFullOperation(
-        operation: operationToSave,
-      );
-      emit(
-        state.copyWith(
-          operation: savedOperation,
-          status: OperationFormStatus.ready,
-        ),
-      );
-      return savedOperation.id;
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: OperationFormStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-      return null;
-    }
-  }
-
-  // --- GESTIONE DEI CAMPI IN TEMPO REALE ---
-
-  void updateFields({
-    String? customerId,
-    String? customerDisplayName,
-    String? reference,
-    String? note,
-    String? type,
-    String? providerId,
-    String? providerDisplayName,
-    String? subtype,
-    String? description,
-    DateTime? expirationDate,
-    int? quantity,
-    String? modelId,
-    String? modelDisplayName,
-    String? staffId,
-    String? staffDisplayName,
-    OperationStatus? status,
-
-    bool clearProvider = false,
-    bool clearType = false,
-    bool clearSubtype = false,
-    bool clearDescription = false,
-    bool clearExpiration = false,
-    bool clearQuantity = false,
-    bool clearModel = false,
-  }) {
-    final current = state.operation;
-
-    int? newQuantity;
-    if (clearQuantity) newQuantity = 1;
-    if (quantity != null && quantity <= 0) newQuantity = 0;
-    if (quantity != null && quantity > 0) newQuantity = quantity;
-
-    final updated = current.copyWith(
-      customerId:
-          customerId ??
-          current.customerId, // Se non passo customerId, tengo il vecchio
-      customerDisplayName: customerDisplayName ?? current.customerDisplayName,
-      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),
-      expirationDate: clearExpiration
-          ? null
-          : (expirationDate ?? current.expirationDate),
-      modelId: clearModel ? null : (modelId ?? current.modelId),
-      modelDisplayName: clearModel
-          ? null
-          : (modelDisplayName ?? current.modelDisplayName),
-      staffId: staffId ?? current.staffId,
-      staffDisplayName: staffDisplayName ?? current.staffDisplayName,
-      status: status ?? current.status,
-    );
-
-    emit(state.copyWith(operation: updated));
-  }
-
-  // --- UTILS ---
-
-  void setTypeWithSmartDefault(String type) {
-    DateTime? defaultDate;
-    final now = DateTime.now();
-
-    if (type == 'Energy') {
-      defaultDate = DateTime(now.year, now.month + 24, now.day);
-    }
-    if (type == 'Fin') {
-      defaultDate = DateTime(now.year, now.month + 30, now.day);
-    }
-    if (type == 'Entertainment') {
-      defaultDate = DateTime(now.year, now.month + 12, now.day);
-    }
-
-    updateFields(
-      type: type,
-      expirationDate: defaultDate,
-      clearProvider: true,
-      clearSubtype: true,
-      clearModel: true,
-      clearQuantity: true,
-    );
-  }
-}

lib/features/operations/blocs/operation_form_state.dart

@@ -1,48 +0,0 @@
-part of 'operation_form_cubit.dart';
-
-enum OperationFormStatus {
-  initial,
-  loading,
-  ready,
-  saving,
-  success,
-  successAndAddAnother, // Nuovo stato in stile Ticket!
-  failure,
-}
-
-class OperationFormState extends Equatable {
-  final OperationFormStatus status;
-  final OperationModel operation;
-  final String? errorMessage;
-  // Teniamo traccia delle operazioni salvate in questa sessione (per UI riepilogo)
-  final List<OperationModel> savedBatchOperations;
-
-  const OperationFormState({
-    this.status = OperationFormStatus.initial,
-    required this.operation,
-    this.errorMessage,
-    this.savedBatchOperations = const [],
-  });
-
-  OperationFormState copyWith({
-    OperationFormStatus? status,
-    OperationModel? operation,
-    String? errorMessage,
-    List<OperationModel>? savedBatchOperations,
-  }) {
-    return OperationFormState(
-      status: status ?? this.status,
-      operation: operation ?? this.operation,
-      errorMessage: errorMessage,
-      savedBatchOperations: savedBatchOperations ?? this.savedBatchOperations,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-    status,
-    operation,
-    errorMessage,
-    savedBatchOperations,
-  ];
-}

lib/features/operations/blocs/operation_list_cubit.dart

@@ -1,81 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/blocs/session/session_cubit.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 'operation_list_state.dart';
-
-class OperationListCubit extends Cubit<OperationListState> {
-  final OperationsRepository _repository = GetIt.I<OperationsRepository>();
-  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
-
-  OperationListCubit() : super(const OperationListState());
-
-  Future<void> loadOperations({bool refresh = false}) async {
-    if (state.status == OperationListStatus.loading) return;
-    if (!refresh && state.hasReachedMax) return;
-
-    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;
-
-      if (companyId == null) {
-        throw Exception("Company ID non trovato nella sessione");
-      }
-
-      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
-              ? newOperations
-              : [...state.operations, ...newOperations],
-          hasReachedMax: reachedMax,
-        ),
-      );
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: OperationListStatus.failure,
-          errorMessage: "Errore nel caricamento operazioni: $e",
-        ),
-      );
-    }
-  }
-
-  void updateFilters({String? query, DateTimeRange? range}) {
-    emit(
-      state.copyWith(
-        query: query ?? state.query,
-        dateRange: range ?? state.dateRange,
-      ),
-    );
-    loadOperations(refresh: true);
-  }
-
-  void clearFilters() {
-    emit(const OperationListState()); // Resetta tutto allo stato iniziale
-    loadOperations(refresh: true);
-  }
-}

lib/features/operations/blocs/operation_list_state.dart

@@ -1,49 +0,0 @@
-part of 'operation_list_cubit.dart';
-
-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;
-  final DateTimeRange? dateRange;
-
-  const OperationListState({
-    this.status = OperationListStatus.initial,
-    this.operations = const [],
-    this.hasReachedMax = false,
-    this.errorMessage,
-    this.query = '',
-    this.dateRange,
-  });
-
-  OperationListState copyWith({
-    OperationListStatus? status,
-    List<OperationModel>? operations,
-    bool? hasReachedMax,
-    String? errorMessage,
-    String? query,
-    DateTimeRange? dateRange,
-  }) {
-    return OperationListState(
-      status: status ?? this.status,
-      operations: operations ?? this.operations,
-      hasReachedMax: hasReachedMax ?? this.hasReachedMax,
-      errorMessage: errorMessage,
-      query: query ?? this.query,
-      dateRange: dateRange ?? this.dateRange,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-    status,
-    operations,
-    hasReachedMax,
-    errorMessage,
-    query,
-    dateRange,
-  ];
-}

lib/features/operations/blocs/operations_cubit.dart

@@ -0,0 +1,304 @@
+import 'package:equatable/equatable.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/core/blocs/session/session_cubit.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';
+import 'package:collection/collection.dart';
+import 'package:uuid/uuid.dart';
+part 'operations_state.dart';
+
+class OperationsCubit extends Cubit<OperationsState> {
+  final OperationsRepository _repository = GetIt.I<OperationsRepository>();
+  final SessionCubit _sessionCubit = GetIt.I<SessionCubit>();
+  final Uuid _uuid = const Uuid(); // Generatore di UUID per il batch
+
+  OperationsCubit()
+    : super(const OperationsState(status: OperationsStatus.initial));
+
+  // --- CARICAMENTO E PAGINAZIONE ---
+
+  Future<void> loadOperations({bool refresh = false}) async {
+    if (state.status == OperationsStatus.loading) return;
+    if (!refresh && state.hasReachedMax) return;
+
+    emit(
+      state.copyWith(
+        status: OperationsStatus.loading,
+        errorMessage: null,
+        allOperations: refresh ? [] : state.allOperations,
+        hasReachedMax: refresh ? false : state.hasReachedMax,
+      ),
+    );
+
+    try {
+      final currentOffset = refresh ? 0 : state.allOperations.length;
+      final companyId = _sessionCubit.state.company?.id;
+
+      if (companyId == null) {
+        throw Exception("Company ID non trovato nella sessione");
+      }
+
+      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: OperationsStatus.ready,
+          allOperations: refresh
+              ? newOperations
+              : [...state.allOperations, ...newOperations],
+          hasReachedMax: reachedMax,
+        ),
+      );
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationsStatus.failure,
+          errorMessage: "Errore nel caricamento operazioni: $e",
+        ),
+      );
+    }
+  }
+
+  // --- GESTIONE FILTRI ---
+
+  void updateFilters({String? query, DateTimeRange? range}) {
+    emit(
+      state.copyWith(
+        query: query ?? state.query,
+        dateRange: range ?? state.dateRange,
+      ),
+    );
+    loadOperations(refresh: true);
+  }
+
+  void clearFilters() {
+    emit(state.copyWith(query: '', dateRange: null));
+    loadOperations(refresh: true);
+  }
+
+  void initOperationForm({
+    OperationModel? existingOperation,
+    String? operationId,
+    String? staffId,
+    String? staffDisplayName,
+  }) async {
+    if (existingOperation != null) {
+      emit(
+        state.copyWith(
+          currentOperation: existingOperation,
+          status: OperationsStatus.ready,
+        ),
+      );
+    } else if (operationId != null) {
+      OperationModel? operationModel = state.allOperations.firstWhereOrNull(
+        (s) => s.id == operationId,
+      );
+      operationModel ??= await _repository.fetchOperationById(operationId);
+      emit(
+        state.copyWith(
+          currentOperation: operationModel,
+          status: OperationsStatus.ready,
+        ),
+      );
+    } else {
+      // NUOVA PRATICA: Creiamo un nuovo Batch UUID
+      emit(
+        state.copyWith(
+          currentOperation: OperationModel(
+            storeId: _sessionCubit.state.currentStore?.id ?? '',
+            reference: '',
+            createdAt: DateTime.now(),
+            companyId: _sessionCubit.state.company!.id!,
+            status: OperationStatus.draft,
+            batchUuid: _uuid.v4(), // <-- GENERIAMO IL BATCH UNIVOCO
+          ),
+          status: OperationsStatus.ready,
+        ),
+      );
+    }
+  }
+
+  /// MAGIA PURA: Prepara il form per inserire un altro servizio nella stessa pratica.
+  /// Mantiene il Cliente, il Batch e lo Store, ma svuota il resto.
+  void prepareNextOperationInBatch() {
+    if (state.currentOperation == null) return;
+
+    final current = state.currentOperation!;
+
+    emit(
+      state.copyWith(
+        status: OperationsStatus.ready,
+        currentOperation: OperationModel(
+          companyId: current.companyId,
+          storeId: current.storeId,
+          storeDisplayName: current.storeDisplayName,
+          batchUuid: current.batchUuid, // <-- MANTIENE IL COLLEGAMENTO
+          customerId: current.customerId, // <-- MANTIENE IL CLIENTE
+          customerDisplayName: current.customerDisplayName,
+          status: OperationStatus.draft,
+          createdAt: DateTime.now(),
+        ),
+      ),
+    );
+  }
+
+  // --- PERSISTENZA ---
+
+  Future<void> saveCurrentOperation({
+    required OperationStatus targetStatus,
+    bool shouldPop = true,
+  }) async {
+    if (state.currentOperation == null) return;
+
+    emit(state.copyWith(status: OperationsStatus.saving, errorMessage: null));
+    try {
+      final operationToSave = state.currentOperation!.copyWith(
+        status: targetStatus,
+      );
+
+      final updatedOperation = await _repository.saveFullOperation(
+        operation: operationToSave,
+      );
+
+      emit(
+        state.copyWith(
+          // Se non facciamo Pop (es. l'utente vuole aggiungere un altro servizio), non killiamo l'operazione corrente
+          status: shouldPop
+              ? OperationsStatus.saved
+              : OperationsStatus.savedNoPop,
+          currentOperation: shouldPop ? null : updatedOperation,
+        ),
+      );
+
+      // Ricarica in background per la dashboard
+      loadOperations(refresh: true);
+    } catch (e) {
+      emit(
+        state.copyWith(
+          status: OperationsStatus.failure,
+          errorMessage: e.toString(),
+        ),
+      );
+    }
+  }
+
+  // --- RECUPERO OPERAZIONI DELLO STESSO BATCH (Per UI di riepilogo) ---
+
+  /// Puoi usare questa funzione se nella UI vuoi mostrare "Hai inserito 3 servizi in questa pratica"
+  List<OperationModel> getOperationsInCurrentBatch() {
+    if (state.currentOperation == null) return [];
+    final currentBatch = state.currentOperation!.batchUuid;
+
+    // Filtriamo dalla lista caricata (o potresti fare una query diretta a Supabase se preferisci)
+    return state.allOperations
+        .where(
+          (op) =>
+              op.batchUuid == currentBatch &&
+              op.id != state.currentOperation!.id,
+        )
+        .toList();
+  }
+
+  // --- GESTIONE DELLO STATO DEL FORM IN TEMPO REALE ---
+  void updateOperationFields({
+    String? customerId,
+    String? customerDisplayName,
+    String? type,
+    String? providerId,
+    String? providerDisplayName,
+    String? subtype,
+    String? description,
+    DateTime? expirationDate,
+    int? quantity,
+    String? modelId,
+    String? modelDisplayName,
+    String? staffId,
+    String? staffDisplayName,
+    // Aggiungiamo questi flag per forzare la pulizia dei campi quando cambi tipo
+    bool clearProvider = false,
+    bool clearType = false,
+    bool clearSubtype = false,
+    bool clearDescription = false,
+    bool clearExpiration = false,
+    bool clearQuantity = false,
+    bool clearModel = false,
+  }) {
+    if (state.currentOperation == null) return;
+
+    final current = state.currentOperation!;
+
+    // Creiamo il modello aggiornato
+    // ATTENZIONE: adatta questa logica in base a come è scritto il tuo copyWith!
+    int? newQuantity;
+    if (clearQuantity) {
+      newQuantity = 1;
+    }
+    if (quantity != null && quantity <= 0) {
+      newQuantity = 0;
+    }
+    if (quantity != null && quantity > 0) {
+      newQuantity = quantity;
+    }
+    final updated = current.copyWith(
+      customerId: customerId,
+      customerDisplayName: customerDisplayName,
+
+      // Se clearProvider è true, forziamo una stringa vuota (o null se il tuo modello lo supporta)
+      providerId: clearProvider ? null : (providerId ?? current.providerId),
+      providerDisplayName: clearProvider
+          ? null
+          : (providerDisplayName ?? current.providerDisplayName),
+      quantity: newQuantity,
+      type: clearType ? null : (type ?? current.type),
+      description: clearDescription
+          ? null
+          : (description ?? current.description),
+      subtype: clearSubtype ? null : (subtype ?? current.subtype),
+      expirationDate: clearExpiration
+          ? null
+          : (expirationDate ?? current.expirationDate),
+      modelId: clearModel ? null : (modelId ?? current.modelId),
+      modelDisplayName: clearModel
+          ? null
+          : (modelDisplayName ?? current.modelDisplayName),
+      staffId: staffId ?? current.staffId,
+      staffDisplayName: staffDisplayName ?? current.staffDisplayName,
+    );
+
+    emit(state.copyWith(currentOperation: updated));
+  }
+
+  // Metodo di utilità per calcolare la data X mesi da oggi
+  DateTime _calculateMonths(int months) {
+    final now = DateTime.now();
+    return DateTime(now.year, now.month + months, now.day);
+  }
+
+  // Quando l'utente seleziona un tipo, impostiamo il default
+  void setTypeWithSmartDefault(String type) {
+    DateTime? defaultDate;
+
+    if (type == 'Energy') defaultDate = _calculateMonths(24);
+    if (type == 'Fin') defaultDate = _calculateMonths(30);
+    if (type == 'Entertainment') defaultDate = _calculateMonths(12);
+
+    updateOperationFields(
+      type: type,
+      expirationDate: defaultDate,
+      clearProvider: true,
+      clearSubtype: true,
+      clearModel: true,
+      clearQuantity: true,
+    );
+  }
+}

lib/features/operations/blocs/operations_state.dart

@@ -0,0 +1,68 @@
+part of 'operations_cubit.dart';
+
+enum OperationsStatus {
+  initial,
+  loading,
+  ready,
+  saving,
+  saved,
+  savedNoPop,
+  success,
+  failure,
+}
+
+class OperationsState extends Equatable {
+  final OperationsStatus status;
+  final List<OperationModel> allOperations;
+  final OperationModel? currentOperation; // La bozza che stiamo editando
+  final String? errorMessage;
+  final String query;
+  final DateTimeRange? dateRange;
+  final bool hasReachedMax;
+  final bool isSavingDraft;
+
+  const OperationsState({
+    required this.status,
+    this.allOperations = const [],
+    this.currentOperation,
+    this.errorMessage,
+    this.query = '',
+    this.dateRange,
+    this.hasReachedMax = false,
+    this.isSavingDraft = false,
+  });
+
+  OperationsState copyWith({
+    OperationsStatus? status,
+    List<OperationModel>? allOperations,
+    OperationModel? currentOperation,
+    String? errorMessage,
+    String? query,
+    DateTimeRange? dateRange,
+    bool? hasReachedMax,
+    bool? isSavingDraft,
+  }) {
+    return OperationsState(
+      status: status ?? this.status,
+      allOperations: allOperations ?? this.allOperations,
+      currentOperation: currentOperation ?? this.currentOperation,
+      errorMessage: errorMessage,
+      query: query ?? this.query,
+      dateRange: dateRange ?? this.dateRange,
+      hasReachedMax: hasReachedMax ?? this.hasReachedMax,
+      isSavingDraft: isSavingDraft ?? this.isSavingDraft,
+    );
+  }
+
+  @override
+  List<Object?> get props => [
+    status,
+    allOperations,
+    currentOperation,
+    errorMessage,
+    query,
+    dateRange,
+    hasReachedMax,
+    isSavingDraft,
+  ];
+}

lib/features/operations/models/operation_model.dart

@@ -3,11 +3,13 @@ import 'package:flux/core/utils/extensions.dart';
 import 'package:flux/features/attachments/models/attachment_model.dart';
 
 enum OperationStatus {
-  success('success', 'OK'),
-  waitingForAction('waiting_for_action', 'In attesa di azione'),
-  waitingForSupport('waiting_for_support', 'In attesa di supporto'),
-  failure('failure', 'KO'),
-  draft('draft', 'Bozza');
+  ok('ok'),
+  waitingforaction('waiting_for_action'),
+  waitingforsupport('waiting_for_support'),
+  waitingfordeployment('waiting_for_deployment'),
+  ko('ko'),
+  draft('draft'),
+  canceled('canceled');
 
   static OperationStatus fromString(String value) {
     final normalizedValue = value.replaceAll('_', '').toLowerCase();
@@ -17,9 +19,8 @@ enum OperationStatus {
   }
 
   final String supabaseName;
-  final String displayName;
 
-  const OperationStatus(this.supabaseName, this.displayName);
+  const OperationStatus(this.supabaseName);
 }
 
 class OperationModel extends Equatable {
@@ -162,8 +163,8 @@ class OperationModel extends Equatable {
     attachments,
   ];
 
-  factory OperationModel.empty() {
-    return OperationModel(id: null, createdAt: null, companyId: '');
+  factory OperationModel.empty({required String companyId}) {
+    return OperationModel(id: null, createdAt: null, companyId: companyId);
   }
 
   factory OperationModel.fromMap(Map<String, dynamic> map) {

lib/features/operations/ui/operation_form_screen.dart

@@ -1,12 +1,14 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:flux/features/operations/blocs/operations_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
-import 'package:flux/core/widgets/shared_forms/customer_section.dart';
+import 'package:flux/features/operations/ui/widgets/customer_section.dart';
 import 'package:flux/features/operations/ui/widgets/details_section.dart';
-import 'package:flux/core/widgets/shared_forms/attachments_section.dart';
-import 'package:flux/core/widgets/shared_forms/staff_section.dart';
+import 'package:flux/features/operations/ui/widgets/operation_files_section.dart';
+import 'package:flux/features/operations/ui/widgets/staff_section.dart';
+import 'package:get_it/get_it.dart'; // ASSICURATI DEL PATH
+// import 'package:flux/features/attachments/ui/operation_files_section.dart';
 
 class OperationFormScreen extends StatefulWidget {
   final String? operationId;
@@ -47,10 +49,26 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
   @override
   void initState() {
     super.initState();
-    context.read<OperationFormCubit>().initForm(
+    final cubit = context.read<OperationsCubit>();
+    final currentLoggedStaff = GetIt.I
+        .get<SessionCubit>()
+        .state
+        .currentStaffMember!;
+
+    // 1. Diciamo al Cubit di prepararsi
+    cubit.initOperationForm(
       existingOperation: widget.existingOperation,
       operationId: widget.operationId,
+      staffId: currentLoggedStaff.id,
+      staffDisplayName: currentLoggedStaff.name,
     );
+
+    // 2. IL TRUCCO MAGICO:
+    // Se abbiamo passato existingOperation, il Cubit si è appena aggiornato.
+    // Lo stato è già pronto, quindi sincronizziamo i controller SUBITO!
+    if (cubit.state.currentOperation != null) {
+      _syncTextControllers(cubit.state.currentOperation!);
+    }
   }
 
   @override
@@ -58,111 +76,84 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
     _referenceController.dispose();
     _noteController.dispose();
     _freeTextSubtypeController.dispose();
-    _freeTextDescriptionController.dispose();
     super.dispose();
   }
 
   void _syncTextControllers(OperationModel model) {
-    if (_referenceController.text.isEmpty) {
+    if (_referenceController.text.isEmpty && model.reference.isNotEmpty) {
       _referenceController.text = model.reference;
     }
-    if (_noteController.text.isEmpty) {
+    if (_noteController.text.isEmpty && model.note.isNotEmpty) {
       _noteController.text = model.note;
     }
-    if (_freeTextSubtypeController.text.isEmpty) {
-      _freeTextSubtypeController.text = model.subtype ?? '';
+    if (_freeTextSubtypeController.text.isEmpty &&
+        model.subtype != null &&
+        model.subtype!.isNotEmpty) {
+      _freeTextSubtypeController.text = model.subtype!;
     }
-    if (_freeTextDescriptionController.text.isEmpty) {
-      _freeTextDescriptionController.text = model.description ?? '';
+    if (_freeTextDescriptionController.text.isEmpty &&
+        model.description != null &&
+        model.description!.isNotEmpty) {
+      _freeTextDescriptionController.text = model.description!;
     }
-
-    // Se è una nuova pratica (draft), impostiamo di default il target su OK per comodità UI
-    if (model.id == null && model.status == OperationStatus.draft) {
-      // Usiamo addPostFrameCallback per non interferire con il build attuale
-      WidgetsBinding.instance.addPostFrameCallback((_) {
-        // Supponendo tu aggiunga la possibilità di aggiornare lo status nel metodo updateFields del Cubit
-        // context.read<OperationFormCubit>().updateFields(status: OperationStatus.ok);
-      });
-    }
-
     _isInitialized = true;
   }
 
-  void _flushControllersToCubit() {
-    context.read<OperationFormCubit>().updateFields(
+  void _saveOperation({required bool keepAdding}) {
+    if (_formKey.currentState!.validate()) {
+      final cubit = context.read<OperationsCubit>();
+      final currentOperation = cubit.state.currentOperation!;
+
+      final operationToSave = currentOperation.copyWith(
         reference: _referenceController.text,
         note: _noteController.text,
-      subtype: _freeTextSubtypeController.text,
-      description: _freeTextDescriptionController.text,
+        subtype: ['Entertainment', 'Custom'].contains(currentOperation.type)
+            ? _freeTextSubtypeController.text
+            : currentOperation.subtype,
+        description: ['Energy', 'Custom'].contains(currentOperation.type)
+            ? _freeTextDescriptionController.text
+            : currentOperation.description,
       );
-  }
 
-  void _saveOperation({
-    required OperationStatus targetStatus,
-    required bool keepAdding,
-  }) {
-    if (_formKey.currentState!.validate()) {
-      _flushControllersToCubit();
-      context.read<OperationFormCubit>().saveOperation(
-        targetStatus: targetStatus,
-        keepAdding: keepAdding,
+      cubit.initOperationForm(existingOperation: operationToSave);
+      cubit.saveCurrentOperation(
+        targetStatus: OperationStatus.ok,
+        shouldPop: !keepAdding,
       );
     }
   }
 
-  Future<String?> _generateIdForQr() async {
-    if (!_formKey.currentState!.validate()) return null;
-    _flushControllersToCubit();
-    final attachmentsBloc = context.read<AttachmentsBloc>();
-    // Presumo tu abbia creato il metodo saveOperationDraft() nel Cubit!
-    final newId = await context.read<OperationFormCubit>().saveOperationDraft();
-    if (newId != null && context.mounted) {
-      attachmentsBloc.add(ParentEntitySavedEvent(newId));
-    }
-    return newId;
-  }
-
-  // Helper per assegnare un colore agli stati
-  Color _getStatusColor(OperationStatus status) {
-    switch (status) {
-      case OperationStatus.success:
-        return Colors.green;
-      case OperationStatus.waitingForAction:
-        return Colors.orange;
-      case OperationStatus.waitingForSupport:
-        return Colors.blue;
-      case OperationStatus.failure:
-        return Colors.red;
-      case OperationStatus.draft:
-        return Colors.grey;
-    }
-  }
-
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    return BlocConsumer<OperationFormCubit, OperationFormState>(
-      listenWhen: (previous, current) => previous.status != current.status,
+    return BlocConsumer<OperationsCubit, OperationsState>(
+      listenWhen: (previous, current) =>
+          previous.status != current.status ||
+          previous.currentOperation?.id != current.currentOperation?.id,
       listener: (context, state) {
-        if (state.status == OperationFormStatus.ready && !_isInitialized) {
-          _syncTextControllers(state.operation);
+        if (state.status == OperationsStatus.ready &&
+            state.currentOperation != null &&
+            !_isInitialized) {
+          _syncTextControllers(state.currentOperation!);
         }
-        if (state.status == OperationFormStatus.success) {
+
+        if (state.status == OperationsStatus.saved) {
           Navigator.of(context).pop();
-        } else if (state.status == OperationFormStatus.successAndAddAnother) {
+        } else if (state.status == OperationsStatus.savedNoPop) {
+          context.read<OperationsCubit>().prepareNextOperationInBatch();
           ScaffoldMessenger.of(context).showSnackBar(
             const SnackBar(
-              content: Text('Operazione salvata! Inserisci la prossima'),
+              content: Text('Servizio aggiunto! Inserisci il prossimo.'),
             ),
           );
           _freeTextSubtypeController.clear();
           _freeTextDescriptionController.clear();
-        } else if (state.status == OperationFormStatus.failure) {
+        } else if (state.status == OperationsStatus.failure) {
           ScaffoldMessenger.of(context).showSnackBar(
             SnackBar(
-              content: Text(state.errorMessage ?? 'Errore di salvataggio'),
-              backgroundColor: Colors.red,
+              content: Text(state.errorMessage ?? 'Errore'),
+              backgroundColor: theme.colorScheme.error,
             ),
           );
         }
@@ -170,45 +161,19 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
       builder: (context, state) {
         if (!_isInitialized &&
             (widget.operationId != null || widget.existingOperation != null) &&
-            state.status == OperationFormStatus.loading) {
+            state.status == OperationsStatus.loading) {
           return const Scaffold(
             body: Center(child: CircularProgressIndicator()),
           );
         }
 
-        // Determiniamo lo stato da mostrare nel form.
-        // Se è una bozza appena creata, mostriamo visivamente "OK" come default per il salvataggio.
-        final displayStatus =
-            state.operation.status == OperationStatus.draft &&
-                state.operation.id == null
-            ? OperationStatus.success
-            : state.operation.status;
-
         return Scaffold(
           appBar: AppBar(
             title: Text(
-              state.operation.id == null ? 'Nuova Pratica' : 'Modifica Pratica',
+              state.currentOperation?.id == null
+                  ? 'Nuova Pratica'
+                  : 'Modifica Pratica',
             ),
-            // Mettiamo un piccolo indicatore visivo anche nella AppBar se non è OK
-            actions:
-                displayStatus != OperationStatus.success &&
-                    displayStatus != OperationStatus.draft
-                ? [
-                    Padding(
-                      padding: const EdgeInsets.only(right: 16.0),
-                      child: Chip(
-                        label: Text(
-                          displayStatus.displayName,
-                          style: const TextStyle(
-                            color: Colors.white,
-                            fontSize: 12,
-                          ),
-                        ),
-                        backgroundColor: _getStatusColor(displayStatus),
-                      ),
-                    ),
-                  ]
-                : null,
           ),
           body: Form(
             key: _formKey,
@@ -217,22 +182,26 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                 final isUltraWide = constraints.maxWidth > 1400;
                 final isDesktop = constraints.maxWidth > 900;
                 if (isUltraWide) {
+                  // --- LAYOUT 3 COLONNE (Schermi giganti) ---
                   return Row(
                     crossAxisAlignment: CrossAxisAlignment.start,
                     children: [
+                      // 1. FORM PRINCIPALE (40%)
                       Expanded(
                         flex: 4,
                         child: SingleChildScrollView(
                           padding: const EdgeInsets.all(16.0),
+                          // Attenzione: devi togliere la sezione file dal _buildMainFormContent!
                           child: _buildMainFormContent(
                             theme,
                             state,
-                            displayStatus,
                             showFiles: false,
                           ),
                         ),
                       ),
                       VerticalDivider(width: 1, color: theme.dividerColor),
+
+                      // 2. NOTE (30%)
                       Expanded(
                         flex: 3,
                         child: Padding(
@@ -241,17 +210,14 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                         ),
                       ),
                       VerticalDivider(width: 1, color: theme.dividerColor),
+
+                      // 3. FILE (30%)
                       Expanded(
                         flex: 3,
                         child: SingleChildScrollView(
                           padding: const EdgeInsets.all(16.0),
-                          child: SharedAttachmentsSection(
-                            parentType: AttachmentParentType.operation,
-                            parentId: state.operation.id,
-                            titleForUpload:
-                                state.operation.customerDisplayName ??
-                                'Nuova pratica',
-                            onGenerateIdForQr: _generateIdForQr,
+                          child: OperationFilesSection(
+                            currentOp: state.currentOperation!,
                           ),
                         ),
                       ),
@@ -265,11 +231,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                         flex: 7,
                         child: SingleChildScrollView(
                           padding: const EdgeInsets.all(16.0),
-                          child: _buildMainFormContent(
-                            theme,
-                            state,
-                            displayStatus,
-                          ),
+                          child: _buildMainFormContent(theme, state),
                         ),
                       ),
                       VerticalDivider(width: 1, color: theme.dividerColor),
@@ -288,7 +250,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                     child: Column(
                       crossAxisAlignment: CrossAxisAlignment.start,
                       children: [
-                        _buildMainFormContent(theme, state, displayStatus),
+                        _buildMainFormContent(theme, state),
                         const Divider(height: 32),
                         _buildNotesSection(isDesktop: false),
                         const SizedBox(height: 80),
@@ -307,13 +269,9 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                   Expanded(
                     flex: 1,
                     child: OutlinedButton(
-                      onPressed: state.status == OperationFormStatus.saving
+                      onPressed: state.status == OperationsStatus.saving
                           ? null
-                          : () => _saveOperation(
-                              keepAdding: true,
-                              targetStatus:
-                                  displayStatus, // <-- Usiamo lo stato selezionato nel form!
-                            ),
+                          : () => _saveOperation(keepAdding: true),
                       child: const Text(
                         'Salva e Aggiungi Altro',
                         textAlign: TextAlign.center,
@@ -324,27 +282,10 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                   Expanded(
                     flex: 1,
                     child: ElevatedButton(
-                      style: ElevatedButton.styleFrom(
-                        // Se c'è un KO o un blocco, cambiamo il colore del bottone principale per attirare l'attenzione
-                        backgroundColor:
-                            displayStatus != OperationStatus.success &&
-                                displayStatus != OperationStatus.draft
-                            ? _getStatusColor(displayStatus)
-                            : null,
-                        foregroundColor:
-                            displayStatus != OperationStatus.success &&
-                                displayStatus != OperationStatus.draft
-                            ? Colors.white
-                            : null,
-                      ),
-                      onPressed: state.status == OperationFormStatus.saving
+                      onPressed: state.status == OperationsStatus.saving
                           ? null
-                          : () => _saveOperation(
-                              keepAdding: false,
-                              targetStatus:
-                                  displayStatus, // <-- Usiamo lo stato selezionato nel form!
-                            ),
-                      child: state.status == OperationFormStatus.saving
+                          : () => _saveOperation(keepAdding: false),
+                      child: state.status == OperationsStatus.saving
                           ? const SizedBox(
                               width: 20,
                               height: 20,
@@ -367,107 +308,19 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
 
   Widget _buildMainFormContent(
     ThemeData theme,
-    OperationFormState state,
-    OperationStatus displayStatus, {
+    OperationsState state, {
     bool showFiles = true,
   }) {
-    final currentOp = state.operation;
-    final currentType = currentOp.type;
+    final currentOp = state.currentOperation;
+    final currentType = currentOp?.type ?? 'AL';
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
       children: [
-        StaffSection(
-          staffId: currentOp.staffId,
-          staffName: currentOp.staffDisplayName,
-          onStaffSelected: (staff) => {
-            context.read<OperationFormCubit>().updateFields(
-              staffId: staff.id,
-              staffDisplayName: staff.name,
-            ),
-          },
-        ),
+        StaffSection(currentOp: currentOp),
         const Divider(height: 50),
-
-        // --- SEZIONE STATO OPERAZIONE ---
-        _buildSectionTitle('Esito / Stato Operazione'),
-        Container(
-          padding: const EdgeInsets.symmetric(horizontal: 16, vertical: 4),
-          decoration: BoxDecoration(
-            color: _getStatusColor(displayStatus).withValues(alpha: 0.1),
-            border: Border.all(
-              color: _getStatusColor(displayStatus).withValues(alpha: 0.3),
-            ),
-            borderRadius: BorderRadius.circular(12),
-          ),
-          child: DropdownButtonHideUnderline(
-            child: DropdownButton<OperationStatus>(
-              isExpanded: true,
-              value: displayStatus,
-              icon: Icon(
-                Icons.arrow_drop_down,
-                color: _getStatusColor(displayStatus),
-              ),
-              items: OperationStatus.values
-                  /* .where(
-                    (s) => s != OperationStatus.draft,
-                  ) // Nascondiamo 'Bozza' dal menu */
-                  .map(
-                    (status) => DropdownMenuItem(
-                      value: status,
-                      child: Row(
-                        children: [
-                          Icon(
-                            status == OperationStatus.success
-                                ? Icons.check_circle
-                                : Icons.error_outline,
-                            color: _getStatusColor(status),
-                            size: 20,
-                          ),
-                          const SizedBox(width: 12),
-                          Text(
-                            status.displayName,
-                            style: TextStyle(
-                              fontWeight: FontWeight.w600,
-                              color: _getStatusColor(status),
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  )
-                  .toList(),
-              onChanged: (newStatus) {
-                if (newStatus != null) {
-                  // Assicurati che il metodo updateFields nel tuo Cubit accetti anche 'status'
-                  context.read<OperationFormCubit>().updateFields(
-                    status: newStatus,
-                  );
-                }
-              },
-            ),
-          ),
-        ),
-        const SizedBox(height: 8),
-        Text(
-          displayStatus == OperationStatus.success
-              ? 'Lascia OK se la pratica è stata caricata con successo.'
-              : 'Attenzione: la pratica verrà salvata come ${displayStatus.displayName}.',
-          style: TextStyle(fontSize: 12, color: Colors.grey.shade600),
-        ),
-        const Divider(height: 32),
-
-        //_buildSectionTitle('Cliente & Riferimento'),
-        SharedCustomerSection(
-          customerId: currentOp.customerId,
-          customerName: currentOp.customerDisplayName,
-          onCustomerSelected: (customer) {
-            context.read<OperationFormCubit>().updateFields(
-              customerId: customer.id,
-              customerDisplayName: customer.name,
-            );
-          },
-        ),
+        _buildSectionTitle('Cliente & Riferimento'),
+        CustomerSection(currentOp: currentOp),
         const SizedBox(height: 16),
         TextFormField(
           controller: _referenceController,
@@ -488,9 +341,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
               selected: currentType == type,
               onSelected: (selected) {
                 if (selected) {
-                  context.read<OperationFormCubit>().setTypeWithSmartDefault(
-                    type,
-                  );
+                  context.read<OperationsCubit>().setTypeWithSmartDefault(type);
                 }
               },
             );
@@ -514,23 +365,23 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
             IconButton(
               icon: const Icon(Icons.remove),
               onPressed: () {
-                final q = currentOp.quantity;
+                final q = currentOp?.quantity ?? 1;
                 if (q > 1) {
-                  context.read<OperationFormCubit>().updateFields(
+                  context.read<OperationsCubit>().updateOperationFields(
                     quantity: q - 1,
                   );
                 }
               },
             ),
             Text(
-              '${currentOp.quantity}',
+              '${currentOp?.quantity ?? 1}',
               style: const TextStyle(fontSize: 18, fontWeight: FontWeight.bold),
             ),
             IconButton(
               icon: const Icon(Icons.add),
               onPressed: () {
-                final q = currentOp.quantity;
-                context.read<OperationFormCubit>().updateFields(
+                final q = currentOp?.quantity ?? 1;
+                context.read<OperationsCubit>().updateOperationFields(
                   quantity: q + 1,
                 );
               },
@@ -539,20 +390,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
         ),
         const Divider(height: 32),
 
-        if (showFiles) ...[
-          SharedAttachmentsSection(
-            parentType: AttachmentParentType.operation,
-            parentId: currentOp.id,
-            titleForUpload:
-                state.operation.customerDisplayName ?? 'Nuova pratica',
-            onGenerateIdForQr: _generateIdForQr,
-          ),
-          /* SharedFilesSection(
-            titleNameForUpload:
-                state.operation.customerDisplayName ?? 'Nuova pratica',
-            onGenerateIdForQr: _generateIdForQr,
-          ), */
-        ],
+        if (showFiles) ...[OperationFilesSection(currentOp: currentOp!)],
       ],
     );
   }
@@ -582,7 +420,7 @@ class _OperationFormScreenState extends State<OperationFormScreen> {
                   backgroundColor: Colors.blue.withValues(alpha: 0.05),
                   onPressed: () {
                     final now = DateTime.now();
-                    context.read<OperationFormCubit>().updateFields(
+                    context.read<OperationsCubit>().updateOperationFields(
                       expirationDate: DateTime(
                         now.year,
                         now.month + months,

lib/features/operations/ui/operation_mobile_upload_screen.dart

@@ -0,0 +1,303 @@
+import 'dart:io';
+import 'package:flutter/material.dart';
+import 'package:flutter_bloc/flutter_bloc.dart';
+import 'package:flux/features/operations/blocs/operation_files_bloc.dart';
+import 'package:image_picker/image_picker.dart';
+import 'package:file_picker/file_picker.dart';
+
+class OperationMobileUploadScreen extends StatefulWidget {
+  final String operationId;
+  final String operationName;
+
+  const OperationMobileUploadScreen({
+    super.key,
+    required this.operationId,
+    required this.operationName,
+  });
+
+  @override
+  State<OperationMobileUploadScreen> createState() =>
+      _OperationMobileUploadScreenState();
+}
+
+class _OperationMobileUploadScreenState
+    extends State<OperationMobileUploadScreen> {
+  // 1. LA NOSTRA STAGING AREA (Il "Carrello")
+  final List<PlatformFile> _stagedFiles = [];
+
+  // 2. STATO DI CARICAMENTO GLOBALE
+  bool _isUploading = false;
+
+  // Funzione magica per capire se è un'immagine o un PDF dall'estensione
+  bool _isImage(String path) {
+    final ext = path.split('.').last.toLowerCase();
+    return ['jpg', 'jpeg', 'png', 'webp'].contains(ext);
+  }
+
+  @override
+  Widget build(BuildContext context) {
+    return BlocListener<OperationFilesBloc, OperationFilesState>(
+      listener: (context, state) {
+        // Quando il BLoC ci dice che ha finito l'upload (Success), chiudiamo la pagina!
+        if (state.status == OperationFilesStatus.success && _isUploading) {
+          ScaffoldMessenger.of(context).showSnackBar(
+            const SnackBar(
+              content: Text("Tutti i file caricati con successo! ✅"),
+            ),
+          );
+          Navigator.of(context).pop();
+        }
+        if (state.status == OperationFilesStatus.failure) {
+          setState(() => _isUploading = false);
+          ScaffoldMessenger.of(
+            context,
+          ).showSnackBar(SnackBar(content: Text("Errore: ${state.error}")));
+        }
+      },
+      child: Scaffold(
+        appBar: AppBar(
+          title: Text("Upload Pratica:\n${widget.operationName}"),
+          automaticallyImplyLeading: !_isUploading,
+        ),
+        body: Stack(
+          children: [
+            Column(
+              children: [
+                // --- SEZIONE PULSANTI (Fotocamera / Galleria) ---
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Row(
+                    children: [
+                      Expanded(
+                        child: ElevatedButton.icon(
+                          onPressed: _isUploading ? null : _handleCamera,
+                          icon: const Icon(Icons.camera_alt),
+                          label: const Text("SCATTA"),
+                          style: ElevatedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(vertical: 16),
+                          ),
+                        ),
+                      ),
+                      const SizedBox(width: 12),
+                      Expanded(
+                        child: OutlinedButton.icon(
+                          onPressed: _isUploading ? null : _handleFilePicker,
+                          icon: const Icon(Icons.folder),
+                          label: const Text("GALLERIA"),
+                          style: OutlinedButton.styleFrom(
+                            padding: const EdgeInsets.symmetric(vertical: 16),
+                          ),
+                        ),
+                      ),
+                    ],
+                  ),
+                ),
+
+                const Divider(),
+
+                // --- SEZIONE ANTEPRIME (La GridView Magica) ---
+                Expanded(
+                  child: _stagedFiles.isEmpty
+                      ? const Center(
+                          child: Text(
+                            "Nessun file selezionato.\nScatta una foto o scegli dalla galleria.",
+                            textAlign: TextAlign.center,
+                            style: TextStyle(color: Colors.grey),
+                          ),
+                        )
+                      : GridView.builder(
+                          padding: const EdgeInsets.all(16),
+                          gridDelegate:
+                              const SliverGridDelegateWithFixedCrossAxisCount(
+                                crossAxisCount:
+                                    3, // 3 colonne come la galleria dell'iPhone
+                                crossAxisSpacing: 12,
+                                mainAxisSpacing: 12,
+                              ),
+                          itemCount: _stagedFiles.length,
+                          itemBuilder: (context, index) {
+                            final file = _stagedFiles[index];
+                            final isImg = _isImage(file.name);
+
+                            return Stack(
+                              clipBehavior: Clip.none,
+                              children: [
+                                // L'ANTEPRIMA
+                                Container(
+                                  width: double.infinity,
+                                  height: double.infinity,
+                                  decoration: BoxDecoration(
+                                    color: Colors.grey.shade200,
+                                    borderRadius: BorderRadius.circular(12),
+                                    border: Border.all(
+                                      color: Colors.grey.shade300,
+                                    ),
+                                  ),
+                                  child: ClipRRect(
+                                    borderRadius: BorderRadius.circular(12),
+                                    child: isImg
+                                        ? Image.file(
+                                            File(file.path!),
+                                            fit: BoxFit.cover,
+                                          )
+                                        : const Column(
+                                            mainAxisAlignment:
+                                                MainAxisAlignment.center,
+                                            children: [
+                                              Icon(
+                                                Icons.picture_as_pdf,
+                                                color: Colors.red,
+                                                size: 36,
+                                              ),
+                                              SizedBox(height: 4),
+                                              Text(
+                                                "PDF",
+                                                style: TextStyle(
+                                                  fontSize: 10,
+                                                  fontWeight: FontWeight.bold,
+                                                ),
+                                              ),
+                                            ],
+                                          ),
+                                  ),
+                                ),
+
+                                // IL PULSANTE CESTINO (In alto a destra)
+                                Positioned(
+                                  top: -8,
+                                  right: -8,
+                                  child: GestureDetector(
+                                    onTap: () {
+                                      setState(() {
+                                        _stagedFiles.removeAt(index);
+                                      });
+                                    },
+                                    child: Container(
+                                      padding: const EdgeInsets.all(4),
+                                      decoration: const BoxDecoration(
+                                        color: Colors.red,
+                                        shape: BoxShape.circle,
+                                      ),
+                                      child: const Icon(
+                                        Icons.close,
+                                        color: Colors.white,
+                                        size: 16,
+                                      ),
+                                    ),
+                                  ),
+                                ),
+                              ],
+                            );
+                          },
+                        ),
+                ),
+
+                // --- SEZIONE INVIA E CHIUDI ---
+                SafeArea(
+                  child: Padding(
+                    padding: const EdgeInsets.all(16.0),
+                    child: SizedBox(
+                      width: double.infinity,
+                      height: 56,
+                      child: ElevatedButton.icon(
+                        // Il pulsante si accende SOLO se ci sono file nel carrello
+                        onPressed: _stagedFiles.isEmpty || _isUploading
+                            ? null
+                            : _submitAllFiles,
+                        icon: const Icon(Icons.cloud_upload),
+                        label: Text(
+                          "INVIA ${_stagedFiles.length} FILE E CHIUDI",
+                          style: const TextStyle(
+                            fontSize: 16,
+                            fontWeight: FontWeight.bold,
+                          ),
+                        ),
+                        style: ElevatedButton.styleFrom(
+                          backgroundColor: Theme.of(
+                            context,
+                          ).colorScheme.primary,
+                          foregroundColor: Theme.of(
+                            context,
+                          ).colorScheme.onPrimary,
+                        ),
+                      ),
+                    ),
+                  ),
+                ),
+              ],
+            ),
+
+            // --- OVERLAY DI CARICAMENTO (Impedisce tap multipli) ---
+            if (_isUploading)
+              Container(
+                color: Colors.black.withValues(alpha: 0.5),
+                child: const Center(
+                  child: Card(
+                    child: Padding(
+                      padding: EdgeInsets.all(24.0),
+                      child: Column(
+                        mainAxisSize: MainAxisSize.min,
+                        children: [
+                          CircularProgressIndicator(),
+                          SizedBox(height: 16),
+                          Text(
+                            "Caricamento in corso...",
+                            style: TextStyle(fontWeight: FontWeight.bold),
+                          ),
+                        ],
+                      ),
+                    ),
+                  ),
+                ),
+              ),
+          ],
+        ),
+      ),
+    );
+  }
+
+  // --- LOGICA FOTOCAMERA E LIBRERIA ---
+  Future<void> _handleCamera() async {
+    final picker = ImagePicker();
+    final photo = await picker.pickImage(
+      source: ImageSource.camera,
+      imageQuality: 80,
+    );
+    if (photo != null) {
+      final photoBytes = await photo.readAsBytes(); // Sicuro anche per Web!
+      final photoSize = await photo.length();
+
+      final platformFile = PlatformFile(
+        name: photo.name,
+        size: photoSize,
+        path: photo.path,
+        bytes: photoBytes, // I bytes ci salvano la vita su Supabase!
+      );
+      setState(() {
+        _stagedFiles.add(platformFile); // Unifichiamo tutto in un dart:io File
+      });
+    }
+  }
+
+  Future<void> _handleFilePicker() async {
+    // allowMultiple: true permette di pescare 5 foto dalla galleria in un colpo solo!
+    final result = await FilePicker.pickFiles(allowMultiple: true);
+    if (result != null) {
+      setState(() {
+        _stagedFiles.addAll(result.files);
+      });
+    }
+  }
+
+  // --- LOGICA DI INVIO AL BLoC ---
+  void _submitAllFiles() {
+    setState(() => _isUploading = true);
+
+    // Diciamo al BLoC di caricare tutti i file.
+    // Usiamo il tuo evento esistente per ogni file (il BLoC li metterà in coda)
+    final bloc = context.read<OperationFilesBloc>();
+    bloc.add(UploadOperationFilesEvent(pickedFiles: _stagedFiles));
+
+    // N.B: Il Navigator.pop() viene chiamato dal BlocListener in alto quando lo stato diventa "success"!
+  }
+}

lib/features/operations/ui/operations_screen.dart

@@ -1,18 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/operations/blocs/operation_list_cubit.dart';
+import 'package:flux/features/operations/blocs/operations_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});
+class OperationsScreen extends StatefulWidget {
+  const OperationsScreen({super.key});
 
   @override
-  State<OperationListScreen> createState() => _OperationListScreenState();
+  State<OperationsScreen> createState() => _OperationsScreenState();
 }
 
-class _OperationListScreenState extends State<OperationListScreen> {
+class _OperationsScreenState extends State<OperationsScreen> {
   final ScrollController _scrollController = ScrollController();
 
   @override
@@ -20,11 +20,13 @@ class _OperationListScreenState extends State<OperationListScreen> {
     super.initState();
     // Agganciamo il listener per la paginazione (Scroll Infinito)
     _scrollController.addListener(_onScroll);
+    // Carichiamo i servizi iniziali
+    context.read<OperationsCubit>().loadOperations();
   }
 
   void _onScroll() {
     if (_isBottom) {
-      context.read<OperationListCubit>().loadOperations();
+      context.read<OperationsCubit>().loadOperations();
     }
   }
 
@@ -57,16 +59,16 @@ class _OperationListScreenState extends State<OperationListScreen> {
           ),
         ],
       ),
-      body: BlocBuilder<OperationListCubit, OperationListState>(
+      body: BlocBuilder<OperationsCubit, OperationsState>(
         builder: (context, state) {
           // 1. Stato di caricamento iniziale
-          if (state.status == OperationListStatus.loading &&
-              state.operations.isEmpty) {
+          if (state.status == OperationsStatus.loading &&
+              state.allOperations.isEmpty) {
             return const Center(child: CircularProgressIndicator());
           }
 
           // 2. Lista vuota
-          if (state.operations.isEmpty) {
+          if (state.allOperations.isEmpty) {
             return Center(
               child: Column(
                 mainAxisAlignment: MainAxisAlignment.center,
@@ -75,7 +77,7 @@ class _OperationListScreenState extends State<OperationListScreen> {
                   const SizedBox(height: 10),
                   ElevatedButton(
                     onPressed: () => context
-                        .read<OperationListCubit>()
+                        .read<OperationsCubit>()
                         .loadOperations(refresh: true),
                     child: const Text("Riprova"),
                   ),
@@ -86,17 +88,16 @@ class _OperationListScreenState extends State<OperationListScreen> {
 
           // 3. La Lista (con Pull-to-refresh)
           return RefreshIndicator(
-            onRefresh: () => context.read<OperationListCubit>().loadOperations(
-              refresh: true,
-            ),
+            onRefresh: () =>
+                context.read<OperationsCubit>().loadOperations(refresh: true),
             child: ListView.builder(
               controller: _scrollController,
               padding: const EdgeInsets.only(bottom: 80), // Spazio per il FAB
               itemCount: state.hasReachedMax
-                  ? state.operations.length
-                  : state.operations.length + 1,
+                  ? state.allOperations.length
+                  : state.allOperations.length + 1,
               itemBuilder: (context, index) {
-                if (index >= state.operations.length) {
+                if (index >= state.allOperations.length) {
                   return const Center(
                     child: Padding(
                       padding: EdgeInsets.all(16.0),
@@ -105,7 +106,7 @@ class _OperationListScreenState extends State<OperationListScreen> {
                   );
                 }
 
-                final operation = state.operations[index];
+                final operation = state.allOperations[index];
                 return _buildOperationCard(context, operation);
               },
             ),
@@ -172,16 +173,17 @@ class _OperationListScreenState extends State<OperationListScreen> {
   Widget _buildOperationStatus(OperationStatus status) {
     Color color;
     switch (status) {
-      case OperationStatus.failure:
+      case OperationStatus.canceled || OperationStatus.ko:
         color = Colors.grey.shade800;
         break;
-      case OperationStatus.waitingForAction || OperationStatus.draft:
+      case OperationStatus.waitingforaction || OperationStatus.draft:
         color = Colors.orange;
         break;
-      case OperationStatus.success:
+      case OperationStatus.ok:
         color = Colors.green;
         break;
-      case OperationStatus.waitingForSupport:
+      case OperationStatus.waitingfordeployment ||
+          OperationStatus.waitingforsupport:
         color = Colors.blue;
         break;
     }

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

@@ -1,24 +1,18 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/features/customers/blocs/customers_cubit.dart';
-import 'package:flux/features/customers/models/customer_model.dart';
 import 'package:flux/features/customers/ui/quick_customer_dialog.dart';
+import 'package:flux/features/operations/blocs/operations_cubit.dart';
+import 'package:flux/features/operations/models/operation_model.dart';
 
-class SharedCustomerSection extends StatelessWidget {
-  final String? customerId;
-  final String? customerName;
-  final ValueChanged<CustomerModel> onCustomerSelected;
-
-  const SharedCustomerSection({
-    super.key,
-    this.customerId,
-    this.customerName,
-    required this.onCustomerSelected,
-  });
+class CustomerSection extends StatelessWidget {
+  final OperationModel? currentOp;
+  const CustomerSection({super.key, required this.currentOp});
 
   @override
   Widget build(BuildContext context) {
-    final hasCustomer = customerId != null && customerId!.isNotEmpty;
+    final hasCustomer =
+        currentOp?.customerId != null && currentOp!.customerId!.isNotEmpty;
     final theme = Theme.of(context);
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -47,7 +41,9 @@ class SharedCustomerSection extends StatelessWidget {
                 const SizedBox(width: 12),
                 Expanded(
                   child: Text(
-                    hasCustomer ? customerName! : 'Seleziona Cliente *',
+                    hasCustomer
+                        ? currentOp!.customerDisplayName!
+                        : 'Seleziona Cliente *',
                     style: TextStyle(
                       fontWeight: hasCustomer
                           ? FontWeight.bold
@@ -129,6 +125,9 @@ class SharedCustomerSection extends StatelessWidget {
                     icon: const Icon(Icons.person_add),
                     label: const Text('Crea Nuovo Cliente'),
                     onPressed: () async {
+                      final OperationsCubit operationsCubit = context
+                          .read<OperationsCubit>();
+
                       // APRIAMO LA DIALOG RAPIDA CON LA MAGIA DEL BLOC PROVIDER
                       final newCustomer = await showDialog(
                         context: context,
@@ -146,7 +145,10 @@ class SharedCustomerSection extends StatelessWidget {
                       // Se l'ha creato davvero (e non ha premuto annulla)...
                       if (newCustomer != null) {
                         // 1. Aggiorniamo il form delle operazioni
-                        onCustomerSelected(newCustomer);
+                        operationsCubit.updateOperationFields(
+                          customerId: newCustomer.id,
+                          customerDisplayName: newCustomer.name,
+                        );
 
                         // 2. Chiudiamo la BottomSheet dei clienti per tornare alla form!
                         if (context.mounted) {
@@ -194,7 +196,14 @@ class SharedCustomerSection extends StatelessWidget {
                               '${customer.phoneNumber} • ${customer.email}',
                             ),
                             onTap: () {
-                              onCustomerSelected(customer);
+                              // Aggiorniamo il form tramite il Cubit delle operazioni
+                              context
+                                  .read<OperationsCubit>()
+                                  .updateOperationFields(
+                                    customerId: customer.id, // customer.id
+                                    customerDisplayName:
+                                        customer.name, // customer.name
+                                  );
                               Navigator.pop(modalContext);
                             },
                           );

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

@@ -1,8 +1,9 @@
 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/products/blocs/product_cubit.dart';
+import 'package:flux/features/master_data/products/ui/quick_product_dialog.dart';
 import 'package:flux/features/master_data/providers/blocs/provider_cubit.dart';
-import 'package:flux/features/operations/blocs/operation_form_cubit.dart';
+import 'package:flux/features/operations/blocs/operations_cubit.dart';
 import 'package:flux/features/operations/models/operation_model.dart';
 
 class DetailsSection extends StatelessWidget {
@@ -45,7 +46,6 @@ class DetailsSection extends StatelessWidget {
   }
 
   void _showProviderModal(BuildContext context, String operationType) {
-    final OperationFormCubit cubit = context.read<OperationFormCubit>();
     showModalBottomSheet(
       context: context,
       isScrollControlled: true,
@@ -104,9 +104,7 @@ class DetailsSection extends StatelessWidget {
                         );
                       }
 
-                      return BlocProvider.value(
-                        value: cubit,
-                        child: ListView.builder(
+                      return ListView.builder(
                         controller: scrollController,
                         itemCount: filteredProviders.length,
                         itemBuilder: (context, index) {
@@ -120,7 +118,9 @@ class DetailsSection extends StatelessWidget {
                               ),
                             ),
                             onTap: () {
-                                context.read<OperationFormCubit>().updateFields(
+                              context
+                                  .read<OperationsCubit>()
+                                  .updateOperationFields(
                                     providerId: provider.id,
                                     providerDisplayName: provider.name,
                                   );
@@ -128,7 +128,129 @@ class DetailsSection extends StatelessWidget {
                             },
                           );
                         },
+                      );
+                    },
                   ),
+                ),
+              ],
+            );
+          },
+        );
+      },
+    );
+  }
+
+  void _showModelModal(BuildContext context) {
+    showModalBottomSheet(
+      context: context,
+      isScrollControlled: true,
+      shape: const RoundedRectangleBorder(
+        borderRadius: BorderRadius.vertical(top: Radius.circular(16)),
+      ),
+      builder: (modalContext) {
+        return DraggableScrollableSheet(
+          initialChildSize: 0.6,
+          minChildSize: 0.4,
+          maxChildSize: 0.9,
+          expand: false,
+          builder: (_, scrollController) {
+            return Column(
+              children: [
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: Row(
+                    mainAxisAlignment: MainAxisAlignment.spaceBetween,
+                    children: [
+                      Text(
+                        'Seleziona Modello',
+                        style: Theme.of(context).textTheme.titleLarge,
+                      ),
+                      IconButton(
+                        icon: const Icon(Icons.close),
+                        onPressed: () => Navigator.pop(modalContext),
+                      ),
+                    ],
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.symmetric(horizontal: 16.0),
+                  child: TextField(
+                    decoration: InputDecoration(
+                      hintText: 'Cerca modello (es. iPhone 15...)',
+                      prefixIcon: const Icon(Icons.search),
+                      border: OutlineInputBorder(
+                        borderRadius: BorderRadius.circular(8),
+                      ),
+                    ),
+                    onChanged: (query) =>
+                        context.read<ProductsCubit>().searchModels(query),
+                  ),
+                ),
+                Padding(
+                  padding: const EdgeInsets.all(16.0),
+                  child: ElevatedButton.icon(
+                    style: ElevatedButton.styleFrom(
+                      minimumSize: const Size.fromHeight(48),
+                    ),
+                    icon: const Icon(Icons.add),
+                    label: const Text('Aggiungi Modello al Volo'),
+                    onPressed: () async {
+                      final operationsCubit = context.read<OperationsCubit>();
+                      final existingBrands = context
+                          .read<ProductsCubit>()
+                          .state
+                          .brands;
+
+                      final newModel = await showDialog(
+                        context: context,
+                        builder: (dialogContext) {
+                          return BlocProvider.value(
+                            value: context.read<ProductsCubit>(),
+                            child: QuickProductDialog(
+                              existingBrands: existingBrands,
+                            ),
+                          );
+                        },
+                      );
+
+                      if (newModel != null) {
+                        operationsCubit.updateOperationFields(
+                          modelId: newModel.id,
+                          modelDisplayName: newModel.nameWithBrand,
+                        );
+                        if (context.mounted) Navigator.pop(modalContext);
+                      }
+                    },
+                  ),
+                ),
+                const Divider(),
+                Expanded(
+                  child: BlocBuilder<ProductsCubit, ProductState>(
+                    builder: (context, state) {
+                      return ListView.builder(
+                        controller: scrollController,
+                        itemCount: state.models.length,
+                        itemBuilder: (context, index) {
+                          final deviceModel = state.models[index];
+                          return ListTile(
+                            leading: const Icon(Icons.devices),
+                            title: Text(
+                              deviceModel.nameWithBrand,
+                              style: const TextStyle(
+                                fontWeight: FontWeight.bold,
+                              ),
+                            ),
+                            onTap: () {
+                              context
+                                  .read<OperationsCubit>()
+                                  .updateOperationFields(
+                                    modelId: deviceModel.id,
+                                    modelDisplayName: deviceModel.nameWithBrand,
+                                  );
+                              Navigator.pop(modalContext);
+                            },
+                          );
+                        },
                       );
                     },
                   ),
@@ -192,7 +314,9 @@ class DetailsSection extends StatelessWidget {
             ].map((s) => DropdownMenuItem(value: s, child: Text(s))).toList(),
             onChanged: (val) {
               if (val != null) {
-                context.read<OperationFormCubit>().updateFields(subtype: val);
+                context.read<OperationsCubit>().updateOperationFields(
+                  subtype: val,
+                );
               }
             },
           ),
@@ -210,16 +334,30 @@ class DetailsSection extends StatelessWidget {
 
         // 2. SCENARIO FIN (Ricerca Modello/Prodotto)
         if (currentType == 'Fin') ...[
-          SharedModelSection(
-            label: 'Seleziona Dispositivo/Prodotto',
-            modelId: currentOp?.modelId,
-            modelName: currentOp?.modelDisplayName,
-            onModelSelected: (id, name) {
-              context.read<OperationFormCubit>().updateFields(
-                modelId: id,
-                modelDisplayName: name,
-              );
-            },
+          ListTile(
+            title: const Text('Seleziona Dispositivo/Prodotto'),
+            subtitle: Text(
+              (currentOp?.modelDisplayName != null &&
+                      currentOp!.modelDisplayName!.isNotEmpty)
+                  ? currentOp!.modelDisplayName!
+                  : 'Nessun modello selezionato',
+              style: TextStyle(
+                color:
+                    (currentOp?.modelId == null || currentOp!.modelId!.isEmpty)
+                    ? Colors.grey
+                    : null,
+                fontWeight:
+                    (currentOp?.modelId == null || currentOp!.modelId!.isEmpty)
+                    ? FontWeight.normal
+                    : FontWeight.bold,
+              ),
+            ),
+            trailing: const Icon(Icons.arrow_drop_down),
+            shape: RoundedRectangleBorder(
+              side: BorderSide(color: theme.dividerColor),
+              borderRadius: BorderRadius.circular(8),
+            ),
+            onTap: () => _showModelModal(context),
           ),
           const SizedBox(height: 16),
         ],
@@ -271,7 +409,7 @@ class DetailsSection extends StatelessWidget {
                 lastDate: DateTime.now().add(const Duration(days: 3650)),
               );
               if (date != null && context.mounted) {
-                context.read<OperationFormCubit>().updateFields(
+                context.read<OperationsCubit>().updateOperationFields(
                   expirationDate: date,
                 );
               }

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

@@ -4,16 +4,16 @@ import 'package:flutter/foundation.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:file_picker/file_picker.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/core/widgets/qr_upload_dialog.dart';
 import 'package:flux/features/attachments/data/attachments_repository.dart';
 import 'package:flux/features/attachments/ui/attachment_viewer_screen.dart';
 import 'package:flux/features/attachments/ui/quick_rename_dialog.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
+import 'package:flux/features/operations/blocs/operation_files_bloc.dart';
 import 'package:get_it/get_it.dart';
 import 'package:shared_preferences/shared_preferences.dart';
+import 'package:flux/features/operations/models/operation_model.dart';
 import 'package:flux/features/attachments/models/attachment_model.dart';
 import 'package:pdf/widgets.dart' as pw;
+import 'package:pdf/pdf.dart' as p; // Se ti serve formattazione core
 import 'package:pdfx/pdfx.dart' as px; // Isoliamo pdfx
 
 class _ExportItem {
@@ -30,26 +30,16 @@ class _ExportItem {
   });
 }
 
-class SharedAttachmentsSection extends StatefulWidget {
-  final String? parentId;
-  final String titleForUpload;
-  final AttachmentParentType parentType;
-  final Future<String?> Function()? onGenerateIdForQr;
+class OperationFilesSection extends StatefulWidget {
+  final OperationModel currentOp;
 
-  const SharedAttachmentsSection({
-    super.key,
-    this.parentId,
-    this.titleForUpload = 'Cliente_sconosciuto',
-    required this.parentType,
-    this.onGenerateIdForQr,
-  });
+  const OperationFilesSection({super.key, required this.currentOp});
 
   @override
-  State<SharedAttachmentsSection> createState() =>
-      _SharedAttachmentsSectionState();
+  State<OperationFilesSection> createState() => _OperationFilesSectionState();
 }
 
-class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
+class _OperationFilesSectionState extends State<OperationFilesSection> {
   String? _exportDirectory;
 
   @override
@@ -69,7 +59,7 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
 
   Future<void> _selectExportDirectory() async {
     final String? selectedDirectory = await FilePicker.getDirectoryPath(
-      dialogTitle: 'Seleziona la cartella di esportazione',
+      dialogTitle: 'Seleziona la cartella di esportazione per TIM/Citrix',
     );
 
     if (selectedDirectory != null) {
@@ -99,14 +89,16 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
 
     if (result != null && mounted) {
       // MAGIA: Passiamo direttamente la lista di PlatformFile al tuo BLoC!
-      context.read<AttachmentsBloc>().add(AddAttachmentsEvent(result.files));
+      context.read<OperationFilesBloc>().add(
+        AddOperationFilesEvent(result.files),
+      );
     }
   }
 
   // --- APERTURA VIEWER ---
   void _openFile(AttachmentModel file) {
     // 1. Catturiamo il BLoC dalla pagina corrente prima di navigare
-    final operationFilesBloc = context.read<AttachmentsBloc>();
+    final operationFilesBloc = context.read<OperationFilesBloc>();
     Navigator.push(
       context,
       MaterialPageRoute(
@@ -116,10 +108,10 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
             attachment: file,
             onRename: (newName) {
               // Spara l'evento al BLoC e lui farà il resto!
-              operationFilesBloc.add(RenameAttachmentEvent(file, newName));
+              operationFilesBloc.add(RenameOperationFileEvent(file, newName));
             },
             onDelete: () {
-              operationFilesBloc.add(DeleteSpecificAttachmentEvent(file));
+              operationFilesBloc.add(DeleteSpecificOperationFileEvent(file));
             },
           ),
         ),
@@ -192,8 +184,7 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
         suggestedName = selectedFiles.first.name;
       } else {
         // Se sono più file uniti
-
-        suggestedName = '${widget.titleForUpload}_Unito';
+        suggestedName = '${widget.currentOp.customerDisplayName}_Unito';
       }
 
       if (!mounted) return;
@@ -290,7 +281,7 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
         if (fileBytes == null) continue;
 
         // Recuperiamo il nome che l'utente ha (magari) già impostato
-        final baseName = file.name;
+        final baseName = file.name ?? 'Documento';
 
         if (file.extension == 'pdf') {
           final document = await px.PdfDocument.openData(fileBytes);
@@ -401,7 +392,8 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
 
-    return BlocBuilder<AttachmentsBloc, AttachmentsState>(
+    // USIAMO IL TUO BLOC!
+    return BlocBuilder<OperationFilesBloc, OperationFilesState>(
       builder: (context, state) {
         final allFiles = state.allFiles;
         final selectedFiles = state.selectedFiles;
@@ -424,7 +416,7 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                     color: theme.colorScheme.primary,
                   ),
                   title: const Text(
-                    'Cartella Export (Es. TIM AttachmentRepository)',
+                    'Cartella Export (Es. Citrix TIM)',
                     style: TextStyle(fontWeight: FontWeight.bold),
                   ),
                   subtitle: Text(
@@ -451,72 +443,9 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                 ElevatedButton.icon(
                   icon: const Icon(Icons.add_photo_alternate),
                   label: const Text('Aggiungi File'),
-                  onPressed: state.status == AttachmentsStatus.uploading
+                  onPressed: state.status == OperationFilesStatus.uploading
                       ? null
                       : _pickFiles,
-                  /* : () {
-                          final bloc = context.read<AttachmentsBloc>();
-                          Navigator.of(context).push(
-                            MaterialPageRoute(
-                              builder: (_) => BlocProvider.value(
-                                value: bloc,
-                                child: SharedMobileUploadScreen(
-                                  title: widget.titleForUpload,
-                                ),
-                              ),
-                            ),
-                          );
-                        }, */
-                ),
-                const SizedBox(width: 8),
-                Tooltip(
-                  message: 'Carica foto con lo smartphone',
-                  child: IconButton(
-                    icon: const Icon(Icons.qr_code_scanner),
-                    color: theme.colorScheme.primary, // Sempre colorato!
-                    onPressed: () async {
-                      String? targetId = state.parentId;
-
-                      // SE L'ID NON C'È, CHIAMIAMO IL SALVATAGGIO IN BACKGROUND!
-                      if (targetId == null) {
-                        if (widget.onGenerateIdForQr != null) {
-                          ScaffoldMessenger.of(context).showSnackBar(
-                            const SnackBar(
-                              content: Text(
-                                'Salvataggio rapido scheda in corso... ⏳',
-                              ),
-                              duration: Duration(seconds: 1),
-                            ),
-                          );
-
-                          // Aspettiamo che il TicketFormCubit faccia il suo lavoro
-                          targetId = await widget.onGenerateIdForQr!();
-                        }
-
-                        // Se fallisce (es. validazione form non passata), ci fermiamo
-                        if (targetId == null) return;
-                      }
-
-                      // GENERAZIONE DEL DEEP LINK AGNOSTICO
-                      final companyId = GetIt.I
-                          .get<SessionCubit>()
-                          .state
-                          .company!
-                          .id!;
-                      final deepLink =
-                          'https://flux.catelli.it/upload/${state.parentType.name}/$targetId?companyId=$companyId';
-
-                      if (context.mounted) {
-                        showDialog(
-                          context: context,
-                          builder: (_) => QrUploadDialog(
-                            deepLinkUrl: deepLink,
-                            title: 'Carica File: ${widget.titleForUpload}',
-                          ),
-                        );
-                      }
-                    },
-                  ),
                 ),
                 const SizedBox(width: 12),
 
@@ -535,12 +464,12 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                     ),
                     onPressed: () {
                       if (selectedFiles.length == allFiles.length) {
-                        context.read<AttachmentsBloc>().add(
-                          ClearAttachmentSelectionEvent(),
+                        context.read<OperationFilesBloc>().add(
+                          ClearOperationFileSelectionEvent(),
                         );
                       } else {
-                        context.read<AttachmentsBloc>().add(
-                          SelectAllAttachmentsEvent(),
+                        context.read<OperationFilesBloc>().add(
+                          SelectAllOperationFilesEvent(),
                         );
                       }
                     },
@@ -549,7 +478,7 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                 const SizedBox(width: 12),
 
                 // Loader di upload
-                if (state.status == AttachmentsStatus.uploading)
+                if (state.status == OperationFilesStatus.uploading)
                   const SizedBox(
                     width: 24,
                     height: 24,
@@ -565,21 +494,21 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                     icon: const Icon(Icons.delete, color: Colors.red),
                     tooltip: 'Elimina selezionati',
                     onPressed: () {
-                      context.read<AttachmentsBloc>().add(
-                        DeleteAttachmentsEvent(),
+                      context.read<OperationFilesBloc>().add(
+                        DeleteOperationFilesEvent(),
                       );
                     },
                   ),
                   // Bottone Associa a Cliente
-                  if (widget.parentId != null && widget.parentId != '')
+                  if (widget.currentOp.customerId != null &&
+                      widget.currentOp.customerId!.isNotEmpty)
                     IconButton(
                       icon: const Icon(Icons.person_add, color: Colors.blue),
                       tooltip: 'Copia nei documenti del Cliente',
                       onPressed: () {
-                        context.read<AttachmentsBloc>().add(
-                          LinkAttachmentsToEntityEvent(
-                            targetId: widget.parentId!,
-                            targetType: AttachmentParentType.customer,
+                        context.read<OperationFilesBloc>().add(
+                          LinkFilesToCustomerEvent(
+                            customerId: widget.currentOp.customerId!,
                           ),
                         );
                         ScaffoldMessenger.of(context).showSnackBar(
@@ -693,8 +622,8 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                         onTap: () => _openFile(file),
                         onLongPress: () {
                           // Selezione rapida con long press!
-                          context.read<AttachmentsBloc>().add(
-                            ToggleAttachmentSelectionEvent(file),
+                          context.read<OperationFilesBloc>().add(
+                            ToggleOperationFileSelectionEvent(file),
                           );
                         },
                         borderRadius: BorderRadius.circular(8),
@@ -768,8 +697,8 @@ class _SharedAttachmentsSectionState extends State<SharedAttachmentsSection> {
                         right: 4,
                         child: InkWell(
                           onTap: () {
-                            context.read<AttachmentsBloc>().add(
-                              ToggleAttachmentSelectionEvent(file),
+                            context.read<OperationFilesBloc>().add(
+                              ToggleOperationFileSelectionEvent(file),
                             );
                           },
                           child: Container(

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

@@ -2,29 +2,23 @@ import 'package:flutter/material.dart';
 import 'package:flutter_bloc/flutter_bloc.dart';
 import 'package:flux/core/blocs/session/session_cubit.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/operations/blocs/operations_cubit.dart';
+import 'package:flux/features/operations/models/operation_model.dart';
 import 'package:get_it/get_it.dart';
+// IMPORTA IL TUO CUBIT DELLO STAFF
+// import 'package:flux/features/staff/blocs/staff_cubit.dart';
 
 class StaffSection extends StatelessWidget {
-  final String? label;
-  final String? staffId;
-  final String? staffName;
-  final ValueChanged<StaffMemberModel> onStaffSelected;
+  final OperationModel? currentOp;
 
-  const StaffSection({
-    super.key,
-    required this.onStaffSelected,
-    this.label,
-    this.staffId,
-    this.staffName,
-  });
+  const StaffSection({super.key, required this.currentOp});
 
   @override
   Widget build(BuildContext context) {
     final theme = Theme.of(context);
-    // Se staffId è nullo, proviamo a preselezionare l'utente loggato
     final selectedStaffId =
-        staffId ?? GetIt.I.get<SessionCubit>().state.currentStaffMember?.id;
+        currentOp?.staffId ??
+        GetIt.I.get<SessionCubit>().state.currentStaffMember?.id;
 
     return Column(
       crossAxisAlignment: CrossAxisAlignment.start,
@@ -32,8 +26,7 @@ class StaffSection extends StatelessWidget {
         Padding(
           padding: const EdgeInsets.only(bottom: 12.0),
           child: Text(
-            label ??
-                'Operatore', // <-- FIX: Ora usa l'etichetta passata dal form!
+            'Operatore',
             style: theme.textTheme.titleLarge?.copyWith(
               fontWeight: FontWeight.bold,
             ),
@@ -41,28 +34,8 @@ class StaffSection extends StatelessWidget {
         ),
         BlocBuilder<StaffCubit, StaffState>(
           builder: (context, state) {
-            // FIX: Aggiunto un controllo se sta caricando
-            if (state.status == StaffStatus.loading) {
-              return const Padding(
-                padding: EdgeInsets.symmetric(vertical: 8.0),
-                child: SizedBox(
-                  height: 24,
-                  width: 24,
-                  child: CircularProgressIndicator(strokeWidth: 2),
-                ),
-              );
-            }
-
+            // Dati finti per farti vedere la UI, piallali quando attacchi il BlocBuilder!
             final staffMembers = state.storeStaff;
-
-            // FIX: Feedback visivo se la lista è vuota
-            if (staffMembers.isEmpty) {
-              return const Text(
-                'Nessun operatore caricato. Controlla il Cubit!',
-                style: TextStyle(color: Colors.red),
-              );
-            }
-
             final currentLoggedStaffMember = GetIt.I
                 .get<SessionCubit>()
                 .state
@@ -76,7 +49,11 @@ class StaffSection extends StatelessWidget {
 
                   return GestureDetector(
                     onTap: () {
-                      onStaffSelected(staff);
+                      // Aggiorniamo la form con un solo tap!
+                      context.read<OperationsCubit>().updateOperationFields(
+                        staffId: staff.id,
+                        staffDisplayName: staff.name,
+                      );
                     },
                     child: AnimatedContainer(
                       duration: const Duration(milliseconds: 200),

lib/features/settings/settings_view.dart

@@ -1,9 +1,7 @@
 // lib/ui/impostazioni/impostazioni_view.dart
 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/theme/theme.dart';
-import 'package:go_router/go_router.dart';
+import 'package:flux/features/settings/theme_settings_view.dart';
 
 class SettingsView extends StatelessWidget {
   const SettingsView({super.key});
@@ -17,33 +15,48 @@ class SettingsView extends StatelessWidget {
         children: [
           _settingsSection('Account', [
             _settingsTile(
-              icon: Icons.person,
-              title: 'Profilo Utente',
-              subtitle: 'Configura i tuoi dati',
-              context: context,
-              onTap: () {},
+              Icons.person,
+              'Profilo Utente',
+              'Configura i tuoi dati',
+              context,
+              MaterialPageRoute(
+                builder: (context) => const ThemeSettingsView(),
+              ),
             ),
             _settingsTile(
-              title: 'Impostazioni Azienda',
-              icon: Icons.business,
-              subtitle: 'Configura i dati aziendali',
-              context: context,
-              onTap: () => context.push('/master-data/company-settings'),
+              Icons.store,
+              'Mio Negozio',
+              'Piacenza Centro',
+              context,
+              MaterialPageRoute(
+                builder: (context) => const ThemeSettingsView(),
+              ),
             ),
           ]),
           const SizedBox(height: 16),
           _settingsSection('Applicazione', [
             _settingsTile(
-              icon: Icons.dark_mode,
-              title: 'Tema (FLUX Dark)',
-              subtitle: 'Configurazione visiva',
-              context: context,
-              onTap: () => context.push('/settings/theme'),
+              Icons.sync,
+              'Sincronizzazione',
+              'Ultima: 5 min fa',
+              context,
+              MaterialPageRoute(
+                builder: (context) => const ThemeSettingsView(),
+              ),
+            ),
+            _settingsTile(
+              Icons.dark_mode,
+              'Tema (FLUX Dark)',
+              'Configurazione visiva',
+              context,
+              MaterialPageRoute(
+                builder: (context) => const ThemeSettingsView(),
+              ),
             ),
           ]),
           const SizedBox(height: 24),
           TextButton.icon(
-            onPressed: () => context.read<SessionCubit>().signOut(),
+            onPressed: () {},
             icon: const Icon(Icons.exit_to_app, color: Colors.red),
             label: const Text('Logout', style: TextStyle(color: Colors.red)),
           ),
@@ -70,22 +83,22 @@ class SettingsView extends StatelessWidget {
     );
   }
 
-  Widget _settingsTile({
-    required BuildContext context,
-    required IconData icon,
-    required String title,
-    String? subtitle,
-    required VoidCallback onTap,
-  }) {
+  Widget _settingsTile(
+    IconData icon,
+    String title,
+    String subtitle,
+    BuildContext context,
+    MaterialPageRoute route,
+  ) {
     return ListTile(
       leading: Icon(icon, color: FluxColors.primaryBlue),
       title: Text(title, style: Theme.of(context).textTheme.titleLarge),
-      subtitle: Text(subtitle ?? ''),
+      subtitle: Text(subtitle),
       trailing: Icon(
         Icons.chevron_right,
         color: Theme.of(context).textTheme.bodyMedium?.color,
       ),
-      onTap: onTap,
+      onTap: () => Navigator.of(context).push(route),
     );
   }
 }

lib/features/tickets/blocs/ticket_form_cubit.dart

@@ -1,217 +0,0 @@
-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/tickets/models/ticket_model.dart';
-import 'package:flux/features/tickets/data/ticket_repository.dart';
-import 'package:get_it/get_it.dart';
-import 'ticket_form_state.dart';
-
-class TicketFormCubit extends Cubit<TicketFormState> {
-  final TicketRepository _repository = GetIt.I.get<TicketRepository>();
-  final SessionCubit _sessionCubit = GetIt.I.get<SessionCubit>();
-
-  TicketFormCubit()
-    : super(
-        // Inizializziamo con un ticket vuoto di default
-        TicketFormState(ticket: TicketModel.empty()),
-      );
-
-  /// 1. INIZIALIZZAZIONE (Se stiamo modificando un ticket esistente)
-  Future<void> initForm({String? id, TicketModel? existingTicket}) async {
-    if (existingTicket != null) {
-      // SCENARIO 1 (App Native / Navigazione interna Web):
-      // Abbiamo l'oggetto intero passato via 'extra'. Lo mostriamo all'istante!
-      emit(
-        state.copyWith(ticket: existingTicket, status: TicketFormStatus.ready),
-      );
-    } else if (id != null) {
-      // SCENARIO 2 (Web Refresh o Link condiviso):
-      // L'utente ha premuto F5 su /tickets/form/123. L'extra è andato perso, ma abbiamo l'ID!
-      emit(
-        state.copyWith(status: TicketFormStatus.loading),
-      ); // Mostriamo uno spinner
-      try {
-        final fetchedTicket = await _repository.getTicketById(
-          id,
-        ); // Lo scarichiamo!
-        emit(
-          state.copyWith(ticket: fetchedTicket, status: TicketFormStatus.ready),
-        );
-      } catch (e) {
-        emit(
-          state.copyWith(
-            status: TicketFormStatus.failure,
-            errorMessage: 'Ticket non trovato',
-          ),
-        );
-      }
-    } else {
-      // SCENARIO 3 (Nuovo Ticket):
-      // È un nuovo ticket! Inseriamo i default base (Azienda, Negozio, Creatore)
-      final currentUser = _sessionCubit.state.currentStaffMember;
-      final currentStore = _sessionCubit.state.currentStore;
-      final companyId = _sessionCubit.state.company?.id ?? '';
-
-      final newTicket = TicketModel.empty().copyWith(
-        companyId: companyId,
-        storeId: currentStore?.id,
-        createdById: currentUser?.id,
-        createdByName: currentUser?.name,
-        // Impostiamo lo stato iniziale
-        ticketStatus: TicketStatus.open,
-        ticketType: TicketType.repair, // Default
-      );
-
-      emit(state.copyWith(ticket: newTicket, status: TicketFormStatus.ready));
-    }
-  }
-
-  /// 2. AGGIORNAMENTO CLIENTE (Usato dal nostro SharedCustomerSection!)
-  void updateCustomer(CustomerModel customer) {
-    emit(
-      state.copyWith(
-        ticket: state.ticket.copyWith(
-          customerId: customer.id,
-          customerName: customer.name,
-          alternativePhoneNumber: customer.phoneNumber, // Comodo come fallback!
-        ),
-      ),
-    );
-  }
-
-  /// 3. AGGIORNAMENTO MODELLO (Usato dal nostro SharedModelSection!)
-  void updateModel({required String modelId, required String modelName}) {
-    emit(
-      state.copyWith(
-        ticket: state.ticket.copyWith(
-          targetModelId: modelId,
-          targetModelName: modelName,
-        ),
-      ),
-    );
-  }
-
-  void updateCreator({required String staffId, required String staffName}) {
-    emit(
-      state.copyWith(
-        ticket: state.ticket.copyWith(
-          createdById: staffId,
-          createdByName: staffName,
-        ),
-      ),
-    );
-  }
-
-  /// 4. AGGIORNAMENTO GENERICO DEI CAMPI
-  void updateFields({
-    TicketType? ticketType,
-    TicketStatus? status,
-    String? request,
-    String? targetSn,
-    String? alternativePhoneNumber,
-    bool? hasCourtesyDevice,
-    String? includedAccessories,
-    String? publicNotes,
-    String? internalNotes,
-    double? customerPrice,
-    double? internalCost,
-    String? assignedToId,
-    String? assignedToName,
-  }) {
-    emit(
-      state.copyWith(
-        ticket: state.ticket.copyWith(
-          ticketType: ticketType ?? state.ticket.ticketType,
-          ticketStatus: status ?? state.ticket.ticketStatus,
-          request: request ?? state.ticket.request,
-          targetSn: targetSn ?? state.ticket.targetSn,
-          alternativePhoneNumber:
-              alternativePhoneNumber ?? state.ticket.alternativePhoneNumber,
-          hasCourtesyDevice:
-              hasCourtesyDevice ?? state.ticket.hasCourtesyDevice,
-          includedAccessories:
-              includedAccessories ?? state.ticket.includedAccessories,
-          publicNotes: publicNotes ?? state.ticket.publicNotes,
-          internalNotes: internalNotes ?? state.ticket.internalNotes,
-          customerPrice: customerPrice ?? state.ticket.customerPrice,
-          internalCost: internalCost ?? state.ticket.internalCost,
-          assignedToId: assignedToId ?? state.ticket.assignedToId,
-          assignedToName: assignedToName ?? state.ticket.assignedToName,
-        ),
-      ),
-    );
-  }
-
-  /// 5. SALVATAGGIO
-  Future<void> saveTicket({required bool keepAdding}) async {
-    emit(state.copyWith(status: TicketFormStatus.saving));
-
-    try {
-      final ticketToSave = state.ticket;
-
-      // Validazione base
-      if (ticketToSave.customerId == null || ticketToSave.customerId!.isEmpty) {
-        throw Exception("Seleziona un cliente prima di salvare.");
-      }
-
-      final savedTicket = await _repository.saveTicket(ticketToSave);
-
-      if (keepAdding) {
-        emit(
-          state.copyWith(
-            status: TicketFormStatus.successAndAddAnother,
-            // Svuotiamo il form per il prossimo, mantenendo Store e Creatore ATTUALI
-            ticket: TicketModel.empty().copyWith(
-              companyId: savedTicket.companyId,
-              storeId: savedTicket.storeId,
-              createdById: ticketToSave
-                  .createdById, // Manteniamo quello selezionato nella tendina!
-              createdByName: ticketToSave.createdByName,
-              ticketStatus: TicketStatus.open,
-              ticketType: TicketType.repair,
-            ),
-          ),
-        );
-      } else {
-        emit(
-          state.copyWith(status: TicketFormStatus.success, ticket: savedTicket),
-        );
-      }
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: TicketFormStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-    }
-  }
-
-  /// 5.1 SALVATAGGIO SILENZIOSO (Per generare il QR Code al volo)
-  Future<String?> saveTicketDraft() async {
-    // Non mettiamo lo stato 'saving' per non far sfarfallare tutta la UI,
-    // usiamo un caricamento invisibile.
-    try {
-      final ticketToSave = state.ticket;
-
-      if (ticketToSave.customerId == null || ticketToSave.customerId!.isEmpty) {
-        throw Exception("Seleziona un cliente prima di poter usare il QR.");
-      }
-
-      final savedTicket = await _repository.saveTicket(ticketToSave);
-
-      // Aggiorniamo silenziosamente lo stato con il ticket che ora ha un ID!
-      emit(state.copyWith(ticket: savedTicket, status: TicketFormStatus.ready));
-
-      return savedTicket.id;
-    } catch (e) {
-      emit(
-        state.copyWith(
-          status: TicketFormStatus.failure,
-          errorMessage: e.toString(),
-        ),
-      );
-      return null;
-    }
-  }
-}

lib/features/tickets/blocs/ticket_form_state.dart

@@ -1,40 +0,0 @@
-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,
-  successAndAddAnother,
-  failure,
-}
-
-class TicketFormState extends Equatable {
-  final TicketModel ticket;
-  final TicketFormStatus status;
-  final String? errorMessage;
-
-  const TicketFormState({
-    required this.ticket,
-    this.status = TicketFormStatus.initial,
-    this.errorMessage,
-  });
-
-  @override
-  List<Object?> get props => [ticket, status, errorMessage];
-
-  TicketFormState copyWith({
-    TicketModel? ticket,
-    TicketFormStatus? status,
-    String? errorMessage,
-  }) {
-    return TicketFormState(
-      ticket: ticket ?? this.ticket,
-      status: status ?? this.status,
-      errorMessage: errorMessage,
-    );
-  }
-}

lib/features/tickets/blocs/ticket_list_cubit.dart

@@ -1,79 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:flux/features/tickets/data/ticket_repository.dart';
-import 'package:get_it/get_it.dart';
-import 'ticket_list_state.dart';
-
-class TicketListCubit extends Cubit<TicketListState> {
-  final TicketRepository _repository = GetIt.I.get<TicketRepository>();
-  static const int _limit = 20; // Paginazione a blocchi di 20
-
-  TicketListCubit() : super(const TicketListState()) {
-    fetchTickets(reset: true);
-  }
-
-  /// Recupera i ticket. Se reset = true, svuota la lista e riparte da offset 0.
-  Future<void> fetchTickets({bool reset = false}) async {
-    if (state.isLoading) return;
-    if (!reset && state.hasReachedMax) return;
-
-    emit(
-      state.copyWith(
-        isLoading: true,
-        errorMessage: '',
-        tickets: reset ? [] : state.tickets,
-      ),
-    );
-
-    try {
-      final currentOffset = reset ? 0 : state.tickets.length;
-
-      final newTickets = await _repository.fetchStoreTickets(
-        offset: currentOffset,
-        limit: _limit,
-        searchTerm: state.searchTerm,
-        dateRange: state.dateRange,
-        statusFilter: state.statusFilter,
-        ticketTypeFilter: state.ticketTypeFilter,
-        staffIdFilter: state.staffIdFilter,
-      );
-
-      emit(
-        state.copyWith(
-          tickets: reset ? newTickets : [...state.tickets, ...newTickets],
-          isLoading: false,
-          hasReachedMax: newTickets.length < _limit,
-        ),
-      );
-    } catch (e) {
-      emit(state.copyWith(isLoading: false, errorMessage: e.toString()));
-    }
-  }
-
-  /// Aggiorna i filtri e ricarica tutto da zero
-  void updateFilters({
-    String? searchTerm,
-    DateTimeRange? dateRange,
-    TicketStatus? statusFilter,
-    TicketType? ticketTypeFilter,
-    String? staffIdFilter,
-    bool clearSearch = false,
-    bool clearDate = false,
-    bool clearStatus = false,
-  }) {
-    emit(
-      state.copyWith(
-        searchTerm: searchTerm,
-        dateRange: dateRange,
-        statusFilter: statusFilter,
-        ticketTypeFilter: ticketTypeFilter,
-        staffIdFilter: staffIdFilter,
-        clearSearch: clearSearch,
-        clearDate: clearDate,
-        clearStatus: clearStatus,
-      ),
-    );
-    fetchTickets(reset: true); // Applica i filtri e ricarica
-  }
-}

lib/features/tickets/blocs/ticket_list_state.dart

@@ -1,69 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flutter/material.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-
-class TicketListState extends Equatable {
-  final List<TicketModel> tickets;
-  final bool isLoading;
-  final bool hasReachedMax;
-  final String errorMessage;
-
-  // Filtri attivi
-  final String? searchTerm;
-  final DateTimeRange? dateRange;
-  final TicketStatus? statusFilter;
-  final TicketType? ticketTypeFilter;
-  final String? staffIdFilter;
-
-  const TicketListState({
-    this.tickets = const [],
-    this.isLoading = false,
-    this.hasReachedMax = false,
-    this.errorMessage = '',
-    this.searchTerm,
-    this.dateRange,
-    this.statusFilter,
-    this.ticketTypeFilter,
-    this.staffIdFilter,
-  });
-
-  TicketListState copyWith({
-    List<TicketModel>? tickets,
-    bool? isLoading,
-    bool? hasReachedMax,
-    String? errorMessage,
-    String? searchTerm,
-    DateTimeRange? dateRange,
-    TicketStatus? statusFilter,
-    TicketType? ticketTypeFilter,
-    String? staffIdFilter,
-    bool clearSearch = false,
-    bool clearDate = false,
-    bool clearStatus = false,
-  }) {
-    return TicketListState(
-      tickets: tickets ?? this.tickets,
-      isLoading: isLoading ?? this.isLoading,
-      hasReachedMax: hasReachedMax ?? this.hasReachedMax,
-      errorMessage: errorMessage ?? this.errorMessage,
-      searchTerm: clearSearch ? null : (searchTerm ?? this.searchTerm),
-      dateRange: clearDate ? null : (dateRange ?? this.dateRange),
-      statusFilter: clearStatus ? null : (statusFilter ?? this.statusFilter),
-      ticketTypeFilter: ticketTypeFilter ?? this.ticketTypeFilter,
-      staffIdFilter: staffIdFilter ?? this.staffIdFilter,
-    );
-  }
-
-  @override
-  List<Object?> get props => [
-    tickets,
-    isLoading,
-    hasReachedMax,
-    errorMessage,
-    searchTerm,
-    dateRange,
-    statusFilter,
-    ticketTypeFilter,
-    staffIdFilter,
-  ];
-}

lib/features/tickets/data/ticket_repository.dart

@@ -1,238 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flux/core/blocs/session/session_cubit.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:get_it/get_it.dart';
-import 'package:supabase_flutter/supabase_flutter.dart';
-
-class TicketRepository {
-  final SupabaseClient _supabase = GetIt.I.get<SupabaseClient>();
-
-  TicketRepository();
-
-  static const String _tableName = 'ticket';
-
-  // --- RECUPERO PAGINATO CON FILTRI E JOIN DEI TICKET DI UNO STORE ---
-  Future<List<TicketModel>> fetchStoreTickets({
-    required int offset,
-    int limit = 50,
-    String? searchTerm,
-    DateTimeRange? dateRange,
-    TicketStatus? statusFilter,
-    TicketType? ticketTypeFilter,
-    String? staffIdFilter,
-  }) async {
-    try {
-      var query = _supabase
-          .from(_tableName)
-          .select('''
-            *,
-            customer (*),
-            created_by:staff_member!ticket_staff_id_fkey (*),
-            assigned_to:staff_member!ticket_assigned_to_id_fkey (*),
-            target_model:model!ticket_model_id_1_fkey (*),
-            source_model:model!ticket_model_id_2_fkey (*)
-          ''')
-          .eq('store_id', GetIt.I.get<SessionCubit>().state.currentStore!.id!);
-
-      // Filtro Range Date
-      if (dateRange != null) {
-        query = query
-            .gte('created_at', dateRange.start.toIso8601String())
-            .lte('created_at', dateRange.end.toIso8601String());
-      }
-
-      if (statusFilter != null) {
-        query = query.eq('status', statusFilter.value);
-      }
-
-      if (ticketTypeFilter != null) {
-        query = query.eq('ticket_type', ticketTypeFilter.value);
-      }
-
-      if (staffIdFilter != null) {
-        query = query.eq('staff_id', staffIdFilter);
-      }
-
-      if (searchTerm != null && searchTerm.isNotEmpty) {
-        // Filtra sui campi della tabella principale O su quelli della tabella joinata
-        query = query.or('customer.name.ilike.%$searchTerm%');
-      }
-
-      final response = await query
-          .order('created_at', ascending: false)
-          .range(offset, offset + limit - 1);
-
-      return (response as List).map((map) => TicketModel.fromMap(map)).toList();
-    } catch (e) {
-      throw Exception('$e');
-    }
-  }
-
-  // --- RECUPERO PAGINATO CON FILTRI E JOIN DEI TICKET DI TUTTA L'AZIENDA ---
-  Future<List<TicketModel>> fetchCompanyTickets({
-    required int offset,
-    int limit = 50,
-    String? searchTerm,
-    DateTimeRange? dateRange,
-    TicketStatus? ticketStatusFilter,
-    TicketType? ticketTypeFilter,
-    String? staffIdFilter,
-  }) async {
-    try {
-      var query = _supabase
-          .from(_tableName)
-          .select('''
-            *,
-            customer (*),
-            created_by:staff_member!ticket_staff_id_fkey (*),
-            assigned_to:staff_member!ticket_assigned_to_id_fkey (*),
-            target_model:model!ticket_model_id_1_fkey (*),
-            source_model:model!ticket_model_id_2_fkey (*)
-          ''')
-          .eq('company_id', GetIt.I.get<SessionCubit>().state.company!.id!);
-
-      // Filtro Range Date
-      if (dateRange != null) {
-        query = query
-            .gte('created_at', dateRange.start.toIso8601String())
-            .lte('created_at', dateRange.end.toIso8601String());
-      }
-
-      if (ticketStatusFilter != null) {
-        query = query.eq('status', ticketStatusFilter.value);
-      }
-
-      if (ticketTypeFilter != null) {
-        query = query.eq('ticket_type', ticketTypeFilter.value);
-      }
-
-      if (staffIdFilter != null) {
-        query = query.eq('staff_id', staffIdFilter);
-      }
-
-      if (searchTerm != null && searchTerm.isNotEmpty) {
-        // Filtra sui campi della tabella principale O su quelli della tabella joinata
-        query = query.or('customer.name.ilike.%$searchTerm%');
-      }
-
-      final response = await query
-          .order('created_at', ascending: false)
-          .range(offset, offset + limit - 1);
-
-      return (response as List).map((map) => TicketModel.fromMap(map)).toList();
-    } catch (e) {
-      throw Exception('$e');
-    }
-  }
-
-  /// Stream dei ticket che necessitano attenzione (es. in scadenza oggi o in ritardo)
-  Stream<List<TicketModel>> getAttentionNeededTicketsStream() {
-    return _supabase
-        .from(_tableName)
-        .stream(primaryKey: ['id'])
-        .eq('store_id', GetIt.I.get<SessionCubit>().state.currentStore!.id!)
-        // Purtroppo lo stream accetta solo filtri base, quindi ci facciamo
-        // mandare i dati e li filtriamo con la potenza di Dart!
-        .limit(300)
-        .map((listOfMaps) {
-          final now = DateTime.now();
-          final endOfToday = DateTime(now.year, now.month, now.day, 23, 59, 59);
-
-          // 1. Mappiamo tutto in TicketModel
-          final allStoreTickets = listOfMaps
-              .map((map) => TicketModel.fromMap(map))
-              .toList();
-
-          // 2. Filtriamo in memoria!
-          final urgentTickets = allStoreTickets.where((ticket) {
-            // Escludiamo quelli già chiusi o consegnati
-            if (ticket.ticketStatus == TicketStatus.closed ||
-                ticket.ticketStatus == TicketStatus.ready) {
-              return false;
-            }
-
-            // Se c'è una data di consegna stimata ed è <= a stasera, è urgente!
-            if (ticket.estimatedDeliveryAt != null) {
-              return ticket.estimatedDeliveryAt!.isBefore(endOfToday);
-            }
-
-            return false;
-          }).toList();
-
-          // 3. Li ordiniamo mettendo i più vecchi/urgenti in cima
-          urgentTickets.sort(
-            (a, b) => a.estimatedDeliveryAt!.compareTo(b.estimatedDeliveryAt!),
-          );
-
-          return urgentTickets;
-        });
-  }
-
-  /// Recupera un ticket specifico CON TUTTE LE RELAZIONI espanse (Cliente e Modelli)
-  /// Questa è la vera magia di Supabase!
-  Future<TicketModel> getTicketById(String ticketId) async {
-    try {
-      // Usiamo i nomi esatti delle Foreign Key che hai definito nell'SQL!
-      final response = await _supabase
-          .from(_tableName)
-          .select('''
-            *,
-            customer (*),
-            target_model:model!ticket_model_id_1_fkey (*),
-            source_model:model!ticket_model_id_2_fkey (*),
-            created_by:staff_member!ticket_staff_id_fkey (*),
-            assigned_to:staff_member!ticket_assigned_to_id_fkey (*),
-          ''')
-          .eq('id', ticketId)
-          .single();
-
-      return TicketModel.fromMap(response);
-    } catch (e) {
-      throw Exception('Errore nel recupero del dettaglio ticket: $e');
-    }
-  }
-
-  /// Salva il ticket con upsert
-  Future<TicketModel> saveTicket(TicketModel ticket) async {
-    try {
-      final response = await _supabase
-          .from(_tableName)
-          .upsert(ticket.toMap())
-          .select()
-          .single();
-
-      return TicketModel.fromMap(response);
-    } catch (e) {
-      throw Exception('Errore nella creazione del ticket: $e');
-    }
-  }
-
-  /// Aggiorna un ticket esistente
-  Future<TicketModel> updateTicket(TicketModel ticket) async {
-    if (ticket.id == null) {
-      throw Exception('Impossibile aggiornare un ticket senza ID');
-    }
-
-    try {
-      final response = await _supabase
-          .from(_tableName)
-          .update(ticket.toMap())
-          .eq('id', ticket.id!)
-          .select()
-          .single();
-
-      return TicketModel.fromMap(response);
-    } catch (e) {
-      throw Exception('Errore nell\'aggiornamento del ticket: $e');
-    }
-  }
-
-  /// Elimina (o annulla) un ticket
-  Future<void> deleteTicket(String ticketId) async {
-    try {
-      await _supabase.from(_tableName).delete().eq('id', ticketId);
-    } catch (e) {
-      throw Exception('Errore nell\'eliminazione del ticket: $e');
-    }
-  }
-}

lib/features/tickets/models/ticket_model.dart

@@ -1,367 +0,0 @@
-import 'package:equatable/equatable.dart';
-import 'package:flux/core/utils/extensions.dart';
-
-/// Enum per il tipo di ticket
-enum TicketType {
-  repair('repair', 'Riparazione'),
-  softwareSetup('software_setup', 'Setup software'),
-  dataTransfer('data_transfer', 'Trasferimento dati'),
-  operationTicket('operation_ticket', 'Ticket di operazione'),
-  other('other', 'Altro');
-
-  final String value;
-  final String displayValue;
-  const TicketType(this.value, this.displayValue);
-
-  static TicketType fromString(String val) {
-    return TicketType.values.firstWhere(
-      (e) => e.value == val,
-      orElse: () => TicketType.other,
-    );
-  }
-}
-
-/// Enum per lo stato del ticket
-enum TicketStatus {
-  open('open', 'Aperto'),
-  inProgress('in_progress', 'In corso'),
-  waitingForParts('waiting_for_parts', 'In attesa di ricambi'),
-  ready('ready', 'Pronto'),
-  closed('closed', 'Chiuso'),
-  waitingForShipping('waiting_for_shipping', 'In attesa di spedire'),
-  waitingForReturn('waiting_for_return', 'In attesa di ritorno');
-
-  final String value;
-  final String displayValue;
-  const TicketStatus(this.value, this.displayValue);
-
-  static TicketStatus fromString(String? val) {
-    return TicketStatus.values.firstWhere(
-      (e) => e.value == val,
-      orElse: () => TicketStatus.open,
-    );
-  }
-}
-
-/// Enum per il risultato del ticket (OK / KO)
-enum TicketResult {
-  success('success', 'Risolto (OK)'),
-  failure('failure', 'Non Risolto (KO)');
-
-  final String value;
-  final String displayValue;
-  const TicketResult(this.value, this.displayValue);
-
-  static TicketResult? fromString(String? val) {
-    if (val == null) return null;
-    return TicketResult.values.firstWhere(
-      (e) => e.value == val,
-      orElse: () => TicketResult.success,
-    );
-  }
-}
-
-/// Enum per il tipo di garanzia
-enum WarrantyType {
-  manufacturerWarranty('manufacturer_warranty', 'Garanzia produttore'),
-  providerWarranty('provider_warranty', 'Garanzia gestore'),
-  internalWarranty('internal_warranty', 'Garanzia interna'),
-  noWarranty('no_warranty', 'Fuori garanzia');
-
-  final String value;
-  final String displayValue;
-  const WarrantyType(this.value, this.displayValue);
-
-  static WarrantyType? fromString(String? val) {
-    return WarrantyType.values.firstWhere(
-      (e) => e.value == val,
-      orElse: () => WarrantyType.noWarranty,
-    );
-  }
-}
-
-class TicketModel extends Equatable {
-  final String? id; // Null se non ancora salvato
-  final DateTime? createdAt;
-  final String companyId;
-  final String? storeId;
-  final String? customerId;
-  final String? targetModelId;
-  final String? targetSn;
-  final String? sourceModelId;
-  final String? sourceSn;
-  final double customerPrice;
-  final double internalCost;
-  final DateTime? closedAt;
-  final DateTime? returnedAt;
-  final String request;
-  final WarrantyType? warrantyType;
-  final String? publicNotes;
-  final String? internalNotes;
-  final int? referenceNumber;
-  final String? alternativePhoneNumber;
-  final bool hasCourtesyDevice;
-  final TicketType ticketType;
-  final TicketStatus ticketStatus;
-  final DateTime? estimatedDeliveryAt;
-  final TicketResult? ticketResult;
-  final String? resolutionNotes;
-  final String? legacyId;
-  final String? customerName;
-  final String? targetModelName;
-  final String? sourceModelName;
-  final String? createdById;
-  final String? createdByName;
-  final String? assignedToId;
-  final String? assignedToName;
-  final String? includedAccessories;
-
-  const TicketModel({
-    this.id,
-    this.createdAt,
-    required this.companyId,
-    this.storeId,
-    this.customerId,
-    this.targetModelId,
-    this.targetSn,
-    this.sourceModelId,
-    this.sourceSn,
-    this.customerPrice = 0.0,
-    this.internalCost = 0.0,
-    this.closedAt,
-    this.returnedAt,
-    this.request = '',
-    this.warrantyType,
-    this.publicNotes,
-    this.internalNotes,
-    this.referenceNumber,
-    this.alternativePhoneNumber,
-    this.hasCourtesyDevice = false,
-    required this.ticketType,
-    this.ticketStatus = TicketStatus.closed,
-    this.estimatedDeliveryAt,
-    this.ticketResult,
-    this.resolutionNotes,
-    this.legacyId,
-    this.customerName,
-    this.targetModelName,
-    this.sourceModelName,
-    this.createdById,
-    this.createdByName,
-    this.assignedToId,
-    this.assignedToName,
-    this.includedAccessories,
-  });
-
-  /// Factory per creare un ticket vuoto (utile per i form di creazione)
-  factory TicketModel.empty({String? companyId, String? storeId}) {
-    return TicketModel(
-      companyId: companyId ?? '',
-      storeId: storeId,
-      ticketType: TicketType.repair, // Valore di default
-      ticketStatus: TicketStatus.open,
-      customerPrice: 0.0,
-      internalCost: 0.0,
-      hasCourtesyDevice: false,
-      request: '',
-    );
-  }
-
-  TicketModel copyWith({
-    String? id,
-    DateTime? createdAt,
-    String? companyId,
-    String? storeId,
-    String? customerId,
-    String? targetModelId,
-    String? targetSn,
-    String? sourceModelId,
-    String? sourceSn,
-    double? customerPrice,
-    double? internalCost,
-    DateTime? closedAt,
-    DateTime? returnedAt,
-    String? request,
-    WarrantyType? warrantyType,
-    String? publicNotes,
-    String? internalNotes,
-    int? referenceNumber,
-    String? alternativePhoneNumber,
-    bool? hasCourtesyDevice,
-    TicketType? ticketType,
-    TicketStatus? ticketStatus,
-    DateTime? estimatedDeliveryAt,
-    TicketResult? ticketResult,
-    String? resolutionNotes,
-    String? legacyId,
-    String? customerName,
-    String? targetModelName,
-    String? sourceModelName,
-    String? createdById,
-    String? createdByName,
-    String? assignedToId,
-    String? assignedToName,
-    String? includedAccessories,
-  }) {
-    return TicketModel(
-      id: id ?? this.id,
-      createdAt: createdAt ?? this.createdAt,
-      companyId: companyId ?? this.companyId,
-      storeId: storeId ?? this.storeId,
-      customerId: customerId ?? this.customerId,
-      targetModelId: targetModelId ?? this.targetModelId,
-      targetSn: targetSn ?? this.targetSn,
-      sourceModelId: sourceModelId ?? this.sourceModelId,
-      sourceSn: sourceSn ?? this.sourceSn,
-      customerPrice: customerPrice ?? this.customerPrice,
-      internalCost: internalCost ?? this.internalCost,
-      closedAt: closedAt ?? this.closedAt,
-      returnedAt: returnedAt ?? this.returnedAt,
-      request: request ?? this.request,
-      warrantyType: warrantyType ?? this.warrantyType,
-      publicNotes: publicNotes ?? this.publicNotes,
-      internalNotes: internalNotes ?? this.internalNotes,
-      referenceNumber: referenceNumber ?? this.referenceNumber,
-      alternativePhoneNumber:
-          alternativePhoneNumber ?? this.alternativePhoneNumber,
-      hasCourtesyDevice: hasCourtesyDevice ?? this.hasCourtesyDevice,
-      ticketType: ticketType ?? this.ticketType,
-      ticketStatus: ticketStatus ?? this.ticketStatus,
-      estimatedDeliveryAt: estimatedDeliveryAt ?? this.estimatedDeliveryAt,
-      ticketResult: ticketResult ?? this.ticketResult,
-      resolutionNotes: resolutionNotes ?? this.resolutionNotes,
-      legacyId: legacyId ?? this.legacyId,
-      customerName: customerName ?? this.customerName,
-      targetModelName: targetModelName ?? this.targetModelName,
-      sourceModelName: sourceModelName ?? this.sourceModelName,
-      createdById: createdById ?? this.createdById,
-      createdByName: createdByName ?? this.createdByName,
-      assignedToId: assignedToId ?? this.assignedToId,
-      assignedToName: assignedToName ?? this.assignedToName,
-      includedAccessories: includedAccessories ?? this.includedAccessories,
-    );
-  }
-
-  /// Deserializzazione da Supabase
-  factory TicketModel.fromMap(Map<String, dynamic> map) {
-    return TicketModel(
-      id: map['id'] as String,
-      createdAt: map['created_at'] != null
-          ? DateTime.parse(map['created_at']).toLocal()
-          : null,
-      companyId: map['company_id'] as String,
-      storeId: map['store_id'] as String?,
-      customerId: map['customer_id'] as String?,
-      targetModelId: map['target_model_id'] as String?,
-      targetSn: map['target_sn'] as String?,
-      sourceModelId: map['source_model_id'] as String?,
-      sourceSn: map['source_sn'] as String?,
-      // Fix per i field numerici di Postgres che potrebbero arrivare come int o double
-      customerPrice: (map['customer_price'] as num?)?.toDouble() ?? 0.0,
-      internalCost: (map['internal_cost'] as num?)?.toDouble() ?? 0.0,
-      closedAt: map['closed_at'] != null
-          ? DateTime.parse(map['closed_at']).toLocal()
-          : null,
-      returnedAt: map['returned_at'] != null
-          ? DateTime.parse(map['returned_at']).toLocal()
-          : null,
-      request: map['request'] as String? ?? '',
-      warrantyType: WarrantyType.fromString(map['warranty_type'] as String?),
-      publicNotes: map['public_notes'] as String?,
-      internalNotes: map['internal_notes'] as String?,
-      referenceNumber: map['reference_number'] as int?,
-      alternativePhoneNumber: map['alternative_phone_number'] as String?,
-      hasCourtesyDevice: map['has_courtesy_device'] as bool? ?? false,
-      ticketType: TicketType.fromString(map['ticket_type'] as String),
-      ticketStatus: TicketStatus.fromString(map['ticket_status'] as String),
-      estimatedDeliveryAt: map['estimated_delivery_at'] != null
-          ? DateTime.parse(map['estimated_delivery_at']).toLocal()
-          : null,
-      ticketResult: TicketResult.fromString(map['ticket_result'] as String?),
-      resolutionNotes: map['resolution_notes'] as String?,
-      legacyId: map['legacy_id'] as String?,
-      customerName: (map['customer']?['name'] as String?).myFormat(),
-      targetModelName: (map['target_model']?['name_with_brand'] as String?)
-          ?.myFormat(),
-      sourceModelName: (map['source_model']?['name_with_brand'] as String?)
-          ?.myFormat(),
-      createdById: map['staff_id'] as String?,
-      createdByName: (map['staff']?['name'] as String?).myFormat(),
-      assignedToId: map['assigned_to_id'] as String?,
-      assignedToName: (map['assigned_to']?['name'] as String?).myFormat(),
-      includedAccessories: map['included_accessories'] as String?,
-    );
-  }
-
-  /// Serializzazione per Supabase
-  Map<String, dynamic> toMap() {
-    return {
-      if (id != null) 'id': id,
-      'company_id': companyId,
-      'store_id': storeId,
-      'customer_id': customerId,
-      'target_model_id': targetModelId,
-      'target_sn': targetSn,
-      'source_model_id': sourceModelId,
-      'source_sn': sourceSn,
-      'customer_price': customerPrice,
-      'internal_cost': internalCost,
-      if (closedAt != null) 'closed_at': closedAt!.toUtc().toIso8601String(),
-      if (returnedAt != null)
-        'returned_at': returnedAt!.toUtc().toIso8601String(),
-      'request': request,
-      'created_by_id': createdById,
-      'warranty_type': warrantyType,
-      'public_notes': publicNotes,
-      'internal_notes': internalNotes,
-      'alternative_phone_number': alternativePhoneNumber,
-      'has_courtesy_device': hasCourtesyDevice,
-      'ticket_type': ticketType.value,
-      'ticket_status': ticketStatus.value,
-      if (estimatedDeliveryAt != null)
-        'estimated_delivery_at': estimatedDeliveryAt!.toUtc().toIso8601String(),
-      if (ticketResult != null) 'ticket_result': ticketResult!.value,
-      'resolution_notes': resolutionNotes,
-      'legacy_id': legacyId,
-      'included_accessories': includedAccessories,
-    };
-  }
-
-  @override
-  List<Object?> get props => [
-    id,
-    createdAt,
-    companyId,
-    storeId,
-    customerId,
-    targetModelId,
-    targetSn,
-    sourceModelId,
-    sourceSn,
-    customerPrice,
-    internalCost,
-    closedAt,
-    returnedAt,
-    request,
-    warrantyType,
-    publicNotes,
-    internalNotes,
-    referenceNumber,
-    alternativePhoneNumber,
-    hasCourtesyDevice,
-    ticketType,
-    ticketStatus,
-    estimatedDeliveryAt,
-    ticketResult,
-    resolutionNotes,
-    legacyId,
-    includedAccessories,
-    customerName,
-    targetModelName,
-    sourceModelName,
-    createdById,
-    createdByName,
-    assignedToId,
-    assignedToName,
-  ];
-}

lib/features/tickets/models/ticket_status_extension.dart

@@ -1,43 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-
-extension TicketStatusVisuals on TicketStatus {
-  Color get color {
-    switch (this) {
-      case TicketStatus.open:
-        return Colors.blueGrey;
-      case TicketStatus.waitingForParts:
-        return Colors.amber.shade700;
-      case TicketStatus.inProgress:
-        return Colors.blue;
-      case TicketStatus.waitingForShipping:
-        // Il tuo rosa storico!
-        return Colors.pinkAccent;
-      case TicketStatus.waitingForReturn:
-        return Colors.purpleAccent;
-      case TicketStatus.ready:
-        return Colors.green;
-      case TicketStatus.closed:
-        return Colors.grey.shade400;
-    }
-  }
-
-  IconData get icon {
-    switch (this) {
-      case TicketStatus.open:
-        return Icons.inbox;
-      case TicketStatus.waitingForParts:
-        return Icons.hourglass_empty;
-      case TicketStatus.inProgress:
-        return Icons.build;
-      case TicketStatus.waitingForShipping:
-        return Icons.local_shipping_outlined;
-      case TicketStatus.waitingForReturn:
-        return Icons.undo;
-      case TicketStatus.ready:
-        return Icons.check_circle_outline;
-      case TicketStatus.closed:
-        return Icons.lock_outline;
-    }
-  }
-}

lib/features/tickets/ui/ticket_form_screen.dart

@@ -1,599 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/core/widgets/shared_forms/customer_section.dart';
-import 'package:flux/core/widgets/shared_forms/model_section.dart';
-import 'package:flux/core/widgets/shared_forms/shared_files_section.dart';
-import 'package:flux/features/attachments/blocs/attachments_bloc.dart';
-import 'package:flux/features/tickets/blocs/ticket_form_cubit.dart';
-import 'package:flux/features/tickets/blocs/ticket_form_state.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:flux/core/widgets/shared_forms/staff_section.dart';
-import 'package:flux/features/tickets/models/ticket_status_extension.dart';
-
-class TicketFormScreen extends StatefulWidget {
-  final TicketModel? existingTicket;
-  final String? ticketId;
-
-  const TicketFormScreen({super.key, this.existingTicket, this.ticketId});
-
-  @override
-  State<TicketFormScreen> createState() => _TicketFormScreenState();
-}
-
-class _TicketFormScreenState extends State<TicketFormScreen> {
-  final _formKey = GlobalKey<FormState>();
-
-  final _altPhoneCtrl = TextEditingController();
-  final _serialCtrl = TextEditingController();
-  final _requestCtrl = TextEditingController();
-  final _accessoriesCtrl = TextEditingController();
-  final _publicNotesCtrl = TextEditingController();
-  final _internalNotesCtrl = TextEditingController();
-  final _priceCtrl = TextEditingController();
-  final _costCtrl = TextEditingController();
-
-  bool _isInitialized = false;
-
-  @override
-  void initState() {
-    super.initState();
-    context.read<TicketFormCubit>().initForm(
-      existingTicket: widget.existingTicket,
-      id: widget.ticketId,
-    );
-  }
-
-  @override
-  void dispose() {
-    _altPhoneCtrl.dispose();
-    _serialCtrl.dispose();
-    _requestCtrl.dispose();
-    _accessoriesCtrl.dispose();
-    _publicNotesCtrl.dispose();
-    _internalNotesCtrl.dispose();
-    _priceCtrl.dispose();
-    _costCtrl.dispose();
-    super.dispose();
-  }
-
-  void _syncTextControllers(TicketModel model) {
-    if (_altPhoneCtrl.text.isEmpty) {
-      _altPhoneCtrl.text = model.alternativePhoneNumber ?? '';
-    }
-    if (_serialCtrl.text.isEmpty) _serialCtrl.text = model.targetSn ?? '';
-    if (_requestCtrl.text.isEmpty) _requestCtrl.text = model.request;
-    if (_accessoriesCtrl.text.isEmpty) {
-      _accessoriesCtrl.text = model.includedAccessories ?? '';
-    }
-    if (_publicNotesCtrl.text.isEmpty) {
-      _publicNotesCtrl.text = model.publicNotes ?? '';
-    }
-    if (_internalNotesCtrl.text.isEmpty) {
-      _internalNotesCtrl.text = model.internalNotes ?? '';
-    }
-    if (_priceCtrl.text.isEmpty && model.customerPrice > 0) {
-      _priceCtrl.text = model.customerPrice.toString();
-    }
-    if (_costCtrl.text.isEmpty && model.internalCost > 0) {
-      _costCtrl.text = model.internalCost.toString();
-    }
-    _isInitialized = true;
-  }
-
-  void _flushControllersToCubit() {
-    context.read<TicketFormCubit>().updateFields(
-      alternativePhoneNumber: _altPhoneCtrl.text,
-      targetSn: _serialCtrl.text,
-      request: _requestCtrl.text,
-      includedAccessories: _accessoriesCtrl.text,
-      publicNotes: _publicNotesCtrl.text,
-      internalNotes: _internalNotesCtrl.text,
-      customerPrice: double.tryParse(_priceCtrl.text) ?? 0.0,
-      internalCost: double.tryParse(_costCtrl.text) ?? 0.0,
-    );
-  }
-
-  void _saveTicket({required bool keepAdding}) {
-    if (_formKey.currentState!.validate()) {
-      _flushControllersToCubit();
-      context.read<TicketFormCubit>().saveTicket(keepAdding: keepAdding);
-    }
-  }
-
-  Future<String?> _generateIdForQr() async {
-    // 1. Validiamo i campi obbligatori (es. il cliente)
-    if (!_formKey.currentState!.validate()) return null;
-
-    // 2. Sincronizziamo i testi scritti a mano nel Cubit
-    _flushControllersToCubit();
-
-    final attachmentsBloc = context.read<AttachmentsBloc>();
-
-    // 3. Facciamo il salvataggio silenzioso
-    final newId = await context.read<TicketFormCubit>().saveTicketDraft();
-
-    if (newId != null && context.mounted) {
-      // 4. IL TOCCO DI CLASSE: Diciamo all'AttachmentsBloc che ora la pratica ha un ID!
-      // Questo farà partire l'upload automatico di eventuali file "in bozza"
-      attachmentsBloc.add(ParentEntitySavedEvent(newId));
-    }
-
-    return newId;
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    final theme = Theme.of(context);
-
-    return BlocConsumer<TicketFormCubit, TicketFormState>(
-      listenWhen: (previous, current) => previous.status != current.status,
-      listener: (context, state) {
-        if (state.status == TicketFormStatus.ready && !_isInitialized) {
-          _syncTextControllers(state.ticket);
-        }
-
-        if (state.status == TicketFormStatus.success) {
-          Navigator.of(context).pop();
-        } else if (state.status == TicketFormStatus.successAndAddAnother) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            const SnackBar(
-              content: Text('Scheda salvata! Inserisci la prossima.'),
-            ),
-          );
-          _altPhoneCtrl.clear();
-          _serialCtrl.clear();
-          _requestCtrl.clear();
-          _accessoriesCtrl.clear();
-          _publicNotesCtrl.clear();
-          _internalNotesCtrl.clear();
-          _priceCtrl.clear();
-          _costCtrl.clear();
-          _isInitialized = false;
-        } else if (state.status == TicketFormStatus.failure) {
-          ScaffoldMessenger.of(context).showSnackBar(
-            SnackBar(
-              content: Text(state.errorMessage ?? 'Errore di salvataggio'),
-              backgroundColor: theme.colorScheme.error,
-            ),
-          );
-        }
-      },
-      builder: (context, state) {
-        final ticket = state.ticket;
-
-        return Scaffold(
-          appBar: AppBar(
-            title: Text(
-              ticket.id == null ? 'Nuova Scheda Assistenza' : 'Modifica Scheda',
-            ),
-            actions: [
-              Padding(
-                padding: const EdgeInsets.only(right: 16.0),
-                child: Chip(
-                  label: Text(
-                    ticket.ticketStatus.name.toUpperCase(),
-                    style: const TextStyle(color: Colors.white, fontSize: 10),
-                  ),
-                  backgroundColor: ticket.ticketStatus.color,
-                ),
-              ),
-            ],
-          ),
-          body: Form(
-            key: _formKey,
-            // IL TRUCCO PER LA TASTIERA: Obblighiamo il tab a seguire il DOM
-            child: FocusTraversalGroup(
-              policy: WidgetOrderTraversalPolicy(),
-              child: LayoutBuilder(
-                builder: (context, constraints) {
-                  final isUltraWide = constraints.maxWidth > 1400;
-                  final isDesktop = constraints.maxWidth > 900;
-
-                  return SingleChildScrollView(
-                    padding: const EdgeInsets.all(16.0),
-                    child: Center(
-                      child: ConstrainedBox(
-                        constraints: BoxConstraints(
-                          maxWidth: isUltraWide
-                              ? 1600
-                              : (isDesktop ? 1200 : 800),
-                        ),
-                        child: _buildResponsiveLayout(
-                          isUltraWide,
-                          isDesktop,
-                          ticket,
-                        ),
-                      ),
-                    ),
-                  );
-                },
-              ),
-            ),
-          ),
-          bottomNavigationBar: SafeArea(
-            child: Container(
-              padding: const EdgeInsets.all(16.0),
-              decoration: BoxDecoration(
-                color: theme.scaffoldBackgroundColor,
-                boxShadow: [
-                  BoxShadow(
-                    color: Colors.black.withValues(alpha: 0.05),
-                    blurRadius: 10,
-                    offset: const Offset(0, -3),
-                  ),
-                ],
-              ),
-              child: FocusTraversalGroup(
-                // Un gruppo a parte per il footer, così viene visitato per ultimo
-                child: Row(
-                  children: [
-                    Expanded(
-                      flex: 1,
-                      child: OutlinedButton(
-                        onPressed: state.status == TicketFormStatus.saving
-                            ? null
-                            : () => _saveTicket(keepAdding: true),
-                        child: const Text(
-                          'Salva e Aggiungi Altro',
-                          textAlign: TextAlign.center,
-                        ),
-                      ),
-                    ),
-                    const SizedBox(width: 12),
-                    Expanded(
-                      flex: 1,
-                      child: ElevatedButton(
-                        onPressed: state.status == TicketFormStatus.saving
-                            ? null
-                            : () => _saveTicket(keepAdding: false),
-                        child: state.status == TicketFormStatus.saving
-                            ? const SizedBox(
-                                width: 20,
-                                height: 20,
-                                child: CircularProgressIndicator(
-                                  color: Colors.white,
-                                  strokeWidth: 2,
-                                ),
-                              )
-                            : const Text('Salva ed Esci'),
-                      ),
-                    ),
-                  ],
-                ),
-              ),
-            ),
-          ),
-        );
-      },
-    );
-  }
-
-  // --- LOGICA DI IMPAGINAZIONE RESPONSIVE ---
-  Widget _buildResponsiveLayout(
-    bool isUltraWide,
-    bool isDesktop,
-    TicketModel ticket,
-  ) {
-    if (isUltraWide) {
-      // 3 COLONNE
-      return Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Expanded(
-            child: Column(
-              children: [_cardAnagrafica(ticket), _cardDispositivo(ticket)],
-            ),
-          ),
-          const SizedBox(width: 24),
-          Expanded(child: Column(children: [_cardDettagli(ticket)])),
-          const SizedBox(width: 24),
-          Expanded(
-            child: Column(
-              children: [_cardCosti(ticket), _cardAssegnazione(ticket)],
-            ),
-          ),
-        ],
-      );
-    } else if (isDesktop) {
-      // 2 COLONNE
-      return Row(
-        crossAxisAlignment: CrossAxisAlignment.start,
-        children: [
-          Expanded(
-            child: Column(
-              children: [
-                _cardAnagrafica(ticket),
-                _cardDispositivo(ticket),
-                _cardAssegnazione(ticket),
-              ],
-            ),
-          ),
-          const SizedBox(width: 24),
-          Expanded(
-            child: Column(
-              children: [_cardDettagli(ticket), _cardCosti(ticket)],
-            ),
-          ),
-        ],
-      );
-    } else {
-      // 1 COLONNA (Mobile)
-      return Column(
-        crossAxisAlignment: CrossAxisAlignment.stretch,
-        children: [
-          _cardAnagrafica(ticket),
-          _cardDispositivo(ticket),
-          _cardDettagli(ticket),
-          _cardCosti(ticket),
-          _cardAssegnazione(ticket),
-        ],
-      );
-    }
-  }
-
-  // --- LE 5 CARD (MODULARIZZATE E COLORATE) ---
-
-  Widget _cardAnagrafica(TicketModel ticket) {
-    return _buildCard(
-      title: 'Anagrafica',
-      icon: Icons.person,
-      themeColor: Colors.indigo,
-      children: [
-        StaffSection(
-          label: 'Creato Da',
-          staffId: ticket.createdById,
-          staffName: ticket.createdByName,
-          onStaffSelected: (staff) => context
-              .read<TicketFormCubit>()
-              .updateCreator(staffId: staff.id!, staffName: staff.name),
-        ),
-        const Divider(height: 32),
-        SharedCustomerSection(
-          customerId: ticket.customerId,
-          customerName: ticket.customerName,
-          onCustomerSelected: (customer) =>
-              context.read<TicketFormCubit>().updateCustomer(customer),
-        ),
-        const SizedBox(height: 16),
-        TextFormField(
-          controller: _altPhoneCtrl,
-          decoration: const InputDecoration(
-            labelText: 'Recapito Alternativo',
-            prefixIcon: Icon(Icons.phone),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _cardDispositivo(TicketModel ticket) {
-    return _buildCard(
-      title: 'Dispositivo',
-      icon: Icons.devices,
-      themeColor: Colors.deepOrange,
-      children: [
-        SharedModelSection(
-          label: 'Modello da Riparare',
-          modelId: ticket.targetModelId,
-          modelName: ticket.targetModelName,
-          onModelSelected: (id, name) => context
-              .read<TicketFormCubit>()
-              .updateModel(modelId: id, modelName: name),
-        ),
-        const SizedBox(height: 16),
-        TextFormField(
-          controller: _serialCtrl,
-          decoration: const InputDecoration(
-            labelText: 'Seriale / IMEI',
-            prefixIcon: Icon(Icons.qr_code),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _cardDettagli(TicketModel ticket) {
-    return _buildCard(
-      title: 'Dettagli Riparazione',
-      icon: Icons.build,
-      themeColor: Colors.pink,
-      children: [
-        Row(
-          children: [
-            Expanded(
-              child: DropdownButtonFormField<TicketType>(
-                initialValue: ticket.ticketType,
-                decoration: const InputDecoration(
-                  labelText: 'Tipo Lavorazione',
-                ),
-                items: TicketType.values
-                    .map((t) => DropdownMenuItem(value: t, child: Text(t.name)))
-                    .toList(),
-                onChanged: (val) => context
-                    .read<TicketFormCubit>()
-                    .updateFields(ticketType: val),
-              ),
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: DropdownButtonFormField<TicketStatus>(
-                initialValue: ticket.ticketStatus,
-                decoration: const InputDecoration(labelText: 'Stato Attuale'),
-                items: TicketStatus.values
-                    .map((s) => DropdownMenuItem(value: s, child: Text(s.name)))
-                    .toList(),
-                onChanged: (val) =>
-                    context.read<TicketFormCubit>().updateFields(status: val),
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(height: 16),
-        TextFormField(
-          controller: _requestCtrl,
-          maxLines: 4,
-          decoration: const InputDecoration(
-            labelText: 'Difetto dichiarato o Richiesta del cliente',
-            alignLabelWithHint: true,
-          ),
-        ),
-        const SizedBox(height: 16),
-        TextFormField(
-          controller: _accessoriesCtrl,
-          decoration: const InputDecoration(
-            labelText: 'Accessori Consegnati',
-            prefixIcon: Icon(Icons.cable),
-          ),
-        ),
-        const SizedBox(height: 16),
-        SwitchListTile(
-          title: const Text('Prestato Telefono di Cortesia?'),
-          value: ticket.hasCourtesyDevice,
-          onChanged: (val) => context.read<TicketFormCubit>().updateFields(
-            hasCourtesyDevice: val,
-          ),
-          shape: RoundedRectangleBorder(
-            borderRadius: BorderRadius.circular(8),
-            side: BorderSide(color: Theme.of(context).dividerColor),
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _cardCosti(TicketModel ticket) {
-    return _buildCard(
-      title: 'Costi & Note',
-      icon: Icons.euro,
-      themeColor: Colors.teal,
-      children: [
-        Row(
-          children: [
-            Expanded(
-              child: TextFormField(
-                controller: _priceCtrl,
-                keyboardType: const TextInputType.numberWithOptions(
-                  decimal: true,
-                ),
-                decoration: const InputDecoration(
-                  labelText: 'Preventivo Cliente (€)',
-                  prefixIcon: Icon(Icons.sell_outlined),
-                ),
-              ),
-            ),
-            const SizedBox(width: 16),
-            Expanded(
-              child: TextFormField(
-                controller: _costCtrl,
-                keyboardType: const TextInputType.numberWithOptions(
-                  decimal: true,
-                ),
-                decoration: const InputDecoration(
-                  labelText: 'Nostro Costo (€)',
-                  prefixIcon: Icon(Icons.shopping_cart_outlined),
-                ),
-              ),
-            ),
-          ],
-        ),
-        const SizedBox(height: 16),
-        TextFormField(
-          controller: _publicNotesCtrl,
-          maxLines: 2,
-          decoration: const InputDecoration(
-            labelText: 'Note Pubbliche (Visibili su ricevuta)',
-          ),
-        ),
-        const SizedBox(height: 16),
-        TextFormField(
-          controller: _internalNotesCtrl,
-          maxLines: 3,
-          decoration: InputDecoration(
-            labelText: 'Note Interne (Solo per lo Staff)',
-            fillColor: Colors.amber.withValues(alpha: 0.1),
-            filled: true,
-          ),
-        ),
-      ],
-    );
-  }
-
-  Widget _cardAssegnazione(TicketModel ticket) {
-    return _buildCard(
-      title: 'Assegnazione e Allegati',
-      icon: Icons.engineering,
-      themeColor: Colors.deepPurple,
-      children: [
-        StaffSection(
-          label: 'Assegnato A',
-          staffId: ticket.assignedToId,
-          staffName: ticket.assignedToName,
-          onStaffSelected: (staff) => context
-              .read<TicketFormCubit>()
-              .updateFields(assignedToId: staff.id, assignedToName: staff.name),
-        ),
-        const Divider(height: 32),
-        // ECCO LA MAGIA:
-        SharedFilesSection(
-          titleNameForUpload: ticket.customerName ?? 'Nuovo Ticket',
-          onGenerateIdForQr: _generateIdForQr,
-        ),
-        /* SharedAttachmentsSection(
-          parentType: AttachmentParentType.ticket,
-          parentId: ticket.id,
-        ), */
-      ],
-    );
-  }
-
-  // --- WIDGET BASE PER LA CARD ---
-  Widget _buildCard({
-    required String title,
-    required IconData icon,
-    required Color themeColor,
-    required List<Widget> children,
-  }) {
-    return Card(
-      margin: const EdgeInsets.only(bottom: 24),
-      elevation: 0, // Tolta l'ombra standard
-      shape: RoundedRectangleBorder(
-        borderRadius: BorderRadius.circular(16),
-        side: BorderSide(
-          color: themeColor.withValues(alpha: 0.3),
-          width: 1,
-        ), // Bordo colorato delicato
-      ),
-      child: Padding(
-        padding: const EdgeInsets.all(20.0),
-        child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
-          children: [
-            Row(
-              children: [
-                // Pallino colorato con l'icona dentro
-                Container(
-                  padding: const EdgeInsets.all(8),
-                  decoration: BoxDecoration(
-                    color: themeColor.withValues(alpha: 0.1),
-                    borderRadius: BorderRadius.circular(8),
-                  ),
-                  child: Icon(icon, color: themeColor),
-                ),
-                const SizedBox(width: 12),
-                Text(
-                  title,
-                  style: Theme.of(context).textTheme.titleLarge?.copyWith(
-                    fontWeight: FontWeight.bold,
-                    color: themeColor,
-                  ),
-                ),
-              ],
-            ),
-            const Divider(height: 32),
-            ...children,
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/features/tickets/ui/ticket_list_screen.dart

@@ -1,291 +0,0 @@
-import 'package:flutter/material.dart';
-import 'package:flutter_bloc/flutter_bloc.dart';
-import 'package:flux/features/tickets/blocs/ticket_list_cubit.dart';
-import 'package:flux/features/tickets/blocs/ticket_list_state.dart';
-import 'package:flux/features/tickets/models/ticket_model.dart';
-import 'package:flux/features/tickets/models/ticket_status_extension.dart';
-
-class TicketListScreen extends StatefulWidget {
-  const TicketListScreen({super.key});
-
-  @override
-  State<TicketListScreen> createState() => _TicketListScreenState();
-}
-
-class _TicketListScreenState extends State<TicketListScreen> {
-  final ScrollController _scrollController = ScrollController();
-  final TextEditingController _searchController = TextEditingController();
-
-  @override
-  void initState() {
-    super.initState();
-    // INFINITY SCROLL: Quando arriviamo quasi in fondo, chiediamo altri ticket
-    _scrollController.addListener(() {
-      if (_scrollController.position.pixels >=
-          _scrollController.position.maxScrollExtent - 200) {
-        context.read<TicketListCubit>().fetchTickets();
-      }
-    });
-  }
-
-  @override
-  void dispose() {
-    _scrollController.dispose();
-    _searchController.dispose();
-    super.dispose();
-  }
-
-  @override
-  Widget build(BuildContext context) {
-    return Scaffold(
-      appBar: AppBar(
-        title: const Text('Assistenza & Riparazioni'),
-        actions: [
-          // Tasto per filtri avanzati (Data, Staff, Tipo) -> Da fare in un BottomSheet!
-          IconButton(
-            icon: const Icon(Icons.filter_list),
-            onPressed: () {
-              // TODO: Aprire BottomSheet filtri avanzati
-            },
-          ),
-        ],
-      ),
-      body: Column(
-        children: [
-          // 1. BARRA DI RICERCA
-          Padding(
-            padding: const EdgeInsets.all(8.0),
-            child: TextField(
-              controller: _searchController,
-              decoration: InputDecoration(
-                hintText: 'Cerca per nome cliente...',
-                prefixIcon: const Icon(Icons.search),
-                suffixIcon: IconButton(
-                  icon: const Icon(Icons.clear),
-                  onPressed: () {
-                    _searchController.clear();
-                    context.read<TicketListCubit>().updateFilters(
-                      clearSearch: true,
-                    );
-                  },
-                ),
-                border: OutlineInputBorder(
-                  borderRadius: BorderRadius.circular(12),
-                ),
-              ),
-              onSubmitted: (value) {
-                context.read<TicketListCubit>().updateFilters(
-                  searchTerm: value,
-                );
-              },
-            ),
-          ),
-
-          // 2. FILTRI RAPIDI PER STATO (CHIPS)
-          BlocBuilder<TicketListCubit, TicketListState>(
-            buildWhen: (previous, current) =>
-                previous.statusFilter != current.statusFilter,
-            builder: (context, state) {
-              return SizedBox(
-                height: 50,
-                child: ListView(
-                  scrollDirection: Axis.horizontal,
-                  padding: const EdgeInsets.symmetric(horizontal: 8.0),
-                  children: [
-                    _buildStatusChip(context, state, null, 'Tutti'),
-                    ...TicketStatus.values.map(
-                      (status) => _buildStatusChip(
-                        context,
-                        state,
-                        status,
-                        status.displayValue,
-                      ),
-                    ),
-                  ],
-                ),
-              );
-            },
-          ),
-          const Divider(),
-
-          // 3. LA LISTA DEI TICKET
-          Expanded(
-            child: BlocBuilder<TicketListCubit, TicketListState>(
-              builder: (context, state) {
-                if (state.isLoading && state.tickets.isEmpty) {
-                  return const Center(child: CircularProgressIndicator());
-                }
-
-                if (state.tickets.isEmpty) {
-                  return const Center(child: Text('Nessun ticket trovato.'));
-                }
-
-                return ListView.builder(
-                  controller: _scrollController,
-                  itemCount: state.hasReachedMax
-                      ? state.tickets.length
-                      : state.tickets.length + 1,
-                  itemBuilder: (context, index) {
-                    // Se siamo all'ultimo elemento e non abbiamo raggiunto il max, mostriamo il loader
-                    if (index >= state.tickets.length) {
-                      return const Center(
-                        child: Padding(
-                          padding: EdgeInsets.all(16.0),
-                          child: CircularProgressIndicator(),
-                        ),
-                      );
-                    }
-
-                    final ticket = state.tickets[index];
-                    return _TicketCard(ticket: ticket);
-                  },
-                );
-              },
-            ),
-          ),
-        ],
-      ),
-      floatingActionButton: FloatingActionButton.extended(
-        onPressed: () {
-          // TODO: Navigare alla creazione di un nuovo ticket
-        },
-        icon: const Icon(Icons.add),
-        label: const Text('Nuovo Ticket'),
-      ),
-    );
-  }
-
-  // Widget di supporto per creare le Chip di filtro
-  Widget _buildStatusChip(
-    BuildContext context,
-    TicketListState state,
-    TicketStatus? status,
-    String label,
-  ) {
-    final isSelected = state.statusFilter == status;
-    return Padding(
-      padding: const EdgeInsets.only(right: 8.0),
-      child: ChoiceChip(
-        label: Text(label),
-        selected: isSelected,
-        selectedColor:
-            status?.color.withValues(alpha: 0.2) ??
-            Colors.blue.withValues(alpha: 0.2),
-        onSelected: (selected) {
-          context.read<TicketListCubit>().updateFilters(
-            statusFilter: selected ? status : null,
-            clearStatus: !selected && status != null,
-          );
-        },
-      ),
-    );
-  }
-}
-
-// ---------------------------------------------------------
-// LA CARD DEL TICKET (Il "Colpo d'Occhio")
-// ---------------------------------------------------------
-class _TicketCard extends StatelessWidget {
-  final TicketModel ticket;
-
-  const _TicketCard({required this.ticket});
-
-  @override
-  Widget build(BuildContext context) {
-    final statusColor = ticket.ticketStatus.color;
-    final statusIcon = ticket.ticketStatus.icon;
-
-    return Card(
-      margin: const EdgeInsets.symmetric(horizontal: 8.0, vertical: 4.0),
-      clipBehavior: Clip
-          .antiAlias, // Serve per tagliare il container laterale con gli angoli della card
-      child: IntrinsicHeight(
-        // Serve per far sì che il container laterale prenda tutta l'altezza
-        child: Row(
-          crossAxisAlignment: CrossAxisAlignment.stretch,
-          children: [
-            // LA STRISCIA COLORATA LATERALE
-            Container(width: 6, color: statusColor),
-            Expanded(
-              child: ListTile(
-                contentPadding: const EdgeInsets.symmetric(
-                  horizontal: 16.0,
-                  vertical: 8.0,
-                ),
-                title: Row(
-                  mainAxisAlignment: MainAxisAlignment.spaceBetween,
-                  children: [
-                    Expanded(
-                      child: Text(
-                        ticket.customerName ?? 'Cliente Sconosciuto',
-                        style: const TextStyle(
-                          fontWeight: FontWeight.bold,
-                          fontSize: 16,
-                        ),
-                        overflow: TextOverflow.ellipsis,
-                      ),
-                    ),
-                    // IL BADGE DELLO STATO
-                    Container(
-                      padding: const EdgeInsets.symmetric(
-                        horizontal: 8,
-                        vertical: 4,
-                      ),
-                      decoration: BoxDecoration(
-                        color: statusColor.withValues(alpha: 0.1),
-                        borderRadius: BorderRadius.circular(12),
-                        border: Border.all(
-                          color: statusColor.withValues(alpha: 0.5),
-                        ),
-                      ),
-                      child: Row(
-                        mainAxisSize: MainAxisSize.min,
-                        children: [
-                          Icon(statusIcon, size: 14, color: statusColor),
-                          const SizedBox(width: 4),
-                          Text(
-                            ticket.ticketStatus.displayValue,
-                            style: TextStyle(
-                              fontSize: 12,
-                              color: statusColor,
-                              fontWeight: FontWeight.bold,
-                            ),
-                          ),
-                        ],
-                      ),
-                    ),
-                  ],
-                ),
-                subtitle: Column(
-                  crossAxisAlignment: CrossAxisAlignment.start,
-                  children: [
-                    const SizedBox(height: 4),
-                    // MODELLO O TIPO DI INTERVENTO
-                    Text(
-                      ticket.targetModelName ?? ticket.ticketType.displayValue,
-                      style: const TextStyle(fontWeight: FontWeight.w500),
-                    ),
-                    const SizedBox(height: 4),
-                    // DATA CREAZIONE (Es: 04/05/2026)
-                    Text(
-                      ticket.createdAt != null
-                          ? 'Creato il: ${ticket.createdAt!.day}/${ticket.createdAt!.month}/${ticket.createdAt!.year}'
-                          : '',
-                      style: TextStyle(
-                        color: Colors.grey.shade600,
-                        fontSize: 12,
-                      ),
-                    ),
-                  ],
-                ),
-                onTap: () {
-                  // TODO: Aprire il dettaglio del ticket!
-                },
-              ),
-            ),
-          ],
-        ),
-      ),
-    );
-  }
-}

lib/firebase_options.dart

@@ -0,0 +1,88 @@
+// 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: 'AIzaSyA8vQbyEt81DoAuRVDc_3W_VIKY-9F-XTw',
+    appId: '1:872447580790:web:10745e7f9afb447d5d9d57',
+    messagingSenderId: '872447580790',
+    projectId: 'assistenza-catelli',
+    authDomain: 'assistenza-catelli.firebaseapp.com',
+    storageBucket: 'assistenza-catelli.firebasestorage.app',
+    measurementId: 'G-HTSSNQJ15P',
+  );
+
+  static const FirebaseOptions android = FirebaseOptions(
+    apiKey: 'AIzaSyBSxpdLDlPnN0xjejlX_5JL19BDeSzKOr8',
+    appId: '1:872447580790:android:a1d8d57960451f935d9d57',
+    messagingSenderId: '872447580790',
+    projectId: 'assistenza-catelli',
+    storageBucket: 'assistenza-catelli.firebasestorage.app',
+  );
+
+  static const FirebaseOptions ios = FirebaseOptions(
+    apiKey: 'AIzaSyCkjOTW6BlckKIxQdp5TPnHuRfXFoVC3bY',
+    appId: '1:872447580790:ios:a87d56c718aa61e05d9d57',
+    messagingSenderId: '872447580790',
+    projectId: 'assistenza-catelli',
+    storageBucket: 'assistenza-catelli.firebasestorage.app',
+    iosBundleId: 'com.catellisrl.flux',
+  );
+
+  static const FirebaseOptions macos = FirebaseOptions(
+    apiKey: 'AIzaSyCkjOTW6BlckKIxQdp5TPnHuRfXFoVC3bY',
+    appId: '1:872447580790:ios:a87d56c718aa61e05d9d57',
+    messagingSenderId: '872447580790',
+    projectId: 'assistenza-catelli',
+    storageBucket: 'assistenza-catelli.firebasestorage.app',
+    iosBundleId: 'com.catellisrl.flux',
+  );
+
+  static const FirebaseOptions windows = FirebaseOptions(
+    apiKey: 'AIzaSyA5uJhb8ksqKqdEWbMD5ra6JYXIGoaIdIM',
+    appId: '1:872447580790:web:3b1623eda6abdac75d9d57',
+    messagingSenderId: '872447580790',
+    projectId: 'assistenza-catelli',
+    authDomain: 'assistenza-catelli.firebaseapp.com',
+    storageBucket: 'assistenza-catelli.firebasestorage.app',
+    measurementId: 'G-J8LZTQ9NHB',
+  );
+}

lib/main.dart

@@ -1,15 +1,14 @@
 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/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/operations/blocs/operation_list_cubit.dart';
 import 'package:flux/features/operations/data/operations_repository.dart';
-import 'package:flux/features/tickets/data/ticket_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';
@@ -30,8 +29,8 @@ 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/operations/blocs/operations_cubit.dart';
 import 'package:flux/features/settings/settings.dart';
-import 'package:flutter_web_plugins/url_strategy.dart';
 
 void main() async {
   WidgetsFlutterBinding.ensureInitialized();
@@ -39,8 +38,7 @@ void main() async {
 
   // Inizializza le dipendenze PRIMA di lanciare l'app
   await setupLocator();
-  // RIMUOVE IL CARATTERE # DAGLI URL WEB!
-  usePathUrlStrategy();
+
   runApp(
     MultiBlocProvider(
       providers: [
@@ -56,7 +54,7 @@ void main() async {
         BlocProvider<CustomersCubit>(create: (_) => CustomersCubit()),
         BlocProvider<ProductsCubit>(create: (_) => ProductsCubit()),
         BlocProvider<StaffCubit>(create: (_) => StaffCubit()),
-        BlocProvider<OperationListCubit>(create: (_) => OperationListCubit()),
+        BlocProvider<OperationsCubit>(create: (_) => OperationsCubit()),
         BlocProvider<ProvidersCubit>(create: (_) => ProvidersCubit()),
       ],
       child: const FluxApp(),
@@ -96,7 +94,6 @@ Future<void> setupLocator() async {
   getIt.registerLazySingleton<AttachmentsRepository>(
     () => AttachmentsRepository(),
   );
-  getIt.registerLazySingleton<TicketRepository>(() => TicketRepository());
 
   // NOTA: CompanyRepository l'ho tolto perché la logica della Company
   // ora è gestita dal CoreRepository durante l'Onboarding.
@@ -107,7 +104,9 @@ Future<void> setupLocator() async {
   getIt.registerSingleton<SessionCubit>(
     SessionCubit(getIt<CoreRepository>(), getIt<SharedPreferences>()),
   );
-  getIt.registerLazySingleton<CompanyRepository>(() => CompanyRepository());
+  //TODO rimuovere dopo gli import
+  WidgetsFlutterBinding.ensureInitialized();
+  await Firebase.initializeApp(options: DefaultFirebaseOptions.currentPlatform);
 }
 
 class FluxApp extends StatefulWidget {

lib/temp/migration_tools.dart

@@ -0,0 +1,336 @@
+import 'dart:convert';
+
+import 'package:cloud_firestore/cloud_firestore.dart';
+import 'package:flutter/material.dart';
+import 'package:flux/core/blocs/session/session_cubit.dart';
+import 'package:get_it/get_it.dart';
+import 'package:supabase_flutter/supabase_flutter.dart';
+
+Future<void> migrateCustomersToSupabase() async {
+  // 1. IL TUO COMPANY ID REALE SU SUPABASE
+  // Vai nel database Supabase, copia l'UUID della tua azienda e incollalo qui
+  final String myRealCompanyId = '6c4b2323-2a60-4d33-bf21-c5a8eb6b4a5b';
+
+  try {
+    print("Inizio download modello da Firebase...");
+
+    // 2. Scarichiamo TUTTI i clienti da Firebase
+    final snapshot = await FirebaseFirestore.instance.collection('marca').get();
+
+    if (snapshot.docs.isEmpty) {
+      print("Nessun marca trovato su Firebase!");
+      return;
+    }
+
+    // Questa lista conterrà i dati formattati pronti per Supabase
+    List<Map<String, dynamic>> supabaseBrands = [];
+
+    // 3. Cicliamo i documenti di Firebase e li trasformiamo
+    for (var doc in snapshot.docs) {
+      final data = doc.data();
+
+      // Creiamo la riga per Supabase
+      supabaseBrands.add({
+        'legacy_id': doc.id, // L'ID vecchio di Firebase
+        //'company_id': myRealCompanyId, // ECCO IL TUO COMPANY ID!
+        // Mappa i campi (attento a far combaciare i nomi esatti delle colonne Supabase!)
+        'name': (data['nome'] as String).trim().toLowerCase(),
+
+        'company_id': myRealCompanyId,
+
+        // Se avevi una data di creazione su Firebase, convertila, altrimenti ignorala
+        // e Supabase userà il suo 'default now()'
+        // 'created_at': (data['createdAt'] as Timestamp?)?.toDate().toIso8601String(),
+      });
+    }
+
+    print("Sto per inviare ${supabaseBrands.length} brand a Supabase...");
+
+    // 4. Invio a Supabase con UPSERT
+    await Supabase.instance.client
+        .from('brand')
+        .upsert(
+          supabaseBrands,
+          onConflict:
+              'legacy_id', // Se il legacy_id c'è già, aggiorna invece di duplicare
+        );
+
+    print("BOOM! Migrazione brand completata con successo! 🚀");
+  } catch (e) {
+    print("Porca miseria, errore durante la migrazione: $e");
+  }
+}
+
+Future<void> migrateModelsToSupabase() async {
+  final String myRealCompanyId = '6c4b2323-2a60-4d33-bf21-c5a8eb6b4a5b';
+
+  try {
+    print("Inizio migrazione Modelli...");
+
+    // ==========================================================
+    // FASE 1: CREAZIONE DEL DIZIONARIO DI TRADUZIONE (LA MAGIA)
+    // ==========================================================
+    print("Scarico i Brand da Supabase per tradurre gli ID...");
+
+    // Chiediamo a Supabase solo 2 colonne: il nuovo UUID e il vecchio ID di Firebase
+    final List<dynamic> brandResponse = await Supabase.instance.client
+        .from('brand')
+        .select('id, legacy_id');
+
+    // Creiamo la mappa: la chiave è il vecchio ID, il valore è il nuovo UUID
+    Map<String, String> brandTranslationMap = {};
+    for (var b in brandResponse) {
+      if (b['legacy_id'] != null) {
+        brandTranslationMap[b['legacy_id']] = b['id'];
+      }
+    }
+
+    print("Dizionario pronto! Trovati ${brandTranslationMap.length} Brand.");
+
+    // ==========================================================
+    // FASE 2: SCARICAMENTO E TRADUZIONE DEI MODELLI
+    // ==========================================================
+    final snapshot = await FirebaseFirestore.instance
+        .collection('modello')
+        .get(); // Controlla il nome esatto della collection!
+
+    if (snapshot.docs.isEmpty) {
+      print("Nessun modello trovato su Firebase!");
+      return;
+    }
+
+    List<Map<String, dynamic>> supabaseModels = [];
+
+    for (var doc in snapshot.docs) {
+      final data = doc.data();
+
+      // 1. Prendiamo il vecchio ID del brand salvato su Firebase
+      String? oldFirebaseBrandId = data['idMarca'];
+
+      // 2. TRADUZIONE ISTANTANEA! Cerchiamo il nuovo UUID nel nostro dizionario
+      String? newSupabaseBrandUuid;
+      if (oldFirebaseBrandId != null) {
+        newSupabaseBrandUuid = brandTranslationMap[oldFirebaseBrandId];
+      }
+
+      // 3. Controllo di sicurezza: se  il brand non esiste su Supabase, saltiamo il record o mettiamo null?
+      // Se nella tua tabella 'model' il 'brand_id' NON PUÒ essere null, devi per forza avere un match!
+      if (newSupabaseBrandUuid == null && oldFirebaseBrandId != null) {
+        print(
+          "ATTENZIONE: Il modello ${data['nome']} ha un brand_id ($oldFirebaseBrandId) che non esiste su Supabase. Salto o metto null.",
+        );
+        continue; // Decommenta questo se vuoi saltare i modelli orfani
+      }
+
+      // Creiamo la riga per Supabase
+      supabaseModels.add({
+        'legacy_id': doc.id,
+
+        // ECCO LA CHIAVE ESTERNA TRADOTTA!
+        'brand_id': newSupabaseBrandUuid,
+
+        // Mappa gli altri campi
+        'name': (data['nome'] as String).trim().toLowerCase(),
+        'name_with_brand': (data['nomeConMarca'] as String)
+            .toLowerCase()
+            .trim(),
+      });
+    }
+
+    // ==========================================================
+    // FASE 3: INVIO A SUPABASE
+    // ==========================================================
+    print("Sto per inviare ${supabaseModels.length} modelli a Supabase...");
+
+    await Supabase.instance.client
+        .from('model')
+        .upsert(supabaseModels, onConflict: 'legacy_id');
+
+    print("BOOM! Migrazione modelli completata con successo! 🚀");
+  } catch (e) {
+    print("Errore durante la migrazione dei modelli: $e");
+  }
+}
+
+class TicketMigrationScript {
+  final SupabaseClient supabase = Supabase.instance.client;
+  final String companyId = GetIt.I.get<SessionCubit>().state.company!.id!;
+  final String storeId = GetIt.I.get<SessionCubit>().state.currentStore!.id!;
+
+  /// Esegui questa funzione passandole la stringa JSON grezza (es. copiata da un file)
+  /// e l'ID della tua Company su Supabase (visto che Firebase non lo aveva).
+  Future<void> runMigration(String jsonString) async {
+    debugPrint('🚀 INIZIO MIGRAZIONE TICKET...');
+
+    try {
+      // 1. Parsing del JSON
+      final Map<String, dynamic> decoded = jsonDecode(jsonString);
+      // Scendiamo al piano di sotto, direttamente nella "pancia" dei dati!
+      final Map<String, dynamic> rawData = decoded['data'];
+
+      debugPrint('Trovati ${rawData.length} elementi alla radice.');
+      if (rawData.isNotEmpty) {
+        debugPrint(
+          'Il primo elemento contiene: ${rawData.entries.first.value}',
+        );
+      }
+
+      // 2. CREAZIONE DELLA CACHE (IL TRUCCO PER NON IMPAZZIRE CON LE JOIN)
+      debugPrint('📥 Scarico le mappe dei legacy_id da Supabase...');
+
+      final customersRes = await supabase
+          .from('customer')
+          .select('id, legacy_id')
+          .not('legacy_id', 'is', null);
+
+      final modelsRes = await supabase
+          .from('model')
+          .select('id, legacy_id')
+          .not('legacy_id', 'is', null);
+
+      // Creiamo i dizionari: chiave = legacy_id (Firebase), valore = uuid (Supabase)
+      final Map<String, String> customerMap = {
+        for (var row in customersRes)
+          if (row['legacy_id'] != null)
+            row['legacy_id'].toString(): row['id'].toString(),
+      };
+
+      final Map<String, String> modelMap = {
+        for (var row in modelsRes)
+          if (row['legacy_id'] != null)
+            row['legacy_id'].toString(): row['id'].toString(),
+      };
+
+      debugPrint(
+        '✅ Mappe pronte: ${customerMap.length} clienti, ${modelMap.length} modelli.',
+      );
+
+      // 3. MAPPATURA DEI DATI
+      List<Map<String, dynamic>> ticketsToInsert = [];
+
+      for (var entry in rawData.entries) {
+        final data = entry.value as Map<String, dynamic>;
+
+        // Recuperiamo le relazioni usando i nostri dizionari
+        final String? customerId = customerMap[data['idCliente']];
+        final String? modelId = modelMap[data['idModello']];
+
+        // Se non troviamo il cliente o il modello, magari loggiamo e saltiamo (o mettiamo null)
+        // Per ora li mettiamo null, ma almeno non spacca il DB
+
+        // Risoluzione Date
+        DateTime? createdAt = _parseFirebaseDate(data['dataAperturaScheda']);
+        //DateTime? closedAt = _parseFirebaseDate(data['dataChiusuraScheda']);
+        //DateTime? returnedAt = _parseFirebaseDate(data['dataRiconsegnaCliente']);
+
+        // Costruzione del Ticket
+        ticketsToInsert.add({
+          'legacy_id': data['fsId'], // Il vecchio ID del doc Firebase
+          'company_id': companyId,
+          'store_id': storeId,
+          'customer_id': customerId,
+          'target_model_id': modelId,
+          'target_sn': data['seriale'] ?? '',
+          'customer_price': data['costoTotaleCliente'] ?? 0.0,
+          'internal_cost': data['costoTotaleNostro'] ?? 0.0,
+          'created_at':
+              createdAt?.toUtc().toIso8601String() ??
+              DateTime.now().toUtc().toIso8601String(),
+
+          //'closed_at': closedAt?.toUtc().toIso8601String(),
+          //'returned_at': returnedAt?.toUtc().toIso8601String(),
+          'request': (data['guasto']?.toString() ?? ''),
+          'included_accessories': data['accessoriConsegnati'],
+
+          'public_notes': data['note'],
+          'internal_notes': data['noteInterne'],
+          'resolution_notes':
+              data['operazioneEffettuata'], // Il nuovo campo di cui parlavamo!
+
+          'alternative_phone_number': data['recapitoCliente'],
+          'has_courtesy_device': data['prestatoMuletto'] ?? false,
+
+          // Mappatura Enums
+          'ticket_type': _mapTicketType(data),
+          'ticket_status': _mapTicketStatus(data),
+          'ticket_result': _mapTicketResult(data['risultato']),
+
+          // 'warranty_type': _mapWarranty(data['nomeTipoGaranzia']), // De-commenta se hai la logica pronta
+        });
+      }
+
+      // 4. INSERIMENTO BATCH (A botte di 100 per non far arrabbiare Postgres)
+      debugPrint(
+        '🚀 Inizio inserimento di ${ticketsToInsert.length} ticket su Supabase...',
+      );
+
+      const int batchSize = 100;
+      for (int i = 0; i < ticketsToInsert.length; i += batchSize) {
+        final end = (i + batchSize < ticketsToInsert.length)
+            ? i + batchSize
+            : ticketsToInsert.length;
+        final batch = ticketsToInsert.sublist(i, end);
+
+        await supabase.from('ticket').insert(batch);
+        debugPrint('✅ Inseriti ticket da $i a $end');
+      }
+
+      debugPrint('🎉 MIGRAZIONE COMPLETATA CON SUCCESSO!');
+    } catch (e, stacktrace) {
+      debugPrint('❌ ERRORE DURANTE LA MIGRAZIONE: $e');
+      debugPrint(stacktrace.toString());
+    }
+  }
+
+  // --- FUNZIONI DI AIUTO (PARSER E MAPPER) ---
+
+  /// Estrae la data dalla fastidiosa struttura {"__time__": "..."} di Firestore export
+  DateTime? _parseFirebaseDate(dynamic dateData) {
+    if (dateData == null) return null;
+    if (dateData is Map && dateData.containsKey('__time__')) {
+      return DateTime.tryParse(dateData['__time__'].toString());
+    }
+    if (dateData is String) {
+      return DateTime.tryParse(dateData);
+    }
+    return null;
+  }
+
+  /// Converte i boolean di Firebase nel tuo Enum TicketType
+  String _mapTicketType(Map<String, dynamic> data) {
+    if (data['tipoLavorazionePassaggioDati'] == true) return 'data_transfer';
+    if (data['tipoLavorazioneRiparazione'] == true) return 'repair';
+    if (data['tipoLavorazioneConfigurazione'] == true) return 'software_setup';
+    return 'other'; // Include tipoLavorazioneAltro o fallback
+  }
+
+  /// Converte la logica di stato di Firebase nel tuo Enum TicketStatus
+  String _mapTicketStatus(Map<String, dynamic> data) {
+    // Se è stato riconsegnato al cliente o ritirato, è chiuso/consegnato
+    if (data['riconsegnato'] == true ||
+        data['nomeStatoScheda'] == 'Ritirato da cliente') {
+      return 'closed'; // o 'closed', in base alla tua logica
+    }
+
+    // Altrimenti valutiamo le stringhe
+    final String statoFirebase =
+        data['nomeStatoScheda']?.toString().toLowerCase() ?? '';
+
+    if (statoFirebase.contains('accettazione')) return 'open';
+    if (statoFirebase.contains('da inviare centro esterno'))
+      return 'waiting_for_shipping';
+    if (statoFirebase.contains('attesa ricambi')) return 'waiting_for_parts';
+    if (statoFirebase.contains('pronto')) return 'ready';
+    if (data['daLavorare'] == true) return 'in_progress';
+
+    return 'closed'; // Fallback
+  }
+
+  String? _mapTicketResult(dynamic risultato) {
+    if (risultato == null || risultato.toString().isEmpty) return null;
+    final r = risultato.toString().toUpperCase();
+    if (r == 'OK') return 'success';
+    if (r == 'KO' || r == 'NON RIPARATO') return 'failure';
+    return null;
+  }
+}

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -6,16 +6,22 @@ import FlutterMacOS
 import Foundation
 
 import app_links
+import cloud_firestore
 import file_picker
 import file_selector_macos
+import firebase_auth
+import firebase_core
 import pdfx
 import shared_preferences_foundation
 import url_launcher_macos
 
 func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   AppLinksMacosPlugin.register(with: registry.registrar(forPlugin: "AppLinksMacosPlugin"))
+  FLTFirebaseFirestorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseFirestorePlugin"))
   FilePickerPlugin.register(with: registry.registrar(forPlugin: "FilePickerPlugin"))
   FileSelectorPlugin.register(with: registry.registrar(forPlugin: "FileSelectorPlugin"))
+  FLTFirebaseAuthPlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseAuthPlugin"))
+  FLTFirebaseCorePlugin.register(with: registry.registrar(forPlugin: "FLTFirebaseCorePlugin"))
   PdfxPlugin.register(with: registry.registrar(forPlugin: "PdfxPlugin"))
   SharedPreferencesPlugin.register(with: registry.registrar(forPlugin: "SharedPreferencesPlugin"))
   UrlLauncherPlugin.register(with: registry.registrar(forPlugin: "UrlLauncherPlugin"))

pubspec.lock

@@ -1,6 +1,14 @@
 # Generated by pub
 # See https://dart.dev/tools/pub/glossary#lockfile
 packages:
+  _flutterfire_internals:
+    dependency: transitive
+    description:
+      name: _flutterfire_internals
+      sha256: bda3b7b55958bfd867addc40d067b4b11f7b8846d57671f5b5a6e7f9a56fe3ad
+      url: "https://pub.dev"
+    source: hosted
+    version: "1.3.69"
   app_links:
     dependency: transitive
     description:
@@ -105,6 +113,30 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "1.1.2"
+  cloud_firestore:
+    dependency: "direct main"
+    description:
+      name: cloud_firestore
+      sha256: "3ac242332166ae5037bd87bc343744bb96d88d7b13f791492b00958ce5cc6c63"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.3.0"
+  cloud_firestore_platform_interface:
+    dependency: transitive
+    description:
+      name: cloud_firestore_platform_interface
+      sha256: "1bd08b736e1015e8bf5448f5ef67b2087a2380c2c1c7972f8403c1c7b41f5359"
+      url: "https://pub.dev"
+    source: hosted
+    version: "7.2.0"
+  cloud_firestore_web:
+    dependency: transitive
+    description:
+      name: cloud_firestore_web
+      sha256: "18617275ffa2331d3ea058c515ef218bcce2ae13a14bee922563ca6ae2507c26"
+      url: "https://pub.dev"
+    source: hosted
+    version: "5.3.0"
   code_assets:
     dependency: transitive
     description:
@@ -241,6 +273,54 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.9.3+5"
+  firebase_auth:
+    dependency: "direct main"
+    description:
+      name: firebase_auth
+      sha256: b12cb1e2e87797d27e0041100b73ebf890dbafcff2e7e991d4593f5e8e309808
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.4.0"
+  firebase_auth_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_auth_platform_interface
+      sha256: c71517b3c78480be42789b05316a7692d69296c17848bd6a9e798300abae1ec7
+      url: "https://pub.dev"
+    source: hosted
+    version: "8.1.9"
+  firebase_auth_web:
+    dependency: transitive
+    description:
+      name: firebase_auth_web
+      sha256: "52b0224eb46b09f387e99710707be2d3f48da67c74fe14202e4b942cbe8ce9fd"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.1.5"
+  firebase_core:
+    dependency: "direct main"
+    description:
+      name: firebase_core
+      sha256: d5a94b884dcb1e6d3430298e94bfe002238094cdfd5e29202d536ee2120f9158
+      url: "https://pub.dev"
+    source: hosted
+    version: "4.7.0"
+  firebase_core_platform_interface:
+    dependency: transitive
+    description:
+      name: firebase_core_platform_interface
+      sha256: "0ecda14c1bfc9ed8cac303dd0f8d04a320811b479362a9a4efb14fd331a473ce"
+      url: "https://pub.dev"
+    source: hosted
+    version: "6.0.3"
+  firebase_core_web:
+    dependency: transitive
+    description:
+      name: firebase_core_web
+      sha256: dc5096257cd67292d34d78ceeb90836f02a4be921b5f3934311a02bb2376118c
+      url: "https://pub.dev"
+    source: hosted
+    version: "3.6.0"
   fixnum:
     dependency: transitive
     description:
@@ -305,7 +385,7 @@ packages:
     source: sdk
     version: "0.0.0"
   flutter_web_plugins:
-    dependency: "direct main"
+    dependency: transitive
     description: flutter
     source: sdk
     version: "0.0.0"

pubspec.yaml

@@ -12,8 +12,6 @@ dependencies:
   file_picker: ^11.0.2
   flutter:
     sdk: flutter
-  flutter_web_plugins:
-    sdk: flutter
   flutter_localizations:
     sdk: flutter
   flutter_bloc: ^9.1.1
@@ -33,6 +31,9 @@ dependencies:
   uuid: ^4.5.3
   pdf: ^3.12.0
   universal_io: ^2.3.1
+  firebase_core: ^4.7.0
+  firebase_auth: ^6.4.0
+  cloud_firestore: ^6.3.0
 
 dev_dependencies:
   flutter_test:
@@ -46,4 +47,5 @@ flutter:
   assets:
     - assets/images/
     - assets/svg/
+    - assets/schedeRiparazione-1778021345.json
     - .env

web/_redirects

@@ -1 +0,0 @@
-/* /index.html 200

windows/flutter/generated_plugin_registrant.cc

@@ -7,7 +7,10 @@
 #include "generated_plugin_registrant.h"
 
 #include <app_links/app_links_plugin_c_api.h>
+#include <cloud_firestore/cloud_firestore_plugin_c_api.h>
 #include <file_selector_windows/file_selector_windows.h>
+#include <firebase_auth/firebase_auth_plugin_c_api.h>
+#include <firebase_core/firebase_core_plugin_c_api.h>
 #include <pdfx/pdfx_plugin.h>
 #include <permission_handler_windows/permission_handler_windows_plugin.h>
 #include <url_launcher_windows/url_launcher_windows.h>
@@ -15,8 +18,14 @@
 void RegisterPlugins(flutter::PluginRegistry* registry) {
   AppLinksPluginCApiRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("AppLinksPluginCApi"));
+  CloudFirestorePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("CloudFirestorePluginCApi"));
   FileSelectorWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FileSelectorWindows"));
+  FirebaseAuthPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FirebaseAuthPluginCApi"));
+  FirebaseCorePluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("FirebaseCorePluginCApi"));
   PdfxPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("PdfxPlugin"));
   PermissionHandlerWindowsPluginRegisterWithRegistrar(

windows/flutter/generated_plugins.cmake

@@ -4,7 +4,10 @@
 
 list(APPEND FLUTTER_PLUGIN_LIST
   app_links
+  cloud_firestore
   file_selector_windows
+  firebase_auth
+  firebase_core
   pdfx
   permission_handler_windows
   url_launcher_windows