improvements

design_3.0_demo_module
Sikander Saleem 1 month ago
parent 2997eef5ad
commit 31a9296a8e

@ -163,11 +163,11 @@ class AllRequestsProvider extends ChangeNotifier {
} }
}); });
if (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) { if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) {
list = [13]; list = [13];
} }
// loan module // loan module

@ -226,7 +226,7 @@ class _DeviceTransferDetailsState extends State<DeviceTransferDetails> {
isShow: context.settingProvider.isUserFlowMedical && _model!.senderMachineStatusValue! != 4, isShow: context.settingProvider.isUserFlowMedical && _model!.senderMachineStatusValue! != 4,
isReadOnly: _model!.senderMachineStatusValue! != 1, isReadOnly: _model!.senderMachineStatusValue! != 1,
requestId: widget.model.id!.toInt(), requestId: widget.model.id!.toInt(),
assigneeEmployeeNumber: _model!.senderAssignedEmployeeId, assigneeEmployeeNumber: _model!.senderAssignedEmployeeNumber,
myLoginUserID: context.userProvider.user!.employeeId ?? context.userProvider.user!.username!, myLoginUserID: context.userProvider.user!.employeeId ?? context.userProvider.user!.username!,
contactEmployeeINumber: _model!.assetTransferContactPersons!.first.employeeNumber ?? _model!.assetTransferContactPersons!.first.employeeNumber, contactEmployeeINumber: _model!.assetTransferContactPersons!.first.employeeNumber ?? _model!.assetTransferContactPersons!.first.employeeNumber,
), ),

@ -116,7 +116,7 @@ class CreateRequestModel {
if (context.userProvider.isQualityUser && context.settingProvider.isUserFlowMedical) { if (context.userProvider.isQualityUser && context.settingProvider.isUserFlowMedical) {
list.add(CreateRequestModel("Equipment Internal Audit Checklist".addTranslation, "add_icon", CreateEquipmentInternalAuditForm.id)); list.add(CreateRequestModel("Equipment Internal Audit Checklist".addTranslation, "add_icon", CreateEquipmentInternalAuditForm.id));
list.add(CreateRequestModel("System Internal Audit Checklist".addTranslation, "add_icon", CreateSystemInternalAuditForm.id)); list.add(CreateRequestModel("System Internal Audit Checklist".addTranslation, "add_icon", CreateSystemInternalAuditForm.id));
} else if (context.userProvider.isAssessor) { } else if (context.userProvider.isAssessor && context.settingProvider.isUserFlowMedical) {
list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id));
} else if (context.userProvider.isEngineer) { } else if (context.userProvider.isEngineer) {
if (Provider.of<SettingProvider>(context, listen: false).engineerCanCreateCM) { if (Provider.of<SettingProvider>(context, listen: false).engineerCanCreateCM) {

@ -109,7 +109,7 @@ class _AllRequestsFilterPageState extends State<AllRequestsFilterPage> {
if (context.settingProvider.isUserFlowMedical) types['Equipment Internal Audit'] = 10; if (context.settingProvider.isUserFlowMedical) types['Equipment Internal Audit'] = 10;
if (context.settingProvider.isUserFlowMedical) types['System Internal Audit'] = 11; if (context.settingProvider.isUserFlowMedical) types['System Internal Audit'] = 11;
} }
if (context.userProvider.isCommissioningEngineer) { 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,

@ -83,7 +83,7 @@ class _MyRequestsPageState extends State<MyRequestsPage> {
Request(9, 'TRAF'), Request(9, 'TRAF'),
]; ];
} }
if (context.userProvider.isCommissioningEngineer) { if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) {
///TODO need to show only allowed ids for all workOrder ///TODO need to show only allowed ids for all workOrder
requestsList = [ requestsList = [
Request(null, context.translation.allWorkOrder), Request(null, context.translation.allWorkOrder),

Loading…
Cancel
Save