From 19d8342b1ca0ce7f819970f1678ad1d7fd0b9e30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 18 Aug 2009 12:26:56 +0200 Subject: [PATCH] ItEr22S12CUVistaRecursosTempoPorProxectoItEr21S07: Adding resource load as tab --- .../java/org/zkoss/ganttz/TabsRegistry.java | 1 + .../web/planner/DataForPlanner.java | 64 ++++++++++++++++--- 2 files changed, 57 insertions(+), 8 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java index fdf2c954f..84d4dd484 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/TabsRegistry.java @@ -27,6 +27,7 @@ public class TabsRegistry { public void show(ITab tab) { hideAllExcept(tab); tab.show(); + parent.invalidate(); } private void hideAllExcept(ITab tab) { diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java index f4df06d4a..09cb5b0ba 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/DataForPlanner.java @@ -1,10 +1,13 @@ package org.navalplanner.web.planner; +import static org.navalplanner.web.I18nHelper._; + import java.util.ArrayList; import java.util.Calendar; import java.util.Date; import java.util.List; +import org.zkoss.ganttz.ResourcesLoadPanel; import org.zkoss.ganttz.TaskEditFormComposer; import org.zkoss.ganttz.adapters.AutoAdapter; import org.zkoss.ganttz.adapters.DomainDependency; @@ -15,14 +18,14 @@ import org.zkoss.ganttz.data.DependencyType; import org.zkoss.ganttz.data.GanttDiagramGraph; import org.zkoss.ganttz.data.ITaskFundamentalProperties; import org.zkoss.ganttz.data.Task; -import org.zkoss.ganttz.data.TaskContainer; import org.zkoss.ganttz.data.TaskLeaf; import org.zkoss.ganttz.extensions.ICommand; import org.zkoss.ganttz.extensions.ICommandOnTask; import org.zkoss.ganttz.extensions.IContext; import org.zkoss.ganttz.extensions.IContextWithPlannerTask; - -import static org.navalplanner.web.I18nHelper._; +import org.zkoss.ganttz.extensions.ITab; +import org.zkoss.ganttz.extensions.ITabFactory; +import org.zkoss.zk.ui.Component; /** * Some test data for planner
@@ -40,7 +43,53 @@ public class DataForPlanner { return new GanttDiagramGraph(); } - private PlannerConfiguration addCommands( + private PlannerConfiguration setup( + PlannerConfiguration configuration) { + addCommands(configuration); + addTabs(configuration); + return configuration; + } + + private void addTabs( + PlannerConfiguration configuration) { + configuration.addTab(new ITabFactory() { + + @Override + public ITab create(IContext context) { + return new ITab() { + + private Component parent; + + private ResourcesLoadPanel loadPanel; + + @Override + public void show() { + loadPanel = new ResourcesLoadPanel(); + parent.appendChild(loadPanel); + } + + @Override + public void hide() { + if (loadPanel != null) { + loadPanel.detach(); + } + } + + @Override + public String getName() { + return _("Resource Load"); + } + + @Override + public void addToParent(Component parent) { + this.parent = parent; + } + }; + } + }); + } + + private void addCommands( PlannerConfiguration configuration) { configuration .addGlobalCommand(new ICommand() { @@ -100,19 +149,18 @@ public class DataForPlanner { return ""; } }); - return configuration; } public PlannerConfiguration getLightLoad() { - return addCommands(getModelWith(20)); + return setup(getModelWith(20)); } public PlannerConfiguration getMediumLoad() { - return addCommands(getModelWith(300)); + return setup(getModelWith(300)); } public PlannerConfiguration getHighLoad() { - return addCommands(getModelWith(500)); + return setup(getModelWith(500)); } private PlannerConfiguration getModelWith(