This commit is contained in:
2026-05-16 19:34:33 +02:00
parent a8c9e0f253
commit 1a21b44bc8
6 changed files with 103 additions and 72 deletions

View File

@@ -1,5 +1,9 @@
import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/tickets/data/tickets_shipment_repository.dart';
import 'package:flux/features/tickets/models/shipment_document_model.dart';
import 'package:flux/features/tickets/models/ticket_model.dart'; import 'package:flux/features/tickets/models/ticket_model.dart';
import 'package:flux/features/tickets/data/ticket_repository.dart'; import 'package:flux/features/tickets/data/ticket_repository.dart';
import 'package:get_it/get_it.dart'; import 'package:get_it/get_it.dart';

View File

@@ -1,3 +1,5 @@
import 'dart:typed_data';
import 'package:equatable/equatable.dart'; import 'package:equatable/equatable.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/core/blocs/session/session_cubit.dart'; import 'package:flux/core/blocs/session/session_cubit.dart';
@@ -8,6 +10,7 @@ import 'package:flux/features/master_data/providers/models/provider_model.dart';
import 'package:flux/features/settings/document_sequence/data/document_sequence_repository.dart'; import 'package:flux/features/settings/document_sequence/data/document_sequence_repository.dart';
import 'package:flux/features/settings/document_sequence/models/document_sequence_model.dart'; import 'package:flux/features/settings/document_sequence/models/document_sequence_model.dart';
import 'package:flux/features/tickets/models/ticket_model.dart'; import 'package:flux/features/tickets/models/ticket_model.dart';
import 'package:flux/features/tickets/utils/ticket_shipping_pdf_service.dart';
import 'package:get_it/get_it.dart'; import 'package:get_it/get_it.dart';
part 'ticket_shipping_state.dart'; part 'ticket_shipping_state.dart';
@@ -17,18 +20,19 @@ class TicketShippingCubit extends Cubit<TicketShippingState> {
GetIt.I<TicketsShipmentRepository>(); GetIt.I<TicketsShipmentRepository>();
final DocumentSequenceRepository _sequenceRepository = final DocumentSequenceRepository _sequenceRepository =
GetIt.I<DocumentSequenceRepository>(); GetIt.I<DocumentSequenceRepository>();
TicketShippingCubit({required List<String> ticketIds}) TicketShippingCubit({required List<TicketModel> tickets})
: super( : super(
TicketShippingState( TicketShippingState(
// Inizializziamo il modello direttamente nello stato! // Inizializziamo il modello direttamente nello stato!
document: ShipmentDocumentModel( document: ShipmentDocumentModel(
companyId: GetIt.I.get<SessionCubit>().state.company!.id!, companyId: GetIt.I.get<SessionCubit>().state.company!.id!,
ticketIds: ticketIds, ticketIds: tickets.map((t) => t.id!).toList(),
providerId: '', // Sarà riempito alla selezione providerId: '', // Sarà riempito alla selezione
destinationLocationId: '', // Sarà riempito alla selezione destinationLocationId: '', // Sarà riempito alla selezione
docNumber: '', docNumber: '',
docDate: DateTime.now(), docDate: DateTime.now(),
), ),
tickets: tickets,
), ),
); );
@@ -140,25 +144,35 @@ class TicketShippingCubit extends Cubit<TicketShippingState> {
DocumentType.shipment.name, DocumentType.shipment.name,
); );
updateDocument(docNumber: nextNumber); updateDocument(docNumber: nextNumber);
// 3. GENERIAMO I BYTES DEL PDF
final provider = state.availableProviders.firstWhere(
(p) => p.id == state.document.providerId,
);
final location = state.availableLocations.firstWhere(
(l) => l.id == state.document.destinationLocationId,
);
final pdfBytes = await TicketShippingPdfService.generateDdt(
company: GetIt.I.get<SessionCubit>().state.company!,
provider: provider,
location: location,
document: state.document,
tickets: state.tickets,
);
await _repository.createShipmentWithPdf(
document: state.document,
pdfBytes: pdfBytes,
newTicketStatus: newTicketStatus.value,
);
emit(
state.copyWith(
status: TicketShippingStatus.success,
pdfBytes: pdfBytes,
),
);
} catch (e) { } catch (e) {
emit(state.copyWith(isAutoNumber: false, errorMessage: e.toString())); emit(state.copyWith(isAutoNumber: false, errorMessage: e.toString()));
return; return;
} }
} }
try {
await _repository.createShipmentDocument(
document: state.document,
newTicketStatus: newTicketStatus,
);
emit(state.copyWith(status: TicketShippingStatus.success));
} catch (e) {
emit(
state.copyWith(
status: TicketShippingStatus.failure,
errorMessage: e.toString(),
),
);
}
} }
} }

View File

