From 6402032da202ef0cda9b26e6e25d15f113817d37 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Wed, 16 Jun 2010 00:00:35 +0200
Subject: [PATCH] ItEr60S04ValidacionEProbasFuncionaisItEr59S04: [Bug #526] Use
 the same objects.

It was not finding the allocations at the map because there were
different instances for the same criterions on the db.
---
 .../web/resourceload/ResourceLoadModel.java      | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
index 80eadecf6..9cc235c7c 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/resourceload/ResourceLoadModel.java
@@ -52,6 +52,7 @@ import org.navalplanner.business.planner.entities.ResourceAllocation;
 import org.navalplanner.business.planner.entities.SpecificResourceAllocation;
 import org.navalplanner.business.planner.entities.Task;
 import org.navalplanner.business.planner.entities.TaskElement;
+import org.navalplanner.business.resources.daos.ICriterionDAO;
 import org.navalplanner.business.resources.daos.IResourceDAO;
 import org.navalplanner.business.resources.entities.Criterion;
 import org.navalplanner.business.resources.entities.CriterionSatisfaction;
@@ -86,6 +87,9 @@ public class ResourceLoadModel implements IResourceLoadModel {
     @Autowired
     private IOrderElementDAO orderElementDAO;
 
+    @Autowired
+    private ICriterionDAO criterionDAO;
+
     @Autowired
     private IOrderDAO orderDAO;
 
@@ -222,7 +226,11 @@ public class ResourceLoadModel implements IResourceLoadModel {
     }
 
     private Map<Criterion, List<GenericResourceAllocation>> genericAllocationsByCriterion() {
-        if(!criteriaToShowList.isEmpty()) {
+        if (!criteriaToShowList.isEmpty()) {
+            reattachCriteriaToShow();
+            // reattaching criterions so the query returns the same criteria as
+            // keys
+            allCriteriaList = new ArrayList<Criterion>(criteriaToShowList);
             return resourceAllocationDAO
                     .findGenericAllocationsBySomeCriterion(criteriaToShowList, initDateFilter, endDateFilter);
         }
@@ -262,6 +270,12 @@ public class ResourceLoadModel implements IResourceLoadModel {
         return toReturnFiltered;
     }
 
+    private void reattachCriteriaToShow() {
+        for (Criterion each : criteriaToShowList) {
+            criterionDAO.reattachUnmodifiedEntity(each);
+        }
+    }
+
     private List<Resource> resourcesToShow() {
         if(!resourcesToShowList.isEmpty()) {
             return getResourcesToShowReattached();