From eeb8c28a611826b3437a5653fb4ceefb4e1ac718 Mon Sep 17 00:00:00 2001 From: Suriya Date: Wed, 25 Feb 2026 19:58:28 +0530 Subject: [PATCH] hub & manager issues --- apps/mobile/analyze2.txt | 61 +++ .../lib/src/routing/client/navigator.dart | 8 + .../lib/src/l10n/en.i18n.json | 6 + .../lib/src/l10n/es.i18n.json | 6 + .../hubs_connector_repository_impl.dart | 3 + .../packages/domain/lib/krow_domain.dart | 1 + .../src/entities/business/cost_center.dart | 22 ++ .../domain/lib/src/entities/business/hub.dart | 4 +- .../src/entities/orders/one_time_order.dart | 5 + .../lib/src/entities/orders/order_item.dart | 10 + .../src/entities/orders/permanent_order.dart | 3 + .../src/entities/orders/recurring_order.dart | 5 + .../features/client/hubs/lib/client_hubs.dart | 15 + .../hub_repository_impl.dart | 15 +- .../arguments/create_hub_arguments.dart | 6 +- .../hub_repository_interface.dart | 7 +- .../domain/usecases/create_hub_usecase.dart | 1 + .../usecases/get_cost_centers_usecase.dart | 14 + .../domain/usecases/update_hub_usecase.dart | 4 + .../blocs/edit_hub/edit_hub_bloc.dart | 25 ++ .../blocs/edit_hub/edit_hub_event.dart | 11 + .../blocs/edit_hub/edit_hub_state.dart | 14 +- .../presentation/pages/client_hubs_page.dart | 55 +-- .../src/presentation/pages/edit_hub_page.dart | 145 +++---- .../presentation/pages/hub_details_page.dart | 9 + .../edit_hub/edit_hub_form_section.dart | 107 ++++++ .../widgets/hub_address_autocomplete.dart | 3 + .../presentation/widgets/hub_form_dialog.dart | 356 +++++++++++++----- .../features/client/orders/analyze.txt | Bin 0 -> 3460 bytes .../features/client/orders/analyze_output.txt | Bin 0 -> 2792 bytes .../one_time_order/one_time_order_bloc.dart | 61 +++ .../one_time_order/one_time_order_event.dart | 18 + .../one_time_order/one_time_order_state.dart | 25 ++ .../permanent_order/permanent_order_bloc.dart | 60 +++ .../permanent_order_event.dart | 17 + .../permanent_order_state.dart | 25 ++ .../recurring_order/recurring_order_bloc.dart | 59 +++ .../recurring_order_event.dart | 17 + .../recurring_order_state.dart | 25 ++ .../pages/one_time_order_page.dart | 20 + .../pages/permanent_order_page.dart | 19 + .../pages/recurring_order_page.dart | 19 + .../widgets/hub_manager_selector.dart | 161 ++++++++ .../one_time_order/one_time_order_view.dart | 26 ++ .../presentation/widgets/order_ui_models.dart | 16 + .../permanent_order/permanent_order_view.dart | 27 ++ .../recurring_order/recurring_order_view.dart | 28 ++ .../widgets/order_edit_sheet.dart | 179 ++++++++- .../presentation/widgets/view_order_card.dart | 25 ++ .../settings_actions.dart | 41 +- .../settings_profile_header.dart | 22 +- .../dataconnect/connector/order/mutations.gql | 2 + backend/dataconnect/schema/order.gql | 3 + 53 files changed, 1571 insertions(+), 245 deletions(-) create mode 100644 apps/mobile/analyze2.txt create mode 100644 apps/mobile/packages/domain/lib/src/entities/business/cost_center.dart create mode 100644 apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/get_cost_centers_usecase.dart create mode 100644 apps/mobile/packages/features/client/orders/analyze.txt create mode 100644 apps/mobile/packages/features/client/orders/analyze_output.txt create mode 100644 apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart diff --git a/apps/mobile/analyze2.txt b/apps/mobile/analyze2.txt new file mode 100644 index 00000000..82fbf64b --- /dev/null +++ b/apps/mobile/analyze2.txt @@ -0,0 +1,61 @@ + +┌─────────────────────────────────────────────────────────┐ +│ A new version of Flutter is available! │ +│ │ +│ To update to the latest version, run "flutter upgrade". │ +└─────────────────────────────────────────────────────────┘ +Resolving dependencies... +Downloading packages... + _fe_analyzer_shared 91.0.0 (96.0.0 available) + analyzer 8.4.1 (10.2.0 available) + archive 3.6.1 (4.0.9 available) + bloc 8.1.4 (9.2.0 available) + bloc_test 9.1.7 (10.0.0 available) + build_runner 2.10.5 (2.11.1 available) + built_value 8.12.3 (8.12.4 available) + characters 1.4.0 (1.4.1 available) + code_assets 0.19.10 (1.0.0 available) + csv 6.0.0 (7.1.0 available) + dart_style 3.1.3 (3.1.5 available) + ffi 2.1.5 (2.2.0 available) + fl_chart 0.66.2 (1.1.1 available) + flutter_bloc 8.1.6 (9.1.1 available) + geolocator 10.1.1 (14.0.2 available) + geolocator_android 4.6.2 (5.0.2 available) + geolocator_web 2.2.1 (4.1.3 available) + get_it 7.7.0 (9.2.1 available) + google_fonts 7.0.2 (8.0.2 available) + google_maps_flutter_android 2.18.12 (2.19.1 available) + google_maps_flutter_ios 2.17.3 (2.17.5 available) + google_maps_flutter_web 0.5.14+3 (0.6.1 available) + googleapis_auth 1.6.0 (2.1.0 available) + grpc 3.2.4 (5.1.0 available) + hooks 0.20.5 (1.0.1 available) + image 4.3.0 (4.8.0 available) + json_annotation 4.9.0 (4.11.0 available) + lints 6.0.0 (6.1.0 available) + matcher 0.12.17 (0.12.18 available) + material_color_utilities 0.11.1 (0.13.0 available) + melos 7.3.0 (7.4.0 available) + meta 1.17.0 (1.18.1 available) + native_toolchain_c 0.17.2 (0.17.4 available) + objective_c 9.2.2 (9.3.0 available) + permission_handler 11.4.0 (12.0.1 available) + permission_handler_android 12.1.0 (13.0.1 available) + petitparser 7.0.1 (7.0.2 available) + protobuf 3.1.0 (6.0.0 available) + shared_preferences_android 2.4.18 (2.4.20 available) + slang 4.12.0 (4.12.1 available) + slang_build_runner 4.12.0 (4.12.1 available) + slang_flutter 4.12.0 (4.12.1 available) + source_span 1.10.1 (1.10.2 available) + test 1.26.3 (1.29.0 available) + test_api 0.7.7 (0.7.9 available) + test_core 0.6.12 (0.6.15 available) + url_launcher_ios 6.3.6 (6.4.1 available) + uuid 4.5.2 (4.5.3 available) + yaml_edit 2.2.3 (2.2.4 available) +Got dependencies! +49 packages have newer versions incompatible with dependency constraints. +Try `flutter pub outdated` for more information. +Analyzing mobile... \ No newline at end of file diff --git a/apps/mobile/packages/core/lib/src/routing/client/navigator.dart b/apps/mobile/packages/core/lib/src/routing/client/navigator.dart index edb5141e..a3650f69 100644 --- a/apps/mobile/packages/core/lib/src/routing/client/navigator.dart +++ b/apps/mobile/packages/core/lib/src/routing/client/navigator.dart @@ -135,6 +135,11 @@ extension ClientNavigator on IModularNavigator { pushNamed(ClientPaths.settings); } + /// Pushes the edit profile page. + void toClientEditProfile() { + pushNamed('${ClientPaths.settings}/edit-profile'); + } + // ========================================================================== // HUBS MANAGEMENT // ========================================================================== @@ -159,6 +164,9 @@ extension ClientNavigator on IModularNavigator { return pushNamed( ClientPaths.editHub, arguments: {'hub': hub}, + // Some versions of Modular allow passing opaque here, but if not + // we'll handle transparency in the page itself which we already do. + // To ensure it's not opaque, we'll use push with a PageRouteBuilder if needed. ); } diff --git a/apps/mobile/packages/core_localization/lib/src/l10n/en.i18n.json b/apps/mobile/packages/core_localization/lib/src/l10n/en.i18n.json index ebed7f73..d482bb17 100644 --- a/apps/mobile/packages/core_localization/lib/src/l10n/en.i18n.json +++ b/apps/mobile/packages/core_localization/lib/src/l10n/en.i18n.json @@ -208,6 +208,7 @@ "edit_profile": "Edit Profile", "hubs": "Hubs", "log_out": "Log Out", + "log_out_confirmation": "Are you sure you want to log out?", "quick_links": "Quick Links", "clock_in_hubs": "Clock-In Hubs", "billing_payments": "Billing & Payments" @@ -254,6 +255,8 @@ "address_hint": "Full address", "cost_center_label": "Cost Center", "cost_center_hint": "eg: 1001, 1002", + "name_required": "Name is required", + "address_required": "Address is required", "create_button": "Create Hub" }, "edit_hub": { @@ -332,6 +335,9 @@ "date_hint": "Select date", "location_label": "Location", "location_hint": "Enter address", + "hub_manager_label": "Shift Contact", + "hub_manager_desc": "On-site manager or supervisor for this shift", + "hub_manager_hint": "Select Contact", "positions_title": "Positions", "add_position": "Add Position", "position_number": "Position $number", diff --git a/apps/mobile/packages/core_localization/lib/src/l10n/es.i18n.json b/apps/mobile/packages/core_localization/lib/src/l10n/es.i18n.json index 1111b516..299a7ffd 100644 --- a/apps/mobile/packages/core_localization/lib/src/l10n/es.i18n.json +++ b/apps/mobile/packages/core_localization/lib/src/l10n/es.i18n.json @@ -208,6 +208,7 @@ "edit_profile": "Editar Perfil", "hubs": "Hubs", "log_out": "Cerrar sesi\u00f3n", + "log_out_confirmation": "\u00bfEst\u00e1 seguro de que desea cerrar sesi\u00f3n?", "quick_links": "Enlaces r\u00e1pidos", "clock_in_hubs": "Hubs de Marcaje", "billing_payments": "Facturaci\u00f3n y Pagos" @@ -254,6 +255,8 @@ "address_hint": "Direcci\u00f3n completa", "cost_center_label": "Centro de Costos", "cost_center_hint": "ej: 1001, 1002", + "name_required": "Nombre es obligatorio", + "address_required": "La direcci\u00f3n es obligatoria", "create_button": "Crear Hub" }, "nfc_dialog": { @@ -332,6 +335,9 @@ "date_hint": "Seleccionar fecha", "location_label": "Ubicaci\u00f3n", "location_hint": "Ingresar direcci\u00f3n", + "hub_manager_label": "Contacto del Turno", + "hub_manager_desc": "Gerente o supervisor en el sitio para este turno", + "hub_manager_hint": "Seleccionar Contacto", "positions_title": "Posiciones", "add_position": "A\u00f1adir Posici\u00f3n", "position_number": "Posici\u00f3n $number", diff --git a/apps/mobile/packages/data_connect/lib/src/connectors/hubs/data/repositories/hubs_connector_repository_impl.dart b/apps/mobile/packages/data_connect/lib/src/connectors/hubs/data/repositories/hubs_connector_repository_impl.dart index bc317ea9..dde16851 100644 --- a/apps/mobile/packages/data_connect/lib/src/connectors/hubs/data/repositories/hubs_connector_repository_impl.dart +++ b/apps/mobile/packages/data_connect/lib/src/connectors/hubs/data/repositories/hubs_connector_repository_impl.dart @@ -31,6 +31,7 @@ class HubsConnectorRepositoryImpl implements HubsConnectorRepository { address: h.address, nfcTagId: null, status: h.isActive ? HubStatus.active : HubStatus.inactive, + costCenter: null, ); }).toList(); }); @@ -79,6 +80,7 @@ class HubsConnectorRepositoryImpl implements HubsConnectorRepository { address: address, nfcTagId: null, status: HubStatus.active, + costCenter: null, ); }); } @@ -136,6 +138,7 @@ class HubsConnectorRepositoryImpl implements HubsConnectorRepository { address: address ?? '', nfcTagId: null, status: HubStatus.active, + costCenter: null, ); }); } diff --git a/apps/mobile/packages/domain/lib/krow_domain.dart b/apps/mobile/packages/domain/lib/krow_domain.dart index 9c67574f..562f5656 100644 --- a/apps/mobile/packages/domain/lib/krow_domain.dart +++ b/apps/mobile/packages/domain/lib/krow_domain.dart @@ -19,6 +19,7 @@ export 'src/entities/business/business_setting.dart'; export 'src/entities/business/hub.dart'; export 'src/entities/business/hub_department.dart'; export 'src/entities/business/vendor.dart'; +export 'src/entities/business/cost_center.dart'; // Events & Assignments export 'src/entities/events/event.dart'; diff --git a/apps/mobile/packages/domain/lib/src/entities/business/cost_center.dart b/apps/mobile/packages/domain/lib/src/entities/business/cost_center.dart new file mode 100644 index 00000000..8d3d5528 --- /dev/null +++ b/apps/mobile/packages/domain/lib/src/entities/business/cost_center.dart @@ -0,0 +1,22 @@ +import 'package:equatable/equatable.dart'; + +/// Represents a financial cost center used for billing and tracking. +class CostCenter extends Equatable { + const CostCenter({ + required this.id, + required this.name, + this.code, + }); + + /// Unique identifier. + final String id; + + /// Display name of the cost center. + final String name; + + /// Optional alphanumeric code associated with this cost center. + final String? code; + + @override + List get props => [id, name, code]; +} diff --git a/apps/mobile/packages/domain/lib/src/entities/business/hub.dart b/apps/mobile/packages/domain/lib/src/entities/business/hub.dart index bc6282bf..79c06572 100644 --- a/apps/mobile/packages/domain/lib/src/entities/business/hub.dart +++ b/apps/mobile/packages/domain/lib/src/entities/business/hub.dart @@ -1,5 +1,7 @@ import 'package:equatable/equatable.dart'; +import 'cost_center.dart'; + /// The status of a [Hub]. enum HubStatus { /// Fully operational. @@ -42,7 +44,7 @@ class Hub extends Equatable { final HubStatus status; /// Assigned cost center for this hub. - final String? costCenter; + final CostCenter? costCenter; @override List get props => [id, businessId, name, address, nfcTagId, status, costCenter]; diff --git a/apps/mobile/packages/domain/lib/src/entities/orders/one_time_order.dart b/apps/mobile/packages/domain/lib/src/entities/orders/one_time_order.dart index e0e7ca67..fe50bd20 100644 --- a/apps/mobile/packages/domain/lib/src/entities/orders/one_time_order.dart +++ b/apps/mobile/packages/domain/lib/src/entities/orders/one_time_order.dart @@ -13,6 +13,7 @@ class OneTimeOrder extends Equatable { this.hub, this.eventName, this.vendorId, + this.hubManagerId, this.roleRates = const {}, }); /// The specific date for the shift or event. @@ -33,6 +34,9 @@ class OneTimeOrder extends Equatable { /// Selected vendor id for this order. final String? vendorId; + /// Optional hub manager id. + final String? hubManagerId; + /// Role hourly rates keyed by role id. final Map roleRates; @@ -44,6 +48,7 @@ class OneTimeOrder extends Equatable { hub, eventName, vendorId, + hubManagerId, roleRates, ]; } diff --git a/apps/mobile/packages/domain/lib/src/entities/orders/order_item.dart b/apps/mobile/packages/domain/lib/src/entities/orders/order_item.dart index b9ab956f..88ae8091 100644 --- a/apps/mobile/packages/domain/lib/src/entities/orders/order_item.dart +++ b/apps/mobile/packages/domain/lib/src/entities/orders/order_item.dart @@ -27,6 +27,8 @@ class OrderItem extends Equatable { this.hours = 0, this.totalValue = 0, this.confirmedApps = const >[], + this.hubManagerId, + this.hubManagerName, }); /// Unique identifier of the order. @@ -83,6 +85,12 @@ class OrderItem extends Equatable { /// List of confirmed worker applications. final List> confirmedApps; + /// Optional ID of the assigned hub manager. + final String? hubManagerId; + + /// Optional Name of the assigned hub manager. + final String? hubManagerName; + @override List get props => [ id, @@ -103,5 +111,7 @@ class OrderItem extends Equatable { totalValue, eventName, confirmedApps, + hubManagerId, + hubManagerName, ]; } diff --git a/apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart b/apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart index da4feb71..ef950f87 100644 --- a/apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart +++ b/apps/mobile/packages/domain/lib/src/entities/orders/permanent_order.dart @@ -11,6 +11,7 @@ class PermanentOrder extends Equatable { this.hub, this.eventName, this.vendorId, + this.hubManagerId, this.roleRates = const {}, }); @@ -23,6 +24,7 @@ class PermanentOrder extends Equatable { final OneTimeOrderHubDetails? hub; final String? eventName; final String? vendorId; + final String? hubManagerId; final Map roleRates; @override @@ -33,6 +35,7 @@ class PermanentOrder extends Equatable { hub, eventName, vendorId, + hubManagerId, roleRates, ]; } diff --git a/apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart b/apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart index f11b63ec..76f00720 100644 --- a/apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart +++ b/apps/mobile/packages/domain/lib/src/entities/orders/recurring_order.dart @@ -12,6 +12,7 @@ class RecurringOrder extends Equatable { this.hub, this.eventName, this.vendorId, + this.hubManagerId, this.roleRates = const {}, }); @@ -39,6 +40,9 @@ class RecurringOrder extends Equatable { /// Selected vendor id for this order. final String? vendorId; + /// Optional hub manager id. + final String? hubManagerId; + /// Role hourly rates keyed by role id. final Map roleRates; @@ -52,6 +56,7 @@ class RecurringOrder extends Equatable { hub, eventName, vendorId, + hubManagerId, roleRates, ]; } diff --git a/apps/mobile/packages/features/client/hubs/lib/client_hubs.dart b/apps/mobile/packages/features/client/hubs/lib/client_hubs.dart index 49a88f20..53fdb2e4 100644 --- a/apps/mobile/packages/features/client/hubs/lib/client_hubs.dart +++ b/apps/mobile/packages/features/client/hubs/lib/client_hubs.dart @@ -1,5 +1,6 @@ library; +import 'package:flutter/material.dart'; import 'package:flutter_modular/flutter_modular.dart'; import 'package:krow_core/core.dart'; import 'package:krow_data_connect/krow_data_connect.dart'; @@ -8,6 +9,7 @@ import 'src/domain/repositories/hub_repository_interface.dart'; import 'src/domain/usecases/assign_nfc_tag_usecase.dart'; import 'src/domain/usecases/create_hub_usecase.dart'; import 'src/domain/usecases/delete_hub_usecase.dart'; +import 'src/domain/usecases/get_cost_centers_usecase.dart'; import 'src/domain/usecases/get_hubs_usecase.dart'; import 'src/domain/usecases/update_hub_usecase.dart'; import 'src/presentation/blocs/client_hubs_bloc.dart'; @@ -32,6 +34,7 @@ class ClientHubsModule extends Module { // UseCases i.addLazySingleton(GetHubsUseCase.new); + i.addLazySingleton(GetCostCentersUseCase.new); i.addLazySingleton(CreateHubUseCase.new); i.addLazySingleton(DeleteHubUseCase.new); i.addLazySingleton(AssignNfcTagUseCase.new); @@ -61,6 +64,18 @@ class ClientHubsModule extends Module { ); r.child( ClientPaths.childRoute(ClientPaths.hubs, ClientPaths.editHub), + transition: TransitionType.custom, + customTransition: CustomTransition( + opaque: false, + transitionBuilder: ( + BuildContext context, + Animation animation, + Animation secondaryAnimation, + Widget child, + ) { + return FadeTransition(opacity: animation, child: child); + }, + ), child: (_) { final Map data = r.args.data as Map; return EditHubPage( diff --git a/apps/mobile/packages/features/client/hubs/lib/src/data/repositories_impl/hub_repository_impl.dart b/apps/mobile/packages/features/client/hubs/lib/src/data/repositories_impl/hub_repository_impl.dart index 1935c3c3..28e9aa40 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/data/repositories_impl/hub_repository_impl.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/data/repositories_impl/hub_repository_impl.dart @@ -24,6 +24,17 @@ class HubRepositoryImpl implements HubRepositoryInterface { return _connectorRepository.getHubs(businessId: businessId); } + @override + Future> getCostCenters() async { + // Mocking cost centers for now since the backend is not yet ready. + return [ + const CostCenter(id: 'cc-001', name: 'Kitchen', code: '1001'), + const CostCenter(id: 'cc-002', name: 'Front Desk', code: '1002'), + const CostCenter(id: 'cc-003', name: 'Waitstaff', code: '1003'), + const CostCenter(id: 'cc-004', name: 'Management', code: '1004'), + ]; + } + @override Future createHub({ required String name, @@ -36,7 +47,7 @@ class HubRepositoryImpl implements HubRepositoryInterface { String? street, String? country, String? zipCode, - String? costCenter, + String? costCenterId, }) async { final String businessId = await _service.getBusinessId(); return _connectorRepository.createHub( @@ -80,7 +91,7 @@ class HubRepositoryImpl implements HubRepositoryInterface { String? street, String? country, String? zipCode, - String? costCenter, + String? costCenterId, }) async { final String businessId = await _service.getBusinessId(); return _connectorRepository.updateHub( diff --git a/apps/mobile/packages/features/client/hubs/lib/src/domain/arguments/create_hub_arguments.dart b/apps/mobile/packages/features/client/hubs/lib/src/domain/arguments/create_hub_arguments.dart index d5c25951..18e6a3fd 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/domain/arguments/create_hub_arguments.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/domain/arguments/create_hub_arguments.dart @@ -19,7 +19,7 @@ class CreateHubArguments extends UseCaseArgument { this.street, this.country, this.zipCode, - this.costCenter, + this.costCenterId, }); /// The name of the hub. final String name; @@ -37,7 +37,7 @@ class CreateHubArguments extends UseCaseArgument { final String? zipCode; /// The cost center of the hub. - final String? costCenter; + final String? costCenterId; @override List get props => [ @@ -51,6 +51,6 @@ class CreateHubArguments extends UseCaseArgument { street, country, zipCode, - costCenter, + costCenterId, ]; } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/domain/repositories/hub_repository_interface.dart b/apps/mobile/packages/features/client/hubs/lib/src/domain/repositories/hub_repository_interface.dart index 13d9f45f..14e97bf2 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/domain/repositories/hub_repository_interface.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/domain/repositories/hub_repository_interface.dart @@ -11,6 +11,9 @@ abstract interface class HubRepositoryInterface { /// Returns a list of [Hub] entities. Future> getHubs(); + /// Fetches the list of available cost centers for the current business. + Future> getCostCenters(); + /// Creates a new hub. /// /// Takes the [name] and [address] of the new hub. @@ -26,7 +29,7 @@ abstract interface class HubRepositoryInterface { String? street, String? country, String? zipCode, - String? costCenter, + String? costCenterId, }); /// Deletes a hub by its [id]. @@ -52,6 +55,6 @@ abstract interface class HubRepositoryInterface { String? street, String? country, String? zipCode, - String? costCenter, + String? costCenterId, }); } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/create_hub_usecase.dart b/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/create_hub_usecase.dart index 9c55ed30..550acd89 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/create_hub_usecase.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/create_hub_usecase.dart @@ -29,6 +29,7 @@ class CreateHubUseCase implements UseCase { street: arguments.street, country: arguments.country, zipCode: arguments.zipCode, + costCenterId: arguments.costCenterId, ); } } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/get_cost_centers_usecase.dart b/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/get_cost_centers_usecase.dart new file mode 100644 index 00000000..32f9d895 --- /dev/null +++ b/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/get_cost_centers_usecase.dart @@ -0,0 +1,14 @@ +import 'package:krow_domain/krow_domain.dart'; +import '../repositories/hub_repository_interface.dart'; + +/// Usecase to fetch all available cost centers. +class GetCostCentersUseCase { + GetCostCentersUseCase({required HubRepositoryInterface repository}) + : _repository = repository; + + final HubRepositoryInterface _repository; + + Future> call() async { + return _repository.getCostCenters(); + } +} diff --git a/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/update_hub_usecase.dart b/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/update_hub_usecase.dart index 97af203e..cbfdb799 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/update_hub_usecase.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/domain/usecases/update_hub_usecase.dart @@ -17,6 +17,7 @@ class UpdateHubArguments extends UseCaseArgument { this.street, this.country, this.zipCode, + this.costCenterId, }); final String id; @@ -30,6 +31,7 @@ class UpdateHubArguments extends UseCaseArgument { final String? street; final String? country; final String? zipCode; + final String? costCenterId; @override List get props => [ @@ -44,6 +46,7 @@ class UpdateHubArguments extends UseCaseArgument { street, country, zipCode, + costCenterId, ]; } @@ -67,6 +70,7 @@ class UpdateHubUseCase implements UseCase { street: params.street, country: params.country, zipCode: params.zipCode, + costCenterId: params.costCenterId, ); } } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_bloc.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_bloc.dart index 6923899a..919adb23 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_bloc.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_bloc.dart @@ -1,8 +1,10 @@ import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:krow_core/core.dart'; +import 'package:krow_domain/krow_domain.dart'; import '../../../domain/arguments/create_hub_arguments.dart'; import '../../../domain/usecases/create_hub_usecase.dart'; import '../../../domain/usecases/update_hub_usecase.dart'; +import '../../../domain/usecases/get_cost_centers_usecase.dart'; import 'edit_hub_event.dart'; import 'edit_hub_state.dart'; @@ -12,15 +14,36 @@ class EditHubBloc extends Bloc EditHubBloc({ required CreateHubUseCase createHubUseCase, required UpdateHubUseCase updateHubUseCase, + required GetCostCentersUseCase getCostCentersUseCase, }) : _createHubUseCase = createHubUseCase, _updateHubUseCase = updateHubUseCase, + _getCostCentersUseCase = getCostCentersUseCase, super(const EditHubState()) { + on(_onCostCentersLoadRequested); on(_onAddRequested); on(_onUpdateRequested); } final CreateHubUseCase _createHubUseCase; final UpdateHubUseCase _updateHubUseCase; + final GetCostCentersUseCase _getCostCentersUseCase; + + Future _onCostCentersLoadRequested( + EditHubCostCentersLoadRequested event, + Emitter emit, + ) async { + await handleError( + emit: emit.call, + action: () async { + final List costCenters = await _getCostCentersUseCase.call(); + emit(state.copyWith(costCenters: costCenters)); + }, + onError: (String errorKey) => state.copyWith( + status: EditHubStatus.failure, + errorMessage: errorKey, + ), + ); + } Future _onAddRequested( EditHubAddRequested event, @@ -43,6 +66,7 @@ class EditHubBloc extends Bloc street: event.street, country: event.country, zipCode: event.zipCode, + costCenterId: event.costCenterId, ), ); emit( @@ -79,6 +103,7 @@ class EditHubBloc extends Bloc street: event.street, country: event.country, zipCode: event.zipCode, + costCenterId: event.costCenterId, ), ); emit( diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_event.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_event.dart index 65e18a83..38e25de0 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_event.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_event.dart @@ -8,6 +8,11 @@ abstract class EditHubEvent extends Equatable { List get props => []; } +/// Event triggered to load all available cost centers. +class EditHubCostCentersLoadRequested extends EditHubEvent { + const EditHubCostCentersLoadRequested(); +} + /// Event triggered to add a new hub. class EditHubAddRequested extends EditHubEvent { const EditHubAddRequested({ @@ -21,6 +26,7 @@ class EditHubAddRequested extends EditHubEvent { this.street, this.country, this.zipCode, + this.costCenterId, }); final String name; @@ -33,6 +39,7 @@ class EditHubAddRequested extends EditHubEvent { final String? street; final String? country; final String? zipCode; + final String? costCenterId; @override List get props => [ @@ -46,6 +53,7 @@ class EditHubAddRequested extends EditHubEvent { street, country, zipCode, + costCenterId, ]; } @@ -63,6 +71,7 @@ class EditHubUpdateRequested extends EditHubEvent { this.street, this.country, this.zipCode, + this.costCenterId, }); final String id; @@ -76,6 +85,7 @@ class EditHubUpdateRequested extends EditHubEvent { final String? street; final String? country; final String? zipCode; + final String? costCenterId; @override List get props => [ @@ -90,5 +100,6 @@ class EditHubUpdateRequested extends EditHubEvent { street, country, zipCode, + costCenterId, ]; } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_state.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_state.dart index 17bdffcd..02cfcf03 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_state.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/blocs/edit_hub/edit_hub_state.dart @@ -1,4 +1,5 @@ import 'package:equatable/equatable.dart'; +import 'package:krow_domain/krow_domain.dart'; /// Status of the edit hub operation. enum EditHubStatus { @@ -21,6 +22,7 @@ class EditHubState extends Equatable { this.status = EditHubStatus.initial, this.errorMessage, this.successMessage, + this.costCenters = const [], }); /// The status of the operation. @@ -32,19 +34,29 @@ class EditHubState extends Equatable { /// The success message if the operation succeeded. final String? successMessage; + /// Available cost centers for selection. + final List costCenters; + /// Create a copy of this state with the given fields replaced. EditHubState copyWith({ EditHubStatus? status, String? errorMessage, String? successMessage, + List? costCenters, }) { return EditHubState( status: status ?? this.status, errorMessage: errorMessage ?? this.errorMessage, successMessage: successMessage ?? this.successMessage, + costCenters: costCenters ?? this.costCenters, ); } @override - List get props => [status, errorMessage, successMessage]; + List get props => [ + status, + errorMessage, + successMessage, + costCenters, + ]; } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/client_hubs_page.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/client_hubs_page.dart index 1bcdb4ed..25772bc2 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/client_hubs_page.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/client_hubs_page.dart @@ -57,20 +57,6 @@ class ClientHubsPage extends StatelessWidget { builder: (BuildContext context, ClientHubsState state) { return Scaffold( backgroundColor: UiColors.bgMenu, - floatingActionButton: FloatingActionButton( - onPressed: () async { - final bool? success = await Modular.to.toEditHub(); - if (success == true && context.mounted) { - BlocProvider.of( - context, - ).add(const ClientHubsFetched()); - } - }, - shape: const RoundedRectangleBorder( - borderRadius: BorderRadius.all(Radius.circular(8)), - ), - child: const Icon(UiIcons.add), - ), body: CustomScrollView( slivers: [ _buildAppBar(context), @@ -165,20 +151,35 @@ class ClientHubsPage extends StatelessWidget { Row( mainAxisAlignment: MainAxisAlignment.spaceBetween, children: [ - Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Text( - t.client_hubs.title, - style: UiTypography.headline1m.white, - ), - Text( - t.client_hubs.subtitle, - style: UiTypography.body2r.copyWith( - color: UiColors.switchInactive, + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Text( + t.client_hubs.title, + style: UiTypography.headline1m.white, ), - ), - ], + Text( + t.client_hubs.subtitle, + style: UiTypography.body2r.copyWith( + color: UiColors.switchInactive, + ), + ), + ], + ), + ), + UiButton.primary( + onPressed: () async { + final bool? success = await Modular.to.toEditHub(); + if (success == true && context.mounted) { + BlocProvider.of( + context, + ).add(const ClientHubsFetched()); + } + }, + text: t.client_hubs.add_hub, + leadingIcon: UiIcons.add, + size: UiButtonSize.small, ), ], ), diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/edit_hub_page.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/edit_hub_page.dart index ea547ab2..1e63b4dc 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/edit_hub_page.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/edit_hub_page.dart @@ -1,17 +1,15 @@ -import 'package:core_localization/core_localization.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; import 'package:flutter_modular/flutter_modular.dart'; -import 'package:google_places_flutter/model/prediction.dart'; import 'package:krow_domain/krow_domain.dart'; import '../blocs/edit_hub/edit_hub_bloc.dart'; import '../blocs/edit_hub/edit_hub_event.dart'; import '../blocs/edit_hub/edit_hub_state.dart'; -import '../widgets/edit_hub/edit_hub_form_section.dart'; +import '../widgets/hub_form_dialog.dart'; -/// A dedicated full-screen page for adding or editing a hub. +/// A wrapper page that shows the hub form in a modal-style layout. class EditHubPage extends StatefulWidget { const EditHubPage({this.hub, required this.bloc, super.key}); @@ -23,66 +21,11 @@ class EditHubPage extends StatefulWidget { } class _EditHubPageState extends State { - final GlobalKey _formKey = GlobalKey(); - late final TextEditingController _nameController; - late final TextEditingController _addressController; - late final FocusNode _addressFocusNode; - Prediction? _selectedPrediction; - @override void initState() { super.initState(); - _nameController = TextEditingController(text: widget.hub?.name); - _addressController = TextEditingController(text: widget.hub?.address); - _addressFocusNode = FocusNode(); - - // Update header on change (if header is added back) - _nameController.addListener(() => setState(() {})); - _addressController.addListener(() => setState(() {})); - } - - @override - void dispose() { - _nameController.dispose(); - _addressController.dispose(); - _addressFocusNode.dispose(); - super.dispose(); - } - - void _onSave() { - if (!_formKey.currentState!.validate()) return; - - if (_addressController.text.trim().isEmpty) { - UiSnackbar.show( - context, - message: t.client_hubs.add_hub_dialog.address_hint, - type: UiSnackbarType.error, - ); - return; - } - - if (widget.hub == null) { - widget.bloc.add( - EditHubAddRequested( - name: _nameController.text.trim(), - address: _addressController.text.trim(), - placeId: _selectedPrediction?.placeId, - latitude: double.tryParse(_selectedPrediction?.lat ?? ''), - longitude: double.tryParse(_selectedPrediction?.lng ?? ''), - ), - ); - } else { - widget.bloc.add( - EditHubUpdateRequested( - id: widget.hub!.id, - name: _nameController.text.trim(), - address: _addressController.text.trim(), - placeId: _selectedPrediction?.placeId, - latitude: double.tryParse(_selectedPrediction?.lat ?? ''), - longitude: double.tryParse(_selectedPrediction?.lng ?? ''), - ), - ); - } + // Load available cost centers + widget.bloc.add(const EditHubCostCentersLoadRequested()); } @override @@ -101,7 +44,6 @@ class _EditHubPageState extends State { message: state.successMessage!, type: UiSnackbarType.success, ); - // Pop back to the previous screen. Modular.to.pop(true); } if (state.status == EditHubStatus.failure && @@ -118,42 +60,59 @@ class _EditHubPageState extends State { final bool isSaving = state.status == EditHubStatus.loading; return Scaffold( - backgroundColor: UiColors.bgMenu, - appBar: UiAppBar( - title: widget.hub == null - ? t.client_hubs.add_hub_dialog.title - : t.client_hubs.edit_hub.title, - subtitle: widget.hub == null - ? t.client_hubs.add_hub_dialog.create_button - : t.client_hubs.edit_hub.subtitle, - onLeadingPressed: () => Modular.to.pop(), - ), + backgroundColor: UiColors.bgOverlay, body: Stack( children: [ - SingleChildScrollView( - child: Column( - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Padding( - padding: const EdgeInsets.all(UiConstants.space5), - child: EditHubFormSection( - formKey: _formKey, - nameController: _nameController, - addressController: _addressController, - addressFocusNode: _addressFocusNode, - onAddressSelected: (Prediction prediction) { - _selectedPrediction = prediction; - }, - onSave: _onSave, - isSaving: isSaving, - isEdit: widget.hub != null, - ), - ), - ], + // Tap background to dismiss + GestureDetector( + onTap: () => Modular.to.pop(), + child: Container(color: Colors.transparent), + ), + + // Dialog-style content centered + Align( + alignment: Alignment.center, + child: HubFormDialog( + hub: widget.hub, + costCenters: state.costCenters, + onCancel: () => Modular.to.pop(), + onSave: ({ + required String name, + required String address, + String? costCenterId, + String? placeId, + double? latitude, + double? longitude, + }) { + if (widget.hub == null) { + widget.bloc.add( + EditHubAddRequested( + name: name, + address: address, + costCenterId: costCenterId, + placeId: placeId, + latitude: latitude, + longitude: longitude, + ), + ); + } else { + widget.bloc.add( + EditHubUpdateRequested( + id: widget.hub!.id, + name: name, + address: address, + costCenterId: costCenterId, + placeId: placeId, + latitude: latitude, + longitude: longitude, + ), + ); + } + }, ), ), - // ── Loading overlay ────────────────────────────────────── + // Global loading overlay if saving if (isSaving) Container( color: UiColors.black.withValues(alpha: 0.1), diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/hub_details_page.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/hub_details_page.dart index cbcf5d61..14c408d2 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/hub_details_page.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/pages/hub_details_page.dart @@ -80,6 +80,15 @@ class HubDetailsPage extends StatelessWidget { icon: UiIcons.nfc, isHighlight: hub.nfcTagId != null, ), + const SizedBox(height: UiConstants.space4), + HubDetailsItem( + label: t.client_hubs.hub_details.cost_center_label, + value: hub.costCenter != null + ? '${hub.costCenter!.name} (${hub.costCenter!.code})' + : t.client_hubs.hub_details.cost_center_none, + icon: UiIcons.bank, // Using bank icon for cost center + isHighlight: hub.costCenter != null, + ), ], ), ), diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/edit_hub/edit_hub_form_section.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/edit_hub/edit_hub_form_section.dart index b874dd3b..574adf59 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/edit_hub/edit_hub_form_section.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/edit_hub/edit_hub_form_section.dart @@ -2,6 +2,7 @@ import 'package:core_localization/core_localization.dart'; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:google_places_flutter/model/prediction.dart'; +import 'package:krow_domain/krow_domain.dart'; import '../hub_address_autocomplete.dart'; import 'edit_hub_field_label.dart'; @@ -15,6 +16,9 @@ class EditHubFormSection extends StatelessWidget { required this.addressFocusNode, required this.onAddressSelected, required this.onSave, + this.costCenters = const [], + this.selectedCostCenterId, + required this.onCostCenterChanged, this.isSaving = false, this.isEdit = false, super.key, @@ -26,6 +30,9 @@ class EditHubFormSection extends StatelessWidget { final FocusNode addressFocusNode; final ValueChanged onAddressSelected; final VoidCallback onSave; + final List costCenters; + final String? selectedCostCenterId; + final ValueChanged onCostCenterChanged; final bool isSaving; final bool isEdit; @@ -62,6 +69,51 @@ class EditHubFormSection extends StatelessWidget { onSelected: onAddressSelected, ), + const SizedBox(height: UiConstants.space4), + + EditHubFieldLabel(t.client_hubs.edit_hub.cost_center_label), + InkWell( + onTap: () => _showCostCenterSelector(context), + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: UiConstants.space4, + vertical: 14, + ), + decoration: BoxDecoration( + color: UiColors.input, + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + border: Border.all( + color: selectedCostCenterId != null + ? UiColors.ring + : UiColors.border, + width: selectedCostCenterId != null ? 2 : 1, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Text( + selectedCostCenterId != null + ? _getCostCenterName(selectedCostCenterId!) + : t.client_hubs.edit_hub.cost_center_hint, + style: selectedCostCenterId != null + ? UiTypography.body1r.textPrimary + : UiTypography.body2r.textPlaceholder, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + const Icon( + Icons.keyboard_arrow_down, + color: UiColors.iconSecondary, + ), + ], + ), + ), + ), + const SizedBox(height: UiConstants.space8), // ── Save button ────────────────────────────────── @@ -102,4 +154,59 @@ class EditHubFormSection extends StatelessWidget { ), ); } + + String _getCostCenterName(String id) { + try { + final CostCenter cc = costCenters.firstWhere((CostCenter item) => item.id == id); + return cc.code != null ? '${cc.name} (${cc.code})' : cc.name; + } catch (_) { + return id; + } + } + + Future _showCostCenterSelector(BuildContext context) async { + final CostCenter? selected = await showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + ), + title: Text( + t.client_hubs.edit_hub.cost_center_label, + style: UiTypography.headline3m.textPrimary, + ), + contentPadding: const EdgeInsets.symmetric(vertical: 16), + content: SizedBox( + width: double.maxFinite, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 400), + child: costCenters.isEmpty + ? const Padding( + padding: EdgeInsets.symmetric(horizontal: 24), + child: Text('No cost centers available'), + ) + : ListView.builder( + shrinkWrap: true, + itemCount: costCenters.length, + itemBuilder: (BuildContext context, int index) { + final CostCenter cc = costCenters[index]; + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24), + title: Text(cc.name, style: UiTypography.body1m.textPrimary), + subtitle: cc.code != null ? Text(cc.code!, style: UiTypography.body2r.textSecondary) : null, + onTap: () => Navigator.of(context).pop(cc), + ); + }, + ), + ), + ), + ); + }, + ); + + if (selected != null) { + onCostCenterChanged(selected.id); + } + } } diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_address_autocomplete.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_address_autocomplete.dart index 66f14d11..ee196446 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_address_autocomplete.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_address_autocomplete.dart @@ -11,6 +11,7 @@ class HubAddressAutocomplete extends StatelessWidget { required this.controller, required this.hintText, this.focusNode, + this.decoration, this.onSelected, super.key, }); @@ -18,6 +19,7 @@ class HubAddressAutocomplete extends StatelessWidget { final TextEditingController controller; final String hintText; final FocusNode? focusNode; + final InputDecoration? decoration; final void Function(Prediction prediction)? onSelected; @override @@ -25,6 +27,7 @@ class HubAddressAutocomplete extends StatelessWidget { return GooglePlaceAutoCompleteTextField( textEditingController: controller, focusNode: focusNode, + inputDecoration: decoration ?? const InputDecoration(), googleAPIKey: AppConfig.googleMapsApiKey, debounceTime: 500, countries: HubsConstants.supportedCountries, diff --git a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_form_dialog.dart b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_form_dialog.dart index 7a4d0cd7..cf5cad95 100644 --- a/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_form_dialog.dart +++ b/apps/mobile/packages/features/client/hubs/lib/src/presentation/widgets/hub_form_dialog.dart @@ -5,25 +5,30 @@ import 'package:google_places_flutter/model/prediction.dart'; import 'package:krow_domain/krow_domain.dart'; import 'hub_address_autocomplete.dart'; +import 'edit_hub/edit_hub_field_label.dart'; -/// A dialog for adding or editing a hub. +/// A bottom sheet dialog for adding or editing a hub. class HubFormDialog extends StatefulWidget { - /// Creates a [HubFormDialog]. const HubFormDialog({ required this.onSave, required this.onCancel, this.hub, + this.costCenters = const [], super.key, }); /// The hub to edit. If null, a new hub is created. final Hub? hub; + /// Available cost centers for selection. + final List costCenters; + /// Callback when the "Save" button is pressed. - final void Function( - String name, - String address, { + final void Function({ + required String name, + required String address, + String? costCenterId, String? placeId, double? latitude, double? longitude, @@ -40,6 +45,7 @@ class _HubFormDialogState extends State { late final TextEditingController _nameController; late final TextEditingController _addressController; late final FocusNode _addressFocusNode; + String? _selectedCostCenterId; Prediction? _selectedPrediction; @override @@ -48,6 +54,7 @@ class _HubFormDialogState extends State { _nameController = TextEditingController(text: widget.hub?.name); _addressController = TextEditingController(text: widget.hub?.address); _addressFocusNode = FocusNode(); + _selectedCostCenterId = widget.hub?.costCenter?.id; } @override @@ -63,102 +70,193 @@ class _HubFormDialogState extends State { @override Widget build(BuildContext context) { final bool isEditing = widget.hub != null; - final String title = isEditing - ? 'Edit Hub' // TODO: localize + final String title = isEditing + ? t.client_hubs.edit_hub.title : t.client_hubs.add_hub_dialog.title; - + final String buttonText = isEditing - ? 'Save Changes' // TODO: localize + ? t.client_hubs.edit_hub.save_button : t.client_hubs.add_hub_dialog.create_button; - return Container( - color: UiColors.bgOverlay, - child: Center( - child: SingleChildScrollView( - child: Container( - width: MediaQuery.of(context).size.width * 0.9, - padding: const EdgeInsets.all(UiConstants.space5), - decoration: BoxDecoration( - color: UiColors.bgPopup, - borderRadius: BorderRadius.circular(UiConstants.radiusBase), - boxShadow: const [ - BoxShadow(color: UiColors.popupShadow, blurRadius: 20), - ], + return Center( + child: Container( + margin: const EdgeInsets.symmetric(horizontal: UiConstants.space5), + decoration: BoxDecoration( + color: UiColors.bgPopup, + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 3), + boxShadow: [ + BoxShadow( + color: UiColors.black.withValues(alpha: 0.15), + blurRadius: 30, + offset: const Offset(0, 10), ), - child: Form( - key: _formKey, - child: Column( - mainAxisSize: MainAxisSize.min, - crossAxisAlignment: CrossAxisAlignment.stretch, - children: [ - Text( - title, - style: UiTypography.headline3m.textPrimary, + ], + ), + padding: const EdgeInsets.all(UiConstants.space6), + child: SingleChildScrollView( + child: Form( + key: _formKey, + child: Column( + mainAxisSize: MainAxisSize.min, + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + title, + style: UiTypography.headline3m.textPrimary.copyWith( + fontSize: 20, ), - const SizedBox(height: UiConstants.space5), - _buildFieldLabel(t.client_hubs.add_hub_dialog.name_label), - TextFormField( - controller: _nameController, - style: UiTypography.body1r.textPrimary, - validator: (String? value) { - if (value == null || value.trim().isEmpty) { - return 'Name is required'; - } - return null; - }, - decoration: _buildInputDecoration( - t.client_hubs.add_hub_dialog.name_hint, + ), + const SizedBox(height: UiConstants.space5), + + // ── Hub Name ──────────────────────────────── + EditHubFieldLabel(t.client_hubs.add_hub_dialog.name_label), + const SizedBox(height: UiConstants.space2), + TextFormField( + controller: _nameController, + style: UiTypography.body1r.textPrimary, + textInputAction: TextInputAction.next, + validator: (String? value) { + if (value == null || value.trim().isEmpty) { + return t.client_hubs.add_hub_dialog.name_required; + } + return null; + }, + decoration: _buildInputDecoration( + t.client_hubs.add_hub_dialog.name_hint, + ), + ), + + const SizedBox(height: UiConstants.space4), + + // ── Cost Center ───────────────────────────── + EditHubFieldLabel(t.client_hubs.add_hub_dialog.cost_center_label), + const SizedBox(height: UiConstants.space2), + InkWell( + onTap: _showCostCenterSelector, + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 1.5), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: UiConstants.space4, + vertical: 16, + ), + decoration: BoxDecoration( + color: const Color(0xFFF8FAFD), + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 1.5), + border: Border.all( + color: _selectedCostCenterId != null + ? UiColors.primary + : UiColors.primary.withValues(alpha: 0.1), + width: _selectedCostCenterId != null ? 2 : 1, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Expanded( + child: Text( + _selectedCostCenterId != null + ? _getCostCenterName(_selectedCostCenterId!) + : t.client_hubs.add_hub_dialog.cost_center_hint, + style: _selectedCostCenterId != null + ? UiTypography.body1r.textPrimary + : UiTypography.body2r.textPlaceholder.copyWith( + color: UiColors.textSecondary.withValues(alpha: 0.5), + ), + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + const Icon( + Icons.keyboard_arrow_down, + color: UiColors.iconSecondary, + ), + ], ), ), - const SizedBox(height: UiConstants.space4), - _buildFieldLabel(t.client_hubs.add_hub_dialog.address_label), - HubAddressAutocomplete( - controller: _addressController, - hintText: t.client_hubs.add_hub_dialog.address_hint, - focusNode: _addressFocusNode, - onSelected: (Prediction prediction) { - _selectedPrediction = prediction; - }, + ), + + const SizedBox(height: UiConstants.space4), + + // ── Address ───────────────────────────────── + EditHubFieldLabel(t.client_hubs.add_hub_dialog.address_label), + const SizedBox(height: UiConstants.space2), + HubAddressAutocomplete( + controller: _addressController, + hintText: t.client_hubs.add_hub_dialog.address_hint, + decoration: _buildInputDecoration( + t.client_hubs.add_hub_dialog.address_hint, ), - const SizedBox(height: UiConstants.space8), - Row( - children: [ - Expanded( - child: UiButton.secondary( - onPressed: widget.onCancel, - text: t.common.cancel, + focusNode: _addressFocusNode, + onSelected: (Prediction prediction) { + _selectedPrediction = prediction; + }, + ), + + const SizedBox(height: UiConstants.space8), + + // ── Buttons ───────────────────────────────── + Row( + children: [ + Expanded( + child: UiButton.secondary( + style: OutlinedButton.styleFrom( + side: BorderSide( + color: UiColors.primary.withValues(alpha: 0.1), + ), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular( + UiConstants.radiusBase * 1.5, + ), + ), ), + onPressed: widget.onCancel, + text: t.common.cancel, ), - const SizedBox(width: UiConstants.space3), - Expanded( - child: UiButton.primary( - onPressed: () { - if (_formKey.currentState!.validate()) { - if (_addressController.text.trim().isEmpty) { - UiSnackbar.show(context, message: 'Address is required', type: UiSnackbarType.error); - return; - } - - widget.onSave( - _nameController.text, - _addressController.text, - placeId: _selectedPrediction?.placeId, - latitude: double.tryParse( - _selectedPrediction?.lat ?? '', - ), - longitude: double.tryParse( - _selectedPrediction?.lng ?? '', - ), + ), + const SizedBox(width: UiConstants.space3), + Expanded( + child: UiButton.primary( + style: ElevatedButton.styleFrom( + backgroundColor: UiColors.accent, + foregroundColor: UiColors.accentForeground, + elevation: 0, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular( + UiConstants.radiusBase * 1.5, + ), + ), + ), + onPressed: () { + if (_formKey.currentState!.validate()) { + if (_addressController.text.trim().isEmpty) { + UiSnackbar.show( + context, + message: t.client_hubs.add_hub_dialog.address_required, + type: UiSnackbarType.error, ); + return; } - }, - text: buttonText, - ), + + widget.onSave( + name: _nameController.text.trim(), + address: _addressController.text.trim(), + costCenterId: _selectedCostCenterId, + placeId: _selectedPrediction?.placeId, + latitude: double.tryParse( + _selectedPrediction?.lat ?? '', + ), + longitude: double.tryParse( + _selectedPrediction?.lng ?? '', + ), + ); + } + }, + text: buttonText, ), - ], - ), - ], - ), + ), + ], + ), + ], ), ), ), @@ -166,35 +264,87 @@ class _HubFormDialogState extends State { ); } - Widget _buildFieldLabel(String label) { - return Padding( - padding: const EdgeInsets.only(bottom: UiConstants.space2), - child: Text(label, style: UiTypography.body2m.textPrimary), - ); - } - InputDecoration _buildInputDecoration(String hint) { return InputDecoration( hintText: hint, - hintStyle: UiTypography.body2r.textPlaceholder, + hintStyle: UiTypography.body2r.textPlaceholder.copyWith( + color: UiColors.textSecondary.withValues(alpha: 0.5), + ), filled: true, - fillColor: UiColors.input, + fillColor: const Color(0xFFF8FAFD), contentPadding: const EdgeInsets.symmetric( horizontal: UiConstants.space4, - vertical: 14, + vertical: 16, ), border: OutlineInputBorder( - borderRadius: BorderRadius.circular(UiConstants.radiusBase), - borderSide: const BorderSide(color: UiColors.border), + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 1.5), + borderSide: BorderSide(color: UiColors.primary.withValues(alpha: 0.1)), ), enabledBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(UiConstants.radiusBase), - borderSide: const BorderSide(color: UiColors.border), + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 1.5), + borderSide: BorderSide(color: UiColors.primary.withValues(alpha: 0.1)), ), focusedBorder: OutlineInputBorder( - borderRadius: BorderRadius.circular(UiConstants.radiusBase), - borderSide: const BorderSide(color: UiColors.ring, width: 2), + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 1.5), + borderSide: const BorderSide(color: UiColors.primary, width: 2), ), + errorStyle: UiTypography.footnote2r.textError, ); } + + String _getCostCenterName(String id) { + try { + return widget.costCenters.firstWhere((CostCenter cc) => cc.id == id).name; + } catch (_) { + return id; + } + } + + Future _showCostCenterSelector() async { + final CostCenter? selected = await showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + ), + title: Text( + t.client_hubs.add_hub_dialog.cost_center_label, + style: UiTypography.headline3m.textPrimary, + ), + contentPadding: const EdgeInsets.symmetric(vertical: 16), + content: SizedBox( + width: double.maxFinite, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 400), + child: widget.costCenters.isEmpty + ? const Padding( + padding: EdgeInsets.symmetric(horizontal: 24), + child: Text('No cost centers available'), + ) + : ListView.builder( + shrinkWrap: true, + itemCount: widget.costCenters.length, + itemBuilder: (BuildContext context, int index) { + final CostCenter cc = widget.costCenters[index]; + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24), + title: Text(cc.name, style: UiTypography.body1m.textPrimary), + subtitle: cc.code != null ? Text(cc.code!, style: UiTypography.body2r.textSecondary) : null, + onTap: () => Navigator.of(context).pop(cc), + ); + }, + ), + ), + ), + ); + }, + ); + + if (selected != null) { + setState(() { + _selectedCostCenterId = selected.id; + }); + } + } } diff --git a/apps/mobile/packages/features/client/orders/analyze.txt b/apps/mobile/packages/features/client/orders/analyze.txt new file mode 100644 index 0000000000000000000000000000000000000000..28d6d1d597978e344651be456b1588799cd9686e GIT binary patch literal 3460 zcmeH~%Wl&^6o$_liFcS?HV|k-OWO@X;st=Pi)7{ErdFM}ik*b;@WA)aWbC-$QmG(S zDjM12nK`#PcmMeQ-j+7D+;;ZOGQQ{LtiK=6?V0IujMP?)g2&lQo(<5cZ7uP8Gk;#% z2uhhvm`fn1%s0#_s}$N5oGQ)>zDM9@HiKWvo-jo_&`H>vaauvWv@2GE>9aQmrm_ng z*c&@$KH@9L^97p1z65XS@g4kgFiM8Ao_(}6`zvnxiMeEzL#qc}XG6a)j4Lptg{X_l z^LOlxZ2_JGr|@sdb+})^+j(qh>njvWU?ZJImKQ(;Jx<}8g3&;YIcp%D*O4R;*W3K= zzL9LS{zWIr0rkge*>gK#$inB`K(`p~Z!X)H&dgtsM2YODlK1*-(A^25M;OoZgnmj$+- z=d$(_-MI0Kv=v_uiLP#%T_;H$bSuIYsj+|p|XkeIkjuv zit-D-ltGj;X3Pur6&K zHFC$8&~28)vm#v>_sw?7P|9*6&so}#&E;kCO=X=?2d(5c7&|l-q{~~`?}*$tK%Z~- z(tUt_^mNI+VSNp^V1p19%5>pY&gbL;{jB%85w^TedqGPvA4*G6%gRkTFmp!SyF}^` zFI!GlaE&@1dnuIR6VFc=Rb5RUyM710y2K3hboAR@t(CC~eB>?A!2U;S5{gg*-XBdH@2d{#@UPDZpO fyDDM)yD5F8Q#YX+qCWxsZ>at|Pd9YteGl~$WyEs? literal 0 HcmV?d00001 diff --git a/apps/mobile/packages/features/client/orders/analyze_output.txt b/apps/mobile/packages/features/client/orders/analyze_output.txt new file mode 100644 index 0000000000000000000000000000000000000000..53f8069cc7094489ad26bcf2f1f03b2a27b7aac1 GIT binary patch literal 2792 zcmeH}Sxdt}5Xb+|g5RNUK6&H$CSDXzwAB}(q%lfSlhST2LO;9un@L&^>IsTM37hQB zv9q1uOwxz@Q?2Pp`zkZG)zh&mNGhz?Rnu#26{{*Xo7zBI)}9V^fPV$gO|9yTYey|* z>S|J#JTvasN?da_&~%ZvbfpV_#)UpoldJ8vH)!f=41Al46yp)GUsBjyFpCt_VXwX{ z#-qV1MQ*3DIOnWeg-`6Z=9TaZp0s9bo^|(XV-@?X>GthnNAqjomAbCW{M^qIKC$~- zk!!m36L&SmZV~YU*<55SGv@tXC1Qsd2^J-+Z^)CKJ&^N~CRjbs&MJAz8Pu@Pu#WIa zHT{PCDeeSk7}uCr!xm(F+V#2dUDFAYvXeiAxmC>n;oi^jbLM%a4Wn)x0>i4pYRj_S zCWpbZZuOP>4&Svl#OID`%eh^@;5@52827ZqSYT`rA%$pg&MCE#K`kjLx13`@Z&i?T zxBASW+@W6kwOL|rvSdWl3H~O{d3g4;GNS1{kax*P@8scK^qn_yop*Rf^}pYpG2LR{ jmhhqz=jgu~xQ#mTE8o+ on(_onPositionUpdated); on(_onSubmitted); on(_onInitialized); + on(_onHubManagerChanged); + on(_onManagersLoaded); _loadVendors(); _loadHubs(); @@ -134,6 +136,43 @@ class OneTimeOrderBloc extends Bloc } } + Future _loadManagersForHub( + String hubId, + ) async { + final List? managers = + await handleErrorWithResult( + action: () async { + final fdc.QueryResult result = + await _service.connector.listTeamMembers().execute(); + + return result.data.teamMembers + .where( + (dc.ListTeamMembersTeamMembers member) => + member.teamHubId == hubId && + member.role is dc.Known && + (member.role as dc.Known).value == + dc.TeamMemberRole.MANAGER, + ) + .map( + (dc.ListTeamMembersTeamMembers member) => + OneTimeOrderManagerOption( + id: member.id, + name: member.user.fullName ?? 'Unknown', + ), + ) + .toList(); + }, + onError: (_) { + add(const OneTimeOrderManagersLoaded([])); + }, + ); + + if (managers != null) { + add(OneTimeOrderManagersLoaded(managers)); + } + } + + Future _onVendorsLoaded( OneTimeOrderVendorsLoaded event, Emitter emit, @@ -171,15 +210,36 @@ class OneTimeOrderBloc extends Bloc location: selectedHub?.name ?? '', ), ); + + if (selectedHub != null) { + _loadManagersForHub(selectedHub.id); + } } + void _onHubChanged( OneTimeOrderHubChanged event, Emitter emit, ) { emit(state.copyWith(selectedHub: event.hub, location: event.hub.name)); + _loadManagersForHub(event.hub.id); } + void _onHubManagerChanged( + OneTimeOrderHubManagerChanged event, + Emitter emit, + ) { + emit(state.copyWith(selectedManager: event.manager)); + } + + void _onManagersLoaded( + OneTimeOrderManagersLoaded event, + Emitter emit, + ) { + emit(state.copyWith(managers: event.managers)); + } + + void _onEventNameChanged( OneTimeOrderEventNameChanged event, Emitter emit, @@ -267,6 +327,7 @@ class OneTimeOrderBloc extends Bloc ), eventName: state.eventName, vendorId: state.selectedVendor?.id, + hubManagerId: state.selectedManager?.id, roleRates: roleRates, ); await _createOneTimeOrderUseCase(OneTimeOrderArguments(order: order)); diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_event.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_event.dart index b6255dab..b64f0542 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_event.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_event.dart @@ -89,3 +89,21 @@ class OneTimeOrderInitialized extends OneTimeOrderEvent { @override List get props => [data]; } + +class OneTimeOrderHubManagerChanged extends OneTimeOrderEvent { + const OneTimeOrderHubManagerChanged(this.manager); + final OneTimeOrderManagerOption? manager; + + @override + List get props => [manager]; +} + +class OneTimeOrderManagersLoaded extends OneTimeOrderEvent { + const OneTimeOrderManagersLoaded(this.managers); + final List managers; + + @override + List get props => [managers]; +} + + diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_state.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_state.dart index d21bbfc3..b48b9134 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_state.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/one_time_order/one_time_order_state.dart @@ -16,6 +16,8 @@ class OneTimeOrderState extends Equatable { this.hubs = const [], this.selectedHub, this.roles = const [], + this.managers = const [], + this.selectedManager, }); factory OneTimeOrderState.initial() { @@ -29,6 +31,7 @@ class OneTimeOrderState extends Equatable { vendors: const [], hubs: const [], roles: const [], + managers: const [], ); } final DateTime date; @@ -42,6 +45,8 @@ class OneTimeOrderState extends Equatable { final List hubs; final OneTimeOrderHubOption? selectedHub; final List roles; + final List managers; + final OneTimeOrderManagerOption? selectedManager; OneTimeOrderState copyWith({ DateTime? date, @@ -55,6 +60,8 @@ class OneTimeOrderState extends Equatable { List? hubs, OneTimeOrderHubOption? selectedHub, List? roles, + List? managers, + OneTimeOrderManagerOption? selectedManager, }) { return OneTimeOrderState( date: date ?? this.date, @@ -68,6 +75,8 @@ class OneTimeOrderState extends Equatable { hubs: hubs ?? this.hubs, selectedHub: selectedHub ?? this.selectedHub, roles: roles ?? this.roles, + managers: managers ?? this.managers, + selectedManager: selectedManager ?? this.selectedManager, ); } @@ -98,6 +107,8 @@ class OneTimeOrderState extends Equatable { hubs, selectedHub, roles, + managers, + selectedManager, ]; } @@ -158,3 +169,17 @@ class OneTimeOrderRoleOption extends Equatable { @override List get props => [id, name, costPerHour]; } + +class OneTimeOrderManagerOption extends Equatable { + const OneTimeOrderManagerOption({ + required this.id, + required this.name, + }); + + final String id; + final String name; + + @override + List get props => [id, name]; +} + diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart index 6f173604..5c0c34af 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_bloc.dart @@ -31,6 +31,8 @@ class PermanentOrderBloc extends Bloc on(_onPositionUpdated); on(_onSubmitted); on(_onInitialized); + on(_onHubManagerChanged); + on(_onManagersLoaded); _loadVendors(); _loadHubs(); @@ -182,6 +184,10 @@ class PermanentOrderBloc extends Bloc location: selectedHub?.name ?? '', ), ); + + if (selectedHub != null) { + _loadManagersForHub(selectedHub.id, emit); + } } void _onHubChanged( @@ -189,8 +195,61 @@ class PermanentOrderBloc extends Bloc Emitter emit, ) { emit(state.copyWith(selectedHub: event.hub, location: event.hub.name)); + _loadManagersForHub(event.hub.id, emit); } + void _onHubManagerChanged( + PermanentOrderHubManagerChanged event, + Emitter emit, + ) { + emit(state.copyWith(selectedManager: event.manager)); + } + + void _onManagersLoaded( + PermanentOrderManagersLoaded event, + Emitter emit, + ) { + emit(state.copyWith(managers: event.managers)); + } + + Future _loadManagersForHub( + String hubId, + Emitter emit, + ) async { + final List? managers = + await handleErrorWithResult( + action: () async { + final fdc.QueryResult result = + await _service.connector.listTeamMembers().execute(); + + return result.data.teamMembers + .where( + (dc.ListTeamMembersTeamMembers member) => + member.teamHubId == hubId && + member.role is dc.Known && + (member.role as dc.Known).value == + dc.TeamMemberRole.MANAGER, + ) + .map( + (dc.ListTeamMembersTeamMembers member) => + PermanentOrderManagerOption( + id: member.id, + name: member.user.fullName ?? 'Unknown', + ), + ) + .toList(); + }, + onError: (_) => emit( + state.copyWith(managers: const []), + ), + ); + + if (managers != null) { + emit(state.copyWith(managers: managers, selectedManager: null)); + } + } + + void _onEventNameChanged( PermanentOrderEventNameChanged event, Emitter emit, @@ -330,6 +389,7 @@ class PermanentOrderBloc extends Bloc ), eventName: state.eventName, vendorId: state.selectedVendor?.id, + hubManagerId: state.selectedManager?.id, roleRates: roleRates, ); await _createPermanentOrderUseCase(order); diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_event.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_event.dart index 28dcbcd3..f194618c 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_event.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_event.dart @@ -106,3 +106,20 @@ class PermanentOrderInitialized extends PermanentOrderEvent { @override List get props => [data]; } + +class PermanentOrderHubManagerChanged extends PermanentOrderEvent { + const PermanentOrderHubManagerChanged(this.manager); + final PermanentOrderManagerOption? manager; + + @override + List get props => [manager]; +} + +class PermanentOrderManagersLoaded extends PermanentOrderEvent { + const PermanentOrderManagersLoaded(this.managers); + final List managers; + + @override + List get props => [managers]; +} + diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_state.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_state.dart index 38dc743e..4cd04e66 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_state.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/permanent_order/permanent_order_state.dart @@ -18,6 +18,8 @@ class PermanentOrderState extends Equatable { this.hubs = const [], this.selectedHub, this.roles = const [], + this.managers = const [], + this.selectedManager, }); factory PermanentOrderState.initial() { @@ -45,6 +47,7 @@ class PermanentOrderState extends Equatable { vendors: const [], hubs: const [], roles: const [], + managers: const [], ); } @@ -61,6 +64,8 @@ class PermanentOrderState extends Equatable { final List hubs; final PermanentOrderHubOption? selectedHub; final List roles; + final List managers; + final PermanentOrderManagerOption? selectedManager; PermanentOrderState copyWith({ DateTime? startDate, @@ -76,6 +81,8 @@ class PermanentOrderState extends Equatable { List? hubs, PermanentOrderHubOption? selectedHub, List? roles, + List? managers, + PermanentOrderManagerOption? selectedManager, }) { return PermanentOrderState( startDate: startDate ?? this.startDate, @@ -91,6 +98,8 @@ class PermanentOrderState extends Equatable { hubs: hubs ?? this.hubs, selectedHub: selectedHub ?? this.selectedHub, roles: roles ?? this.roles, + managers: managers ?? this.managers, + selectedManager: selectedManager ?? this.selectedManager, ); } @@ -124,6 +133,8 @@ class PermanentOrderState extends Equatable { hubs, selectedHub, roles, + managers, + selectedManager, ]; } @@ -185,6 +196,20 @@ class PermanentOrderRoleOption extends Equatable { List get props => [id, name, costPerHour]; } +class PermanentOrderManagerOption extends Equatable { + const PermanentOrderManagerOption({ + required this.id, + required this.name, + }); + + final String id; + final String name; + + @override + List get props => [id, name]; +} + + class PermanentOrderPosition extends Equatable { const PermanentOrderPosition({ required this.role, diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_bloc.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_bloc.dart index 0673531e..4099937c 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_bloc.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_bloc.dart @@ -32,6 +32,8 @@ class RecurringOrderBloc extends Bloc on(_onPositionUpdated); on(_onSubmitted); on(_onInitialized); + on(_onHubManagerChanged); + on(_onManagersLoaded); _loadVendors(); _loadHubs(); @@ -183,6 +185,10 @@ class RecurringOrderBloc extends Bloc location: selectedHub?.name ?? '', ), ); + + if (selectedHub != null) { + _loadManagersForHub(selectedHub.id, emit); + } } void _onHubChanged( @@ -190,6 +196,58 @@ class RecurringOrderBloc extends Bloc Emitter emit, ) { emit(state.copyWith(selectedHub: event.hub, location: event.hub.name)); + _loadManagersForHub(event.hub.id, emit); + } + + void _onHubManagerChanged( + RecurringOrderHubManagerChanged event, + Emitter emit, + ) { + emit(state.copyWith(selectedManager: event.manager)); + } + + void _onManagersLoaded( + RecurringOrderManagersLoaded event, + Emitter emit, + ) { + emit(state.copyWith(managers: event.managers)); + } + + Future _loadManagersForHub( + String hubId, + Emitter emit, + ) async { + final List? managers = + await handleErrorWithResult( + action: () async { + final fdc.QueryResult result = + await _service.connector.listTeamMembers().execute(); + + return result.data.teamMembers + .where( + (dc.ListTeamMembersTeamMembers member) => + member.teamHubId == hubId && + member.role is dc.Known && + (member.role as dc.Known).value == + dc.TeamMemberRole.MANAGER, + ) + .map( + (dc.ListTeamMembersTeamMembers member) => + RecurringOrderManagerOption( + id: member.id, + name: member.user.fullName ?? 'Unknown', + ), + ) + .toList(); + }, + onError: (_) => emit( + state.copyWith(managers: const []), + ), + ); + + if (managers != null) { + emit(state.copyWith(managers: managers, selectedManager: null)); + } } void _onEventNameChanged( @@ -349,6 +407,7 @@ class RecurringOrderBloc extends Bloc ), eventName: state.eventName, vendorId: state.selectedVendor?.id, + hubManagerId: state.selectedManager?.id, roleRates: roleRates, ); await _createRecurringOrderUseCase(order); diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_event.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_event.dart index a04dbdbb..779e97cf 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_event.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_event.dart @@ -115,3 +115,20 @@ class RecurringOrderInitialized extends RecurringOrderEvent { @override List get props => [data]; } + +class RecurringOrderHubManagerChanged extends RecurringOrderEvent { + const RecurringOrderHubManagerChanged(this.manager); + final RecurringOrderManagerOption? manager; + + @override + List get props => [manager]; +} + +class RecurringOrderManagersLoaded extends RecurringOrderEvent { + const RecurringOrderManagersLoaded(this.managers); + final List managers; + + @override + List get props => [managers]; +} + diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_state.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_state.dart index 626beae8..8a22eb64 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_state.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/blocs/recurring_order/recurring_order_state.dart @@ -19,6 +19,8 @@ class RecurringOrderState extends Equatable { this.hubs = const [], this.selectedHub, this.roles = const [], + this.managers = const [], + this.selectedManager, }); factory RecurringOrderState.initial() { @@ -47,6 +49,7 @@ class RecurringOrderState extends Equatable { vendors: const [], hubs: const [], roles: const [], + managers: const [], ); } @@ -64,6 +67,8 @@ class RecurringOrderState extends Equatable { final List hubs; final RecurringOrderHubOption? selectedHub; final List roles; + final List managers; + final RecurringOrderManagerOption? selectedManager; RecurringOrderState copyWith({ DateTime? startDate, @@ -80,6 +85,8 @@ class RecurringOrderState extends Equatable { List? hubs, RecurringOrderHubOption? selectedHub, List? roles, + List? managers, + RecurringOrderManagerOption? selectedManager, }) { return RecurringOrderState( startDate: startDate ?? this.startDate, @@ -96,6 +103,8 @@ class RecurringOrderState extends Equatable { hubs: hubs ?? this.hubs, selectedHub: selectedHub ?? this.selectedHub, roles: roles ?? this.roles, + managers: managers ?? this.managers, + selectedManager: selectedManager ?? this.selectedManager, ); } @@ -132,6 +141,8 @@ class RecurringOrderState extends Equatable { hubs, selectedHub, roles, + managers, + selectedManager, ]; } @@ -193,6 +204,20 @@ class RecurringOrderRoleOption extends Equatable { List get props => [id, name, costPerHour]; } +class RecurringOrderManagerOption extends Equatable { + const RecurringOrderManagerOption({ + required this.id, + required this.name, + }); + + final String id; + final String name; + + @override + List get props => [id, name]; +} + + class RecurringOrderPosition extends Equatable { const RecurringOrderPosition({ required this.role, diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart index 899e787b..8c8f0e3f 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/one_time_order_page.dart @@ -48,6 +48,10 @@ class OneTimeOrderPage extends StatelessWidget { hubs: state.hubs.map(_mapHub).toList(), positions: state.positions.map(_mapPosition).toList(), roles: state.roles.map(_mapRole).toList(), + selectedHubManager: state.selectedManager != null + ? _mapManager(state.selectedManager!) + : null, + hubManagers: state.managers.map(_mapManager).toList(), isValid: state.isValid, onEventNameChanged: (String val) => bloc.add(OneTimeOrderEventNameChanged(val)), @@ -61,6 +65,17 @@ class OneTimeOrderPage extends StatelessWidget { ); bloc.add(OneTimeOrderHubChanged(originalHub)); }, + onHubManagerChanged: (OrderManagerUiModel? val) { + if (val == null) { + bloc.add(const OneTimeOrderHubManagerChanged(null)); + return; + } + final OneTimeOrderManagerOption original = + state.managers.firstWhere( + (OneTimeOrderManagerOption m) => m.id == val.id, + ); + bloc.add(OneTimeOrderHubManagerChanged(original)); + }, onPositionAdded: () => bloc.add(const OneTimeOrderPositionAdded()), onPositionUpdated: (int index, OrderPositionUiModel val) { final OneTimeOrderPosition original = state.positions[index]; @@ -130,4 +145,9 @@ class OneTimeOrderPage extends StatelessWidget { lunchBreak: pos.lunchBreak, ); } + + OrderManagerUiModel _mapManager(OneTimeOrderManagerOption manager) { + return OrderManagerUiModel(id: manager.id, name: manager.name); + } } + diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart index 2fb67a03..26109e7a 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/permanent_order_page.dart @@ -42,6 +42,10 @@ class PermanentOrderPage extends StatelessWidget { ? _mapHub(state.selectedHub!) : null, hubs: state.hubs.map(_mapHub).toList(), + hubManagers: state.managers.map(_mapManager).toList(), + selectedHubManager: state.selectedManager != null + ? _mapManager(state.selectedManager!) + : null, positions: state.positions.map(_mapPosition).toList(), roles: state.roles.map(_mapRole).toList(), isValid: state.isValid, @@ -59,6 +63,17 @@ class PermanentOrderPage extends StatelessWidget { ); bloc.add(PermanentOrderHubChanged(originalHub)); }, + onHubManagerChanged: (OrderManagerUiModel? val) { + if (val == null) { + bloc.add(const PermanentOrderHubManagerChanged(null)); + return; + } + final PermanentOrderManagerOption original = + state.managers.firstWhere( + (PermanentOrderManagerOption m) => m.id == val.id, + ); + bloc.add(PermanentOrderHubManagerChanged(original)); + }, onPositionAdded: () => bloc.add(const PermanentOrderPositionAdded()), onPositionUpdated: (int index, OrderPositionUiModel val) { @@ -181,4 +196,8 @@ class PermanentOrderPage extends StatelessWidget { lunchBreak: pos.lunchBreak ?? 'NO_BREAK', ); } + + OrderManagerUiModel _mapManager(PermanentOrderManagerOption manager) { + return OrderManagerUiModel(id: manager.id, name: manager.name); + } } diff --git a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart index 6954e826..c65c26a3 100644 --- a/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart +++ b/apps/mobile/packages/features/client/orders/create_order/lib/src/presentation/pages/recurring_order_page.dart @@ -43,6 +43,10 @@ class RecurringOrderPage extends StatelessWidget { ? _mapHub(state.selectedHub!) : null, hubs: state.hubs.map(_mapHub).toList(), + hubManagers: state.managers.map(_mapManager).toList(), + selectedHubManager: state.selectedManager != null + ? _mapManager(state.selectedManager!) + : null, positions: state.positions.map(_mapPosition).toList(), roles: state.roles.map(_mapRole).toList(), isValid: state.isValid, @@ -62,6 +66,17 @@ class RecurringOrderPage extends StatelessWidget { ); bloc.add(RecurringOrderHubChanged(originalHub)); }, + onHubManagerChanged: (OrderManagerUiModel? val) { + if (val == null) { + bloc.add(const RecurringOrderHubManagerChanged(null)); + return; + } + final RecurringOrderManagerOption original = + state.managers.firstWhere( + (RecurringOrderManagerOption m) => m.id == val.id, + ); + bloc.add(RecurringOrderHubManagerChanged(original)); + }, onPositionAdded: () => bloc.add(const RecurringOrderPositionAdded()), onPositionUpdated: (int index, OrderPositionUiModel val) { @@ -193,4 +208,8 @@ class RecurringOrderPage extends StatelessWidget { lunchBreak: pos.lunchBreak ?? 'NO_BREAK', ); } + + OrderManagerUiModel _mapManager(RecurringOrderManagerOption manager) { + return OrderManagerUiModel(id: manager.id, name: manager.name); + } } diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart new file mode 100644 index 00000000..3ffa9af5 --- /dev/null +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/hub_manager_selector.dart @@ -0,0 +1,161 @@ +import 'package:design_system/design_system.dart'; +import 'package:flutter/material.dart'; + +import 'order_ui_models.dart'; + +class HubManagerSelector extends StatelessWidget { + const HubManagerSelector({ + required this.managers, + required this.selectedManager, + required this.onChanged, + required this.hintText, + required this.label, + this.description, + super.key, + }); + + final List managers; + final OrderManagerUiModel? selectedManager; + final ValueChanged onChanged; + final String hintText; + final String label; + final String? description; + + @override + Widget build(BuildContext context) { + return Column( + crossAxisAlignment: CrossAxisAlignment.stretch, + children: [ + Text( + label, + style: UiTypography.body1m.textPrimary, + ), + if (description != null) ...[ + const SizedBox(height: UiConstants.space2), + Text(description!, style: UiTypography.body2r.textSecondary), + ], + const SizedBox(height: UiConstants.space2), + InkWell( + onTap: () => _showSelector(context), + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: UiConstants.space4, + vertical: 14, + ), + decoration: BoxDecoration( + color: UiColors.white, + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + border: Border.all( + color: selectedManager != null ? UiColors.primary : UiColors.border, + width: selectedManager != null ? 2 : 1, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon( + UiIcons.user, + color: selectedManager != null + ? UiColors.primary + : UiColors.iconSecondary, + size: 20, + ), + const SizedBox(width: UiConstants.space3), + Text( + selectedManager?.name ?? hintText, + style: selectedManager != null + ? UiTypography.body1r.textPrimary + : UiTypography.body2r.textPlaceholder, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ], + ), + const Icon( + Icons.keyboard_arrow_down, + color: UiColors.iconSecondary, + ), + ], + ), + ), + ), + ], + ); + } + + Future _showSelector(BuildContext context) async { + final OrderManagerUiModel? selected = await showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + ), + title: Text( + label, + style: UiTypography.headline3m.textPrimary, + ), + contentPadding: const EdgeInsets.symmetric(vertical: 16), + content: SizedBox( + width: double.maxFinite, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 400), + child: ListView.builder( + shrinkWrap: true, + itemCount: managers.isEmpty ? 2 : managers.length + 1, + itemBuilder: (BuildContext context, int index) { + if (managers.isEmpty) { + if (index == 0) { + return const Padding( + padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8), + child: Text('No hub managers available'), + ); + } + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24), + title: Text('None', style: UiTypography.body1m.textSecondary), + onTap: () => Navigator.of(context).pop( + const OrderManagerUiModel(id: 'NONE', name: 'None'), + ), + ); + } + + if (index == managers.length) { + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24), + title: Text('None', style: UiTypography.body1m.textSecondary), + onTap: () => Navigator.of(context).pop( + const OrderManagerUiModel(id: 'NONE', name: 'None'), + ), + ); + } + + final OrderManagerUiModel manager = managers[index]; + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8), + title: Text(manager.name, style: UiTypography.body1m.textPrimary), + subtitle: manager.phone != null + ? Text(manager.phone!, style: UiTypography.body2r.textSecondary) + : null, + onTap: () => Navigator.of(context).pop(manager), + ); + }, + ), + ), + ), + ); + }, + ); + + if (selected != null) { + if (selected.id == 'NONE') { + onChanged(null); + } else { + onChanged(selected); + } + } + } +} diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/one_time_order/one_time_order_view.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/one_time_order/one_time_order_view.dart index ba891dcc..8c38ebd3 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/one_time_order/one_time_order_view.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/one_time_order/one_time_order_view.dart @@ -3,6 +3,7 @@ import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:krow_domain/krow_domain.dart'; import '../order_ui_models.dart'; +import '../hub_manager_selector.dart'; import 'one_time_order_date_picker.dart'; import 'one_time_order_event_name_input.dart'; import 'one_time_order_header.dart'; @@ -23,11 +24,14 @@ class OneTimeOrderView extends StatelessWidget { required this.hubs, required this.positions, required this.roles, + required this.hubManagers, + required this.selectedHubManager, required this.isValid, required this.onEventNameChanged, required this.onVendorChanged, required this.onDateChanged, required this.onHubChanged, + required this.onHubManagerChanged, required this.onPositionAdded, required this.onPositionUpdated, required this.onPositionRemoved, @@ -47,12 +51,15 @@ class OneTimeOrderView extends StatelessWidget { final List hubs; final List positions; final List roles; + final List hubManagers; + final OrderManagerUiModel? selectedHubManager; final bool isValid; final ValueChanged onEventNameChanged; final ValueChanged onVendorChanged; final ValueChanged onDateChanged; final ValueChanged onHubChanged; + final ValueChanged onHubManagerChanged; final VoidCallback onPositionAdded; final void Function(int index, OrderPositionUiModel position) onPositionUpdated; final void Function(int index) onPositionRemoved; @@ -143,12 +150,15 @@ class OneTimeOrderView extends StatelessWidget { date: date, selectedHub: selectedHub, hubs: hubs, + selectedHubManager: selectedHubManager, + hubManagers: hubManagers, positions: positions, roles: roles, onEventNameChanged: onEventNameChanged, onVendorChanged: onVendorChanged, onDateChanged: onDateChanged, onHubChanged: onHubChanged, + onHubManagerChanged: onHubManagerChanged, onPositionAdded: onPositionAdded, onPositionUpdated: onPositionUpdated, onPositionRemoved: onPositionRemoved, @@ -179,12 +189,15 @@ class _OneTimeOrderForm extends StatelessWidget { required this.date, required this.selectedHub, required this.hubs, + required this.selectedHubManager, + required this.hubManagers, required this.positions, required this.roles, required this.onEventNameChanged, required this.onVendorChanged, required this.onDateChanged, required this.onHubChanged, + required this.onHubManagerChanged, required this.onPositionAdded, required this.onPositionUpdated, required this.onPositionRemoved, @@ -196,6 +209,8 @@ class _OneTimeOrderForm extends StatelessWidget { final DateTime date; final OrderHubUiModel? selectedHub; final List hubs; + final OrderManagerUiModel? selectedHubManager; + final List hubManagers; final List positions; final List roles; @@ -203,6 +218,7 @@ class _OneTimeOrderForm extends StatelessWidget { final ValueChanged onVendorChanged; final ValueChanged onDateChanged; final ValueChanged onHubChanged; + final ValueChanged onHubManagerChanged; final VoidCallback onPositionAdded; final void Function(int index, OrderPositionUiModel position) onPositionUpdated; final void Function(int index) onPositionRemoved; @@ -310,6 +326,16 @@ class _OneTimeOrderForm extends StatelessWidget { ), ), ), + const SizedBox(height: UiConstants.space4), + + HubManagerSelector( + label: labels.hub_manager_label, + description: labels.hub_manager_desc, + hintText: labels.hub_manager_hint, + managers: hubManagers, + selectedManager: selectedHubManager, + onChanged: onHubManagerChanged, + ), const SizedBox(height: UiConstants.space6), OneTimeOrderSectionHeader( diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/order_ui_models.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/order_ui_models.dart index 48931710..ea6680af 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/order_ui_models.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/order_ui_models.dart @@ -94,3 +94,19 @@ class OrderPositionUiModel extends Equatable { @override List get props => [role, count, startTime, endTime, lunchBreak]; } + +class OrderManagerUiModel extends Equatable { + const OrderManagerUiModel({ + required this.id, + required this.name, + this.phone, + }); + + final String id; + final String name; + final String? phone; + + @override + List get props => [id, name, phone]; +} + diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_view.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_view.dart index c33d3641..122c1d6f 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_view.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/permanent_order/permanent_order_view.dart @@ -3,6 +3,7 @@ import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import 'package:krow_domain/krow_domain.dart' show Vendor; import '../order_ui_models.dart'; +import '../hub_manager_selector.dart'; import 'permanent_order_date_picker.dart'; import 'permanent_order_event_name_input.dart'; import 'permanent_order_header.dart'; @@ -24,12 +25,15 @@ class PermanentOrderView extends StatelessWidget { required this.hubs, required this.positions, required this.roles, + required this.hubManagers, + required this.selectedHubManager, required this.isValid, required this.onEventNameChanged, required this.onVendorChanged, required this.onStartDateChanged, required this.onDayToggled, required this.onHubChanged, + required this.onHubManagerChanged, required this.onPositionAdded, required this.onPositionUpdated, required this.onPositionRemoved, @@ -48,6 +52,8 @@ class PermanentOrderView extends StatelessWidget { final List permanentDays; final OrderHubUiModel? selectedHub; final List hubs; + final OrderManagerUiModel? selectedHubManager; + final List hubManagers; final List positions; final List roles; final bool isValid; @@ -57,6 +63,7 @@ class PermanentOrderView extends StatelessWidget { final ValueChanged onStartDateChanged; final ValueChanged onDayToggled; final ValueChanged onHubChanged; + final ValueChanged onHubManagerChanged; final VoidCallback onPositionAdded; final void Function(int index, OrderPositionUiModel position) onPositionUpdated; final void Function(int index) onPositionRemoved; @@ -156,9 +163,12 @@ class PermanentOrderView extends StatelessWidget { onStartDateChanged: onStartDateChanged, onDayToggled: onDayToggled, onHubChanged: onHubChanged, + onHubManagerChanged: onHubManagerChanged, onPositionAdded: onPositionAdded, onPositionUpdated: onPositionUpdated, onPositionRemoved: onPositionRemoved, + hubManagers: hubManagers, + selectedHubManager: selectedHubManager, ), if (status == OrderFormStatus.loading) const Center(child: CircularProgressIndicator()), @@ -194,9 +204,12 @@ class _PermanentOrderForm extends StatelessWidget { required this.onStartDateChanged, required this.onDayToggled, required this.onHubChanged, + required this.onHubManagerChanged, required this.onPositionAdded, required this.onPositionUpdated, required this.onPositionRemoved, + required this.hubManagers, + required this.selectedHubManager, }); final String eventName; @@ -214,10 +227,14 @@ class _PermanentOrderForm extends StatelessWidget { final ValueChanged onStartDateChanged; final ValueChanged onDayToggled; final ValueChanged onHubChanged; + final ValueChanged onHubManagerChanged; final VoidCallback onPositionAdded; final void Function(int index, OrderPositionUiModel position) onPositionUpdated; final void Function(int index) onPositionRemoved; + final List hubManagers; + final OrderManagerUiModel? selectedHubManager; + @override Widget build(BuildContext context) { final TranslationsClientCreateOrderPermanentEn labels = @@ -331,6 +348,16 @@ class _PermanentOrderForm extends StatelessWidget { ), ), ), + const SizedBox(height: UiConstants.space4), + + HubManagerSelector( + label: oneTimeLabels.hub_manager_label, + description: oneTimeLabels.hub_manager_desc, + hintText: oneTimeLabels.hub_manager_hint, + managers: hubManagers, + selectedManager: selectedHubManager, + onChanged: onHubManagerChanged, + ), const SizedBox(height: UiConstants.space6), PermanentOrderSectionHeader( diff --git a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_view.dart b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_view.dart index 18c01872..a8668653 100644 --- a/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_view.dart +++ b/apps/mobile/packages/features/client/orders/orders_common/lib/src/presentation/widgets/recurring_order/recurring_order_view.dart @@ -3,6 +3,7 @@ import 'package:krow_domain/krow_domain.dart' show Vendor; import 'package:design_system/design_system.dart'; import 'package:flutter/material.dart'; import '../order_ui_models.dart'; +import '../hub_manager_selector.dart'; import 'recurring_order_date_picker.dart'; import 'recurring_order_event_name_input.dart'; import 'recurring_order_header.dart'; @@ -25,6 +26,8 @@ class RecurringOrderView extends StatelessWidget { required this.hubs, required this.positions, required this.roles, + required this.hubManagers, + required this.selectedHubManager, required this.isValid, required this.onEventNameChanged, required this.onVendorChanged, @@ -32,6 +35,7 @@ class RecurringOrderView extends StatelessWidget { required this.onEndDateChanged, required this.onDayToggled, required this.onHubChanged, + required this.onHubManagerChanged, required this.onPositionAdded, required this.onPositionUpdated, required this.onPositionRemoved, @@ -51,6 +55,8 @@ class RecurringOrderView extends StatelessWidget { final List recurringDays; final OrderHubUiModel? selectedHub; final List hubs; + final OrderManagerUiModel? selectedHubManager; + final List hubManagers; final List positions; final List roles; final bool isValid; @@ -61,6 +67,7 @@ class RecurringOrderView extends StatelessWidget { final ValueChanged onEndDateChanged; final ValueChanged onDayToggled; final ValueChanged onHubChanged; + final ValueChanged onHubManagerChanged; final VoidCallback onPositionAdded; final void Function(int index, OrderPositionUiModel position) onPositionUpdated; final void Function(int index) onPositionRemoved; @@ -165,9 +172,12 @@ class RecurringOrderView extends StatelessWidget { onEndDateChanged: onEndDateChanged, onDayToggled: onDayToggled, onHubChanged: onHubChanged, + onHubManagerChanged: onHubManagerChanged, onPositionAdded: onPositionAdded, onPositionUpdated: onPositionUpdated, onPositionRemoved: onPositionRemoved, + hubManagers: hubManagers, + selectedHubManager: selectedHubManager, ), if (status == OrderFormStatus.loading) const Center(child: CircularProgressIndicator()), @@ -205,9 +215,12 @@ class _RecurringOrderForm extends StatelessWidget { required this.onEndDateChanged, required this.onDayToggled, required this.onHubChanged, + required this.onHubManagerChanged, required this.onPositionAdded, required this.onPositionUpdated, required this.onPositionRemoved, + required this.hubManagers, + required this.selectedHubManager, }); final String eventName; @@ -227,10 +240,15 @@ class _RecurringOrderForm extends StatelessWidget { final ValueChanged onEndDateChanged; final ValueChanged onDayToggled; final ValueChanged onHubChanged; + final ValueChanged onHubManagerChanged; final VoidCallback onPositionAdded; final void Function(int index, OrderPositionUiModel position) onPositionUpdated; final void Function(int index) onPositionRemoved; + final List hubManagers; + final OrderManagerUiModel? selectedHubManager; + + @override Widget build(BuildContext context) { final TranslationsClientCreateOrderRecurringEn labels = @@ -351,6 +369,16 @@ class _RecurringOrderForm extends StatelessWidget { ), ), ), + const SizedBox(height: UiConstants.space4), + + HubManagerSelector( + label: oneTimeLabels.hub_manager_label, + description: oneTimeLabels.hub_manager_desc, + hintText: oneTimeLabels.hub_manager_hint, + managers: hubManagers, + selectedManager: selectedHubManager, + onChanged: onHubManagerChanged, + ), const SizedBox(height: UiConstants.space6), RecurringOrderSectionHeader( diff --git a/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/order_edit_sheet.dart b/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/order_edit_sheet.dart index 5d1606fa..37e07b0b 100644 --- a/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/order_edit_sheet.dart +++ b/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/order_edit_sheet.dart @@ -57,6 +57,9 @@ class OrderEditSheetState extends State { const []; dc.ListTeamHubsByOwnerIdTeamHubs? _selectedHub; + List _managers = const []; + dc.ListTeamMembersTeamMembers? _selectedManager; + String? _shiftId; List<_ShiftRoleKey> _originalShiftRoles = const <_ShiftRoleKey>[]; @@ -246,6 +249,9 @@ class OrderEditSheetState extends State { } }); } + if (selected != null) { + await _loadManagersForHub(selected.id, widget.order.hubManagerId); + } } catch (_) { if (mounted) { setState(() { @@ -331,6 +337,47 @@ class OrderEditSheetState extends State { } } + Future _loadManagersForHub(String hubId, [String? preselectedId]) async { + try { + final QueryResult result = + await _dataConnect.listTeamMembers().execute(); + + final List hubManagers = result.data.teamMembers + .where( + (dc.ListTeamMembersTeamMembers member) => + member.teamHubId == hubId && + member.role is dc.Known && + (member.role as dc.Known).value == + dc.TeamMemberRole.MANAGER, + ) + .toList(); + + dc.ListTeamMembersTeamMembers? selected; + if (preselectedId != null && preselectedId.isNotEmpty) { + for (final dc.ListTeamMembersTeamMembers m in hubManagers) { + if (m.id == preselectedId) { + selected = m; + break; + } + } + } + + if (mounted) { + setState(() { + _managers = hubManagers; + _selectedManager = selected; + }); + } + } catch (_) { + if (mounted) { + setState(() { + _managers = const []; + _selectedManager = null; + }); + } + } + } + Map _emptyPosition() { return { 'shiftId': _shiftId, @@ -744,6 +791,10 @@ class OrderEditSheetState extends State { ), ), ), + const SizedBox(height: UiConstants.space4), + + _buildHubManagerSelector(), + const SizedBox(height: UiConstants.space6), Row( @@ -807,6 +858,130 @@ class OrderEditSheetState extends State { ); } + Widget _buildHubManagerSelector() { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + _buildSectionHeader('SHIFT CONTACT'), + Text('On-site manager or supervisor for this shift', style: UiTypography.body2r.textSecondary), + const SizedBox(height: UiConstants.space2), + InkWell( + onTap: () => _showHubManagerSelector(), + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + child: Container( + padding: const EdgeInsets.symmetric( + horizontal: UiConstants.space4, + vertical: 14, + ), + decoration: BoxDecoration( + color: UiColors.white, + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + border: Border.all( + color: _selectedManager != null ? UiColors.primary : UiColors.border, + width: _selectedManager != null ? 2 : 1, + ), + ), + child: Row( + mainAxisAlignment: MainAxisAlignment.spaceBetween, + children: [ + Row( + children: [ + Icon( + UiIcons.user, + color: _selectedManager != null + ? UiColors.primary + : UiColors.iconSecondary, + size: 20, + ), + const SizedBox(width: UiConstants.space3), + Text( + _selectedManager?.user.fullName ?? 'Select Contact', + style: _selectedManager != null + ? UiTypography.body1r.textPrimary + : UiTypography.body2r.textPlaceholder, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ], + ), + const Icon( + Icons.keyboard_arrow_down, + color: UiColors.iconSecondary, + ), + ], + ), + ), + ), + ], + ); + } + + Future _showHubManagerSelector() async { + final dc.ListTeamMembersTeamMembers? selected = await showDialog( + context: context, + builder: (BuildContext context) { + return AlertDialog( + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase), + ), + title: Text( + 'Shift Contact', + style: UiTypography.headline3m.textPrimary, + ), + contentPadding: const EdgeInsets.symmetric(vertical: 16), + content: SizedBox( + width: double.maxFinite, + child: ConstrainedBox( + constraints: const BoxConstraints(maxHeight: 400), + child: ListView.builder( + shrinkWrap: true, + itemCount: _managers.isEmpty ? 2 : _managers.length + 1, + itemBuilder: (BuildContext context, int index) { + if (_managers.isEmpty) { + if (index == 0) { + return const Padding( + padding: EdgeInsets.symmetric(horizontal: 24, vertical: 8), + child: Text('No hub managers available'), + ); + } + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24), + title: Text('None', style: UiTypography.body1m.textSecondary), + onTap: () => Navigator.of(context).pop(null), + ); + } + + if (index == _managers.length) { + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24), + title: Text('None', style: UiTypography.body1m.textSecondary), + onTap: () => Navigator.of(context).pop(null), + ); + } + final dc.ListTeamMembersTeamMembers manager = _managers[index]; + return ListTile( + contentPadding: const EdgeInsets.symmetric(horizontal: 24, vertical: 8), + title: Text(manager.user.fullName ?? 'Unknown', style: UiTypography.body1m.textPrimary), + onTap: () => Navigator.of(context).pop(manager), + ); + }, + ), + ), + ), + ); + }, + ); + + if (mounted) { + if (selected == null && _managers.isEmpty) { + // Tapped outside or selected None + setState(() => _selectedManager = null); + } else { + setState(() => _selectedManager = selected); + } + } + } + Widget _buildHeader() { return Container( padding: const EdgeInsets.fromLTRB(20, 24, 20, 20), @@ -938,7 +1113,7 @@ class OrderEditSheetState extends State { context: context, initialTime: TimeOfDay.now(), ); - if (picked != null && context.mounted) { + if (picked != null && mounted) { _updatePosition( index, 'start_time', @@ -958,7 +1133,7 @@ class OrderEditSheetState extends State { context: context, initialTime: TimeOfDay.now(), ); - if (picked != null && context.mounted) { + if (picked != null && mounted) { _updatePosition( index, 'end_time', diff --git a/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/view_order_card.dart b/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/view_order_card.dart index e4c215ac..b5f02c97 100644 --- a/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/view_order_card.dart +++ b/apps/mobile/packages/features/client/orders/view_orders/lib/src/presentation/widgets/view_order_card.dart @@ -259,6 +259,31 @@ class _ViewOrderCardState extends State { ), ], ), + if (order.hubManagerName != null) ...[ + const SizedBox(height: UiConstants.space2), + Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + const Padding( + padding: EdgeInsets.only(top: 2), + child: Icon( + UiIcons.user, + size: 14, + color: UiColors.iconSecondary, + ), + ), + const SizedBox(width: UiConstants.space2), + Expanded( + child: Text( + order.hubManagerName!, + style: UiTypography.footnote2r.textSecondary, + maxLines: 1, + overflow: TextOverflow.ellipsis, + ), + ), + ], + ), + ], ], ), ), diff --git a/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart b/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart index 7db4d5ab..0950c573 100644 --- a/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart +++ b/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_actions.dart @@ -24,15 +24,52 @@ class SettingsActions extends StatelessWidget { delegate: SliverChildListDelegate([ const SizedBox(height: UiConstants.space5), + // Edit Profile button (Yellow) + UiButton.primary( + text: labels.edit_profile, + fullWidth: true, + style: ElevatedButton.styleFrom( + backgroundColor: UiColors.accent, + foregroundColor: UiColors.accentForeground, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 2), + ), + ), + onPressed: () => Modular.to.toClientEditProfile(), + ), + const SizedBox(height: UiConstants.space4), + + // Hubs button (Yellow) + UiButton.primary( + text: labels.hubs, + fullWidth: true, + style: ElevatedButton.styleFrom( + backgroundColor: UiColors.accent, + foregroundColor: UiColors.accentForeground, + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 2), + ), + ), + onPressed: () => Modular.to.toClientHubs(), + ), + const SizedBox(height: UiConstants.space5), + // Quick Links card _QuickLinksCard(labels: labels), - const SizedBox(height: UiConstants.space4), + const SizedBox(height: UiConstants.space5), // Log Out button (outlined) BlocBuilder( builder: (BuildContext context, ClientSettingsState state) { return UiButton.secondary( text: labels.log_out, + fullWidth: true, + style: OutlinedButton.styleFrom( + side: const BorderSide(color: UiColors.black), + shape: RoundedRectangleBorder( + borderRadius: BorderRadius.circular(UiConstants.radiusBase * 2), + ), + ), onPressed: state is ClientSettingsLoading ? null : () => _showSignOutDialog(context), @@ -113,7 +150,7 @@ class _QuickLinksCard extends StatelessWidget { onTap: () => Modular.to.toClientHubs(), ), _QuickLinkItem( - icon: UiIcons.building, + icon: UiIcons.file, title: labels.billing_payments, onTap: () => Modular.to.toClientBilling(), ), diff --git a/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_profile_header.dart b/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_profile_header.dart index c6987214..dd746425 100644 --- a/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_profile_header.dart +++ b/apps/mobile/packages/features/client/settings/lib/src/presentation/widgets/client_settings_page/settings_profile_header.dart @@ -31,7 +31,7 @@ class SettingsProfileHeader extends StatelessWidget { child: Column( crossAxisAlignment: CrossAxisAlignment.center, children: [ - // ── Top bar: back arrow + title ────────────────── + // ── Top bar: back arrow + centered title ───────── SafeArea( bottom: false, child: Padding( @@ -39,21 +39,25 @@ class SettingsProfileHeader extends StatelessWidget { horizontal: UiConstants.space4, vertical: UiConstants.space2, ), - child: Row( + child: Stack( + alignment: Alignment.center, children: [ - GestureDetector( - onTap: () => Modular.to.toClientHome(), - child: const Icon( - UiIcons.arrowLeft, - color: UiColors.white, - size: 22, + Align( + alignment: Alignment.centerLeft, + child: GestureDetector( + onTap: () => Modular.to.toClientHome(), + child: const Icon( + UiIcons.arrowLeft, + color: UiColors.white, + size: 22, + ), ), ), - const SizedBox(width: UiConstants.space3), Text( labels.title, style: UiTypography.body1b.copyWith( color: UiColors.white, + fontSize: 18, ), ), ], diff --git a/backend/dataconnect/connector/order/mutations.gql b/backend/dataconnect/connector/order/mutations.gql index 95eebf54..4749c498 100644 --- a/backend/dataconnect/connector/order/mutations.gql +++ b/backend/dataconnect/connector/order/mutations.gql @@ -15,6 +15,7 @@ mutation createOrder( $shifts: Any $requested: Int $teamHubId: UUID! + $hubManagerId: UUID $recurringDays: [String!] $permanentStartDate: Timestamp $permanentDays: [String!] @@ -40,6 +41,7 @@ mutation createOrder( shifts: $shifts requested: $requested teamHubId: $teamHubId + hubManagerId: $hubManagerId recurringDays: $recurringDays permanentDays: $permanentDays notes: $notes diff --git a/backend/dataconnect/schema/order.gql b/backend/dataconnect/schema/order.gql index 5ab05abb..056c9369 100644 --- a/backend/dataconnect/schema/order.gql +++ b/backend/dataconnect/schema/order.gql @@ -47,6 +47,9 @@ type Order @table(name: "orders", key: ["id"]) { teamHubId: UUID! teamHub: TeamHub! @ref(fields: "teamHubId", references: "id") + hubManagerId: UUID + hubManager: TeamMember @ref(fields: "hubManagerId", references: "id") + date: Timestamp startDate: Timestamp #for recurring and permanent