diff --git a/lib/core/routes/app_router.dart b/lib/core/routes/app_router.dart index 2a942e8..be1f6ed 100644 --- a/lib/core/routes/app_router.dart +++ b/lib/core/routes/app_router.dart @@ -21,11 +21,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/services/blocs/service_files_bloc.dart'; -import 'package:flux/features/services/models/service_model.dart'; -import 'package:flux/features/services/ui/service_form_screen/service_form_screen.dart'; -import 'package:flux/features/services/ui/service_form_screen/service_mobile_upload_screen.dart'; -import 'package:flux/features/services/ui/services_screen.dart'; +import 'package:flux/features/operations/blocs/service_files_bloc.dart'; +import 'package:flux/features/operations/models/service_model.dart'; +import 'package:flux/features/operations/ui/service_form_screen/service_form_screen.dart'; +import 'package:flux/features/operations/ui/service_form_screen/service_mobile_upload_screen.dart'; +import 'package:flux/features/operations/ui/services_screen.dart'; import 'package:get_it/get_it.dart'; import 'package:go_router/go_router.dart'; diff --git a/lib/features/customers/ui/customer_search_sheet.dart b/lib/features/customers/ui/customer_search_sheet.dart index 4cc3ca9..c12609c 100644 --- a/lib/features/customers/ui/customer_search_sheet.dart +++ b/lib/features/customers/ui/customer_search_sheet.dart @@ -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/services/blocs/services_cubit.dart'; +import 'package:flux/features/operations/blocs/services_cubit.dart'; class CustomerSearchSheet extends StatefulWidget { const CustomerSearchSheet({super.key}); diff --git a/lib/features/home/latest_store_services/bloc/latest_store_services_bloc.dart b/lib/features/home/latest_store_services/bloc/latest_store_services_bloc.dart index 9cd5b94..a85c6c9 100644 --- a/lib/features/home/latest_store_services/bloc/latest_store_services_bloc.dart +++ b/lib/features/home/latest_store_services/bloc/latest_store_services_bloc.dart @@ -2,8 +2,8 @@ import 'dart:developer'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:equatable/equatable.dart'; -import 'package:flux/features/services/data/services_repository.dart'; -import 'package:flux/features/services/models/service_model.dart'; +import 'package:flux/features/operations/data/services_repository.dart'; +import 'package:flux/features/operations/models/service_model.dart'; import 'package:get_it/get_it.dart'; part 'latest_store_services_events.dart'; diff --git a/lib/features/services/blocs/service_files_bloc.dart b/lib/features/operations/blocs/service_files_bloc.dart similarity index 97% rename from lib/features/services/blocs/service_files_bloc.dart rename to lib/features/operations/blocs/service_files_bloc.dart index 02f1922..f34f86d 100644 --- a/lib/features/services/blocs/service_files_bloc.dart +++ b/lib/features/operations/blocs/service_files_bloc.dart @@ -5,9 +5,9 @@ import 'package:file_picker/file_picker.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:equatable/equatable.dart'; import 'package:flux/core/utils/extensions.dart'; -import 'package:flux/features/services/data/services_repository.dart'; -import 'package:flux/features/services/models/service_file_model.dart'; -import 'package:flux/features/services/models/service_model.dart'; +import 'package:flux/features/operations/data/services_repository.dart'; +import 'package:flux/features/operations/models/service_file_model.dart'; +import 'package:flux/features/operations/models/service_model.dart'; import 'package:get_it/get_it.dart'; part 'service_files_events.dart'; diff --git a/lib/features/services/blocs/service_files_events.dart b/lib/features/operations/blocs/service_files_events.dart similarity index 100% rename from lib/features/services/blocs/service_files_events.dart rename to lib/features/operations/blocs/service_files_events.dart diff --git a/lib/features/services/blocs/service_files_state.dart b/lib/features/operations/blocs/service_files_state.dart similarity index 100% rename from lib/features/services/blocs/service_files_state.dart rename to lib/features/operations/blocs/service_files_state.dart diff --git a/lib/features/services/blocs/services_cubit.dart b/lib/features/operations/blocs/services_cubit.dart similarity index 95% rename from lib/features/services/blocs/services_cubit.dart rename to lib/features/operations/blocs/services_cubit.dart index a9fb3a6..036a32f 100644 --- a/lib/features/services/blocs/services_cubit.dart +++ b/lib/features/operations/blocs/services_cubit.dart @@ -4,12 +4,12 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flux/core/blocs/session/session_cubit.dart'; import 'package:flux/core/utils/extensions.dart'; -import 'package:flux/features/services/data/services_repository.dart'; -import 'package:flux/features/services/models/energy_service_model.dart'; -import 'package:flux/features/services/models/entertainment_service_model.dart'; -import 'package:flux/features/services/models/fin_service_model.dart'; -import 'package:flux/features/services/models/service_file_model.dart'; -import 'package:flux/features/services/models/service_model.dart'; +import 'package:flux/features/operations/data/services_repository.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'; +import 'package:flux/features/operations/models/service_file_model.dart'; +import 'package:flux/features/operations/models/service_model.dart'; import 'package:get_it/get_it.dart'; import 'package:collection/collection.dart'; part 'services_state.dart'; diff --git a/lib/features/services/blocs/services_state.dart b/lib/features/operations/blocs/services_state.dart similarity index 100% rename from lib/features/services/blocs/services_state.dart rename to lib/features/operations/blocs/services_state.dart diff --git a/lib/features/services/data/services_repository.dart b/lib/features/operations/data/services_repository.dart similarity index 99% rename from lib/features/services/data/services_repository.dart rename to lib/features/operations/data/services_repository.dart index 9c91fc0..ead6a04 100644 --- a/lib/features/services/data/services_repository.dart +++ b/lib/features/operations/data/services_repository.dart @@ -4,7 +4,7 @@ import 'package:flux/core/blocs/session/session_cubit.dart'; import 'package:flux/core/utils/extensions.dart'; import 'package:flux/features/customers/data/customer_repository.dart'; import 'package:flux/features/customers/models/customer_file_model.dart'; -import 'package:flux/features/services/models/service_file_model.dart'; +import 'package:flux/features/operations/models/service_file_model.dart'; import 'package:get_it/get_it.dart'; import 'package:supabase_flutter/supabase_flutter.dart'; import '../models/service_model.dart'; diff --git a/lib/features/services/models/energy_service_model.dart b/lib/features/operations/models/energy_service_model.dart similarity index 100% rename from lib/features/services/models/energy_service_model.dart rename to lib/features/operations/models/energy_service_model.dart diff --git a/lib/features/services/models/entertainment_service_model.dart b/lib/features/operations/models/entertainment_service_model.dart similarity index 100% rename from lib/features/services/models/entertainment_service_model.dart rename to lib/features/operations/models/entertainment_service_model.dart diff --git a/lib/features/services/models/fin_service_model.dart b/lib/features/operations/models/fin_service_model.dart similarity index 100% rename from lib/features/services/models/fin_service_model.dart rename to lib/features/operations/models/fin_service_model.dart diff --git a/lib/features/services/models/service_file_model.dart b/lib/features/operations/models/service_file_model.dart similarity index 100% rename from lib/features/services/models/service_file_model.dart rename to lib/features/operations/models/service_file_model.dart diff --git a/lib/features/services/models/service_model.dart b/lib/features/operations/models/service_model.dart similarity index 94% rename from lib/features/services/models/service_model.dart rename to lib/features/operations/models/service_model.dart index a4d15f6..86c0bf4 100644 --- a/lib/features/services/models/service_model.dart +++ b/lib/features/operations/models/service_model.dart @@ -1,9 +1,9 @@ import 'package:equatable/equatable.dart'; import 'package:flux/core/utils/extensions.dart'; -import 'package:flux/features/services/models/energy_service_model.dart'; -import 'package:flux/features/services/models/entertainment_service_model.dart'; -import 'package:flux/features/services/models/fin_service_model.dart'; -import 'package:flux/features/services/models/service_file_model.dart'; // <-- Aggiunto Import +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'; +import 'package:flux/features/operations/models/service_file_model.dart'; // <-- Aggiunto Import class ServiceModel extends Equatable { final String? id; diff --git a/lib/features/services/ui/service_action_card.dart b/lib/features/operations/ui/service_action_card.dart similarity index 100% rename from lib/features/services/ui/service_action_card.dart rename to lib/features/operations/ui/service_action_card.dart diff --git a/lib/features/services/ui/service_form_screen/action_card.dart b/lib/features/operations/ui/service_form_screen/action_card.dart similarity index 100% rename from lib/features/services/ui/service_form_screen/action_card.dart rename to lib/features/operations/ui/service_form_screen/action_card.dart diff --git a/lib/features/services/ui/service_form_screen/attachment_section.dart b/lib/features/operations/ui/service_form_screen/attachment_section.dart similarity index 98% rename from lib/features/services/ui/service_form_screen/attachment_section.dart rename to lib/features/operations/ui/service_form_screen/attachment_section.dart index 6883f65..2211186 100644 --- a/lib/features/services/ui/service_form_screen/attachment_section.dart +++ b/lib/features/operations/ui/service_form_screen/attachment_section.dart @@ -5,9 +5,9 @@ import 'package:flux/core/blocs/session/session_cubit.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/services/blocs/service_files_bloc.dart'; -import 'package:flux/features/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/models/service_file_model.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/models/service_file_model.dart'; class AttachmentsSection extends StatelessWidget { const AttachmentsSection({super.key}); diff --git a/lib/features/services/ui/service_form_screen/customer_section.dart b/lib/features/operations/ui/service_form_screen/customer_section.dart similarity index 97% rename from lib/features/services/ui/service_form_screen/customer_section.dart rename to lib/features/operations/ui/service_form_screen/customer_section.dart index dd1e752..3a5c42c 100644 --- a/lib/features/services/ui/service_form_screen/customer_section.dart +++ b/lib/features/operations/ui/service_form_screen/customer_section.dart @@ -1,6 +1,6 @@ import 'package:flutter/material.dart'; import 'package:flux/features/customers/ui/customer_search_sheet.dart'; -import 'package:flux/features/services/models/service_model.dart'; +import 'package:flux/features/operations/models/service_model.dart'; class CustomerSection extends StatelessWidget { final ServiceModel service; diff --git a/lib/features/services/ui/service_form_screen/energy_service_dialog.dart b/lib/features/operations/ui/service_form_screen/energy_service_dialog.dart similarity index 99% rename from lib/features/services/ui/service_form_screen/energy_service_dialog.dart rename to lib/features/operations/ui/service_form_screen/energy_service_dialog.dart index 58da992..67bd0b4 100644 --- a/lib/features/services/ui/service_form_screen/energy_service_dialog.dart +++ b/lib/features/operations/ui/service_form_screen/energy_service_dialog.dart @@ -2,7 +2,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flux/features/master_data/providers/blocs/provider_cubit.dart'; import 'package:flux/features/master_data/providers/models/provider_model.dart'; -import 'package:flux/features/services/models/energy_service_model.dart'; // Assicurati degli import +import 'package:flux/features/operations/models/energy_service_model.dart'; // Assicurati degli import class EnergyServiceDialog extends StatefulWidget { final List initialServices; diff --git a/lib/features/services/ui/service_form_screen/entertainment_service_card.dart b/lib/features/operations/ui/service_form_screen/entertainment_service_card.dart similarity index 98% rename from lib/features/services/ui/service_form_screen/entertainment_service_card.dart rename to lib/features/operations/ui/service_form_screen/entertainment_service_card.dart index 4e07001..e1899f9 100644 --- a/lib/features/services/ui/service_form_screen/entertainment_service_card.dart +++ b/lib/features/operations/ui/service_form_screen/entertainment_service_card.dart @@ -3,8 +3,8 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flux/core/blocs/session/session_cubit.dart'; import 'package:flux/features/master_data/providers/blocs/provider_cubit.dart'; import 'package:flux/features/master_data/providers/models/provider_model.dart'; -import 'package:flux/features/services/data/services_repository.dart'; -import 'package:flux/features/services/models/entertainment_service_model.dart'; +import 'package:flux/features/operations/data/services_repository.dart'; +import 'package:flux/features/operations/models/entertainment_service_model.dart'; import 'package:get_it/get_it.dart'; class EntertainmentServiceDialog extends StatefulWidget { diff --git a/lib/features/services/ui/service_form_screen/finance_service_dialog.dart b/lib/features/operations/ui/service_form_screen/finance_service_dialog.dart similarity index 99% rename from lib/features/services/ui/service_form_screen/finance_service_dialog.dart rename to lib/features/operations/ui/service_form_screen/finance_service_dialog.dart index b03f4d7..0b0248d 100644 --- a/lib/features/services/ui/service_form_screen/finance_service_dialog.dart +++ b/lib/features/operations/ui/service_form_screen/finance_service_dialog.dart @@ -5,7 +5,7 @@ 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/models/model_model.dart'; import 'package:flux/features/master_data/providers/blocs/provider_cubit.dart'; -import 'package:flux/features/services/models/fin_service_model.dart'; +import 'package:flux/features/operations/models/fin_service_model.dart'; import 'package:flux/features/master_data/providers/models/provider_model.dart'; // =========================================================================== diff --git a/lib/features/services/ui/service_form_screen/general_info_section.dart b/lib/features/operations/ui/service_form_screen/general_info_section.dart similarity index 96% rename from lib/features/services/ui/service_form_screen/general_info_section.dart rename to lib/features/operations/ui/service_form_screen/general_info_section.dart index e2330bf..cf1c3ca 100644 --- a/lib/features/services/ui/service_form_screen/general_info_section.dart +++ b/lib/features/operations/ui/service_form_screen/general_info_section.dart @@ -1,7 +1,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flux/features/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/models/service_model.dart'; +import 'package:flux/features/operations/blocs/services_cubit.dart'; +import 'package:flux/features/operations/models/service_model.dart'; class GeneralInfoSection extends StatelessWidget { final ServiceModel service; diff --git a/lib/features/services/ui/service_form_screen/int_dialogs.dart b/lib/features/operations/ui/service_form_screen/int_dialogs.dart similarity index 100% rename from lib/features/services/ui/service_form_screen/int_dialogs.dart rename to lib/features/operations/ui/service_form_screen/int_dialogs.dart diff --git a/lib/features/services/ui/service_form_screen/service_form_screen.dart b/lib/features/operations/ui/service_form_screen/service_form_screen.dart similarity index 92% rename from lib/features/services/ui/service_form_screen/service_form_screen.dart rename to lib/features/operations/ui/service_form_screen/service_form_screen.dart index 6574c5b..4022f10 100644 --- a/lib/features/services/ui/service_form_screen/service_form_screen.dart +++ b/lib/features/operations/ui/service_form_screen/service_form_screen.dart @@ -1,11 +1,11 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flux/features/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/models/service_model.dart'; -import 'package:flux/features/services/ui/service_form_screen/attachment_section.dart'; -import 'package:flux/features/services/ui/service_form_screen/customer_section.dart'; -import 'package:flux/features/services/ui/service_form_screen/general_info_section.dart'; -import 'package:flux/features/services/ui/service_form_screen/services_grid.dart'; +import 'package:flux/features/operations/blocs/services_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'; +import 'package:flux/features/operations/ui/service_form_screen/general_info_section.dart'; +import 'package:flux/features/operations/ui/service_form_screen/services_grid.dart'; class ServiceFormScreen extends StatefulWidget { final String? serviceId; diff --git a/lib/features/services/ui/service_form_screen/service_mobile_upload_screen.dart b/lib/features/operations/ui/service_form_screen/service_mobile_upload_screen.dart similarity index 99% rename from lib/features/services/ui/service_form_screen/service_mobile_upload_screen.dart rename to lib/features/operations/ui/service_form_screen/service_mobile_upload_screen.dart index 08e306a..bd64cf5 100644 --- a/lib/features/services/ui/service_form_screen/service_mobile_upload_screen.dart +++ b/lib/features/operations/ui/service_form_screen/service_mobile_upload_screen.dart @@ -3,7 +3,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:image_picker/image_picker.dart'; import 'package:file_picker/file_picker.dart'; -import 'package:flux/features/services/blocs/service_files_bloc.dart'; +import 'package:flux/features/operations/blocs/service_files_bloc.dart'; class ServiceMobileUploadScreen extends StatefulWidget { final String serviceId; diff --git a/lib/features/services/ui/service_form_screen/services_grid.dart b/lib/features/operations/ui/service_form_screen/services_grid.dart similarity index 89% rename from lib/features/services/ui/service_form_screen/services_grid.dart rename to lib/features/operations/ui/service_form_screen/services_grid.dart index 28e282a..f9d5874 100644 --- a/lib/features/services/ui/service_form_screen/services_grid.dart +++ b/lib/features/operations/ui/service_form_screen/services_grid.dart @@ -1,16 +1,16 @@ 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/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/models/energy_service_model.dart'; -import 'package:flux/features/services/models/entertainment_service_model.dart'; -import 'package:flux/features/services/models/fin_service_model.dart'; -import 'package:flux/features/services/models/service_model.dart'; -import 'package:flux/features/services/ui/service_form_screen/action_card.dart'; -import 'package:flux/features/services/ui/service_form_screen/energy_service_dialog.dart'; -import 'package:flux/features/services/ui/service_form_screen/entertainment_service_card.dart'; -import 'package:flux/features/services/ui/service_form_screen/finance_service_dialog.dart'; -import 'package:flux/features/services/ui/service_form_screen/int_dialogs.dart'; // Assicurati di importare il modello +import 'package:flux/features/operations/blocs/services_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'; +import 'package:flux/features/operations/models/service_model.dart'; +import 'package:flux/features/operations/ui/service_form_screen/action_card.dart'; +import 'package:flux/features/operations/ui/service_form_screen/energy_service_dialog.dart'; +import 'package:flux/features/operations/ui/service_form_screen/entertainment_service_card.dart'; +import 'package:flux/features/operations/ui/service_form_screen/finance_service_dialog.dart'; +import 'package:flux/features/operations/ui/service_form_screen/int_dialogs.dart'; // Assicurati di importare il modello class ServicesGrid extends StatelessWidget { final ServiceModel service; diff --git a/lib/features/services/ui/services_screen.dart b/lib/features/operations/ui/services_screen.dart similarity index 96% rename from lib/features/services/ui/services_screen.dart rename to lib/features/operations/ui/services_screen.dart index dfb53f9..2c1ec32 100644 --- a/lib/features/services/ui/services_screen.dart +++ b/lib/features/operations/ui/services_screen.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; -import 'package:flux/features/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/models/service_model.dart'; -import 'package:flux/features/services/utils/service_actions.dart'; +import 'package:flux/features/operations/blocs/services_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'; // Importa i tuoi modelli e cubit diff --git a/lib/features/services/utils/service_actions.dart b/lib/features/operations/utils/service_actions.dart similarity index 95% rename from lib/features/services/utils/service_actions.dart rename to lib/features/operations/utils/service_actions.dart index 3159591..ca8565f 100644 --- a/lib/features/services/utils/service_actions.dart +++ b/lib/features/operations/utils/service_actions.dart @@ -2,8 +2,8 @@ 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/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/models/service_model.dart'; +import 'package:flux/features/operations/blocs/services_cubit.dart'; +import 'package:flux/features/operations/models/service_model.dart'; import 'package:go_router/go_router.dart'; /// Avvia la creazione di un nuovo servizio partendo dalla selezione dell'operatore. diff --git a/lib/main.dart b/lib/main.dart index 4130cd2..532039d 100644 --- a/lib/main.dart +++ b/lib/main.dart @@ -26,8 +26,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/services/blocs/services_cubit.dart'; -import 'package:flux/features/services/data/services_repository.dart'; +import 'package:flux/features/operations/blocs/services_cubit.dart'; +import 'package:flux/features/operations/data/services_repository.dart'; import 'package:flux/features/settings/settings.dart'; void main() async {