From 891a67951833caf00812f1ff60043523edab7492 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Tue, 16 Jun 2026 13:18:43 +0300 Subject: [PATCH] traf code switch to permission api. --- .../providers/api/all_requests_provider.dart | 22 +++++------ .../create_request_type_bottom_sheet.dart | 15 ++++---- .../my_request/my_requests_page.dart | 9 ++--- .../lookups/customer_lookup_provider.dart | 37 +------------------ 4 files changed, 24 insertions(+), 59 deletions(-) diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 49156233..99c58970 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -158,21 +158,21 @@ class AllRequestsProvider extends ChangeNotifier { } //TODO uncommit this to enable TRAF in production. - // context.userProvider.modulesPermissionsList.forEach((module) { - // if (module.module!.value! == 8 || module.module!.value! == 9) { - // list.add(module.module!.value!); - // } - // }); - //Todo commit this when passing to production. context.userProvider.modulesPermissionsList.forEach((module) { - if (module.module!.value! == 8) { + if (module.module!.value! == 8 || module.module!.value! == 9) { list.add(module.module!.value!); } }); - - if (context.settingProvider.isUserFlowMedical && !context.userProvider.isAssessor && (context.userProvider.isNurse || context.userProvider.isEngineer)) { - list.add(9); // - } + //Todo commit this when passing to production. + // context.userProvider.modulesPermissionsList.forEach((module) { + // if (module.module!.value! == 8) { + // list.add(module.module!.value!); + // } + // }); + // + // if (context.settingProvider.isUserFlowMedical && !context.userProvider.isAssessor && (context.userProvider.isNurse || context.userProvider.isEngineer)) { + // list.add(9); // + // } list.add(12); if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { list = [13]; diff --git a/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart b/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart index d673c3dc..0d189bb7 100644 --- a/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart +++ b/lib/new_views/pages/land_page/create_request_type_bottom_sheet.dart @@ -147,17 +147,16 @@ class CreateRequestModel { // list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id)); } } - if(context.settingProvider.isUserFlowMedical&&(context.userProvider.isAssessor||context.userProvider.isEngineer||context.userProvider.isNurse)){ - //Traf name changed to Assessment of Need & Technology by client . - list.add(CreateRequestModel("Assessment of Need & Technology".addTranslation, "add_icon", CreateTRAFRequestPage.id)); - - } + // if (context.settingProvider.isUserFlowMedical && (context.userProvider.isAssessor || context.userProvider.isEngineer || context.userProvider.isNurse)) { + // //Traf name changed to Assessment of Need & Technology by client . + // list.add(CreateRequestModel("Assessment of Need & Technology".addTranslation, "add_icon", CreateTRAFRequestPage.id)); + // } context.userProvider.modulesPermissionsList.forEach((module) { ///TODO uncommit this to enable TRAF in production. - // if (module.module!.value! == 9 && (module.canAdd ?? false)) { - // list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); - // } + if (module.module!.value! == 9 && (module.canAdd ?? false)) { + list.add(CreateRequestModel(module.module?.name ?? "Assessment of Need & Technology".addTranslation, "add_icon", CreateTRAFRequestPage.id)); + } if (module.module!.value! == 15 && (module.canAdd ?? false)) { list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id)); } diff --git a/lib/new_views/pages/land_page/my_request/my_requests_page.dart b/lib/new_views/pages/land_page/my_request/my_requests_page.dart index c9d3d946..8294a838 100644 --- a/lib/new_views/pages/land_page/my_request/my_requests_page.dart +++ b/lib/new_views/pages/land_page/my_request/my_requests_page.dart @@ -59,15 +59,14 @@ class _MyRequestsPageState extends State { // switching asset inventory to users permissions context.userProvider.modulesPermissionsList.forEach((module) { ///todo uncommit this in prod currently apis is not giving the correct name for traf - // if (module.module!.value! == 8 || module.module!.value! == 9 || module.module!.value! == 15) { - if (module.module!.value! == 8 || module.module!.value! == 15) { + if (module.module!.value! == 8 || module.module!.value! == 9 || module.module!.value! == 15) { requestsList.add(Request(module.module!.value!, module.module!.name!.addTranslation)); } }); //Hide TRAF. - if (context.settingProvider.isUserFlowMedical && context.userProvider.user!.type == UsersTypes.normal_user) { - requestsList.add(Request(9, 'Assessment of Need & Technology')); - } + // if (context.settingProvider.isUserFlowMedical && context.userProvider.user!.type == UsersTypes.normal_user) { + // requestsList.add(Request(9, 'Assessment of Need & Technology')); + // } if (context.userProvider.isEngineer && context.settingProvider.isUserFlowMedical) { requestsList.add(Request(10, 'Equipment Internal Audit')); requestsList.add(Request(11, 'System Internal Audit')); diff --git a/lib/providers/lookups/customer_lookup_provider.dart b/lib/providers/lookups/customer_lookup_provider.dart index c87b54c5..086154a1 100644 --- a/lib/providers/lookups/customer_lookup_provider.dart +++ b/lib/providers/lookups/customer_lookup_provider.dart @@ -9,37 +9,8 @@ import '../../controllers/api_routes/urls.dart'; class CustomerLookupProvider extends LoadingListNotifier { @override - Future getData({int? id}) async { - if (loading == true) return -2; - loading = true; - notifyListeners(); - try { - // Get customers by user ID (GUID string) - // If id is null, try to get it from the current user - String? userId = id?.toString(); - - Response response = await ApiManager.instance.get( - URLs.getCustomersByUserId + "?userId=$userId", - useCache: true, - enableToastMessage: false, - ); - stateCode = response.statusCode; - if (response.statusCode >= 200 && response.statusCode < 300) { - List categoriesListJson = json.decode(response.body)["data"]; - items = categoriesListJson.map((item) => TrafCustomer.fromJson(item)).toList(); - } - loading = false; - notifyListeners(); - return response.statusCode; - } catch (error) { - loading = false; - stateCode = -1; - notifyListeners(); - return -1; - } - } + Future getData({int? id}) async {} - // Add method to get data by string user ID (GUID) Future getDataByUserId(String? userId) async { if (loading == true) return -2; if (userId == null || userId.isEmpty) return -1; @@ -47,11 +18,7 @@ class CustomerLookupProvider extends LoadingListNotifier { loading = true; notifyListeners(); try { - Response response = await ApiManager.instance.get( - URLs.getCustomersByUserId + "?userId=$userId", - useCache: true, - enableToastMessage: false, - ); + Response response = await ApiManager.instance.get(URLs.getCustomersByUserId + "?userId=$userId", useCache: true, enableToastMessage: false); stateCode = response.statusCode; if (response.statusCode >= 200 && response.statusCode < 300) { List categoriesListJson = json.decode(response.body)["data"];