RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ItEr44S10CUGravacionModelosUnidadesTraballoItEr43S12: Adding tab showing quality forms

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-23 20:45:56 +01:00
parent 7eb8639a86
commit 9fa4790528
3 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/EditTemplateWindowController.java
View file

@ -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);
}

7
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/quality/QualityFormAssignerComponent.java
View file

@ -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<QualityForm> getNotAssignedQualityForms() {

5
navalplanner-webapp/src/main/webapp/templates/_editTemplateWindow.zul
View file

@ -21,6 +21,7 @@
<?component name="listOrderElementLabels" class="org.navalplanner.web.templates.labels.LabelsAssignmentToTemplateComponent" macroURI="/orders/components/_listOrderElementLabels.zul"?>
<?component name="listOrderElementMaterials" class="org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent"
macroURI="/orders/components/_listOrderElementMaterials.zul"?>
<?component name="assignedQualityForms" class="org.navalplanner.web.templates.quality.QualityFormAssignerComponent" macroURI="/templates/_assignedQualityForms.zul" ?>
<window id="editTemplateWindow" title="${i18n:_('Edit order element')}"
width="950px" left="50px" top="50px"
closable="false" visible="false">
@ -29,6 +30,7 @@
<tab label="${i18n:_('Advances')}" />
<tab label="${i18n:_('Labels')}" />
<tab label="${i18n:_('Materials')}" />
<tab label="${i18n:_('Quality Forms')}" />
</tabs>
<tabpanels>
<tabpanel>
@ -40,6 +42,9 @@
<tabpanel>
<listOrderElementMaterials id="listOrderElementMaterials"/>
</tabpanel>
<tabpanel>
<assignedQualityForms id="assignedQualityForms"/>
</tabpanel>
</tabpanels>
</tabbox>
<hbox>