From 9fa479052892b852ffa830d7c6736dbb0933c4a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Sat, 23 Jan 2010 20:45:56 +0100 Subject: [PATCH] ItEr44S10CUGravacionModelosUnidadesTraballoItEr43S12: Adding tab showing quality forms --- .../web/templates/EditTemplateWindowController.java | 8 ++++++++ .../templates/quality/QualityFormAssignerComponent.java | 7 ++++++- .../src/main/webapp/templates/_editTemplateWindow.zul | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java index 5fb9de16f..79232d899 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java @@ -24,6 +24,7 @@ import org.navalplanner.web.common.Util; import org.navalplanner.web.templates.advances.AdvancesAssignmentComponent; import org.navalplanner.web.templates.labels.LabelsAssignmentToTemplateComponent; import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent; +import org.navalplanner.web.templates.quality.QualityFormAssignerComponent; import org.zkoss.zk.ui.util.GenericForwardComposer; import org.zkoss.zul.Window; @@ -82,6 +83,7 @@ public class EditTemplateWindowController extends GenericForwardComposer { bindAdvancesAssignment(template); bindOrderElementLabels(template); bindOrderElementMaterials(template); + bindAssignedQualityForms(template); Util.reloadBindings(editTemplateWindow); } @@ -104,6 +106,12 @@ public class EditTemplateWindowController extends GenericForwardComposer { component.getController().openWindow(template); } + private void bindAssignedQualityForms(OrderElementTemplate template) { + QualityFormAssignerComponent c = (QualityFormAssignerComponent) editTemplateWindow + .getFellow("assignedQualityForms"); + c.useModel(model, template); + } + public void onClick$backButton() { editTemplateWindow.setVisible(false); } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/quality/QualityFormAssignerComponent.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/quality/QualityFormAssignerComponent.java index 5cbfeb9a8..98595c52b 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/quality/QualityFormAssignerComponent.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/templates/quality/QualityFormAssignerComponent.java @@ -43,8 +43,13 @@ public class QualityFormAssignerComponent extends HtmlMacroComponent { private IOrderTemplatesModel model; public void useModel(IOrderTemplatesModel model) { - template = model.getTemplate(); + useModel(model, model.getTemplate()); + } + + public void useModel(IOrderTemplatesModel model, + OrderElementTemplate template) { this.model = model; + this.template = template; } public List getNotAssignedQualityForms() { diff --git a/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul b/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul index 3a1c0c42f..ad9059850 100644 --- a/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul +++ b/navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul @@ -21,6 +21,7 @@ + @@ -29,6 +30,7 @@ + @@ -40,6 +42,9 @@ + + +