improvements

design_3.0_demo_module
Sikander Saleem 20 hours ago
parent 7020b9b36e
commit 86c530dc45

@ -158,14 +158,14 @@ class AllRequestsProvider extends ChangeNotifier {
// switching asset inventory to users permissions // switching asset inventory to users permissions
context.userProvider.modulesPermissionsList.forEach((module) { context.userProvider.modulesPermissionsList.forEach((module) {
if (module.module!.value! == 8) { if (module.module!.value! == 8 || module.module!.value! == 9) {
list.add(module.module!.value!); list.add(module.module!.value!);
} }
}); });
if (context.settingProvider.isUserFlowMedical && context.userProvider.isNurse) { // if (context.settingProvider.isUserFlowMedical && context.userProvider.isNurse) {
list.add(9); // // list.add(9); //
} // }
list.add(12); list.add(12);
if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) {
list = [13]; list = [13];

@ -21,6 +21,11 @@ extension StringExtensions on String {
return DateFormat('EEE dd MMM').format(dateTime); 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 { String get chatMsgDateWithYear {
DateTime dateTime = DateTime.parse(this).toLocal(); DateTime dateTime = DateTime.parse(this).toLocal();
return DateFormat('EEE dd MMM, yyyy').format(dateTime); return DateFormat('EEE dd MMM, yyyy').format(dateTime);

@ -137,9 +137,11 @@ class CreateRequestModel {
list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id)); list.add(CreateRequestModel(context.translation.transferAsset, "add_icon", CreateDeviceTransferRequest.id));
//TODO uncommit this to enable task. //TODO uncommit this to enable task.
list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id)); list.add(CreateRequestModel(context.translation.task, "add_icon", CreateTaskView.id));
if ((context.settingProvider.isUserFlowMedical)) { context.userProvider.modulesPermissionsList.forEach((module) {
list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); 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('Loan Equipment Request'.addTranslation, "add_icon", CreateLoanRequestPage.id));
list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id)); list.add(CreateRequestModel('Demo Request'.addTranslation, "add_icon", CreateDemoRequestPage.id));
} }

@ -91,18 +91,18 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
// switching asset inventory to users permissions // switching asset inventory to users permissions
context.userProvider.modulesPermissionsList.forEach((module) { 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!; types[module.module!.name!] = module.module!.value!;
} }
}); });
//Hide traf //Hide traf
if (!isEngineer && context.settingProvider.isUserFlowMedical) { // if (!isEngineer && context.settingProvider.isUserFlowMedical) {
types['TRAF'] = 9; // types['TRAF'] = 9;
} // }
//
if (context.settingProvider.isUserFlowMedical && context.userProvider.isAssessor) { // if (context.settingProvider.isUserFlowMedical && context.userProvider.isAssessor) {
types = {"TRAF": 9}; // types = {"TRAF": 9};
} // }
if (context.userProvider.isQualityUser) { if (context.userProvider.isQualityUser) {
if (context.settingProvider.isUserFlowMedical) types = {'Recall and Alert': 7}; if (context.settingProvider.isUserFlowMedical) types = {'Recall and Alert': 7};
if (context.settingProvider.isUserFlowMedical) types['Equipment Internal Audit'] = 10; if (context.settingProvider.isUserFlowMedical) types['Equipment Internal Audit'] = 10;
@ -110,19 +110,18 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
} }
if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) {
///TODO need to check what other requests type needed here. ///TODO need to check what other requests type needed here.
types = { types = {'Asset Delivery': 13};
'Asset Delivery': 13,
};
} }
///TODO need add accessor filter as well. ///TODO need add accessor filter as well.
if (context.userProvider.isAssessor) { if (context.settingProvider.isUserFlowMedical && context.userProvider.isAssessor) {
types = { types = {
'TRAF': 9,
'Demo Request': 15, 'Demo Request': 15,
}; };
} }
if (context.settingProvider.isUserFlowMedical && !context.userProvider.isNurse) { if (context.settingProvider.isUserFlowMedical && !context.userProvider.isNurse) {
types = {'Incidents': 16}; types['Incidents'] = 16;
} }
final statuses = { final statuses = {

@ -58,14 +58,14 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
// switching asset inventory to users permissions // switching asset inventory to users permissions
context.userProvider.modulesPermissionsList.forEach((module) { 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)); requestsList.add(Request(module.module!.value!, module.module!.name!.addTranslation));
} }
}); });
//Hide TRAF. //Hide TRAF.
if (context.settingProvider.isUserFlowMedical && context.userProvider.user!.type == UsersTypes.normal_user) { // if (context.settingProvider.isUserFlowMedical && context.userProvider.user!.type == UsersTypes.normal_user) {
requestsList.add(Request(9, 'TRAF')); // requestsList.add(Request(9, 'TRAF'));
} // }
if (context.userProvider.isEngineer && context.settingProvider.isUserFlowMedical) { if (context.userProvider.isEngineer && context.settingProvider.isUserFlowMedical) {
requestsList.add(Request(10, 'Equipment Internal Audit')); requestsList.add(Request(10, 'Equipment Internal Audit'));
requestsList.add(Request(11, 'System Internal Audit')); requestsList.add(Request(11, 'System Internal Audit'));

@ -51,7 +51,7 @@ class UnReadChatList extends StatelessWidget {
).expanded, ).expanded,
8.width, 8.width,
Text( Text(
messages[index].createdAt?.toServiceRequestCardFormat ?? "", messages[index].createdAt?.unReadChatMsgDate ?? "",
textAlign: TextAlign.right, textAlign: TextAlign.right,
style: AppTextStyles.tinyFont.copyWith( style: AppTextStyles.tinyFont.copyWith(
color: context.isDark ? AppColor.neutral20 : AppColor.neutral50, color: context.isDark ? AppColor.neutral20 : AppColor.neutral50,

Loading…
Cancel
Save