@@ -4,7 +4,9 @@ enum TicketShippingStatus { initial, loading, success, failure }
class TicketShippingState extends Equatable { class TicketShippingState extends Equatable {
final TicketShippingStatus status; final TicketShippingStatus status;
final ShipmentDocumentModel document; // Il nostro eroe! final ShipmentDocumentModel document;
final List<TicketModel> tickets;
final Uint8List? pdfBytes; // Per tenere il PDF in memoria dopo la generazione
// Dati di supporto per la UI // Dati di supporto per la UI
final List<ProviderModel> availableProviders; final List<ProviderModel> availableProviders;
@@ -15,10 +17,12 @@ class TicketShippingState extends Equatable {
const TicketShippingState({ const TicketShippingState({
this.status = TicketShippingStatus.initial, this.status = TicketShippingStatus.initial,
required this.document, required this.document,
required this.tickets,
this.availableProviders = const [], this.availableProviders = const [],
this.availableLocations = const [], this.availableLocations = const [],
this.isAutoNumber = true, this.isAutoNumber = true,
this.errorMessage, this.errorMessage,
this.pdfBytes,
}); });
TicketShippingState copyWith({ TicketShippingState copyWith({
@@ -28,14 +32,17 @@ class TicketShippingState extends Equatable {
List<ProviderLocationModel>? availableLocations, List<ProviderLocationModel>? availableLocations,
bool? isAutoNumber, bool? isAutoNumber,
String? errorMessage, String? errorMessage,
Uint8List? pdfBytes,
}) { }) {
return TicketShippingState( return TicketShippingState(
status: status ?? this.status, status: status ?? this.status,
document: document ?? this.document, document: document ?? this.document,
tickets: tickets,
availableProviders: availableProviders ?? this.availableProviders, availableProviders: availableProviders ?? this.availableProviders,
availableLocations: availableLocations ?? this.availableLocations, availableLocations: availableLocations ?? this.availableLocations,
isAutoNumber: isAutoNumber ?? this.isAutoNumber, isAutoNumber: isAutoNumber ?? this.isAutoNumber,
errorMessage: errorMessage ?? this.errorMessage, errorMessage: errorMessage ?? this.errorMessage,
pdfBytes: pdfBytes ?? this.pdfBytes,
); );
} }
@@ -43,9 +50,11 @@ class TicketShippingState extends Equatable {
List<Object?> get props => [ List<Object?> get props => [
status, status,
document, document,
tickets,
availableProviders, availableProviders,
availableLocations, availableLocations,
isAutoNumber, isAutoNumber,
errorMessage, errorMessage,
pdfBytes,
]; ];
} }

View File

@@ -1,3 +1,5 @@
import 'dart:typed_data';
import 'package:flux/features/tickets/models/shipment_document_model.dart'; import 'package:flux/features/tickets/models/shipment_document_model.dart';
import 'package:flux/features/master_data/providers/models/provider_model.dart'; import 'package:flux/features/master_data/providers/models/provider_model.dart';
import 'package:flux/features/master_data/providers/models/provider_role.dart'; import 'package:flux/features/master_data/providers/models/provider_role.dart';
@@ -29,22 +31,51 @@ class TicketsShipmentRepository {
} }
} }
// NUOVO METODO: Salva il DDT e aggiorna i Ticket /// Salva il DDT nel DB, fa l'upload del PDF nello Storage e aggiorna il path
Future<void> createShipmentDocument({ Future<String> createShipmentWithPdf({
required ShipmentDocumentModel document, required ShipmentDocumentModel document,
required TicketStatus newTicketStatus, // es: 'shipped' o 'inExternalLab' required Uint8List pdfBytes,
required String newTicketStatus,
}) async { }) async {
try { try {
// 1. Inseriamo il singolo Documento di Trasporto // 1. Definiamo un percorso unico e ordinato per il file nello Storage
await _supabase.from('shipment_documents').insert(document.toMap()); // Struttura: company_id / ddt / anno / numero_ddt.pdf
final year = document.docDate.year;
final cleanedDocNumber = document.docNumber
.replaceAll('/', '_')
.replaceAll(' ', '_');
final storagePath =
'${document.companyId}/ddt/$year/$cleanedDocNumber.pdf';
// 2. Aggiorniamo lo stato di TUTTI i ticket inclusi nel DDT // 2. Facciamo l'upload dei bytes grezzi nel bucket 'company_documents'
await _supabase.storage
.from('company_documents')
.uploadBinary(
storagePath,
pdfBytes,
fileOptions: const FileOptions(
contentType: 'application/pdf',
upsert: true,
),
);
// 3. Creiamo la mappa del documento includendo il percorso dello storage
final documentData = document.toMap();
documentData['storage_path'] = storagePath;
// 4. Inseriamo il Documento di Trasporto nel DB
await _supabase.from('shipment_documents').insert(documentData);
// 5. Aggiorniamo lo stato di TUTTI i ticket inclusi nel DDT
await _supabase await _supabase
.from('ticket') .from('ticket')
.update({'ticket_status': newTicketStatus.value}) .update({'ticket_status': newTicketStatus})
.inFilter('id', document.ticketIds); .inFilter('id', document.ticketIds);
// Restituiamo lo storagePath per usarlo subito nell'interfaccia se serve
return storagePath;
} catch (e) { } catch (e) {
throw ('Errore durante la creazione della spedizione: $e'); throw ('Errore durante il salvataggio e upload della spedizione: $e');
} }
} }
} }

