From ad45e71051820e7f0ebe6d684ff996be514c5a43 Mon Sep 17 00:00:00 2001
From: Tchama <mat@collectifs.net>
Date: Thu, 2 May 2019 19:27:31 +0200
Subject: [PATCH] minor changes

---
 Controller/EventController.php               | 3 +++
 Form/Type/PickEventType.php                  | 6 ++++--
 Resources/views/Event/listByPerson.html.twig | 4 ++--
 Search/EventSearch.php                       | 4 +++-
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/Controller/EventController.php b/Controller/EventController.php
index 5be3717cd..f727afca1 100644
--- a/Controller/EventController.php
+++ b/Controller/EventController.php
@@ -442,4 +442,7 @@ class EventController extends Controller
         return $builder->getForm();
     }
     
+    // pour aller plus loin
+    // TODO ?? inclure le type d'événement et la date dans les résultats de recherche (ex: on tape 'vis' --> il affiche les visites )
+    // TODO ?? exclure des résultats les événement déjà sélectionnés pour une personne. empêcher d'inscrire 2x une personne !
 }
diff --git a/Form/Type/PickEventType.php b/Form/Type/PickEventType.php
index 9d9d2bc96..9cf8c3f29 100644
--- a/Form/Type/PickEventType.php
+++ b/Form/Type/PickEventType.php
@@ -120,8 +120,9 @@ class PickEventType extends AbstractType
         $resolver->setDefaults(array(
             'class' => Event::class,
             'choice_label' => function(Event $e) {
-                return $e->getDate()->format('d-m-Y'). ' ' .$e->getName();
-                // TODO ajouter si possible le type de l'événement !
+                return  $e->getDate()->format('d/m/Y, H:i') . ' → ' .
+                        // $e->getType()->getName()['fr'] . ':  ' .    // display the type of event
+                        $e->getName();
             },
             'placeholder' => 'Pick an event',
             'attr' => array('class' => 'select2 '),
@@ -133,6 +134,7 @@ class PickEventType extends AbstractType
                 return new EventChoiceLoader($this->eventRepository, $centers);
             }
         ));
+        
     }
     
     /**
diff --git a/Resources/views/Event/listByPerson.html.twig b/Resources/views/Event/listByPerson.html.twig
index 7277b4c1b..a59d28076 100644
--- a/Resources/views/Event/listByPerson.html.twig
+++ b/Resources/views/Event/listByPerson.html.twig
@@ -27,8 +27,8 @@
 <table class="events">
     <thead>
         <tr>
-            <th class="chill-red">{{ 'Name'|trans }}</th>
             <th class="chill-green">{{ 'Date'|trans }}</th>
+            <th class="chill-red">{{ 'Name'|trans }}</th>
             <th class="chill-orange">{{ 'Event type'|trans }}</th>
             <th class="chill-red">{{ 'Role'|trans }}</th>
             <th class="chill-green">{{ 'Status'|trans }}</th>
@@ -38,8 +38,8 @@
     <tbody>
         {% for participation in participations %}
             <tr>
-                <td>{{ participation.event.name }}</td>
                 <td>{{ participation.event.date|localizeddate('long', 'short') }}</td>
+                <td>{{ participation.event.name }}</td>
                 <td>{{ participation.event.type.name|localize_translatable_string }}</td>
                 <td>{{ participation.role.name|localize_translatable_string }}</td>
                 <td>{{ participation.status.name|localize_translatable_string }}</td>
diff --git a/Search/EventSearch.php b/Search/EventSearch.php
index bd87b5ad5..8833ed702 100644
--- a/Search/EventSearch.php
+++ b/Search/EventSearch.php
@@ -120,7 +120,9 @@ class EventSearch extends AbstractSearch
             foreach ($search as $item) {
                 $results[] = [
                     'id' => $item->getId(),
-                    'text' => $item->getDate()->format('d-m-Y, H:i'). ' → ' .$item->getName()
+                    'text' => $item->getDate()->format('d/m/Y, H:i') . ' → ' .
+                              // $item->getType()->getName()['fr'] . ':  ' .    // display the type of event
+                              $item->getName()
                 ];
             }
             return [