From 85ce192e0614fc06e51b0cb49682ccd28843b1a1 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <rego@igalia.com>
Date: Fri, 16 Dec 2011 17:15:48 +0100
Subject: [PATCH] [Bug #1300] Updated intended resources per day after
 consolidation is added or removed

FEA: ItEr75S04BugFixing
---
 .../business/planner/entities/ResourceAllocation.java |  4 ++++
 .../consolidations/AdvanceConsolidationModel.java     | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java
index 10a7678f2..6f6b012db 100644
--- a/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java
+++ b/libreplan-business/src/main/java/org/libreplan/business/planner/entities/ResourceAllocation.java
@@ -2198,4 +2198,8 @@ public abstract class ResourceAllocation<T extends DayAssignment> extends
         return false;
     }
 
+    public void resetIntendedIntendedResourcesPerDayWithNonConsolidated() {
+        intendedResourcesPerDay = getNonConsolidatedResourcePerDay();
+    }
+
 }
diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
index d39519f3c..384615788 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/consolidations/AdvanceConsolidationModel.java
@@ -221,6 +221,15 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
         } else {
             reassignAll(end, allResourceAllocations);
         }
+
+        resetIntendedResourcesPerDayWithNonConsolidated(allResourceAllocations);
+    }
+
+    private void resetIntendedResourcesPerDayWithNonConsolidated(
+            Set<ResourceAllocation<?>> allResourceAllocations) {
+        for (ResourceAllocation<?> resourceAllocation : allResourceAllocations) {
+            resourceAllocation.resetIntendedIntendedResourcesPerDayWithNonConsolidated();
+        }
     }
 
     private void withDetachOnDayAssignmentRemoval(
@@ -326,6 +335,8 @@ public class AdvanceConsolidationModel implements IAdvanceConsolidationModel {
         withDetachOnDayAssignmentRemoval(allResourceAllocations);
 
         reassignAll(task.getIntraDayEndDate(), allResourceAllocations);
+
+        resetIntendedResourcesPerDayWithNonConsolidated(allResourceAllocations);
     }
 
     private void updateConsolidationInAdvanceIfIsNeeded() {