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 bb58a7a4..00d6738e 100644 --- a/lib/modules/tm_module/device_transfer/device_transfer_details.dart +++ b/lib/modules/tm_module/device_transfer/device_transfer_details.dart @@ -194,7 +194,7 @@ class _DeviceTransferDetailsState extends State { _internalRequestDetailsCard() { bool isCurrentEngineerEligibleForEdit = _model?.senderAssignedEmployeeId == _userProvider!.user?.userID; - bool isCurrentRequestEditAble = (!(_model?.senderMachineStatusValue == 5)); + bool isCurrentRequestEditAble = (!(_model?.senderMachineStatusValue == 5) && !(_model?.senderMachineStatusValue == 3)); bool isCurrentRequestInProgress = (_model?.senderMachineStatusValue == 1); // bool isCurrentRequestClosed = isSender ? ((_model?.senderMachineStatusValue == 3)) : ((_model?.receiverMachineStatusValue == 3)); @@ -313,7 +313,7 @@ class _DeviceTransferDetailsState extends State { {required String site, String? building, String? dept, String? floor, required String comment, required bool isSender, StatusLabel? statusLabel, String? assignTo}) { bool isCurrentEngineerEligibleForEdit = isSender ? _model?.senderAssignedEmployeeId == _userProvider!.user?.userID : _model?.receiverAssignedEmployeeId == _userProvider!.user?.userID; - bool isCurrentRequestClosed = isSender ? ((_model?.senderMachineStatusValue == 3)) : ((_model?.receiverMachineStatusValue == 3)); + bool isCurrentRequestClosed = isSender ? ((_model?.senderMachineStatusValue == 3 || _model?.senderMachineStatusValue == 5)) : ((_model?.receiverMachineStatusValue == 3 || _model?.receiverMachineStatusValue == 5)); bool isCurrentRequestOpen = isSender ? ((_model?.senderMachineStatusValue == 4)) : ((_model?.receiverMachineStatusValue == 4)); bool isCurrentRequestInProgress = isSender ? ((_model?.senderMachineStatusValue == 1)) : ((_model?.receiverMachineStatusValue == 1));