diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java index 6fdb73270..5d3e783e3 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesLeftPane.java @@ -21,7 +21,6 @@ package org.navalplanner.web.limitingresources; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; import org.navalplanner.business.resources.entities.LimitingResourceQueue; @@ -32,7 +31,6 @@ import org.zkoss.zul.Div; import org.zkoss.zul.Label; import org.zkoss.zul.Popup; import org.zkoss.zul.Treecell; -import org.zkoss.zul.Treechildren; import org.zkoss.zul.Treeitem; import org.zkoss.zul.TreeitemRenderer; import org.zkoss.zul.Treerow; @@ -87,35 +85,26 @@ public class LimitingResourcesLeftPane extends HtmlMacroComponent { }; } - private void collapse(LimitingResourceQueue line) { - // unnecesary - limitingResourcesList.collapse(line); - } - - private void expand(LimitingResourceQueue line, - List closed) { - // unnecesary - // limitingResourcesList.expand(line, closed); - } - - private List calculatedClosedItems(Treeitem item) { - List result = new ArrayList(); - Treechildren treeChildren = item.getTreechildren(); - if (treeChildren != null) { - List myTreeItems = (List) treeChildren - .getChildren(); - Iterator iterator = myTreeItems.iterator(); - while (iterator.hasNext()) { - Treeitem child = (Treeitem) iterator.next(); - if (!child.isOpen()) { - result.addAll(getLineChildrenBy(child)); - } else { - result.addAll(calculatedClosedItems(child)); - } - } - } - return result; - } + // private List calculatedClosedItems(Treeitem item) + // { + // List result = new + // ArrayList(); + // Treechildren treeChildren = item.getTreechildren(); + // if (treeChildren != null) { + // List myTreeItems = (List) treeChildren + // .getChildren(); + // Iterator iterator = myTreeItems.iterator(); + // while (iterator.hasNext()) { + // Treeitem child = (Treeitem) iterator.next(); + // if (!child.isOpen()) { + // result.addAll(getLineChildrenBy(child)); + // } else { + // result.addAll(calculatedClosedItems(child)); + // } + // } + // } + // return result; + // } private List getLineChildrenBy(Treeitem item) { List result = new ArrayList(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java index 268d2e3fb..e182f953d 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java @@ -104,8 +104,8 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { } public void reloadLimitingResourcesList() { - limitingResourcesList.setModel(createModelForTree()); - limitingResourcesList.invalidate(); + queueListComponent.setModel(createModelForTree()); + queueListComponent.invalidate(); } public ListModel getFilters() { @@ -223,10 +223,16 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { // FIXME: Insert calculated dependencies dependencyList = new LimitingDependencyList(this); - if (queueListComponent.getQueueTasks().size() > 2) { - QueueTask source = queueListComponent.getQueueTasks().get(0); - QueueTask destination = queueListComponent.getQueueTasks().get(1); - QueueTask destination2 = queueListComponent.getQueueTasks().get(2); + System.out + .println("tasks!" + queueListComponent.getQueueTasks().size()); + // for (LimitingResourceQueue each: limitingResourceQueues) { + // each.getLimitingResourceQueueElements(); + // } + + if (queueListComponent.getQueueTasks().size() > 3) { + QueueTask source = queueListComponent.getQueueTasks().get(1); + QueueTask destination = queueListComponent.getQueueTasks().get(2); + QueueTask destination2 = queueListComponent.getQueueTasks().get(3); LimitingDependencyComponent limitingDependencyComponent = new LimitingDependencyComponent( source, destination); @@ -250,7 +256,7 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { dependencyList.afterCompose(); queueListComponent.afterCompose(); - limitingResourcesList.invalidate(); + queueListComponent.invalidate(); // Insert timetracker headers TimeTrackerComponent timeTrackerHeader = createTimeTrackerHeader(); diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java index 59aed0658..4685a7f19 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueComponent.java @@ -120,8 +120,7 @@ public class QueueComponent extends XulElement implements private void appendMenu(QueueTask divElement) { if (divElement.getPage() != null) { MenuBuilder menuBuilder = MenuBuilder.on(divElement - .getPage(), - queueTasks); + .getPage(), queueTasks); menuBuilder.item(_("Unassign"), "/common/img/ico_borrar.png", new ItemAction() { @Override diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java index 10fbe615d..9df612ea8 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/QueueListComponent.java @@ -53,8 +53,6 @@ public class QueueListComponent extends HtmlMacroComponent implements private List limitingResourcesComponents = new ArrayList(); - private MutableTreeModel timelinesTree; - private List queueTasks = new ArrayList(); public QueueListComponent(TimeTracker timeTracker, @@ -71,10 +69,15 @@ public class QueueListComponent extends HtmlMacroComponent implements private void insertAsComponents(List children) { for (LimitingResourceQueue each : children) { - LimitingResourcesComponent component = LimitingResourcesComponent - .create(timeTracker, each); + QueueComponent component = QueueComponent.create(timeTracker, each); this.appendChild(component); - fromTimeLineToComponent.put(each, component); + fromQueueToElement.put(each, component); + + // FIXME: Added for temporary dependencies + limitingResourcesComponents.add(component); + if (!component.getQueueTasks().isEmpty()) { + queueTasks.addAll(component.getQueueTasks()); + } } } @@ -83,7 +86,7 @@ public class QueueListComponent extends HtmlMacroComponent implements } public void invalidate() { - fromTimeLineToComponent.clear(); + fromQueueToElement.clear(); this.getChildren().clear(); insertAsComponents(model.asList()); super.invalidate(); @@ -102,37 +105,11 @@ public class QueueListComponent extends HtmlMacroComponent implements }; } - private void insertAsComponents(TimeTracker timetracker, - List children) { - for (LimitingResourceQueue LimitingResourceQueue : children) { - QueueComponent component = QueueComponent - .create(timetracker, LimitingResourceQueue); - limitingResourcesComponents.add(component); - appendChild(component); - queueTasks.addAll(component.getQueueTasks()); - fromQueueToElement.put(LimitingResourceQueue, component); - } - } - - - public void collapse(LimitingResourceQueue line) { - } - - - private QueueComponent getComponentFor(LimitingResourceQueue l) { - QueueComponent resourceLoadComponent = fromQueueToElement - .get(l); - return resourceLoadComponent; - } - - public void expand(LimitingResourceQueue line, - List closed) { - } - @Override public void afterCompose() { super.afterCompose(); for (QueueComponent each : limitingResourcesComponents) { + System.out.println("Composing!"); each.afterCompose(); } } diff --git a/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js b/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js index 7ef010d81..437beb3c8 100644 --- a/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js +++ b/navalplanner-webapp/src/main/resources/web/js/limitingresources/limitingdependency.js @@ -186,16 +186,16 @@ zkLimitingDependency.draw = function(dependency) { switch(dependency.getAttribute('type')) { case zkLimitingDependencies.constants.START_START: - parameter = 5; + verticalSeparation = 5; break; case zkLimitingDependencies.constants.END_END: - parameter = 10; + verticalSeparation = 10; break; case zkLimitingDependencies.constants.END_START: default: - parameter = 15; + verticalSeparation = 15; } - zkLimitingDependencies.newdraw(dependency, orig, dest, parameter); + zkLimitingDependencies.newdraw(dependency, orig, dest, verticalSeparation); } diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index 080594844..23fed519a 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -165,7 +165,7 @@ } /* -------------- Dependencies -------------- */ -#listdependencies, #listlimitingdependencies { +#listdependencies { position: relative; width: 400px; float: left; @@ -183,21 +183,13 @@ z-index:0; } -#listdependencies .end, -#listdependencies .start { +.end,.start { height: 1px; } -#listdependencies .mid { - width: 1px; -} -#listlimitingdependencies .end, -#listlimitingdependencies .start { +.mid { width: 1px; } -#listlimitingdependencies .mid { - height: 1px; -} .completion { width: 0%;