diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 0a93116b..45f62f80 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -137,7 +137,14 @@ class AllRequestsProvider extends ChangeNotifier { List list = [1, 2, 3, 4]; if (context.userProvider.isAssessor) { - list = [9, 15]; + list = [9]; + context.userProvider.modulesPermissionsList.forEach((module) { + if (module.module!.value! == 8 || module.module!.value! == 9 || module.module!.value! == 15) { + list.add(module.module!.value!); + } + }); + list.add(16); + list = list.toSet().toList(); return list; } if (context.userProvider.isQualityUser) { @@ -158,9 +165,8 @@ class AllRequestsProvider extends ChangeNotifier { list.add(7); // task mod } - //TODO uncommit this to enable TRAF in production. context.userProvider.modulesPermissionsList.forEach((module) { - if (module.module!.value! == 8 || module.module!.value! == 9) { + if (module.module!.value! == 8 || module.module!.value! == 9 || module.module!.value! == 15) { list.add(module.module!.value!); } }); @@ -184,11 +190,10 @@ class AllRequestsProvider extends ChangeNotifier { // list = [16]; list.add(16); } - if ( context.userProvider.isHouseKeeper) { + if (context.userProvider.isHouseKeeper) { list = [5]; } - 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 0c4c61ab..68f27fad 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 @@ -141,6 +141,11 @@ class _AllRequestsFilterPageState extends State { 'Assessment of Need & Technology': 9, // 'Demo': 15, moved to permission api }; + context.userProvider.modulesPermissionsList.forEach((module) { + if (module.module!.value! == 8 || module.module!.value! == 9 || module.module!.value! == 15) { + types[module.module!.name!] = module.module!.value!; + } + }); } if (context.settingProvider.isUserFlowMedical && !context.userProvider.isNurse) { types['Incidents'] = 16; 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 65e635ea..2dc66f86 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 @@ -130,6 +130,17 @@ class _MyRequestsPageState extends State with SingleTickerProvid Request(9, 'Assessment of Need & Technology'), // Request(15, 'Demo'), moved to permission api ]; + + context.userProvider.modulesPermissionsList.forEach((module) { + if (module.module!.value! == 8 || module.module!.value! == 9 || module.module!.value! == 15) { + requestsList.add(Request(module.module!.value!, module.module!.name!.addTranslation)); + } + }); + + final seenIds = {}; + requestsList = requestsList.where((req) { + return req.id == null ? true : seenIds.add(req.id!); + }).toList(); } if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { ///TODO need to show only allowed ids for all workOrder