From 2ba923e9ee9ca434a5a6053cab7481e73bd704f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Tue, 13 Oct 2009 21:35:17 +0200 Subject: [PATCH] ItEr30S15RFVisualizacionMultiplesProxectosItEr29S18: Adding orders tab --- .../tabs/MultipleTabsPlannerController.java | 34 ++++++++-- .../src/main/webapp/orders/_ordersTab.zul | 68 +++++++++++++++++++ .../src/main/webapp/planner/index.zul | 2 - 3 files changed, 98 insertions(+), 6 deletions(-) create mode 100644 navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java index 60125aa88..c045c6f95 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/MultipleTabsPlannerController.java @@ -21,9 +21,12 @@ package org.navalplanner.web.planner.tabs; import static org.navalplanner.web.I18nHelper._; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import org.navalplanner.business.orders.entities.Order; +import org.navalplanner.web.common.Util; import org.navalplanner.web.planner.CompanyPlanningController; import org.navalplanner.web.planner.tabs.CreatedOnDemandTab.IComponentCreator; import org.springframework.beans.factory.annotation.Autowired; @@ -36,6 +39,7 @@ import org.zkoss.zk.ui.Executions; import org.zkoss.zk.ui.event.Event; import org.zkoss.zk.ui.event.EventListener; import org.zkoss.zk.ui.event.Events; +import org.zkoss.zkplus.databind.AnnotateDataBinder; import org.zkoss.zul.Button; import org.zkoss.zul.Div; import org.zkoss.zul.Label; @@ -182,10 +186,32 @@ public class MultipleTabsPlannerController { @Override public org.zkoss.zk.ui.Component create( org.zkoss.zk.ui.Component parent) { - return withUpAndDownButton(new Label("on order view. mode: " - + mode.getType())); - } - }); + org.zkoss.zk.ui.Component result = Executions.createComponents( + "/orders/_ordersTab.zul", + parent, + null); + createBindingsFor(result); + Util.reloadBindings(result); + return result; + } + + }); + } + + @SuppressWarnings("unchecked") + private void createBindingsFor(org.zkoss.zk.ui.Component result) { + List children = new ArrayList( + result.getChildren()); + for (org.zkoss.zk.ui.Component child : children) { + createBindingsFor(child); + } + setBinderFor(result); + } + + private void setBinderFor(org.zkoss.zk.ui.Component result) { + AnnotateDataBinder binder = new AnnotateDataBinder(result, true); + result.setVariable("binder", binder, true); + binder.loadAll(); } private ITab createOrderOrdersTab() { diff --git a/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul new file mode 100644 index 000000000..cd8447d9e --- /dev/null +++ b/navalplanner-webapp/src/main/webapp/orders/_ordersTab.zul @@ -0,0 +1,68 @@ + + + + + + + + + + + + + + + + + + + +