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

ItEr43S12CUGravacionModelosUnidadesTraballoItEr42S17: Componetizing labels assignment tab

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-12 13:15:41 +01:00
parent 65b91abba7
commit 2f276aef4f
7 changed files with 53 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementController.java
View file

@ -59,7 +59,6 @@ public class AssignedLabelsToOrderElementController extends
@Override
public void doAfterCompose(Component comp) throws Exception {
super.doAfterCompose(comp);
comp.setVariable("assignedLabelsController", this, true);
}
public void openWindow(IOrderElementModel orderElementModel) {

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

@ -43,6 +43,7 @@ import org.navalplanner.web.common.Level;
import org.navalplanner.web.common.MessagesForUser;
import org.navalplanner.web.common.OnlyOneVisible;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.labels.LabelsAssignmentComponent;
import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent;
import org.navalplanner.web.planner.order.IOrderPlanningGate;
@ -218,9 +219,9 @@ public class OrderCRUDController extends GenericForwardComposer {
private void setupAssignedLabelsToOrderElementController(Component comp)
throws Exception {
Component orderElementLabels = editWindow.getFellowIfAny("orderElementLabels");
assignedLabelsController = (AssignedLabelsToOrderElementController)
orderElementLabels.getVariable("assignedLabelsController", true);
LabelsAssignmentComponent labelsAssignment = (LabelsAssignmentComponent) editWindow
.getFellow("orderElementLabels");
assignedLabelsController = labelsAssignment.getController();
}
private AssignedCriterionRequirementToOrderElementController assignedCriterionRequirementController;

6
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementController.java
View file

@ -25,6 +25,7 @@ import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.business.orders.entities.OrderLine;
import org.navalplanner.business.orders.entities.OrderLineGroup;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.labels.LabelsAssignmentComponent;
import org.navalplanner.web.orders.materials.AssignedMaterialsToOrderElementController;
import org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent;
import org.zkoss.zk.ui.Component;
@ -60,7 +61,7 @@ public class OrderElementController extends GenericForwardComposer {
private ManageOrderElementAdvancesController manageOrderElementAdvancesController;
private Component orderElementLabels;
private LabelsAssignmentComponent orderElementLabels;
private AssignedLabelsToOrderElementController assignedLabelsController;
@ -104,8 +105,7 @@ public class OrderElementController extends GenericForwardComposer {
private void setupAssignedLabelsToOrderElementController(Component comp)
throws Exception {
assignedLabelsController = (AssignedLabelsToOrderElementController)
orderElementLabels.getVariable("assignedLabelsController", true);
assignedLabelsController = orderElementLabels.getController();
}
private void setupAssignedCriterionRequirementToOrderElementController(

37
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/labels/LabelsAssignmentComponent.java Normal file
View file

@ -0,0 +1,37 @@
/*
* This file is part of ###PROJECT_NAME###
*
* Copyright (C) 2009 Fundación para o Fomento da Calidade Industrial e
* Desenvolvemento Tecnolóxico de Galicia
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Affero General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Affero General Public License for more details.
*
* You should have received a copy of the GNU Affero General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.navalplanner.web.orders.labels;
import org.navalplanner.web.orders.AssignedLabelsToOrderElementController;
import org.zkoss.zk.ui.HtmlMacroComponent;
/**
* @author Óscar González Fernández <ogonzalez@igalia.com>
*
*/
public class LabelsAssignmentComponent extends HtmlMacroComponent {
private AssignedLabelsToOrderElementController controller = new AssignedLabelsToOrderElementController();
public AssignedLabelsToOrderElementController getController() {
return controller;
}
}

2
navalplanner-webapp/src/main/webapp/orders/_editOrderElement.zul
View file

@ -21,7 +21,7 @@
<?component name="orderElementDetails" inline="true" macroURI="_orderElementDetails.zul"?>
<?component name="listOrderElementHours" inline="true" macroURI="_listOrderElementHours.zul"?>
<?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
<?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
<?component name="listOrderElementLabels" class="org.navalplanner.web.orders.labels.LabelsAssignmentComponent" macroURI="components/_listOrderElementLabels.zul"?>
<?component name="listOrderElementCriterionRequirements" inline="true" macroURI="_listOrderElementCriterionRequirements.zul"?>
<?component name="listOrderElementMaterials" class="org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent"
macroURI="/orders/components/_listOrderElementMaterials.zul"?>

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

@ -22,7 +22,7 @@
class="org.navalplanner.web.orders.OrdersTreeComponent"?>
<?component name="listOrderElementHours" inline="true" macroURI="_listOrderElementHours.zul"?>
<?component name="listOrderElementAdvances" inline="true" macroURI="_listOrderElementAdvances.zul"?>
<?component name="listOrderElementLabels" inline="true" macroURI="_listOrderElementLabels.zul"?>
<?component name="listOrderElementLabels" class="org.navalplanner.web.orders.labels.LabelsAssignmentComponent" macroURI="components/_listOrderElementLabels.zul"?>
<?component name="listOrderElementCriterionRequirements" inline="true" macroURI="_listOrderElementCriterionRequirements.zul"?>
<?component name="listOrderElementMaterials" class="org.navalplanner.web.orders.materials.OrderElementMaterialAssignmentsComponent"
macroURI="/orders/components/_listOrderElementMaterials.zul"?>

10
navalplanner-webapp/src/main/webapp/orders/_listOrderElementLabels.zul → navalplanner-webapp/src/main/webapp/orders/components/_listOrderElementLabels.zul
View file

@ -17,9 +17,12 @@
You should have received a copy of the GNU Affero General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
-->
<vbox id="${arg.id}"
apply="org.navalplanner.web.orders.AssignedLabelsToOrderElementController" >
<zk>
<zscript><![CDATA[
assignedLabelsController = self.controller;
]]>
</zscript>
<vbox apply="${assignedLabelsController}" >
<!-- Indirect labels -->
<vbox>
<panel title="${i18n:_('Indirect labels')}" border="normal">
@ -96,3 +99,4 @@
</panel>
</vbox>
</vbox>
</zk>