From 96701730c0900d0696c3ce27af783ef652ea5fc1 Mon Sep 17 00:00:00 2001 From: Sikander Saleem Date: Wed, 27 Mar 2024 13:55:18 +0300 Subject: [PATCH] eng can edit device transfer even status is completed. --- .../pages/device_transfer/device_transfer_details.dart | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lib/views/pages/device_transfer/device_transfer_details.dart b/lib/views/pages/device_transfer/device_transfer_details.dart index cc768fdc..9b26a152 100644 --- a/lib/views/pages/device_transfer/device_transfer_details.dart +++ b/lib/views/pages/device_transfer/device_transfer_details.dart @@ -179,10 +179,9 @@ class _DeviceTransferDetailsState extends State { _buildCard({@required String site, @required String unit, @required String comment, @required bool isSender, StatusLabel statusLabel}) { bool isCurrentEngineerEligibleForEdit = isSender ? _model?.senderAssignedEmployeeId == _userProvider.user?.userID : _model?.receiverAssignedEmployeeId == _userProvider.user?.userID; - - bool isCurrentRequestCompletedOrClosed = isSender - ? ((_model?.senderMachineStatusName?.toLowerCase()?.contains("close") ?? false) || (_model?.senderMachineStatusName?.toLowerCase()?.contains("complete") ?? false)) - : ((_model?.receiverMachineStatusName?.toLowerCase()?.contains("close") ?? false) || (_model?.receiverMachineStatusName?.toLowerCase()?.contains("complete") ?? false)); + bool isCurrentRequestClosed = isSender + ? ((_model?.senderMachineStatusName?.toLowerCase()?.contains("close") ?? false)) + : ((_model?.receiverMachineStatusName?.toLowerCase()?.contains("close") ?? false)); return Column( @@ -200,7 +199,7 @@ class _DeviceTransferDetailsState extends State { ], ), if ((_userProvider.user?.type == UsersTypes.engineer)) - if (isCurrentEngineerEligibleForEdit && !isCurrentRequestCompletedOrClosed) + if (isCurrentEngineerEligibleForEdit && !isCurrentRequestClosed) // if (isSender // ? (!(_model?.senderMachineStatusName?.toLowerCase()?.contains("close") ?? false) && !(_model?.senderMachineStatusName?.toLowerCase()?.contains("complete") ?? false))