From 31a9296a8e7586f0774c96466f82dbcc5005801a Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 11 Feb 2026 14:57:00 +0300 Subject: [PATCH] improvements --- lib/controllers/providers/api/all_requests_provider.dart | 4 ++-- .../tm_module/device_transfer/device_transfer_details.dart | 2 +- .../pages/land_page/create_request_type_bottom_sheet.dart | 2 +- .../pages/land_page/my_request/all_requests_filter_page.dart | 2 +- .../pages/land_page/my_request/my_requests_page.dart | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/controllers/providers/api/all_requests_provider.dart b/lib/controllers/providers/api/all_requests_provider.dart index 86579328..7a7f2c0d 100644 --- a/lib/controllers/providers/api/all_requests_provider.dart +++ b/lib/controllers/providers/api/all_requests_provider.dart @@ -163,11 +163,11 @@ class AllRequestsProvider extends ChangeNotifier { } }); - if (context.userProvider.isNurse) { + if (context.settingProvider.isUserFlowMedical && context.userProvider.isNurse) { list.add(9); // } list.add(12); - if (context.userProvider.isCommissioningEngineer) { + if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { list = [13]; } // loan module diff --git a/lib/modules/tm_module/device_transfer/device_transfer_details.dart b/lib/modules/tm_module/device_transfer/device_transfer_details.dart index de9da297..709fde85 100644 --- a/lib/modules/tm_module/device_transfer/device_transfer_details.dart +++ b/lib/modules/tm_module/device_transfer/device_transfer_details.dart @@ -226,7 +226,7 @@ class _DeviceTransferDetailsState extends State { isShow: context.settingProvider.isUserFlowMedical && _model!.senderMachineStatusValue! != 4, isReadOnly: _model!.senderMachineStatusValue! != 1, requestId: widget.model.id!.toInt(), - assigneeEmployeeNumber: _model!.senderAssignedEmployeeId, + assigneeEmployeeNumber: _model!.senderAssignedEmployeeNumber, myLoginUserID: context.userProvider.user!.employeeId ?? context.userProvider.user!.username!, contactEmployeeINumber: _model!.assetTransferContactPersons!.first.employeeNumber ?? _model!.assetTransferContactPersons!.first.employeeNumber, ), 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 2f0fdf37..b8970b77 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 @@ -116,7 +116,7 @@ class CreateRequestModel { if (context.userProvider.isQualityUser && context.settingProvider.isUserFlowMedical) { 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) { + } else if (context.userProvider.isAssessor && context.settingProvider.isUserFlowMedical) { list.add(CreateRequestModel("TRAF".addTranslation, "add_icon", CreateTRAFRequestPage.id)); } else if (context.userProvider.isEngineer) { if (Provider.of(context, listen: false).engineerCanCreateCM) { 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 bca9e7f6..6a854af3 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 @@ -109,7 +109,7 @@ class _AllRequestsFilterPageState extends State { if (context.settingProvider.isUserFlowMedical) types['Equipment Internal Audit'] = 10; 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. types = { 'Asset Delivery': 13, 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 dc3f93c5..e4b0953c 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 @@ -83,7 +83,7 @@ class _MyRequestsPageState extends State { Request(9, 'TRAF'), ]; } - if (context.userProvider.isCommissioningEngineer) { + if (context.userProvider.isCommissioningEngineer && context.settingProvider.isUserFlowMedical) { ///TODO need to show only allowed ids for all workOrder requestsList = [ Request(null, context.translation.allWorkOrder),