brontomark/flux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

autoreplace service operation

Browse Source
This commit is contained in:
Mark M2 Macbook
2026-05-01 09:51:42 +02:00
parent 87b4661d33
commit 9c8576ada5
26 changed files with 136 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -2,4 +2,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14-all.zip
distributionUrl=https\://operations.gradle.org/distributions/gradle-8.14-all.zip

8
lib/core/routes/app_router.dart
View File

@@ -131,7 +131,7 @@ class AppRouter {
),
),
GoRoute(
path: '/services',
path: '/operations',
builder: (context, state) => const ServicesScreen(),
),
GoRoute(
@@ -168,8 +168,8 @@ class AppRouter {
},
),
GoRoute(
path: '/service-form',
name: 'service-form',
path: '/operation-form',
name: 'operation-form',
builder: (context, state) {
final existingService = state.extra as ServiceModel?;
final serviceId = state.uri.queryParameters['serviceId'];
@@ -184,7 +184,7 @@ class AppRouter {
},
),
GoRoute(
path: '/service/:id/upload',
path: '/operation/:id/upload',
builder: (context, state) {
final serviceId = state.pathParameters['id']!;
final serviceName = state.uri.queryParameters['name'] ?? 'Pratica';

2
lib/core/widgets/flux_text_field.dart
View File

@@ -1,6 +1,6 @@
// lib/ui/common/flux_text_field.dart
import 'package:flutter/material.dart';
import 'package:flutter/services.dart';
import 'package:flutter/operations.dart';
import 'package:flux/core/theme/theme.dart';
class FluxTextField extends StatefulWidget {

2
lib/features/customers/ui/customer_search_sheet.dart
View File

@@ -3,7 +3,7 @@ import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/customers/blocs/customer_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/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
class CustomerSearchSheet extends StatefulWidget {
const CustomerSearchSheet({super.key});

6
lib/features/home/latest_store_services/bloc/latest_store_services_bloc.dart
View File

@@ -29,10 +29,10 @@ class LatestStoreServicesBloc
// Questo gira ad ogni "scatto" dello stream di Supabase
List<ServiceModel> fullyHydratedServices = [];
for (ServiceModel service in rawServices) {
for (ServiceModel operation in rawServices) {
// Peschiamo i dati completi (incluso il cliente)
ServiceModel fullService = await _repository.fetchServiceById(
service.id!,
operation.id!,
);
fullyHydratedServices.add(fullService);
}
@@ -47,7 +47,7 @@ class LatestStoreServicesBloc
onData: (List<ServiceModel> fullyHydratedServices) {
// Qui ora è tutto sincrono e bellissimo
return state.copyWith(
services: fullyHydratedServices,
operations: fullyHydratedServices,
status: LatestStoreServicesStatus.success,
);
},

10
lib/features/home/latest_store_services/bloc/latest_store_services_state.dart
View File

@@ -5,26 +5,26 @@ enum LatestStoreServicesStatus { initial, loading, success, failure }
class LatestStoreServicesState extends Equatable {
final LatestStoreServicesStatus status;
final String? error;
final List<ServiceModel> services;
final List<ServiceModel> operations;
const LatestStoreServicesState({
required this.status,
this.error,
this.services = const [],
this.operations = const [],
});
@override
List<Object?> get props => [status, error, services];
List<Object?> get props => [status, error, operations];
LatestStoreServicesState copyWith({
LatestStoreServicesStatus? status,
String? error,
List<ServiceModel>? services,
List<ServiceModel>? operations,
}) {
return LatestStoreServicesState(
status: status ?? this.status,
error: error,
services: services ?? this.services,
operations: operations ?? this.operations,
);
}
}

16
lib/features/home/latest_store_services/ui/latest_store_services_card.dart
View File

@@ -70,7 +70,7 @@ class _LatestServicesCardContent extends StatelessWidget {
const SizedBox(width: 12),
Expanded(
child: TextButton(
onPressed: () => context.push('/services'),
onPressed: () => context.push('/operations'),
child: Text(
context.l10n.homeLatestServices,
style: TextStyle(
@@ -105,7 +105,7 @@ class _LatestServicesCardContent extends StatelessWidget {
);
}
if (state.services.isEmpty) {
if (state.operations.isEmpty) {
return Center(
child: Text(
"Nessun servizio recente.",
@@ -118,16 +118,16 @@ class _LatestServicesCardContent extends StatelessWidget {
}
return ListView.separated(
itemCount: state.services.length,
itemCount: state.operations.length,
separatorBuilder: (context, index) => Divider(
height: 1,
color: theme.dividerColor.withValues(alpha: 0.3),
),
itemBuilder: (context, index) {
final service = state.services[index];
final operation = state.operations[index];
return InkWell(
onTap: () =>
context.push('/service-form', extra: service),
context.push('/operation-form', extra: operation),
child: Padding(
padding: const EdgeInsets.symmetric(vertical: 8.0),
child: Row(
@@ -136,7 +136,7 @@ class _LatestServicesCardContent extends StatelessWidget {
Expanded(
flex: 5,
child: Text(
service.customerDisplayName ??
operation.customerDisplayName ??
'Cliente sconosciuto',
style: TextStyle(
fontWeight: FontWeight.w700,
@@ -147,7 +147,7 @@ class _LatestServicesCardContent extends StatelessWidget {
Expanded(
flex: 5,
child: Text(
service.number,
operation.number,
style: TextStyle(
fontWeight: FontWeight.w600,
color: context.primaryText,
@@ -157,7 +157,7 @@ class _LatestServicesCardContent extends StatelessWidget {
),
),
Text(
"${service.createdAt?.day}/${service.createdAt?.month}",
"${operation.createdAt?.day}/${operation.createdAt?.month}",
style: TextStyle(
color: context.secondaryText,
fontSize: 12,

2
lib/features/home/ui/home_screen.dart
View File

@@ -185,7 +185,7 @@ class HomeScreen extends StatelessWidget {
color: Colors.blue,
onTap: () {
// Entriamo nel form! Nessun parametro extra = Nuovo Servizio
context.push('/service-form');
context.push('/operation-form');
},
),
const SizedBox(width: 12),

2
lib/features/onboarding/ui/store_onboarding_form.dart
View File

@@ -1,5 +1,5 @@
import 'package:flutter/material.dart';
import 'package:flutter/services.dart'; // <-- IMPORTANTE per i formatter
import 'package:flutter/operations.dart'; // <-- IMPORTANTE per i formatter
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/core/widgets/flux_text_field.dart';
import 'package:flux/features/master_data/store/models/store_model.dart';

0
lib/features/operations/blocs/services_cubit.dart → lib/features/operations/blocs/operations_cubit.dart
View File

6
lib/features/operations/blocs/service_files_events.dart
View File

@@ -17,11 +17,11 @@ class ServiceSavedEvent extends ServiceFilesEvent {
class LoadServiceFilesEvent extends ServiceFilesEvent {
final String? serviceId;
final ServiceModel? service;
const LoadServiceFilesEvent({this.serviceId, this.service});
final ServiceModel? operation;
const LoadServiceFilesEvent({this.serviceId, this.operation});
@override
List<Object?> get props => [serviceId, service];
List<Object?> get props => [serviceId, operation];
}
class AddServiceFilesEvent extends ServiceFilesEvent {

2
lib/features/operations/blocs/services_state.dart
View File

@@ -1,4 +1,4 @@
part of 'services_cubit.dart';
part of 'operations_cubit.dart';
enum ServicesStatus {
initial,

42
lib/features/operations/data/services_repository.dart
View File

@@ -18,7 +18,7 @@ class ServicesRepository {
Future<ServiceModel> fetchServiceById(String id) async {
try {
final response = await _supabase
.from('service')
.from('operation')
.select('''
*,
customer(nome),
@@ -47,7 +47,7 @@ class ServicesRepository {
try {
// Nota: 'customer(name, surname)' serve per il display name nella card
var query = _supabase
.from('service')
.from('operation')
.select('''
*,
customer(nome),
@@ -89,7 +89,7 @@ class ServicesRepository {
required int limit,
}) {
return _supabase
.from('service')
.from('operation')
.stream(primaryKey: ['id'])
.eq('store_id', storeId)
.order('created_at', ascending: false)
@@ -101,12 +101,12 @@ class ServicesRepository {
}
// --- SALVATAGGIO COMPLETO (PRIMA PADRE, POI FIGLI) ---
Future<ServiceModel> saveFullService(ServiceModel service) async {
Future<ServiceModel> saveFullService(ServiceModel operation) async {
try {
// 1. Upsert del record principale
final serviceData = await _supabase
.from('service')
.upsert(service.toMap())
.from('operation')
.upsert(operation.toMap())
.select()
.single();
@@ -114,7 +114,7 @@ class ServicesRepository {
// 2. MODIFICA: Pulizia atomica dei figli
// Se stiamo modificando (id != null), resettiamo le tabelle collegate
if (service.id != null) {
if (operation.id != null) {
await Future.wait([
_supabase.from('energy_service').delete().eq('service_id', newId),
_supabase.from('fin_service').delete().eq('service_id', newId),
@@ -129,36 +129,36 @@ class ServicesRepository {
// 3. Inserimento dei moduli in parallelo per velocità
final List<Future> insertTasks = [];
if (service.energyServices.isNotEmpty) {
if (operation.energyServices.isNotEmpty) {
insertTasks.add(
_supabase
.from('energy_service')
.insert(
service.energyServices
operation.energyServices
.map((item) => item.copyWith(serviceId: newId).toMap())
.toList(),
),
);
}
if (service.finServices.isNotEmpty) {
if (operation.finServices.isNotEmpty) {
insertTasks.add(
_supabase
.from('fin_service')
.insert(
service.finServices
operation.finServices
.map((item) => item.copyWith(serviceId: newId).toMap())
.toList(),
),
);
}
if (service.entertainmentServices.isNotEmpty) {
if (operation.entertainmentServices.isNotEmpty) {
insertTasks.add(
_supabase
.from('entertainment_service')
.insert(
service.entertainmentServices
operation.entertainmentServices
.map((item) => item.copyWith(serviceId: newId).toMap())
.toList(),
),
@@ -171,7 +171,7 @@ class ServicesRepository {
// 4. UPLOAD DEI FILE LOCALI (Nuovi)
// Filtriamo solo i file che non hanno ancora un ID (quindi sono locali)
final localFilesToUpload = service.files
final localFilesToUpload = operation.files
.where((f) => f.id == null)
.toList();
@@ -180,7 +180,7 @@ class ServicesRepository {
for (var file in localFilesToUpload) {
final storagePath =
'$companyId/services/$newId/${DateTime.now().millisecondsSinceEpoch}_${file.name}.${file.extension}';
'$companyId/operations/$newId/${DateTime.now().millisecondsSinceEpoch}_${file.name}.${file.extension}';
final String mimeType = file.extension.toLowerCase() == 'pdf'
? 'application/pdf'
: 'image/${file.extension}';
@@ -216,7 +216,7 @@ class ServicesRepository {
// Interroghiamo Supabase per farci restituire la pratica con TUTTI gli ID generati
// (inclusi quelli della tabella service_file appena inseriti)
final updatedServiceData = await _supabase
.from('service')
.from('operation')
.select('''
*,
energy_service(*),
@@ -237,7 +237,7 @@ class ServicesRepository {
// --- ELIMINAZIONE ---
Future<void> deleteService(String id) async {
try {
await _supabase.from('service').delete().eq('id', id);
await _supabase.from('operation').delete().eq('id', id);
} catch (e) {
throw Exception('Errore durante l\'eliminazione: $e');
}
@@ -247,11 +247,11 @@ class ServicesRepository {
Future<List<String>> fetchTopEntertainmentTypes(String companyId) async {
try {
// Cerchiamo i tipi più frequenti associati ai servizi di questa company
// Nota: dobbiamo passare attraverso la tabella 'service' per filtrare per company_id
// Nota: dobbiamo passare attraverso la tabella 'operation' per filtrare per company_id
final response = await _supabase
.from('entertainment_service')
.select('type, service!inner(store!inner(company_id))')
.eq('service.store.company_id', companyId)
.select('type, operation!inner(store!inner(company_id))')
.eq('operation.store.company_id', companyId)
.limit(100); // Prendiamo un campione
// Logica rapida per contare le occorrenze e prendere i primi 5
@@ -297,7 +297,7 @@ class ServicesRepository {
'_',
);
final storagePath =
'$companyId/services/$serviceId/${DateTime.now().millisecondsSinceEpoch}_$cleanFileName';
'$companyId/operations/$serviceId/${DateTime.now().millisecondsSinceEpoch}_$cleanFileName';
final int fileSize = pickedFile.size;
final fileToSave = ServiceFileModel(
serviceId: serviceId,

4
lib/features/operations/ui/service_form_screen/attachment_section.dart
View File

@@ -6,7 +6,7 @@ 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/operations/blocs/service_files_bloc.dart';
import 'package:flux/features/operations/blocs/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/models/service_file_model.dart';
class AttachmentsSection extends StatelessWidget {
@@ -310,7 +310,7 @@ class AttachmentsSection extends StatelessWidget {
},
child: QrUploadDialog(
deepLinkUrl:
'fluxapp:///service/${currentService!.id}/upload?name=${Uri.encodeComponent(nomePratica)}',
'fluxapp:///operation/${currentService!.id}/upload?name=${Uri.encodeComponent(nomePratica)}',
title: 'Scatta per\n$nomePratica',
),
),

10
lib/features/operations/ui/service_form_screen/customer_section.dart
View File

@@ -3,9 +3,9 @@ import 'package:flux/features/customers/ui/customer_search_sheet.dart';
import 'package:flux/features/operations/models/service_model.dart';
class CustomerSection extends StatelessWidget {
final ServiceModel service;
final ServiceModel operation;
const CustomerSection({super.key, required this.service});
const CustomerSection({super.key, required this.operation});
void _openCustomerSearch(BuildContext context) {
showModalBottomSheet(
@@ -28,8 +28,8 @@ class CustomerSection extends StatelessWidget {
@override
Widget build(BuildContext context) {
// Niente BlocBuilder qui! Leggiamo solo la variabile 'service'
final hasCustomer = service.customerId != null;
// Niente BlocBuilder qui! Leggiamo solo la variabile 'operation'
final hasCustomer = operation.customerId != null;
return Card(
elevation: 2,
@@ -74,7 +74,7 @@ class CustomerSection extends StatelessWidget {
children: [
Expanded(
child: Text(
service.customerDisplayName ?? "Cliente Selezionato",
operation.customerDisplayName ?? "Cliente Selezionato",
style: const TextStyle(
fontSize: 16,
fontWeight: FontWeight.bold,

12
lib/features/operations/ui/service_form_screen/energy_service_dialog.dart
View File

@@ -63,7 +63,7 @@ class _EnergyServiceDialogState extends State<EnergyServiceDialog> {
},
)
: _EnergyList(
services: _tempList,
operations: _tempList,
onDelete: (index) {
setState(() => _tempList.removeAt(index));
},
@@ -101,14 +101,14 @@ class _EnergyServiceDialogState extends State<EnergyServiceDialog> {
// VISTA 1: LA LISTA DEI CONTRATTI
// ==========================================
class _EnergyList extends StatelessWidget {
final List<EnergyServiceModel> services;
final List<EnergyServiceModel> operations;
final List<ProviderModel>
activeProviders; // <--- NUOVO: La lista vera dal Cubit
final Function(int) onDelete;
final VoidCallback onAddTap;
const _EnergyList({
required this.services,
required this.operations,
required this.activeProviders, // <--- Richiesto
required this.onDelete,
required this.onAddTap,
@@ -120,7 +120,7 @@ class _EnergyList extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (services.isEmpty)
if (operations.isEmpty)
const Padding(
padding: EdgeInsets.symmetric(vertical: 32.0),
child: Text(
@@ -133,10 +133,10 @@ class _EnergyList extends StatelessWidget {
Flexible(
child: ListView.separated(
shrinkWrap: true,
itemCount: services.length,
itemCount: operations.length,
separatorBuilder: (_, _) => const Divider(height: 1),
itemBuilder: (context, index) {
final s = services[index];
final s = operations[index];
final isLuce = s.type == EnergyType.luce;
// LA MAGIA: Troviamo il nome partendo dall'ID salvato nel servizio

12
lib/features/operations/ui/service_form_screen/entertainment_service_card.dart
View File

@@ -67,7 +67,7 @@ class _EntertainmentServiceDialogState
builder: (context, state) {
// Passiamo allProviders per garantire la visione dello storico
return _EntertainmentList(
services: _tempList,
operations: _tempList,
allProviders: state.allProviders,
onDelete: (index) =>
setState(() => _tempList.removeAt(index)),
@@ -94,13 +94,13 @@ class _EntertainmentServiceDialogState
}
class _EntertainmentList extends StatelessWidget {
final List<EntertainmentServiceModel> services;
final List<EntertainmentServiceModel> operations;
final List<ProviderModel> allProviders;
final Function(int) onDelete;
final VoidCallback onAddTap;
const _EntertainmentList({
required this.services,
required this.operations,
required this.allProviders,
required this.onDelete,
required this.onAddTap,
@@ -112,7 +112,7 @@ class _EntertainmentList extends StatelessWidget {
mainAxisSize: MainAxisSize.min,
crossAxisAlignment: CrossAxisAlignment.stretch,
children: [
if (services.isEmpty)
if (operations.isEmpty)
const Padding(
padding: EdgeInsets.symmetric(vertical: 32.0),
child: Text(
@@ -125,10 +125,10 @@ class _EntertainmentList extends StatelessWidget {
Flexible(
child: ListView.separated(
shrinkWrap: true,
itemCount: services.length,
itemCount: operations.length,
separatorBuilder: (_, _) => const Divider(height: 1),
itemBuilder: (context, index) {
final s = services[index];
final s = operations[index];
final providerName = allProviders
.firstWhere(

12
lib/features/operations/ui/service_form_screen/finance_service_dialog.dart
View File

@@ -74,7 +74,7 @@ class _FinanceServiceDialogState extends State<FinanceServiceDialog> {
return BlocBuilder<ProductCubit, ProductState>(
builder: (context, prodState) {
return _FinanceList(
services: _tempList,
operations: _tempList,
allProviders:
provState.allProviders, // Per vedere lo storico
allModels: prodState.models,
@@ -109,14 +109,14 @@ class _FinanceServiceDialogState extends State<FinanceServiceDialog> {
// VISTA LISTA (STORICA)
// ===========================================================================
class _FinanceList extends StatelessWidget {
final List<FinServiceModel> services;
final List<FinServiceModel> operations;
final List<ProviderModel> allProviders;
final List<ModelModel> allModels;
final Function(int) onDelete;
final VoidCallback onAddTap;
const _FinanceList({
required this.services,
required this.operations,
required this.allProviders,
required this.allModels,
required this.onDelete,
@@ -125,7 +125,7 @@ class _FinanceList extends StatelessWidget {
@override
Widget build(BuildContext context) {
if (services.isEmpty) {
if (operations.isEmpty) {
return Column(
mainAxisSize: MainAxisSize.min,
children: [
@@ -151,10 +151,10 @@ class _FinanceList extends StatelessWidget {
Flexible(
child: ListView.separated(
shrinkWrap: true,
itemCount: services.length,
itemCount: operations.length,
separatorBuilder: (_, _) => const Divider(),
itemBuilder: (context, index) {
final s = services[index];
final s = operations[index];
// Cerchiamo il nome del provider in TUTTI quelli caricati (storico)
final providerName = allProviders

14
lib/features/operations/ui/service_form_screen/general_info_section.dart
View File

@@ -1,11 +1,11 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/operations/blocs/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/models/service_model.dart';
class GeneralInfoSection extends StatelessWidget {
final ServiceModel service;
const GeneralInfoSection({super.key, required this.service});
final ServiceModel operation;
const GeneralInfoSection({super.key, required this.operation});
@override
Widget build(BuildContext context) {
@@ -34,7 +34,7 @@ class GeneralInfoSection extends StatelessWidget {
// Numero di Riferimento / Telefono
TextFormField(
initialValue: service.number,
initialValue: operation.number,
keyboardType: TextInputType
.phone, // Fa aprire il tastierino numerico su mobile
decoration: const InputDecoration(
@@ -59,7 +59,7 @@ class GeneralInfoSection extends StatelessWidget {
"Pratica in lavorazione",
style: TextStyle(fontSize: 12),
),
value: service.isBozza,
value: operation.isBozza,
activeThumbColor: Colors.orange,
contentPadding: EdgeInsets.zero,
onChanged: (val) {
@@ -75,7 +75,7 @@ class GeneralInfoSection extends StatelessWidget {
"Esito positivo",
style: TextStyle(fontSize: 12),
),
value: service.resultOk,
value: operation.resultOk,
activeThumbColor: Colors.green,
contentPadding: EdgeInsets.zero,
onChanged: (val) {
@@ -89,7 +89,7 @@ class GeneralInfoSection extends StatelessWidget {
// Campo Note
TextFormField(
initialValue: service.note,
initialValue: operation.note,
maxLines: 4,
minLines: 2,
decoration: const InputDecoration(

14
lib/features/operations/ui/service_form_screen/service_form_screen.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/operations/blocs/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/models/service_model.dart';
import 'package:flux/features/operations/ui/service_form_screen/attachment_section.dart';
import 'package:flux/features/operations/ui/service_form_screen/customer_section.dart';
@@ -70,7 +70,7 @@ class _ServiceFormScreenState extends State<ServiceFormScreen> {
}
},
builder: (context, state) {
final service = state.currentService;
final operation = state.currentService;
final isSaving = state.status == ServicesStatus.saving;
final isEditMode = widget.serviceId != null;
@@ -89,7 +89,7 @@ class _ServiceFormScreenState extends State<ServiceFormScreen> {
),
),
)
else if (service != null) ...[
else if (operation != null) ...[
IconButton(
icon: const Icon(Icons.edit_note),
tooltip: "Salva come Bozza",
@@ -107,20 +107,20 @@ class _ServiceFormScreenState extends State<ServiceFormScreen> {
],
],
),
body: (service == null)
body: (operation == null)
? const Center(child: CircularProgressIndicator())
: SingleChildScrollView(
padding: const EdgeInsets.all(16),
child: Column(
crossAxisAlignment: CrossAxisAlignment.start,
children: [
CustomerSection(service: service),
CustomerSection(operation: operation),
const SizedBox(height: 24),
GeneralInfoSection(service: service),
GeneralInfoSection(operation: operation),
const SizedBox(height: 24),
ServicesGrid(service: service),
ServicesGrid(operation: operation),
const SizedBox(height: 32),
AttachmentsSection(),

46
lib/features/operations/ui/service_form_screen/services_grid.dart
View File

@@ -1,7 +1,7 @@
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/operations/blocs/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/models/energy_service_model.dart';
import 'package:flux/features/operations/models/entertainment_service_model.dart';
import 'package:flux/features/operations/models/fin_service_model.dart';
@@ -13,9 +13,9 @@ import 'package:flux/features/operations/ui/service_form_screen/finance_service_
import 'package:flux/features/operations/ui/service_form_screen/int_dialogs.dart'; // Assicurati di importare il modello
class ServicesGrid extends StatelessWidget {
final ServiceModel service;
final ServiceModel operation;
const ServicesGrid({super.key, required this.service});
const ServicesGrid({super.key, required this.operation});
@override
Widget build(BuildContext context) {
@@ -52,65 +52,65 @@ class ServicesGrid extends StatelessWidget {
// --- CONTATORI SEMPLICI ---
ActionCard(
label: "AL",
count: service.al,
count: operation.al,
icon: Icons.sim_card,
color: Colors.blue,
onTap: () => updateCountDialog(
context,
"AL",
service.al,
operation.al,
(val) =>
context.read<ServicesCubit>().updateField(al: val),
),
),
ActionCard(
label: "MNP",
count: service.mnp,
count: operation.mnp,
icon: Icons.phone_android,
color: Colors.indigo,
onTap: () => updateCountDialog(
context,
"MNP",
service.mnp,
operation.mnp,
(val) =>
context.read<ServicesCubit>().updateField(mnp: val),
),
),
ActionCard(
label: "NIP",
count: service.nip,
count: operation.nip,
icon: Icons.compare_arrows,
color: Colors.cyan,
onTap: () => updateCountDialog(
context,
"NIP",
service.nip,
operation.nip,
(val) =>
context.read<ServicesCubit>().updateField(nip: val),
),
),
ActionCard(
label: "Unica",
count: service.unica,
count: operation.unica,
icon: Icons.all_inclusive,
color: Colors.purple,
onTap: () => updateCountDialog(
context,
"Unica",
service.unica,
operation.unica,
(val) =>
context.read<ServicesCubit>().updateField(unica: val),
),
),
ActionCard(
label: "Telepass",
count: service.telepass,
count: operation.telepass,
icon: Icons.directions_car,
color: Colors.amber.shade700,
onTap: () => updateCountDialog(
context,
"Telepass",
service.telepass,
operation.telepass,
(val) => context.read<ServicesCubit>().updateField(
telepass: val,
),
@@ -120,7 +120,7 @@ class ServicesGrid extends StatelessWidget {
// --- MODULI COMPLESSI (Le liste) ---
ActionCard(
label: "Energia",
count: service.energyServices.length,
count: operation.energyServices.length,
icon: Icons.bolt,
color: Colors.green,
onTap: () async {
@@ -128,8 +128,8 @@ class ServicesGrid extends StatelessWidget {
final result = await showDialog<List<EnergyServiceModel>>(
context: context,
builder: (context) => EnergyServiceDialog(
currentStoreId: service.storeId,
initialServices: service
currentStoreId: operation.storeId,
initialServices: operation
.energyServices, // Passiamo la lista attuale
),
);
@@ -144,7 +144,7 @@ class ServicesGrid extends StatelessWidget {
),
ActionCard(
label: "Finanziam.",
count: service.finServices.length,
count: operation.finServices.length,
icon: Icons.euro_symbol,
color: Colors.teal,
onTap: () async {
@@ -152,9 +152,9 @@ class ServicesGrid extends StatelessWidget {
context: context,
builder: (context) => FinanceServiceDialog(
productCubit: context.read<ProductCubit>(),
currentStoreId: service.storeId,
initialServices:
service.finServices, // Passiamo la lista attuale
currentStoreId: operation.storeId,
initialServices: operation
.finServices, // Passiamo la lista attuale
),
);
@@ -165,7 +165,7 @@ class ServicesGrid extends StatelessWidget {
),
ActionCard(
label: "Intratten.",
count: service.entertainmentServices.length,
count: operation.entertainmentServices.length,
icon: Icons.movie_filter_outlined,
color: Colors.purple,
onTap: () async {
@@ -173,8 +173,8 @@ class ServicesGrid extends StatelessWidget {
await showDialog<List<EntertainmentServiceModel>>(
context: context,
builder: (context) => EntertainmentServiceDialog(
initialServices: service.entertainmentServices,
currentStoreId: service.storeId,
initialServices: operation.entertainmentServices,
currentStoreId: operation.storeId,
),
);

30
lib/features/operations/ui/services_screen.dart
View File

@@ -1,6 +1,6 @@
import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/operations/blocs/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/models/service_model.dart';
import 'package:flux/features/operations/utils/service_actions.dart';
import 'package:go_router/go_router.dart';
@@ -107,8 +107,8 @@ class _ServicesScreenState extends State<ServicesScreen> {
);
}
final service = state.allServices[index];
return _buildServiceCard(context, service);
final operation = state.allServices[index];
return _buildServiceCard(context, operation);
},
),
);
@@ -121,7 +121,7 @@ class _ServicesScreenState extends State<ServicesScreen> {
);
}
Widget _buildServiceCard(BuildContext context, ServiceModel service) {
Widget _buildServiceCard(BuildContext context, ServiceModel operation) {
return Card(
margin: const EdgeInsets.symmetric(horizontal: 12, vertical: 6),
elevation: 2,
@@ -132,14 +132,14 @@ class _ServicesScreenState extends State<ServicesScreen> {
children: [
Expanded(
child: Text(
service.customerDisplayName ?? "Cliente sconosciuto",
operation.customerDisplayName ?? "Cliente sconosciuto",
style: const TextStyle(
fontWeight: FontWeight.bold,
fontSize: 16,
),
),
),
if (service.isBozza)
if (operation.isBozza)
const Chip(
label: Text(
"BOZZA",
@@ -155,20 +155,20 @@ class _ServicesScreenState extends State<ServicesScreen> {
children: [
const SizedBox(height: 4),
Text(
"Pratica: ${service.number} • ${service.createdAt?.day}/${service.createdAt?.month}/${service.createdAt?.year}",
"Pratica: ${operation.number} • ${operation.createdAt?.day}/${operation.createdAt?.month}/${operation.createdAt?.year}",
),
const SizedBox(height: 8),
// I nostri mini-chip per i servizi attivati
Wrap(
spacing: 6,
children: [
if (service.al > 0 || service.mnp > 0)
if (operation.al > 0 || operation.mnp > 0)
_miniBadge("📞 Tel", Colors.blue),
if (service.energyServices.isNotEmpty)
if (operation.energyServices.isNotEmpty)
_miniBadge("⚡ Energy", Colors.green),
if (service.finServices.isNotEmpty)
if (operation.finServices.isNotEmpty)
_miniBadge("💰 Fin", Colors.purple),
if (service.entertainmentServices.isNotEmpty)
if (operation.entertainmentServices.isNotEmpty)
_miniBadge("📺 Ent", Colors.red),
],
),
@@ -176,10 +176,12 @@ class _ServicesScreenState extends State<ServicesScreen> {
),
trailing: const Icon(Icons.chevron_right),
onTap: () => context.pushNamed(
'service-form',
extra: service, // <-- LA MAGIA È QUI: Passa l'oggetto intero!
'operation-form',
extra: operation, // <-- LA MAGIA È QUI: Passa l'oggetto intero!
// Teniamo anche il parametro URL per coerenza di routing
queryParameters: service.id != null ? {'serviceId': service.id!} : {},
queryParameters: operation.id != null
? {'serviceId': operation.id!}
: {},
),
),
);

4
lib/features/operations/utils/service_actions.dart
View File

@@ -2,7 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/core/blocs/session/session_cubit.dart';
import 'package:flux/features/master_data/store/bloc/store_cubit.dart';
import 'package:flux/features/operations/blocs/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/models/service_model.dart';
import 'package:go_router/go_router.dart';
@@ -67,7 +67,7 @@ void startNewService(BuildContext context) {
Navigator.pop(modalContext);
// 3. Naviga verso il form
context.pushNamed('service-form');
context.pushNamed('operation-form');
},
),
),

6
lib/l10n/app_en.arb
View File

@@ -1,13 +1,13 @@
{
"@@locale": "en",
"welcomeBack": "Welcome back, {name}! 👋",
"latestServices": "Latest Services",
"latestServices": "Latest Operations",
"masterData": "Master Data",
"settings": "Settings",
"newService": "Service",
"newService": "Operation",
"expiring_contracts": "Expiring Contracts",
"sticky_notes": "Sticky Notes",
"my_tasks": "My Tasks",
"latest_service_tickets": "Latest service tickets"
"latest_service_tickets": "Latest operation tickets"
}

2
lib/main.dart
View File

@@ -26,7 +26,7 @@ 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/services_cubit.dart';
import 'package:flux/features/operations/blocs/operations_cubit.dart';
import 'package:flux/features/operations/data/services_repository.dart';
import 'package:flux/features/settings/settings.dart';

4
macos/Runner/Base.lproj/MainMenu.xib
View File

@@ -35,9 +35,9 @@
<menuItem isSeparatorItem="YES" id="VOq-y0-SEH"/>
<menuItem title="Preferences…" keyEquivalent="," id="BOF-NM-1cW"/>
<menuItem isSeparatorItem="YES" id="wFC-TO-SCJ"/>
<menuItem title="Services" id="NMo-om-nkz">
<menuItem title="Operations" id="NMo-om-nkz">
<modifierMask key="keyEquivalentModifierMask"/>
<menu key="submenu" title="Services" systemMenu="services" id="hz9-B4-Xy5"/>
<menu key="submenu" title="Operations" systemMenu="operations" id="hz9-B4-Xy5"/>
</menuItem>
<menuItem isSeparatorItem="YES" id="4je-JR-u6R"/>
<menuItem title="Hide APP_NAME" keyEquivalent="h" id="Olw-nP-bQN">