From 7c2fcf7858c2de0f7d7885adff3393ebb79f5f46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacobo=20Aragunde=20P=C3=A9rez?= <jaragunde@igalia.com>
Date: Thu, 7 Oct 2010 19:54:20 +0200
Subject: [PATCH] [Bug #670] Compare sumOfHoursAllocated with 0 to know if
 there were any assigments in TaskElement.getAssignedStatus().

With this change, ResourceAllocations aren't loaded anymore in
simplified calculation.

FEA: ItEr61S05BugFixing
---
 .../business/planner/entities/TaskElement.java     | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
index a63bf02ea..c6156e5dd 100644
--- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
+++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/TaskElement.java
@@ -542,15 +542,15 @@ public abstract class TaskElement extends BaseEntity {
     }
 
     public String getAssignedStatus() {
-        if(isSimplifiedAssignedStatusCalculationEnabled()) {
-            if (getSatisfiedResourceAllocations().isEmpty()) {
-                return "unassigned";
-            }
-            return "assigned";
-        }
-        if (getSatisfiedResourceAllocations().isEmpty()) {
+        if (getSumOfHoursAllocated() == 0) {
             return "unassigned";
         }
+        if(isSimplifiedAssignedStatusCalculationEnabled()) {
+            //simplified calculation has only two states:
+            //unassigned, which was checked previously, and
+            //assigned otherwise
+            return "assigned";
+        }
         for (ResourceAllocation<?> resourceAllocation : getSatisfiedResourceAllocations()) {
             final ResourcesPerDay resourcesPerDay = resourceAllocation.getResourcesPerDay();
             if (resourcesPerDay != null && resourcesPerDay.isZero()) {