diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java index 7ab3f9598..522bef6bd 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java @@ -138,6 +138,8 @@ public abstract class TaskElement extends BaseEntity { private BigDecimal advancePercentage = BigDecimal.ZERO; + private Boolean assignedStatusDisabled = false; + public void initializeEndDateIfDoesntExist() { if (getEndDate() == null) { initializeEndDate(); @@ -501,7 +503,18 @@ public abstract class TaskElement extends BaseEntity { return result; } + public Boolean isAssignedStatusDisabled() { + return assignedStatusDisabled; + } + + public void setAssignedStatusDisabled(Boolean disabled) { + this.assignedStatusDisabled = disabled; + } + public String getAssignedStatus() { + if(isAssignedStatusDisabled()) { + return "unassigned"; + } if (getSatisfiedResourceAllocations().isEmpty()) { return "unassigned"; } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java index afd611c65..4ed4edb46 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/company/CompanyPlanningModel.java @@ -717,6 +717,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { if (associatedTaskElement != null && STATUS_VISUALIZED.contains(order.getState()) && (predicate == null || predicate.accepts(order))) { + associatedTaskElement.setAssignedStatusDisabled(true); result.add(associatedTaskElement); ordersToShow.add(order); }