ItEr26S13AltaEtiquetasTipoEtiqueta: Added assigned Labels to OrderElement controller
This commit is contained in:
parent
e04ea5d8c7
commit
73a9d135a0
2 changed files with 32 additions and 2 deletions
|
|
@ -0,0 +1,21 @@
|
|||
package org.navalplanner.web.orders;
|
||||
|
||||
import org.zkoss.zk.ui.Component;
|
||||
import org.zkoss.zk.ui.util.GenericForwardComposer;
|
||||
|
||||
/**
|
||||
* Controller for showing OrderElement assigned labels
|
||||
*
|
||||
* @author Diego Pino García <dpino@igalia.com>
|
||||
*
|
||||
*/
|
||||
public class AssignedLabelsToOrderElementController extends
|
||||
GenericForwardComposer {
|
||||
|
||||
@Override
|
||||
public void doAfterCompose(Component comp) throws Exception {
|
||||
super.doAfterCompose(comp.getFellow("listOrderElementLabels"));
|
||||
comp.setVariable("assignedLabelsController", this, true);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -20,6 +20,8 @@
|
|||
|
||||
package org.navalplanner.web.orders;
|
||||
|
||||
import static org.navalplanner.web.I18nHelper._;
|
||||
|
||||
import java.math.BigDecimal;
|
||||
import java.util.ArrayList;
|
||||
import java.util.HashMap;
|
||||
|
|
@ -58,8 +60,6 @@ import org.zkoss.zul.Vbox;
|
|||
import org.zkoss.zul.Window;
|
||||
import org.zkoss.zul.api.Listhead;
|
||||
|
||||
import static org.navalplanner.web.I18nHelper._;
|
||||
|
||||
/**
|
||||
* Controller for {@link OrderElement} view of {@link Order} entities <br />
|
||||
*
|
||||
|
|
@ -97,6 +97,8 @@ public class OrderElementController extends GenericForwardComposer {
|
|||
|
||||
private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
|
||||
|
||||
private AssignedLabelsToOrderElementController assignedLabelsController;
|
||||
|
||||
public OrderElement getOrderElement() {
|
||||
if (model == null) {
|
||||
return OrderLine.create();
|
||||
|
|
@ -184,6 +186,7 @@ public class OrderElementController extends GenericForwardComposer {
|
|||
window = (Window) comp;
|
||||
setupAsignedHoursToOrderElementController(comp);
|
||||
setupManageOrderElementAdvancesController(comp);
|
||||
setupAssignedLabelsToOrderElementController(comp);
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -192,6 +195,12 @@ public class OrderElementController extends GenericForwardComposer {
|
|||
asignedHoursController.doAfterCompose(comp);
|
||||
}
|
||||
|
||||
private void setupAssignedLabelsToOrderElementController(Component comp)
|
||||
throws Exception {
|
||||
assignedLabelsController = new AssignedLabelsToOrderElementController();
|
||||
assignedLabelsController.doAfterCompose(comp);
|
||||
}
|
||||
|
||||
private void setupManageOrderElementAdvancesController(Component comp)
|
||||
throws Exception {
|
||||
manageOrderElementAdvancesController = new ManageOrderElementAdvancesController();
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue