From 9e2e7845c8b6ac2db3ca89320cdeb701e277b380 Mon Sep 17 00:00:00 2001 From: "mr.mojtaba" Date: Mon, 29 Dec 2025 16:44:36 +0330 Subject: [PATCH] feat: integrate GService into various root logic classes and log user roles during initialization --- .../features/city_jahad/presentation/pages/root/logic.dart | 2 ++ .../presentation/pages/active_hatching/logic.dart | 5 +++++ .../city_poultry/presentation/pages/root/logic.dart | 6 +++--- .../features/common/presentation/page/profile/logic.dart | 1 + .../lib/features/jahad/presentation/pages/root/logic.dart | 2 ++ packages/chicken/lib/features/kill_house/root/logic.dart | 2 ++ .../kill_house/warehouse_and_distribution/root/logic.dart | 2 ++ .../poultry_science/presentation/pages/root/logic.dart | 2 ++ .../province_inspector/presentation/pages/root/logic.dart | 2 ++ .../province_operator/presentation/pages/root/logic.dart | 2 ++ .../province_supervisor/presentation/pages/root/logic.dart | 2 ++ .../lib/features/steward/presentation/pages/root/logic.dart | 2 ++ .../features/super_admin/presentation/pages/root/logic.dart | 2 ++ .../features/vet_farm/presentation/pages/root/logic.dart | 2 ++ 14 files changed, 31 insertions(+), 3 deletions(-) diff --git a/packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart b/packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart index 6117f02..9add4ea 100644 --- a/packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/city_jahad/presentation/pages/root/logic.dart @@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class CityJahadRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late CityJahadRepository cityJahadRepository; @@ -45,6 +46,7 @@ class CityJahadRootLogic extends GetxController { void onInit() { super.onInit(); cityJahadRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/logic.dart b/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/logic.dart index dbbd23d..62c3dc7 100644 --- a/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/logic.dart +++ b/packages/chicken/lib/features/city_poultry/presentation/pages/active_hatching/logic.dart @@ -39,6 +39,11 @@ class ActiveHatchingLogic extends GetxController { } Future getHatchingList([bool isLoadingMore = false]) async { + + + + + if (isLoadingMore) { isLoadingMoreList.value = true; } else { diff --git a/packages/chicken/lib/features/city_poultry/presentation/pages/root/logic.dart b/packages/chicken/lib/features/city_poultry/presentation/pages/root/logic.dart index 327dcb3..a890993 100644 --- a/packages/chicken/lib/features/city_poultry/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/city_poultry/presentation/pages/root/logic.dart @@ -13,6 +13,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class CityPoultryRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late CityPoultryRepository cityPoultryRepository; @@ -44,6 +45,7 @@ class CityPoultryRootLogic extends GetxController { void onInit() { super.onInit(); cityPoultryRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { @@ -69,14 +71,12 @@ class CityPoultryRootLogic extends GetxController { final currentRoute = Get.routing.current; - // بررسی کن که آیا route فعلی یکی از route‌های داخلی است final isInternalRoute = currentRoute == CityPoultryRoutes.activeHatchingCityPoultry || currentRoute == CityPoultryRoutes.newInspectionCityPoultry || currentRoute == CityPoultryRoutes.actionCityPoultry; - // فقط اگر می‌توان pop کرد و در یکی از صفحه‌های داخلی هستیم، pop کن - if ( isInternalRoute) { + if (isInternalRoute) { Get.back(id: cityPoultryActionKey); return; } diff --git a/packages/chicken/lib/features/common/presentation/page/profile/logic.dart b/packages/chicken/lib/features/common/presentation/page/profile/logic.dart index 9622ecf..b1df16b 100644 --- a/packages/chicken/lib/features/common/presentation/page/profile/logic.dart +++ b/packages/chicken/lib/features/common/presentation/page/profile/logic.dart @@ -176,6 +176,7 @@ class ProfileLogic extends GetxController { Future changeUserRole(String newRole) async { dLog(newRole); await gService.saveRoute(Module.chicken, newRole); + await gService.saveRole(Module.chicken, newRole); Get.offAllNamed(newRole); } diff --git a/packages/chicken/lib/features/jahad/presentation/pages/root/logic.dart b/packages/chicken/lib/features/jahad/presentation/pages/root/logic.dart index e31a5eb..1452bad 100644 --- a/packages/chicken/lib/features/jahad/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/jahad/presentation/pages/root/logic.dart @@ -15,6 +15,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class JahadRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late JahadRepository jahadRepository; @@ -45,6 +46,7 @@ class JahadRootLogic extends GetxController { void onInit() { super.onInit(); jahadRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/kill_house/root/logic.dart b/packages/chicken/lib/features/kill_house/root/logic.dart index bd778a0..3d8b102 100644 --- a/packages/chicken/lib/features/kill_house/root/logic.dart +++ b/packages/chicken/lib/features/kill_house/root/logic.dart @@ -12,6 +12,7 @@ class KillHouseRootLogic extends GetxController { RxInt currentPage = 1.obs; var tokenService = Get.find(); + var gService = Get.find(); late KillHouseRepository killHouseRepository; @@ -19,6 +20,7 @@ class KillHouseRootLogic extends GetxController { void onInit() { super.onInit(); killHouseRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } final pages = [ diff --git a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart index 7aa939e..bbbd7ae 100644 --- a/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart +++ b/packages/chicken/lib/features/kill_house/warehouse_and_distribution/root/logic.dart @@ -30,6 +30,7 @@ class WarehouseAndDistributionRootLogic extends GetxController { late DioRemote dioRemote; var tokenService = Get.find(); + var gService = Get.find(); RxInt currentPage = 2.obs; List pages = [ @@ -68,6 +69,7 @@ class WarehouseAndDistributionRootLogic extends GetxController { super.onInit(); killHouseRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } @override diff --git a/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart b/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart index 217d918..0d7fdc1 100644 --- a/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/poultry_science/presentation/pages/root/logic.dart @@ -15,6 +15,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class PoultryScienceRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late PoultryScienceRepository poultryRepository; @@ -46,6 +47,7 @@ class PoultryScienceRootLogic extends GetxController { void onInit() { super.onInit(); poultryRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/province_inspector/presentation/pages/root/logic.dart b/packages/chicken/lib/features/province_inspector/presentation/pages/root/logic.dart index 48419f1..4d02afa 100644 --- a/packages/chicken/lib/features/province_inspector/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/province_inspector/presentation/pages/root/logic.dart @@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class ProvinceInspectorRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late ProvinceInspectorRepository provinceInspectorRepository; @@ -45,6 +46,7 @@ class ProvinceInspectorRootLogic extends GetxController { void onInit() { super.onInit(); provinceInspectorRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/province_operator/presentation/pages/root/logic.dart b/packages/chicken/lib/features/province_operator/presentation/pages/root/logic.dart index 0f9f14a..938f8cf 100644 --- a/packages/chicken/lib/features/province_operator/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/province_operator/presentation/pages/root/logic.dart @@ -13,6 +13,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class ProvinceOperatorRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late ProvinceOperatorRepository provinceOperatorRepository; @@ -44,6 +45,7 @@ class ProvinceOperatorRootLogic extends GetxController { void onInit() { super.onInit(); provinceOperatorRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/province_supervisor/presentation/pages/root/logic.dart b/packages/chicken/lib/features/province_supervisor/presentation/pages/root/logic.dart index 642f191..6d237c7 100644 --- a/packages/chicken/lib/features/province_supervisor/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/province_supervisor/presentation/pages/root/logic.dart @@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class ProvinceSupervisorRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late ProvinceSupervisorRepository provinceSupervisorRepository; @@ -46,6 +47,7 @@ class ProvinceSupervisorRootLogic extends GetxController { super.onInit(); provinceSupervisorRepository = diChicken .get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart b/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart index 6cefdfd..978abed 100644 --- a/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/steward/presentation/pages/root/logic.dart @@ -42,6 +42,7 @@ class StewardRootLogic extends GetxController { late DioRemote dioRemote; var tokenService = Get.find(); + var gService = Get.find(); late CommonRepository commonRepository; late StewardRepository stewardRepository; late ChickenLocalDataSource localDatasource; @@ -61,6 +62,7 @@ class StewardRootLogic extends GetxController { localDatasource = diChicken.get(); commonRepository = diChicken.get(); stewardRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } @override diff --git a/packages/chicken/lib/features/super_admin/presentation/pages/root/logic.dart b/packages/chicken/lib/features/super_admin/presentation/pages/root/logic.dart index cec976c..8d3d50a 100644 --- a/packages/chicken/lib/features/super_admin/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/super_admin/presentation/pages/root/logic.dart @@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class SuperAdminRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late SuperAdminRepository superAdminRepository; @@ -45,6 +46,7 @@ class SuperAdminRootLogic extends GetxController { void onInit() { super.onInit(); superAdminRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) { diff --git a/packages/chicken/lib/features/vet_farm/presentation/pages/root/logic.dart b/packages/chicken/lib/features/vet_farm/presentation/pages/root/logic.dart index c77df23..f1cca51 100644 --- a/packages/chicken/lib/features/vet_farm/presentation/pages/root/logic.dart +++ b/packages/chicken/lib/features/vet_farm/presentation/pages/root/logic.dart @@ -14,6 +14,7 @@ enum ErrorLocationType { serviceDisabled, permissionDenied, none } class VetFarmRootLogic extends GetxController { var tokenService = Get.find(); + var gService = Get.find(); late VetFarmRepository vetFarmRepository; @@ -45,6 +46,7 @@ class VetFarmRootLogic extends GetxController { void onInit() { super.onInit(); vetFarmRepository = diChicken.get(); + fLog('gService: ${gService.getRole(Module.chicken)}'); } void toggleExpanded(int index) {