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 @@
{{ 'Name'|trans }} | {{ 'Date'|trans }} | +{{ 'Name'|trans }} | {{ 'Event type'|trans }} | {{ 'Role'|trans }} | {{ 'Status'|trans }} | @@ -38,8 +38,8 @@
---|---|---|---|---|---|
{{ participation.event.name }} | {{ participation.event.date|localizeddate('long', 'short') }} | +{{ participation.event.name }} | {{ participation.event.type.name|localize_translatable_string }} | {{ participation.role.name|localize_translatable_string }} | {{ participation.status.name|localize_translatable_string }} | 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 [