From 5a6fb6b1fea2fab88d4b99f901ccbf8b8a4f09ec Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Thu, 7 Jan 2010 10:16:30 +0100
Subject: [PATCH]  ItEr42S15SoporteImpresionMultiplesPaxinasItEr41S18: Shown
 indirect labels in planner tasks and taskgroups fixes

---
 .../resources/web/ganttz/taskcontainer.dsp    |  2 ++
 .../web/planner/TaskElementAdapter.java       | 23 +++++++++++++++++--
 .../src/main/webapp/planner/css/ganttzk.css   | 12 ++++++++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/taskcontainer.dsp b/ganttzk/src/main/resources/web/ganttz/taskcontainer.dsp
index 6e7b5ccff..c2199969d 100644
--- a/ganttzk/src/main/resources/web/ganttz/taskcontainer.dsp
+++ b/ganttzk/src/main/resources/web/ganttz/taskcontainer.dsp
@@ -7,6 +7,8 @@
 <div id="row${self.uuid}" class="row" z.valor="boxid="${self.uuid}">
     <div id="${self.uuid}" z.type="ganttz.taskcontainer.TaskContainer" idTask="${self.id}"
        z.autoz="true"${self.outerAttrs}" class="taskgroup">
+		<div class="task-labels">${self.labelsText}</div>
+		<div class="task-resources">${self.resourcesText}</div>
 	<div class="taskcontainer_completion">
 	        <div class="completion"></div>
 	        <div class="completion2"></div>
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 93e5279a3..8eaca99cc 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
@@ -378,12 +378,31 @@ public class TaskElementAdapter implements ITaskElementAdapter {
                     });
         }
 
+
+
+        private Set<Label> getLabelsFromElementAndPredecesors(
+                OrderElement order) {
+            if (order != null) {
+                if (order.getParent() == null) {
+                    return order.getLabels();
+                } else {
+                    HashSet<Label> labels = new HashSet<Label>(order
+                            .getLabels());
+                    labels.addAll(getLabelsFromElementAndPredecesors(order
+                            .getParent()));
+                    return labels;
+                }
+            }
+            return new HashSet<Label>();
+        }
+
+
         private String buildLabelsText() {
             StringBuilder result = new StringBuilder();
 
             if (taskElement.getOrderElement() != null) {
-                Set<Label> labels = taskElement
-                        .getOrderElement().getLabels();
+                Set<Label> labels = getLabelsFromElementAndPredecesors(taskElement
+                        .getOrderElement());
 
                 if (!labels.isEmpty()) {
                     for (Label label : labels) {
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
index 4262fe415..4e0488275 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css
@@ -182,7 +182,7 @@ min-width:200px;
 
 .taskgroup_start,.taskgroup_end {
     position: relative;
-    top: -10px; /* zkTasklist.HEIGHT_PER_TASK */
+    top: -12px; /* zkTasklist.HEIGHT_PER_TASK */
 }
 
 .row span {
@@ -199,6 +199,7 @@ min-width:200px;
     height: 10px;
     width: 10px;
     float: left;
+    clear: both;
 }
 
 .taskgroup_end {
@@ -206,7 +207,9 @@ min-width:200px;
         url("/navalplanner-webapp/zkau/web/ganttz/img/group_right.png");
     height: 10px;
     width: 10px;
-    float: right;
+    position:absolute;
+    right:0;
+    top:-1px;
 }
 
 .taskgroup,.row .expanded {
@@ -217,6 +220,11 @@ min-width:200px;
     background-color: transparent !important;
 }
 
+.box.expanded, .box.closed {
+    overflow:hidden;
+    padding-right:2px;
+}
+
 .milestone_end {
     background-image:
         url("/navalplanner-webapp/zkau/web/ganttz/img/milestone.png");