From e9565f89e78f51d968ae3a9e9f16f7d0a1fe3ae0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sun, 10 Jan 2010 15:36:18 +0100 Subject: [PATCH] ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Adding grid part for showing and editing assignments --- .../TemplateMaterialsController.java | 4 ++ .../templates/_materialAssignmentsBox.zul | 44 +++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100644 navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/materials/TemplateMaterialsController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/materials/TemplateMaterialsController.java index 9ef1e37eb..64d287400 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/materials/TemplateMaterialsController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/materials/TemplateMaterialsController.java @@ -21,12 +21,14 @@ package org.navalplanner.web.templates.materials; import java.math.BigDecimal; import java.math.RoundingMode; +import java.util.Collections; import org.navalplanner.business.materials.entities.Material; import org.navalplanner.business.materials.entities.MaterialAssignmentTemplate; import org.navalplanner.business.templates.entities.OrderElementTemplate; import org.navalplanner.web.orders.materials.AssignedMaterialsController; import org.zkoss.zk.ui.Component; +import org.zkoss.zk.ui.Executions; import org.zkoss.zul.TreeModel; /** @@ -46,6 +48,8 @@ public class TemplateMaterialsController extends @Override protected void createAssignmentsBoxComponent(Component parent) { + Executions.createComponents("/templates/_materialAssignmentsBox.zul", + parent, Collections.emptyMap()); } @Override diff --git a/navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul b/navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul new file mode 100644 index 000000000..4c3264e0c --- /dev/null +++ b/navalplanner-webapp/src/main/webapp/templates/_materialAssignmentsBox.zul @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file