From b057c8b69a21eae8126f503bbae9be4c3fc8be02 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Sun, 14 Dec 2025 14:18:56 +0330 Subject: [PATCH] feat: integrate CreateInspectionBottomSheetLogic into various feature routes for enhanced inspection submission functionality --- .../lib/features/jahad/presentation/routes/pages.dart | 2 ++ .../submit_inspection_response_schema.json | 1 + .../province_inspector/presentation/routes/pages.dart | 2 ++ .../province_operator/presentation/routes/pages.dart | 8 +++++++- .../presentation/pages/active_hatching/logic.dart | 8 +++++--- .../presentation/pages/active_hatching/view.dart | 2 +- .../province_supervisor/presentation/routes/pages.dart | 6 +++++- .../features/super_admin/presentation/routes/pages.dart | 2 ++ .../lib/features/vet_farm/presentation/routes/pages.dart | 2 ++ 9 files changed, 27 insertions(+), 6 deletions(-) diff --git a/packages/chicken/lib/features/jahad/presentation/routes/pages.dart b/packages/chicken/lib/features/jahad/presentation/routes/pages.dart index 84584f3..4c72c1b 100644 --- a/packages/chicken/lib/features/jahad/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/jahad/presentation/routes/pages.dart @@ -7,6 +7,7 @@ import 'package:rasadyar_chicken/features/jahad/presentation/pages/active_hatchi import 'package:rasadyar_chicken/features/jahad/presentation/pages/new_inspection/logic.dart'; import 'package:rasadyar_chicken/features/jahad/presentation/pages/new_inspection/view.dart'; import 'package:rasadyar_chicken/features/jahad/presentation/routes/routes.dart'; +import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; import 'package:rasadyar_chicken/presentation/routes/global_binding.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/logic.dart'; import 'package:rasadyar_core/core.dart'; @@ -46,6 +47,7 @@ class JahadPages { GlobalBinding(), BindingsBuilder(() { Get.lazyPut(() => ActiveHatchingLogic()); + Get.lazyPut(() => CreateInspectionBottomSheetLogic()); }), ], ), diff --git a/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json b/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json index 53ff3d9..7fc8703 100644 --- a/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json +++ b/packages/chicken/lib/features/poultry_science/data/model/request/submit_inspection/submit_inspection_response_schema.json @@ -422,3 +422,4 @@ } } } + diff --git a/packages/chicken/lib/features/province_inspector/presentation/routes/pages.dart b/packages/chicken/lib/features/province_inspector/presentation/routes/pages.dart index 362b831..c0ee230 100644 --- a/packages/chicken/lib/features/province_inspector/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/province_inspector/presentation/routes/pages.dart @@ -1,3 +1,4 @@ +import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; import 'package:rasadyar_chicken/features/province_inspector/presentation/pages/home/logic.dart'; import 'package:rasadyar_chicken/features/province_inspector/presentation/pages/home/view.dart'; import 'package:rasadyar_chicken/features/province_inspector/presentation/pages/root/logic.dart'; @@ -45,6 +46,7 @@ class ProvinceInspectorPages { GlobalBinding(), BindingsBuilder(() { Get.lazyPut(() => ActiveHatchingLogic()); + Get.lazyPut(() => CreateInspectionBottomSheetLogic()); }), ], ), diff --git a/packages/chicken/lib/features/province_operator/presentation/routes/pages.dart b/packages/chicken/lib/features/province_operator/presentation/routes/pages.dart index 9d0f34f..d0faa29 100644 --- a/packages/chicken/lib/features/province_operator/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/province_operator/presentation/routes/pages.dart @@ -1,3 +1,4 @@ +import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; import 'package:rasadyar_chicken/features/province_operator/presentation/pages/home/logic.dart'; import 'package:rasadyar_chicken/features/province_operator/presentation/pages/home/view.dart'; import 'package:rasadyar_chicken/features/province_operator/presentation/pages/root/logic.dart'; @@ -35,7 +36,8 @@ class ProvinceOperatorPages { page: () => ProvinceOperatorHomePage(), middlewares: [AuthMiddleware()], binding: BindingsBuilder(() { - Get.put(ProvinceOperatorHomeLogic()); + Get.lazyPut(() => ProvinceOperatorRootLogic()); + Get.lazyPut(() => ProvinceOperatorHomeLogic()); Get.lazyPut(() => ChickenBaseLogic()); }), ), @@ -46,6 +48,7 @@ class ProvinceOperatorPages { bindings: [ GlobalBinding(), BindingsBuilder(() { + Get.lazyPut(() => ProvinceOperatorRootLogic()); Get.lazyPut(() => ProvinceOperatorHomeLogic()); }), ], @@ -57,7 +60,9 @@ class ProvinceOperatorPages { bindings: [ GlobalBinding(), BindingsBuilder(() { + Get.lazyPut(() => ProvinceOperatorRootLogic(),fenix: true); Get.lazyPut(() => ActiveHatchingLogic()); + Get.lazyPut(() => CreateInspectionBottomSheetLogic()); }), ], ), @@ -68,6 +73,7 @@ class ProvinceOperatorPages { bindings: [ GlobalBinding(), BindingsBuilder(() { + Get.lazyPut(() => ProvinceOperatorRootLogic()); Get.lazyPut(() => NewInspectionLogic()); }), ], diff --git a/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/logic.dart b/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/logic.dart index 45e9cf7..f9ba29f 100644 --- a/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/logic.dart +++ b/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/logic.dart @@ -1,11 +1,13 @@ import 'package:rasadyar_chicken/data/di/chicken_di.dart'; import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart'; import 'package:rasadyar_chicken/features/poultry_science/data/repositories/poultry_science_repository.dart'; -import 'package:rasadyar_chicken/features/province_operator/presentation/pages/root/logic.dart'; +import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/root/logic.dart'; + import 'package:rasadyar_core/core.dart'; class ActiveHatchingLogic extends GetxController { - ProvinceOperatorRootLogic rootLogic = Get.find(); + ProvinceSupervisorRootLogic rootLogic = + Get.find(); BaseLogic baseLogic = Get.find(); late PoultryScienceRepository poultryScienceRepository; Rx>> activeHatchingList = @@ -57,7 +59,7 @@ class ActiveHatchingLogic extends GetxController { token: rootLogic.tokenService.accessToken.value!, queryParameters: buildQueryParams( queryParams: {'type': 'hatching'}, - role: 'ProvinceOperator', + role: 'ProvinceSupervisor', pageSize: 50, page: currentPage.value, ), diff --git a/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/view.dart b/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/view.dart index 950ecaa..28553c4 100644 --- a/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/view.dart +++ b/packages/chicken/lib/features/province_supervisor/presentation/pages/active_hatching/view.dart @@ -1,8 +1,8 @@ import 'package:flutter/material.dart'; import 'package:rasadyar_chicken/features/poultry_science/data/model/response/hatching/hatching_models.dart'; -import 'package:rasadyar_chicken/features/province_operator/presentation/pages/active_hatching/logic.dart'; import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet.dart'; import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; +import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/active_hatching/logic.dart'; import 'package:rasadyar_chicken/presentation/utils/nested_keys_utils.dart'; import 'package:rasadyar_chicken/presentation/widget/base_page/view.dart'; import 'package:rasadyar_core/core.dart'; diff --git a/packages/chicken/lib/features/province_supervisor/presentation/routes/pages.dart b/packages/chicken/lib/features/province_supervisor/presentation/routes/pages.dart index 21c4320..9212626 100644 --- a/packages/chicken/lib/features/province_supervisor/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/province_supervisor/presentation/routes/pages.dart @@ -1,10 +1,11 @@ +import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; +import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/active_hatching/logic.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/home/logic.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/home/view.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/root/logic.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/root/view.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/new_inspection/logic.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/new_inspection/view.dart'; -import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/active_hatching/logic.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/pages/active_hatching/view.dart'; import 'package:rasadyar_chicken/features/province_supervisor/presentation/routes/routes.dart'; import 'package:rasadyar_chicken/presentation/routes/global_binding.dart'; @@ -45,7 +46,10 @@ class ProvinceSupervisorPages { bindings: [ GlobalBinding(), BindingsBuilder(() { + Get.lazyPut(() => ProvinceSupervisorRootLogic(), fenix: true); Get.lazyPut(() => ActiveHatchingLogic()); + + Get.lazyPut(() => CreateInspectionBottomSheetLogic()); }), ], ), diff --git a/packages/chicken/lib/features/super_admin/presentation/routes/pages.dart b/packages/chicken/lib/features/super_admin/presentation/routes/pages.dart index d78ad92..9b7c76b 100644 --- a/packages/chicken/lib/features/super_admin/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/super_admin/presentation/routes/pages.dart @@ -1,3 +1,4 @@ +import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; import 'package:rasadyar_chicken/features/super_admin/presentation/pages/home/logic.dart'; import 'package:rasadyar_chicken/features/super_admin/presentation/pages/home/view.dart'; import 'package:rasadyar_chicken/features/super_admin/presentation/pages/root/logic.dart'; @@ -56,6 +57,7 @@ class SuperAdminPages { GlobalBinding(), BindingsBuilder(() { Get.lazyPut(() => ActiveHatchingLogic()); + Get.lazyPut(() => CreateInspectionBottomSheetLogic()); }), ], ), diff --git a/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart b/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart index 8763519..2e889a7 100644 --- a/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart +++ b/packages/chicken/lib/features/vet_farm/presentation/routes/pages.dart @@ -1,3 +1,4 @@ +import 'package:rasadyar_chicken/features/poultry_science/presentation/widgets/submit_inspection_bottom_sheet/create_inspection_bottom_sheet_logic.dart'; import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/home/logic.dart'; import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/home/view.dart'; import 'package:rasadyar_chicken/features/vet_farm/presentation/pages/root/logic.dart'; @@ -56,6 +57,7 @@ class VetFarmPages { GlobalBinding(), BindingsBuilder(() { Get.lazyPut(() => ActiveHatchingLogic()); + Get.lazyPut(() => CreateInspectionBottomSheetLogic()); }), ], ),