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

ItEr44S10CUGravacionModelosUnidadesTraballoItEr43S12: Loading _edition initially instead of on demand

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-21 16:30:29 +01:00
parent b78f1887c4
commit 4d73c4be0a
2 changed files with 10 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -19,9 +19,7 @@
*/
package org.navalplanner.web.templates;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.templates.entities.OrderElementTemplate;
@ -38,7 +36,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Window;
@ -69,7 +66,7 @@ public class OrderTemplatesController extends GenericForwardComposer implements
private OnlyOneVisible getVisibility() {
if (cachedOnlyOneVisible == null) {
cachedOnlyOneVisible = new OnlyOneVisible(listWindow);
cachedOnlyOneVisible = new OnlyOneVisible(listWindow, editWindow);
}
return cachedOnlyOneVisible;
}
@ -94,29 +91,29 @@ public class OrderTemplatesController extends GenericForwardComposer implements
bindMaterialsControllerWithCurrentTemplate();
bindLabelsControllerWithCurrentTemplate();
bindQualityFormWithCurrentTemplate();
show(getEditWindow());
show(editWindow);
}
private void bindAdvancesComponentWithCurrentTemplate() {
AdvancesAssignmentComponent c = (AdvancesAssignmentComponent) getEditWindow()
AdvancesAssignmentComponent c = (AdvancesAssignmentComponent) editWindow
.getFellow("advancesAssignment");
c.useModel(model);
}
private void bindMaterialsControllerWithCurrentTemplate() {
MaterialAssignmentTemplateComponent materialsComponent = (MaterialAssignmentTemplateComponent) getEditWindow()
MaterialAssignmentTemplateComponent materialsComponent = (MaterialAssignmentTemplateComponent) editWindow
.getFellow("listOrderElementMaterials");
materialsComponent.getController().openWindow(model.getTemplate());
}
private void bindLabelsControllerWithCurrentTemplate() {
LabelsAssignmentToTemplateComponent labelsComponent = (LabelsAssignmentToTemplateComponent) getEditWindow()
LabelsAssignmentToTemplateComponent labelsComponent = (LabelsAssignmentToTemplateComponent) editWindow
.getFellow("listOrderElementLabels");
labelsComponent.getController().openWindow(model);
}
private void bindQualityFormWithCurrentTemplate() {
QualityFormAssignerComponent c = (QualityFormAssignerComponent) getEditWindow()
QualityFormAssignerComponent c = (QualityFormAssignerComponent) editWindow
.getFellow("assignedQualityForms");
c.useModel(model);
}
@ -130,19 +127,6 @@ public class OrderTemplatesController extends GenericForwardComposer implements
getVisibility().showOnly(window);
}
private Component getEditWindow() {
if (editWindow == null) {
editWindow = (Window) Executions.createComponents(
"/templates/_edition.zul", self, topId("editWindow"));
TreeComponent treeComponent = (TreeComponent) editWindow
.getFellow("orderElementTree");
treeComponent.useController(new TemplatesTreeController(model));
Util.createBindingsFor(editWindow);
Util.reloadBindings(editWindow);
}
return editWindow;
}
public void saveAndExit() {
model.confirmSave();
show(listWindow);
@ -156,16 +140,12 @@ public class OrderTemplatesController extends GenericForwardComposer implements
model.confirmSave();
}
private Map<String, Object> topId(String value) {
Map<String, Object> arguments = new HashMap<String, Object>();
arguments.put("top_id", value);
return arguments;
}
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
getVisibility().showOnly(listWindow);
TreeComponent treeComponent = (TreeComponent) editWindow.getFellow("orderElementTree");
treeComponent.useController(new TemplatesTreeController(model));
final URLHandler<IOrderTemplatesControllerEntryPoints> handler = handlerRegistry
.getRedirectorFor(IOrderTemplatesControllerEntryPoints.class);
handler.registerListener(this, page);

3
navalplanner-webapp/src/main/webapp/templates/templates.zul
View file

@ -26,7 +26,7 @@
<?taglib uri="/WEB-INF/tld/i18n.tld" prefix="i18n"?>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<?component name="list" inline="true" macroURI="_list.zul"?>
<?component name="edition" inline="true" macroURI="_list.zul"?>
<?component name="edition" inline="true" macroURI="_edition.zul"?>
<zk>
<zscript><![CDATA[
templateController = orderTemplatesController;
@ -35,5 +35,6 @@
<div self="@{define(content)}" apply="${templateController}">
<vbox id="messagesContainer" />
<list top_id="listWindow" />
<edition top_id="editWindow" />
</div>
</zk>