diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index f9f9ca77a..6f07e5b0b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -230,7 +230,6 @@ public class AdvancedAllocationController extends GenericForwardComposer { timeTrackerComponent.afterCompose(); table.afterCompose(); Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();"); - System.out.println("Accessing after compose"); } private void createComponents() { @@ -367,6 +366,7 @@ public class AdvancedAllocationController extends GenericForwardComposer { return row.getFunction(); } }); + return result; } @@ -616,6 +616,9 @@ class Row { this.messages = messages; this.restriction = restriction; this.name = name; + if (level != 0) { + this.name = " ยท " + this.name; + } this.level = level; this.aggregate = new AggregateOfResourceAllocations( new ArrayList>(allocations)); @@ -674,6 +677,7 @@ class Row { if (isGroupingRow()) { Label label = (Label) component; label.setValue(getHoursForDetailItem(item) + ""); + label.setClass("calculated-hours"); } else { Intbox intbox = (Intbox) component; intbox.setValue(getHoursForDetailItem(item)); diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index db3a2cf16..2dedc35e8 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -498,3 +498,11 @@ div.z-grid { .assignedresources .z-listbox input { height: 17px !important; } + +/* Highlight advancedallocation grouping row */ +.resourcesload .taskspanelgap .z-grid-body tr:first-child { + background-color: #E8E8E8; +} +.resourcesload .taskspanelgap .z-grid-body tr.z-row td { + background-color:transparent; +}