From c168affc7cc980e4f0015a12c8caec4504f6a65f Mon Sep 17 00:00:00 2001
From: Vova Perebykivskyi <vova@libreplan-enterprise.com>
Date: Thu, 27 Oct 2016 15:01:42 +0300
Subject: [PATCH] Resolve ZK binding model exception. Code refactoring.

---
 .../CalculatedConsolidatedValue.java          | 26 +++++++++----------
 .../_listHoursGroupCriterionRequirement.zul   |  2 +-
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/CalculatedConsolidatedValue.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/CalculatedConsolidatedValue.java
index 326af7e30..219ddf61e 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/CalculatedConsolidatedValue.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/consolidations/CalculatedConsolidatedValue.java
@@ -35,26 +35,24 @@ public class CalculatedConsolidatedValue extends ConsolidatedValue {
 
     private CalculatedConsolidation consolidation;
 
-    public static CalculatedConsolidatedValue create() {
-        return create(new CalculatedConsolidatedValue());
-    }
-
-    public static CalculatedConsolidatedValue create(LocalDate date,
-            BigDecimal value, IntraDayDate taskEndDate) {
-        return create(new CalculatedConsolidatedValue(date, value, taskEndDate));
-    }
-
-    protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value,
-            IntraDayDate taskEndDate) {
-        super(date, value, taskEndDate);
-    }
-
     /**
      * Constructor for {@link DeepCopy}. DO NOT USE!
      */
     public CalculatedConsolidatedValue() {
     }
 
+    protected CalculatedConsolidatedValue(LocalDate date, BigDecimal value, IntraDayDate taskEndDate) {
+        super(date, value, taskEndDate);
+    }
+
+    public static CalculatedConsolidatedValue create() {
+        return create(new CalculatedConsolidatedValue());
+    }
+
+    public static CalculatedConsolidatedValue create(LocalDate date, BigDecimal value, IntraDayDate taskEndDate) {
+        return create(new CalculatedConsolidatedValue(date, value, taskEndDate));
+    }
+
     public void setConsolidation(CalculatedConsolidation consolidation) {
         this.consolidation = consolidation;
     }
diff --git a/libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul b/libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
index c4f4c5730..5c68d1cd8 100644
--- a/libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
+++ b/libreplan-webapp/src/main/webapp/orders/_listHoursGroupCriterionRequirement.zul
@@ -63,7 +63,7 @@
                                  value="@{criterionRequirementWrapper.criterionAndType}">
                             <bandpopup>
                                 <listbox width="500px" height="150px" sizedByContent="true"
-                                         model="@{assignedCriterionRequirementController.criterionWithItsTypesMachine}"
+                                         forEach="@{assignedCriterionRequirementController.criterionWithItsTypesMachine}"
                                          onSelect="assignedCriterionRequirementController.selectCriterionToHoursGroup(self.selectedItem, self.parent.parent,self.parent.parent.parent.parent.value);">
                                     <listhead>
                                         <listheader label="Type" />