From 6d5a365e0dadf00ac669deb7bcaf7ea07dc09bd5 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Thu, 4 Feb 2010 22:50:37 +0100
Subject: [PATCH]  ItEr46S19CUProcuraOrganizacionsTraballoItEr40S22: Not shown
 invalid criterion requirements in tooltip.

---
 .../web/orders/OrderElementTreeController.java       | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
index d663eb636..1a5ae8253 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/orders/OrderElementTreeController.java
@@ -533,11 +533,15 @@ public class OrderElementTreeController extends TreeController<OrderElement> {
                 && (!elem.getCriterionRequirements().isEmpty())) {
             ArrayList<String> criterionNames = new ArrayList<String>();
             for(CriterionRequirement each:elem.getCriterionRequirements()) {
-                criterionNames.add(each.getCriterion().getName());
+                if (each.isValid()) {
+                    criterionNames.add(each.getCriterion().getName());
+                }
+            }
+            if (!criterionNames.isEmpty()) {
+                tooltipText.append(" " + _("Criteria") + ":");
+                tooltipText.append(StringUtils.join(criterionNames, ","));
+                tooltipText.append(".");
             }
-            tooltipText.append(" " + _("Criteria") + ":");
-            tooltipText.append(StringUtils.join(criterionNames, ","));
-            tooltipText.append(".");
         }
         // To calculate other unit advances implement
         // getOtherAdvancesPercentage()