View File

@@ -1,3 +1,6 @@
import 'dart:ffi';
import 'dart:typed_data';
import 'package:flutter/material.dart'; import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/core/blocs/session/session_cubit.dart'; import 'package:flux/core/blocs/session/session_cubit.dart';
@@ -7,6 +10,7 @@ import 'package:flux/features/master_data/providers/models/provider_model.dart';
import 'package:flux/features/tickets/blocs/ticket_list_cubit.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/blocs/ticket_list_state.dart';
import 'package:flux/features/tickets/blocs/ticket_shipping_cubit.dart'; import 'package:flux/features/tickets/blocs/ticket_shipping_cubit.dart';
import 'package:flux/features/tickets/models/ticket_model.dart';
import 'package:flux/features/tickets/ui/widgets/ticket_list_card.dart'; import 'package:flux/features/tickets/ui/widgets/ticket_list_card.dart';
import 'package:flux/features/tickets/ui/widgets/ticket_shipping_modal.dart'; import 'package:flux/features/tickets/ui/widgets/ticket_shipping_modal.dart';
import 'package:flux/features/tickets/utils/ticket_shipping_pdf_service.dart'; import 'package:flux/features/tickets/utils/ticket_shipping_pdf_service.dart';
@@ -99,22 +103,14 @@ class TicketList extends StatelessWidget {
FilledButton.icon( FilledButton.icon(
onPressed: () async { onPressed: () async {
// 1. Apriamo la modale e ASPETTIAMO il risultato (tipizzandolo come Record) // 1. Apriamo la modale e ASPETTIAMO il risultato (tipizzandolo come Record)
final result = final Uint8List? result =
await showModalBottomSheet< await showModalBottomSheet<Uint8List>(
({
ShipmentDocumentModel document,
ProviderModel provider,
ProviderLocationModel location,
})
>(
context: context, context: context,
isScrollControlled: true, isScrollControlled: true,
builder: (context) { builder: (context) {
return BlocProvider( return BlocProvider(
create: (context) => TicketShippingCubit( create: (context) => TicketShippingCubit(
ticketIds: state.selectedTickets tickets: state.selectedTickets.toList(),
.map((t) => t.id!)
.toList(),
)..loadRepairCenters(), )..loadRepairCenters(),
child: TicketShippingModal( child: TicketShippingModal(
ticketIds: state.selectedTickets ticketIds: state.selectedTickets
@@ -128,41 +124,17 @@ class TicketList extends StatelessWidget {
// 2. Se l'utente ha chiuso trascinando giù, result è null. // 2. Se l'utente ha chiuso trascinando giù, result è null.
// Se ha salvato con successo, result contiene il nostro Record! // Se ha salvato con successo, result contiene il nostro Record!
if (result != null && context.mounted) { if (result != null && context.mounted) {
try { await Printing.layoutPdf(
// Recuperiamo la Company (dal tuo SessionCubit o AuthCubit) onLayout: (format) async => result,
final company = context name:
.read<SessionCubit>() 'DDT_${DateTime.now().millisecondsSinceEpoch}.pdf',
.state );
.company!; // 5. Pulizia finale: Deselezioniamo tutti i ticket e ricarichiamo la lista
context.read<TicketListCubit>().clearSelection();
final ticketListCubit = context // (Se necessario, chiama il metodo per ricaricare la lista dei ticket dal DB)
.read<TicketListCubit>(); context.read<TicketListCubit>().loadTickets(
refresh: true,
// 3. GENERIAMO I BYTES DEL PDF );
final pdfBytes =
await TicketShippingPdfService.generateDdt(
company: company,
provider: result.provider,
location: result.location,
document: result.document,
tickets: state.selectedTickets.toList(),
);
await Printing.layoutPdf(
onLayout: (PdfPageFormat format) async => pdfBytes,
name: 'ddt_${result.document.docNumber}.pdf',
);
// 5. Pulizia finale: Deselezioniamo tutti i ticket e ricarichiamo la lista
ticketListCubit.clearSelection();
// (Se necessario, chiama il metodo per ricaricare la lista dei ticket dal DB)
ticketListCubit.loadTickets(refresh: true);
} catch (e) {
if (context.mounted) {
ScaffoldMessenger.of(context).showSnackBar(
SnackBar(content: Text('Errore stampa PDF: $e')),
);
}
}
} }
}, },
icon: const Icon(Icons.local_shipping), icon: const Icon(Icons.local_shipping),

View File

@@ -2,6 +2,7 @@ import 'package:flutter/material.dart';
import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_bloc/flutter_bloc.dart';
import 'package:flux/features/tickets/blocs/ticket_shipping_cubit.dart'; import 'package:flux/features/tickets/blocs/ticket_shipping_cubit.dart';
import 'package:flux/features/tickets/models/ticket_model.dart'; import 'package:flux/features/tickets/models/ticket_model.dart';
import 'package:go_router/go_router.dart';
class TicketShippingModal extends StatefulWidget { class TicketShippingModal extends StatefulWidget {
final List<String> ticketIds; final List<String> ticketIds;