ItEr29S14ProcuraOrganizacionsTraballo: Provide OrderElementModel access to orderModel

OrderModel is responsible of fetching list of Labels, which can be later modified by OrderElementModel. Both models are part of the same conversation and need to share list of Labels.

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

@@ -68,6 +68,8 @@ public class AssignedLabelsToOrderElementController extends
     }
 
     public void openWindow(IOrderElementModel orderElementModel) {
+        assignedLabelsToOrderElementModel.setOrderModel(orderElementModel
+                .getOrderModel());
         openWindow(orderElementModel.getOrderElement());
     }
 

navalplanner-webapp/src/main/java/org/navalplanner/web/orders/AssignedLabelsToOrderElementModel.java

@@ -59,6 +59,8 @@ public class AssignedLabelsToOrderElementModel implements
 
     OrderElement orderElement;
 
+    IOrderModel orderModel;
+
     Set<Label> cacheLabels = new HashSet<Label>();
 
     @Override
@@ -237,4 +239,9 @@ public class AssignedLabelsToOrderElementModel implements
         reattachLabels();
         orderDAO.save(orderElement);
     }
+
+    @Override
+    public void setOrderModel(IOrderModel orderModel) {
+        this.orderModel = orderModel;
+    }
 }

navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IAssignedLabelsToOrderElementModel.java

@@ -118,4 +118,10 @@ public interface IAssignedLabelsToOrderElementModel {
      */
     void confirm();
 
+    /**
+     *
+     * @param orderModel
+     */
+    void setOrderModel(IOrderModel orderModel);
+
 }

navalplanner-webapp/src/main/java/org/navalplanner/web/orders/IOrderElementModel.java

@@ -43,4 +43,6 @@ public interface IOrderElementModel {
     Set<Criterion> getCriterionsHoursGroup(HoursGroup hoursGroup);
 
     CriterionType getCriterionType(Criterion criterion);
+
+    IOrderModel getOrderModel();
 }

navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementModel.java

@@ -62,6 +62,11 @@ public class OrderElementModel implements IOrderElementModel {
         return orderElement;
     }
 
+    @Override
+    public IOrderModel getOrderModel() {
+        return order;
+    }
+
     @Override
     @Transactional(readOnly = true)
     public void setCurrent(OrderElement orderElement, OrderModel order) {
@@ -121,4 +126,5 @@ public class OrderElementModel implements IOrderElementModel {
         criterionType.getName();
         return criterionType;
     }
+
 }