diff --git a/lib/controllers/api_routes/urls.dart b/lib/controllers/api_routes/urls.dart index 20c6305d..aaa1469c 100644 --- a/lib/controllers/api_routes/urls.dart +++ b/lib/controllers/api_routes/urls.dart @@ -7,8 +7,8 @@ class URLs { // static const host1 = "https://atomsmdev.hmg.com"; // local DEV url static const host1 = "https://atomsmuat.hmg.com"; // local UAT url - // static final String _baseUrl = "$_host/mobile"; // host local UAT - static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis + static final String _baseUrl = "$_host/mobile"; // host local UAT + // static final String _baseUrl = "$_host/v2/mobile"; // new V2 apis // static final String _baseUrl = "$_host/mobile"; // host local UAT and for internal audit dev // static final String _baseUrl = "$_host/v3/mobile"; // v3 for production CM,PM,TM // static final String _baseUrl = "$_host/v5/mobile"; // v5 for data segregation 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 f19edb97..d01098a2 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 @@ -117,9 +117,9 @@ class CreateRequestModel { list.add(CreateRequestModel("Equipment Internal Audit Checklist".addTranslation, "add_icon", CreateEquipmentInternalAuditForm.id)); list.add(CreateRequestModel("System Internal Audit Checklist".addTranslation, "add_icon", CreateSystemInternalAuditForm.id)); } - // else if (context.userProvider.isAssessor) { - // list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); - // } + else if (context.userProvider.isAssessor) { + list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); + } else if (context.userProvider.isEngineer) { if (Provider.of(context, listen: false).engineerCanCreateCM) { list.add(CreateRequestModel(context.translation.correctiveMaintenance, "add_icon", CreateCMRequest.id)); @@ -137,8 +137,9 @@ class CreateRequestModel { list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id)); //TODO uncommit this to enable task. list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); - // list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); - list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestPage.id)); + list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); + // Hide Loan + // list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestPage.id)); } return list; } diff --git a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart index 35253c86..7cb33051 100644 --- a/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart +++ b/lib/new_views/pages/land_page/my_request/all_requests_filter_page.dart @@ -74,7 +74,9 @@ class _AllRequestsFilterPageState extends State { context.translation.transferAsset: 3, context.translation.preventiveMaintenance: 4, context.translation.task: 6, - "Loan Equipment": 12, + + // Hide Loan + // "Loan Equipment": 12, }; if (isEngineer) { @@ -95,13 +97,13 @@ class _AllRequestsFilterPageState extends State { } }); //Hide traf - // if (!isEngineer) { - // types['TRAF'] = 9; - // } + if (!isEngineer) { + types['TRAF'] = 9; + } - // if (context.userProvider.isAssessor) { - // types = {"TRAF": 9}; - // } + if (context.userProvider.isAssessor) { + types = {"TRAF": 9}; + } if (context.userProvider.isQualityUser) { if (context.settingProvider.isUserFlowMedical) types = {'Recall and Alert': 7}; if (context.settingProvider.isUserFlowMedical) types['Equipment Internal Audit'] = 10; 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 e28dca9c..2d1d1c40 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 @@ -63,10 +63,10 @@ class _MyRequestsPageState extends State { } }); //Hide TRAF. - // if (context.userProvider.user!.type == UsersTypes.normal_user) { - // requestsList.add(Request(9, 'TRAF')); - // } - if (context.userProvider.isEngineer &&context.settingProvider.isUserFlowMedical) { + if (context.userProvider.user!.type == UsersTypes.normal_user) { + requestsList.add(Request(9, 'TRAF')); + } + if (context.userProvider.isEngineer && context.settingProvider.isUserFlowMedical) { requestsList.add(Request(10, 'Equipment Internal Audit')); requestsList.add(Request(11, 'System Internal Audit')); //Need to be added for new user role commissioning engineer @@ -74,12 +74,14 @@ class _MyRequestsPageState extends State { requestsList.add(Request(14, "Medical Gas Inspection")); } - requestsList.add(Request(12, "Loan Equipment")); + + // Hide Loan + // requestsList.add(Request(12, "Loan Equipment")); if (context.userProvider.isAssessor) { requestsList = [ Request(null, context.translation.allWorkOrder), - // Request(9, 'TRAF'), + Request(9, 'TRAF'), ]; } if (context.userProvider.isCommissioningEngineer) { @@ -93,8 +95,8 @@ class _MyRequestsPageState extends State { requestsList = [ Request(null, context.translation.allWorkOrder), if (context.settingProvider.isUserFlowMedical) Request(7, 'Recall and Alert'), - if (context.settingProvider.isUserFlowMedical) Request(10, 'Equipment Internal Audit'), - if (context.settingProvider.isUserFlowMedical) Request(11, 'System Internal Audit'), + if (context.settingProvider.isUserFlowMedical) Request(10, 'Equipment Internal Audit'), + if (context.settingProvider.isUserFlowMedical) Request(11, 'System Internal Audit'), ]; }