diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java index aeefe1ba4..a388d86da 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/ITaskElementAdapter.java @@ -31,4 +31,9 @@ import org.zkoss.ganttz.adapters.IAdapterToTaskFundamentalProperties; public interface ITaskElementAdapter extends IAdapterToTaskFundamentalProperties{ void useScenario(Scenario scenario); + + void setPreventCalculateResourcesText(boolean preventCalculateResourcesText); + + boolean isPreventCalculateResourcesText(); + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java index 90e0fc5e3..5cd505636 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/TaskElementAdapter.java @@ -85,6 +85,17 @@ public class TaskElementAdapter implements ITaskElementAdapter { private static final Log LOG = LogFactory.getLog(TaskElementAdapter.class); + private boolean preventCalculateResourcesText = false; + + public boolean isPreventCalculateResourcesText() { + return preventCalculateResourcesText; + } + + public void setPreventCalculateResourcesText( + boolean preventCalculateResourcesText) { + this.preventCalculateResourcesText = preventCalculateResourcesText; + } + public static List> getStartConstraintsFor( TaskElement taskElement) { if (taskElement instanceof ITaskLeafConstraint) { @@ -380,7 +391,8 @@ public class TaskElementAdapter implements ITaskElementAdapter { @Override public String getResourcesText() { - if (taskElement.getOrderElement() == null) { + if (isPreventCalculateResourcesText() || + taskElement.getOrderElement() == null) { return ""; } try { 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 1cc9120d1..89cb0ca7f 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 @@ -680,6 +680,7 @@ public abstract class CompanyPlanningModel implements ICompanyPlanningModel { private PlannerConfiguration createConfiguration( IPredicate predicate) { ITaskElementAdapter taskElementAdapter = getTaskElementAdapter(); + taskElementAdapter.setPreventCalculateResourcesText(true); List toShow; toShow = retainOnlyTopLevel(predicate);