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

ItEr47S08RFNavegacionOrganizacionTraballoItEr46S09 : Load and assign labels to the current order on demand.

Browse source
This commit is contained in:
Susana Montes Pedreira 2010-02-12 09:17:12 +01:00 • committed by Javier Moran Rua
parent db41b9a168
commit 5969314627
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -270,7 +270,6 @@ public class OrderCRUDController extends GenericForwardComposer {
private void setupEditControllers() throws Exception {
Component comp = self;
setupAssignedLabelsToOrderElementController(comp);
setupAssignedCriterionRequirementsToOrderElementController(comp);
setupAssignedMaterialsToOrderElementController(comp);
setupAssignedTaskQualityFormsToOrderElementController(comp);
@ -331,11 +330,16 @@ public class OrderCRUDController extends GenericForwardComposer {
private AssignedLabelsToOrderElementController assignedLabelsController;
private void setupAssignedLabelsToOrderElementController(Component comp)
public void setupAssignedLabelsToOrderElementController()
throws Exception {
LabelsAssignmentToOrderElementComponent labelsAssignment = (LabelsAssignmentToOrderElementComponent) editWindow
if (assignedLabelsController == null) {
LabelsAssignmentToOrderElementComponent labelsAssignment = (LabelsAssignmentToOrderElementComponent) editWindow
.getFellow("orderElementLabels");
assignedLabelsController = labelsAssignment.getController();
assignedLabelsController = labelsAssignment.getController();
final IOrderElementModel orderElementModel = getOrderElementModel();
assignedLabelsController.openWindow(orderElementModel);
}
}
private AssignedCriterionRequirementToOrderElementController assignedCriterionRequirementController;
@ -621,7 +625,9 @@ public class OrderCRUDController extends GenericForwardComposer {
if (manageOrderElementAdvancesController != null) {
manageOrderElementAdvancesController.openWindow(orderElementModel);
}
assignedLabelsController.openWindow(orderElementModel);
if (assignedLabelsController != null) {
assignedLabelsController.openWindow(orderElementModel);
}
assignedCriterionRequirementController.openWindow(orderElementModel);
assignedMaterialsController.openWindow(orderElementModel
.getOrderElement());

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

@ -40,7 +40,8 @@
onSelect = "controller.setupAsignedHoursToOrderElementController();"/>
<tab id="tabAdvances" label="${i18n:_('Advances')}"
onSelect = "controller.setupManageOrderElementAdvancesController();"/>
<tab id="tabLabels" label="${i18n:_('Label')}" />
<tab id="tabLabels" label="${i18n:_('Label')}"
onSelect = "controller.setupAssignedLabelsToOrderElementController();"/>
<tab id="tabRequirements" label="${i18n:_('Criterion Requirement')}"
onClick = "controller.reloadHoursGroupOrder();"/>
<tab id="tabMaterials" label="${i18n:_('Materials')}" />
@ -158,7 +159,7 @@
<listOrderElementAdvances id="orderElementAdvances" fulfill="tabAdvances.onSelect"/>
</tabpanel>
<tabpanel>
<listOrderElementLabels id="orderElementLabels" />
<listOrderElementLabels id="orderElementLabels" fulfill="tabLabels.onSelect"/>
</tabpanel>
<tabpanel>
<listOrderElementCriterionRequirements id="orderElementCriterionRequirements"/>