ItEr44S10CUGravacionModelosUnidadesTraballoItEr43S12: Adding tab showing materials
This commit is contained in:
parent
479924a030
commit
7eb8639a86
2 changed files with 14 additions and 0 deletions
|
|
@ -23,6 +23,7 @@ import org.navalplanner.business.templates.entities.OrderElementTemplate;
|
|||
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.zkoss.zk.ui.util.GenericForwardComposer;
|
||||
import org.zkoss.zul.Window;
|
||||
|
||||
|
|
@ -80,6 +81,7 @@ public class EditTemplateWindowController extends GenericForwardComposer {
|
|||
}
|
||||
bindAdvancesAssignment(template);
|
||||
bindOrderElementLabels(template);
|
||||
bindOrderElementMaterials(template);
|
||||
Util.reloadBindings(editTemplateWindow);
|
||||
}
|
||||
|
||||
|
|
@ -96,6 +98,12 @@ public class EditTemplateWindowController extends GenericForwardComposer {
|
|||
component.getController().openWindow(model);
|
||||
}
|
||||
|
||||
private void bindOrderElementMaterials(OrderElementTemplate template) {
|
||||
MaterialAssignmentTemplateComponent component = (MaterialAssignmentTemplateComponent) editTemplateWindow
|
||||
.getFellow("listOrderElementMaterials");
|
||||
component.getController().openWindow(template);
|
||||
}
|
||||
|
||||
public void onClick$backButton() {
|
||||
editTemplateWindow.setVisible(false);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@
|
|||
-->
|
||||
<?component name="advancesAssignment" class="org.navalplanner.web.templates.advances.AdvancesAssignmentComponent" macroURI="/templates/_advances.zul"?>
|
||||
<?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"?>
|
||||
<window id="editTemplateWindow" title="${i18n:_('Edit order element')}"
|
||||
width="950px" left="50px" top="50px"
|
||||
closable="false" visible="false">
|
||||
|
|
@ -26,6 +28,7 @@
|
|||
<tabs>
|
||||
<tab label="${i18n:_('Advances')}" />
|
||||
<tab label="${i18n:_('Labels')}" />
|
||||
<tab label="${i18n:_('Materials')}" />
|
||||
</tabs>
|
||||
<tabpanels>
|
||||
<tabpanel>
|
||||
|
|
@ -34,6 +37,9 @@
|
|||
<tabpanel>
|
||||
<listOrderElementLabels id="listOrderElementLabels"/>
|
||||
</tabpanel>
|
||||
<tabpanel>
|
||||
<listOrderElementMaterials id="listOrderElementMaterials"/>
|
||||
</tabpanel>
|
||||
</tabpanels>
|
||||
</tabbox>
|
||||
<hbox>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue