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

ItEr42S17CUGravacionModelosUnidadesTraballoItEr41S20: AssignedMaterialsToOrderElementModel only needs to be provided with the order element

Browse source
This commit is contained in:
Óscar González Fernández 2010-01-06 22:55:32 +01:00
parent 609379aa62
commit 5747b10193
5 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -421,7 +421,8 @@ public class OrderCRUDController extends GenericForwardComposer {
manageOrderElementAdvancesController.openWindow(orderElementModel);
assignedLabelsController.openWindow(orderElementModel);
assignedCriterionRequirementController.openWindow(orderElementModel);
assignedMaterialsController.openWindow(orderElementModel);
assignedMaterialsController.openWindow(orderElementModel
.getOrderElement());
assignedTaskQualityFormController.openWindow(orderElementModel);
}

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

@ -147,7 +147,7 @@ public class OrderElementController extends GenericForwardComposer {
manageOrderElementAdvancesController.openWindow(model);
assignedLabelsController.openWindow(model);
assignedCriterionRequirementController.openWindow(model);
assignedMaterialsController.openWindow(model);
assignedMaterialsController.openWindow(model.getOrderElement());
assignedTaskQualityFormsController.openWindow(model);
try {

5
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementController.java
View file

@ -37,7 +37,6 @@ import org.navalplanner.business.materials.entities.MaterialAssignment;
import org.navalplanner.business.materials.entities.MaterialCategory;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.web.common.Util;
import org.navalplanner.web.orders.IOrderElementModel;
import org.zkoss.zk.ui.Component;
import org.zkoss.zk.ui.Executions;
import org.zkoss.zk.ui.SuspendNotAllowedException;
@ -93,8 +92,8 @@ public class AssignedMaterialsToOrderElementController extends
comp.setVariable("assignedMaterialsController", this, true);
}
public void openWindow(IOrderElementModel orderElementModel) {
assignedMaterialsToOrderElementModel.initEdit(orderElementModel);
public void openWindow(OrderElement orderElement) {
assignedMaterialsToOrderElementModel.initEdit(orderElement);
prepareCategoriesTree();
prepareAllCategoriesTree();
}

8
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/AssignedMaterialsToOrderElementModel.java
View file

@ -33,7 +33,6 @@ import org.navalplanner.business.materials.entities.MaterialAssignment;
import org.navalplanner.business.materials.entities.MaterialCategory;
import org.navalplanner.business.orders.daos.IOrderElementDAO;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.web.orders.IOrderElementModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.context.annotation.Scope;
@ -59,8 +58,6 @@ public class AssignedMaterialsToOrderElementModel implements
@Autowired
private IOrderElementDAO orderElementDAO;
private IOrderElementModel orderElementModel;
private OrderElement orderElement;
private MutableTreeModel<MaterialCategory> materialCategories = MutableTreeModel
@ -73,9 +70,8 @@ public class AssignedMaterialsToOrderElementModel implements
@Override
@Transactional(readOnly = true)
public void initEdit(IOrderElementModel orderElementModel) {
this.orderElementModel = orderElementModel;
this.orderElement = this.orderElementModel.getOrderElement();
public void initEdit(OrderElement orderElement) {
this.orderElement = orderElement;
orderElementDAO.reattach(this.orderElement);
materialCategories = MutableTreeModel.create(MaterialCategory.class);
initializeMaterialAssigments(this.orderElement.getMaterialAssignments());

3
navalplanner-webapp/src/main/java/org/navalplanner/web/orders/materials/IAssignedMaterialsToOrderElementModel.java
View file

@ -27,7 +27,6 @@ import org.navalplanner.business.materials.entities.Material;
import org.navalplanner.business.materials.entities.MaterialAssignment;
import org.navalplanner.business.materials.entities.MaterialCategory;
import org.navalplanner.business.orders.entities.OrderElement;
import org.navalplanner.web.orders.IOrderElementModel;
import org.zkoss.zul.TreeModel;
@ -88,7 +87,7 @@ public interface IAssignedMaterialsToOrderElementModel {
*/
double getUnits(MaterialCategory materialCategory);
void initEdit(IOrderElementModel orderElementModel);
void initEdit(OrderElement orderElement);
void removeMaterialAssignment(MaterialAssignment materialAssignment);