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

ItEr43S12CUGravacionModelosUnidadesTraballoItEr42S17: Incorporate labels editing to order templates

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-12 20:34:26 +01:00
parent db4fbe48e5
commit eb4852e69d
2 changed files with 13 additions and 0 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/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.labels.LabelsAssignmentToTemplateComponent;
import org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent;
import org.navalplanner.web.tree.TreeComponent;
import org.springframework.beans.factory.annotation.Autowired;
@ -88,6 +89,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements
private void showEditWindow() {
bindMaterialsControllerWithCurrentTemplate();
bindLabelsControllerWithCurrentTemplate();
show(getEditWindow());
}
@ -97,6 +99,12 @@ public class OrderTemplatesController extends GenericForwardComposer implements
materialsComponent.getController().openWindow(model.getTemplate());
}
private void bindLabelsControllerWithCurrentTemplate() {
LabelsAssignmentToTemplateComponent labelsComponent = (LabelsAssignmentToTemplateComponent) getEditWindow()
.getFellow("listOrderElementLabels");
labelsComponent.getController().openWindow(model);
}
public boolean isTemplateTreeDisabled() {
return model.isTemplateTreeDisabled();
}

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

@ -21,11 +21,13 @@
class="org.navalplanner.web.templates.TemplatesTreeComponent"?>
<?component name="listOrderElementMaterials" class="org.navalplanner.web.templates.materials.MaterialAssignmentTemplateComponent"
macroURI="/orders/components/_listOrderElementMaterials.zul"?>
<?component name="listOrderElementLabels" class="org.navalplanner.web.templates.labels.LabelsAssignmentToTemplateComponent" macroURI="/orders/components/_listOrderElementLabels.zul"?>
<window id="${arg.top_id}">
<tabbox>
<tabs>
<tab id="tabGeneralData" label="${i18n:_('General data')}" />
<tab label="${i18n:_('Template Tree')}" disabled="@{templateController.templateTreeDisabled}"/>
<tab label="${i18n:_('Labels')}" />
<tab label="${i18n:_('Materials')}" />
</tabs>
<tabpanels>
@ -62,6 +64,9 @@
<tabpanel>
<orderElementTree id="orderElementTree"/>
</tabpanel>
<tabpanel>
<listOrderElementLabels id="listOrderElementLabels"/>
</tabpanel>
<tabpanel>
<listOrderElementMaterials id="listOrderElementMaterials"/>
</tabpanel>