From ee415e2dca169d7e0481f47edf98ca48856acaaf Mon Sep 17 00:00:00 2001
From: miciele Ghiorghis <m.ghiorghis@antoniusziekenhuis.nl>
Date: Thu, 25 Apr 2013 13:09:08 +0200
Subject: [PATCH] filter-on-projectname: modified to use project name as filter
 criteria

---
 .../libreplan/web/planner/company/CompanyPlanningModel.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
index 6af87e68b..877b9d2d4 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/planner/company/CompanyPlanningModel.java
@@ -726,8 +726,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
                 if (predicate != null) {
                     // If predicate includeChildren then we check if it accepts
                     // the element
-                    if (predicate.isIncludeChildren()
-                            && !predicate.accepts(associatedTaskElement)) {
+                    if (!predicate.accepts(associatedTaskElement)) {
                         // If it doesn't accept the element we move on to the
                         // next order
                         continue;
@@ -807,6 +806,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
 
         Date startDate = FilterUtils.readProjectsStartDate();
         Date endDate = FilterUtils.readProjectsEndDate();
+        String name = FilterUtils.readProjectsName();
 
         boolean calculateStartDate = (startDate == null);
         boolean calculateEndDate = (endDate == null);
@@ -842,7 +842,7 @@ public class CompanyPlanningModel implements ICompanyPlanningModel {
         filterFinishDate = endDate != null ? LocalDate.fromDateFields(endDate)
                 : null;
         return new TaskGroupPredicate(null, startDate, endDate,
-                includeOrderElements);
+                includeOrderElements, name);
     }
 
     private static <T> List<T> notNull(T... values) {