From 4eefa6709fd0b38e202e9cf6f04351be6fbdb3bf Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Fri, 7 Jan 2011 08:44:08 +0100 Subject: [PATCH] [Bug #794] Fixed. Only show scheduling state in tooltip for Order and avoid at OrderElement level. FEA: ItEr67S04BugFixing --- .../web/planner/TaskElementAdapter.java | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) 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 20e18275c..602edd4ac 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 @@ -39,8 +39,8 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import java.util.Set; +import java.util.Map.Entry; import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.Validate; @@ -58,23 +58,24 @@ import org.navalplanner.business.common.daos.IConfigurationDAO; import org.navalplanner.business.common.entities.ProgressType; import org.navalplanner.business.labels.entities.Label; import org.navalplanner.business.orders.daos.IOrderElementDAO; +import org.navalplanner.business.orders.entities.Order; import org.navalplanner.business.orders.entities.OrderElement; import org.navalplanner.business.orders.entities.OrderStatusEnum; import org.navalplanner.business.planner.daos.IResourceAllocationDAO; import org.navalplanner.business.planner.daos.ITaskElementDAO; import org.navalplanner.business.planner.entities.Dependency; -import org.navalplanner.business.planner.entities.Dependency.Type; import org.navalplanner.business.planner.entities.GenericResourceAllocation; import org.navalplanner.business.planner.entities.ITaskPositionConstrained; import org.navalplanner.business.planner.entities.PositionConstraintType; import org.navalplanner.business.planner.entities.ResourceAllocation; -import org.navalplanner.business.planner.entities.ResourceAllocation.Direction; import org.navalplanner.business.planner.entities.SpecificResourceAllocation; import org.navalplanner.business.planner.entities.Task; import org.navalplanner.business.planner.entities.TaskElement; -import org.navalplanner.business.planner.entities.TaskElement.IDatesHandler; import org.navalplanner.business.planner.entities.TaskGroup; import org.navalplanner.business.planner.entities.TaskPositionConstraint; +import org.navalplanner.business.planner.entities.Dependency.Type; +import org.navalplanner.business.planner.entities.ResourceAllocation.Direction; +import org.navalplanner.business.planner.entities.TaskElement.IDatesHandler; import org.navalplanner.business.resources.daos.ICriterionDAO; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.Criterion; @@ -91,10 +92,10 @@ import org.zkoss.ganttz.IDatesMapper; import org.zkoss.ganttz.adapters.DomainDependency; import org.zkoss.ganttz.data.DependencyType; import org.zkoss.ganttz.data.GanttDate; +import org.zkoss.ganttz.data.ITaskFundamentalProperties; import org.zkoss.ganttz.data.GanttDate.Cases; import org.zkoss.ganttz.data.GanttDate.CustomDate; import org.zkoss.ganttz.data.GanttDate.LocalDateBased; -import org.zkoss.ganttz.data.ITaskFundamentalProperties; import org.zkoss.ganttz.data.constraint.Constraint; /** * Responsible of adaptating a {@link TaskElement} into a @@ -844,7 +845,9 @@ public class TaskElementAdapter implements ITaskElementAdapter { result.append(_("Hours invested") + ": ").append( getHoursAdvancePercentage().multiply(new BigDecimal(100))) .append("%
"); - result.append(_("State") +": ").append(getOrderState()); + if (taskElement.getOrderElement() instanceof Order) { + result.append(_("State") + ": ").append(getOrderState()); + } String labels = buildLabelsText(); if (!labels.equals("")) { result.append("
" + _("Labels")