From 6cc8a368606cc01b69f0a29dd22239b82ee1a8d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=93scar=20Gonz=C3=A1lez=20Fern=C3=A1ndez?= Date: Wed, 3 Feb 2010 21:05:11 +0100 Subject: [PATCH] ItEr46S12CUVisualizacionResponsabilidadesTRaballoNaPlanificacion: Not adding tasks that have no satisfied allocations --- .../java/org/navalplanner/business/planner/entities/Task.java | 4 ++++ .../web/planner/tabs/AdvancedAllocationTabCreator.java | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java index 4234887e8..82cd12fa3 100644 --- a/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java +++ b/navalplanner-business/src/main/java/org/navalplanner/business/planner/entities/Task.java @@ -474,4 +474,8 @@ public class Task extends TaskElement { return (subcontractedTaskData != null); } + public boolean hasSomeSatisfiedAllocation() { + return !getSatisfiedResourceAllocations().isEmpty(); + } + } diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java index 8962ceeaf..965a942cc 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/tabs/AdvancedAllocationTabCreator.java @@ -293,7 +293,8 @@ public class AdvancedAllocationTabCreator { private void addAllocations(Order order, List result, TaskElement taskElement) { - if (taskElement instanceof Task) { + if (taskElement instanceof Task + && ((Task) taskElement).hasSomeSatisfiedAllocation()) { result.add(createAllocationInputFor(order, (Task) taskElement)); } if (!taskElement.isLeaf()) {