From deeeac579fa406570f31a681db3afafc8cb4c2fa Mon Sep 17 00:00:00 2001 From: Susana Montes Pedreira Date: Mon, 26 Mar 2012 16:07:13 +0100 Subject: [PATCH] set the fields of the subcontraction pop-up to read-only mode when a subcontracted task has been sent. FEA: ItEr75S32AnA15S04UpdateDeliveringDateInSubcontracting --- .../web/planner/order/SubcontractController.java | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java index e03535717..71d49d013 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractController.java @@ -246,14 +246,16 @@ public class SubcontractController extends GenericForwardComposer { } public boolean isSent(){ + return !isNotSent(); + } + + public boolean isNotSent() { if (this.getSubcontractedTaskData() != null && this.getSubcontractedTaskData().getState() != null) { - return this.getSubcontractedTaskData().getState() - .equals(SubcontractState.SUCCESS_SENT); + return ((this.getSubcontractedTaskData().getState() + .equals(SubcontractState.PENDING_INITIAL_SEND)) || (this + .getSubcontractedTaskData().getState() + .equals(SubcontractState.FAILED_SENT))); } return false; } - - public boolean isNotSent(){ - return !isSent(); - } } \ No newline at end of file