From 2e057952c8ceb9e65f077673c6b6ca262d46c00f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?=
 <ogonzalez@igalia.com>
Date: Mon, 28 Sep 2009 18:28:32 +0200
Subject: [PATCH] ItEr27S07CUVistaRecursosTempoPorProxectoItEr26S08: It allows
 to put the generic allocation to zero

---
 .../web/planner/allocation/AllocationDTO.java      |  4 ++++
 .../allocation/ResourceAllocationsBeingEdited.java | 14 +++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationDTO.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationDTO.java
index ff1a26a49..757c8aba6 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationDTO.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationDTO.java
@@ -65,6 +65,10 @@ public abstract class AllocationDTO {
 
     public abstract boolean isGeneric();
 
+    public boolean isEmptyResourcesPerDay() {
+        return getResourcesPerDay().isZero();
+    }
+
     public static List<AllocationDTO> toDTOs(
             Collection<? extends ResourceAllocation<?>> resourceAllocations) {
         List<AllocationDTO> result = new ArrayList<AllocationDTO>();
diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java
index 61ea40883..987ed4ef2 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/ResourceAllocationsBeingEdited.java
@@ -100,13 +100,25 @@ public class ResourceAllocationsBeingEdited {
 
     public List<ResourceAllocationWithDesiredResourcesPerDay> asResourceAllocations() {
         List<ResourceAllocationWithDesiredResourcesPerDay> result = new ArrayList<ResourceAllocationWithDesiredResourcesPerDay>();
-        for (AllocationDTO allocation : currentAllocations) {
+        for (AllocationDTO allocation : withoutZeroResourcesPerDayAllocations(currentAllocations)) {
             result.add(createOrModify(allocation).withDesiredResourcesPerDay(
                     allocation.getResourcesPerDay()));
         }
         return result;
     }
 
+
+    private List<AllocationDTO> withoutZeroResourcesPerDayAllocations(
+            List<AllocationDTO> allocations) {
+        List<AllocationDTO> result = new ArrayList<AllocationDTO>();
+        for (AllocationDTO allocationDTO : allocations) {
+            if (!allocationDTO.isEmptyResourcesPerDay()) {
+                result.add(allocationDTO);
+            }
+        }
+        return result;
+    }
+
     public AggregateOfResourceAllocations doAllocation() {
         List<ResourceAllocationWithDesiredResourcesPerDay> allocations = asResourceAllocations();
         switch (calculatedValue) {