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

ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: Adding materials tab to template edition

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-10 16:09:48 +01:00
parent bc3679bc52
commit 3858630665
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
navalplanner-webapp/src/main/java/org/navalplanner/web/templates/OrderTemplatesController.java
View file

@ -29,6 +29,7 @@ import org.navalplanner.web.common.OnlyOneVisible;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.common.entrypoints.IURLHandlerRegistry;
import org.navalplanner.web.common.entrypoints.URLHandler;
import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent;
import org.navalplanner.web.tree.TreeComponent;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
@ -77,14 +78,25 @@ public class OrderTemplatesController extends GenericForwardComposer implements
@Override
public void goToCreateTemplateFrom(OrderElement orderElement) {
model.createTemplateFrom(orderElement);
show(getEditWindow());
showEditWindow();
}
public void goToEditForm(OrderElementTemplate template) {
model.initEdit(template);
showEditWindow();
}
private void showEditWindow() {
bindMaterialsControllerWithCurrentTemplate();
show(getEditWindow());
}
private void bindMaterialsControllerWithCurrentTemplate() {
MaterialAssignmentTemplateComponent materialsComponent = (MaterialAssignmentTemplateComponent) getEditWindow()
.getFellow("listOrderElementMaterials");
materialsComponent.getController().openWindow(model.getTemplate());
}
private void show(Component window) {
Util.reloadBindings(window);
getVisibility().showOnly(window);

6
navalplanner-webapp/src/main/webapp/templates/_edition.zul
View file

@ -19,11 +19,14 @@
-->
<?component name="orderElementTree" macroURI="/orders/components/_orderElementTree.zul"
class="org.navalplanner.web.templates.TemplatesTreeComponent"?>
<?component name="listOrderElementMaterials" class="org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent"
macroURI="/orders/components/_listOrderElementMaterials.zul"?>
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab id="tabGeneralData" label="${i18n:_('General data')}" />
<tab label="${i18n:_('Template Tree')}" />
<tab label="${i18n:_('Materials')}" />
</tabs>
<tabpanels>
<tabpanel>
@ -59,6 +62,9 @@
<tabpanel>
<orderElementTree id="orderElementTree"/>
</tabpanel>
<tabpanel>
<listOrderElementMaterials id="listOrderElementMaterials"/>
</tabpanel>
</tabpanels>
</tabbox>
<hbox>