diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java index 5baf7c120..f8da9a16a 100644 --- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java +++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/SubcontractedTaskData.java @@ -68,6 +68,7 @@ public class SubcontractedTaskData extends BaseEntity { result.labelsExported = subcontractedTaskData.labelsExported; result.materialAssignmentsExported = subcontractedTaskData.materialAssignmentsExported; result.hoursGroupsExported = subcontractedTaskData.hoursGroupsExported; + result.setState(subcontractedTaskData.getState()); result.setRequiredDeliveringDates(subcontractedTaskData.getRequiredDeliveringDates()); return create(result); @@ -229,6 +230,7 @@ public class SubcontractedTaskData extends BaseEntity { this.labelsExported = subcontratedTask.labelsExported; this.materialAssignmentsExported = subcontratedTask.materialAssignmentsExported; this.hoursGroupsExported = subcontratedTask.hoursGroupsExported; + this.state = subcontratedTask.getState(); this.setRequiredDeliveringDates(subcontratedTask.getRequiredDeliveringDates()); } 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 8f4393635..e2d6929b3 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 @@ -35,6 +35,7 @@ import javax.servlet.http.HttpServletResponse; import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.externalcompanies.entities.ExternalCompany; +import org.libreplan.business.planner.entities.SubcontractState; import org.libreplan.business.planner.entities.SubcontractedTaskData; import org.libreplan.business.planner.entities.SubcontractorDeliverDate; import org.libreplan.business.planner.entities.Task; @@ -244,4 +245,15 @@ public class SubcontractController extends GenericForwardComposer { Util.reloadBindings(gridDeliverDate); } + public boolean isSent(){ + if (this.getSubcontractedTaskData() != null && this.getSubcontractedTaskData().getState() != null) { + return this.getSubcontractedTaskData().getState() + .equals(SubcontractState.SUCCESS_SENT); + } + return false; + } + + public boolean isNotSent(){ + return !isSent(); + } } \ No newline at end of file diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java index b349f41f7..223cce5d0 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/order/SubcontractModel.java @@ -31,6 +31,7 @@ import org.libreplan.business.common.exceptions.ValidationException; import org.libreplan.business.externalcompanies.daos.IExternalCompanyDAO; import org.libreplan.business.externalcompanies.entities.ExternalCompany; import org.libreplan.business.planner.daos.ISubcontractedTaskDataDAO; +import org.libreplan.business.planner.entities.SubcontractState; import org.libreplan.business.planner.entities.SubcontractedTaskData; import org.libreplan.business.planner.entities.SubcontractorDeliverDate; import org.libreplan.business.planner.entities.Task; diff --git a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul index 29d79ffd3..cec798c01 100644 --- a/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul +++ b/libreplan-webapp/src/main/webapp/planner/taskpanels/_tabPanelSubcontract.zul @@ -25,48 +25,71 @@