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

ItEr30S12ProcuraOrganizacionsTraballoItEr29S14: Initialize widgets on entering OrderElemenTree window

Browse source
This commit is contained in:
Diego Pino Garcia 2009-10-19 09:41:55 +02:00 • committed by Javier Moran Rua
parent 23c4e9ee40
commit d66e65534b
4 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/bandboxsearch/BandboxSearch.java
View file

@ -199,7 +199,7 @@ public class BandboxSearch extends HtmlMacroComponent {
public void clear() {
listbox.setModel(finder.getModel());
bandbox.setValue("");
bandbox.setVariable("selectedLabel", null, true);
clearSelectedElement();
}
/**

16
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderCRUDController.java
View file

@ -42,6 +42,7 @@ import org.springframework.context.annotation.Scope;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.util.GenericForwardComposer;
import org.zkoss.zul.Label;
import org.zkoss.zul.Tab;
import org.zkoss.zul.api.Window;
/**
@ -228,10 +229,23 @@ public class OrderCRUDController extends GenericForwardComposer {
public void goToEditForm(Order order) {
orderModel.prepareEditFor(order);
clearOrderElementTreeController(editWindow);
selectDefaultTab(editWindow);
getVisibility().showOnly(editWindow);
Util.reloadBindings(editWindow);
}
private void selectDefaultTab(Component comp) {
Tab tabGeneralData = (Tab) comp.getFellowIfAny("tabGeneralData");
tabGeneralData.setSelected(true);
}
private void clearOrderElementTreeController(Component comp) {
OrderElementTreeController controller = (OrderElementTreeController) comp
.getVariable("orderElementTreeController", true);
controller.clear();
}
public void remove(Order order) {
orderModel.remove(order);
hideConfirmingWindow();
@ -241,6 +255,8 @@ public class OrderCRUDController extends GenericForwardComposer {
public void goToCreateForm() {
orderModel.prepareForCreate();
clearOrderElementTreeController(createWindow);
selectDefaultTab(createWindow);
getVisibility().showOnly(createWindow);
Util.reloadBindings(createWindow);
}

9
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
View file

@ -595,4 +595,13 @@ public class OrderElementTreeController extends GenericForwardComposer {
btnDown.setDisabled(predicate != null);
}
/**
* Clear {@link BandboxSearch} for Labels, and initializes
* {@link IPredicate}
*/
public void clear() {
bdFilter.clear();
predicate = null;
}
}

4
navalplanner-webapp/src/main/webapp/orders/_edition.zul
View file

@ -23,8 +23,8 @@
<button label="${i18n:_('Up')}" onClick="controller.up();" />
<tabbox>
<tabs>
<tab label="${i18n:_('General data')}"></tab>
<tab label="${i18n:_('Order elements')}"></tab>
<tab id="tabGeneralData" label="${i18n:_('General data')}" />
<tab label="${i18n:_('Order elements')}" />
</tabs>
<tabpanels>
<tabpanel>