From 45606d9b97e586eea9cacb506f127551ebabae3e Mon Sep 17 00:00:00 2001
From: Matthieu Lamalle <mlamalle@cadoles.com>
Date: Tue, 29 Sep 2020 10:34:05 +0200
Subject: [PATCH] correciton requete recherche dans liste des projets

---
 .../src/Controller/ProjectController.php      |  2 +-
 src/schedule-2.0/src/Form/TaskType.php        | 31 ++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/schedule-2.0/src/Controller/ProjectController.php b/src/schedule-2.0/src/Controller/ProjectController.php
index aae9fdb..87a3540 100755
--- a/src/schedule-2.0/src/Controller/ProjectController.php
+++ b/src/schedule-2.0/src/Controller/ProjectController.php
@@ -183,8 +183,8 @@ class ProjectController extends AbstractController
             ->from("App:Project","project")
             ->from("App:Customer", "customer")
             ->where("project.name LIKE :value")
+            ->orWhere("customer.name LIKE :value")
             ->andWhere("project.customer=customer")
-            ->andWhere("customer.name LIKE :value")
             ->setParameter("value", "%".$q."%")
             ->orderBy('customer.name');
         
diff --git a/src/schedule-2.0/src/Form/TaskType.php b/src/schedule-2.0/src/Form/TaskType.php
index 50fc623..e861bfd 100644
--- a/src/schedule-2.0/src/Form/TaskType.php
+++ b/src/schedule-2.0/src/Form/TaskType.php
@@ -65,18 +65,25 @@ class TaskType extends AbstractType
         );
 
         $builder->add('project',
-        EntityType::class, [
-            "label" => "Projet",
-            "class" => "App:Project",
-            "choice_label"  => function ($project) {
-                return $project->getDisplayname();},
-            
-            "disabled" => false,
-            "required"    => true,
-            "multiple" => false,
-            "placeholder" => "Selectionner un Projet",
-        ]
-    );      
+            Select2EntityType::class, [
+                "label" => "Projet",
+                "disabled" => false,
+                "required"    => true,
+                "multiple" => false,
+                "remote_route" => "app_project_select",
+                "class" => "App:Project",
+                "primary_key" => "id",
+                "text_property" => "displayname",
+                "minimum_input_length" => 2,
+                "page_limit" => 100,
+                "allow_clear" => true,
+                "delay" => 250,
+                "cache" => false,
+                "cache_timeout" => 60000,
+                "language" => "fr",
+                "placeholder" => "Selectionner un Projet",
+            ]
+        );       
     }
 
     public function configureOptions(OptionsResolver $resolver)