diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 505091df..533f5b9a 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -158,14 +158,14 @@ class AllRequestsProvider extends ChangeNotifier { // switching asset inventory to users permissions 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.isNurse) { - list.add(9); // - } + // if (context.settingProvider.isUserFlowMedical && context.userProvider.isNurse) { + // list.add(9); // + // } list.add(12); if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { list = [13]; diff --git a/lib/extensions/string_extensions.dart b/lib/extensions/string_extensions.dart index 74f9d0bf..eb143e4b 100644 --- a/lib/extensions/string_extensions.dart +++ b/lib/extensions/string_extensions.dart @@ -21,6 +21,11 @@ extension StringExtensions on String { return DateFormat('EEE dd MMM').format(dateTime); } + String get unReadChatMsgDate { + DateTime dateTime = DateTime.parse(this).toLocal(); + return "${DateFormat('dd MMM, yyyy').format(dateTime)}\n${DateFormat('hh:mm a').format(dateTime)}"; + } + String get chatMsgDateWithYear { DateTime dateTime = DateTime.parse(this).toLocal(); return DateFormat('EEE dd MMM, yyyy').format(dateTime); 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 7a702de2..b0bd23e5 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 @@ -137,9 +137,11 @@ 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)); - if ((context.settingProvider.isUserFlowMedical)) { - list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); - } + context.userProvider.modulesPermissionsList.forEach((module) { + if (module.module!.value! == 9) { + list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); + } + }); list.add(CreateRequestModel('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestPage.id)); list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id)); } 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 e57bf179..ec5d49c9 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 @@ -91,18 +91,18 @@ class _AllRequestsFilterPageState extends State { // switching asset inventory to users permissions context.userProvider.modulesPermissionsList.forEach((module) { - if (module.module!.value! == 8) { + if (module.module!.value! == 8 || module.module!.value! == 9) { types[module.module!.name!] = module.module!.value!; } }); //Hide traf - if (!isEngineer && context.settingProvider.isUserFlowMedical) { - types['TRAF'] = 9; - } - - if (context.settingProvider.isUserFlowMedical && context.userProvider.isAssessor) { - types = {"TRAF": 9}; - } +// if (!isEngineer && context.settingProvider.isUserFlowMedical) { +// types['TRAF'] = 9; +// } +// +// if (context.settingProvider.isUserFlowMedical && 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; @@ -110,19 +110,18 @@ class _AllRequestsFilterPageState extends State { } if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { ///TODO need to check what other requests type needed here. - types = { - 'Asset Delivery': 13, - }; + types = {'Asset Delivery': 13}; } ///TODO need add accessor filter as well. - if (context.userProvider.isAssessor) { + if (context.settingProvider.isUserFlowMedical && context.userProvider.isAssessor) { types = { + 'TRAF': 9, 'Demo Request': 15, }; } if (context.settingProvider.isUserFlowMedical && !context.userProvider.isNurse) { - types = {'Incidents': 16}; + types['Incidents'] = 16; } final statuses = { 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 a02acdbc..18f39022 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 @@ -58,14 +58,14 @@ class _MyRequestsPageState extends State { // switching asset inventory to users permissions context.userProvider.modulesPermissionsList.forEach((module) { - if (module.module!.value! == 8) { + if (module.module!.value! == 8 || module.module!.value! == 9) { 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, 'TRAF')); - } + // if (context.settingProvider.isUserFlowMedical && 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')); diff --git a/lib/views/pages/user/notifications/unread_chat_list.dart b/lib/views/pages/user/notifications/unread_chat_list.dart index ed82f2f7..fb245af3 100644 --- a/lib/views/pages/user/notifications/unread_chat_list.dart +++ b/lib/views/pages/user/notifications/unread_chat_list.dart @@ -51,7 +51,7 @@ class UnReadChatList extends StatelessWidget { ).expanded, 8.width, Text( - messages[index].createdAt?.toServiceRequestCardFormat ?? "", + messages[index].createdAt?.unReadChatMsgDate ?? "", textAlign: TextAlign.right, style: AppTextStyles.tinyFont.copyWith( color: context.isDark ? AppColor.neutral20 : AppColor.neutral50,