Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-06-12 21:34:25 +00:00
Code Issues Actions Projects Releases Wiki Activity

minor changes

Browse Source
This commit is contained in:
Tchama 2019-05-02 19:27:31 +02:00
parent 8c3c9c4a1f
commit ad45e71051
4 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Controller/EventController.php
View File

@ -442,4 +442,7 @@ class EventController extends Controller
return $builder->getForm(); 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 !
} }

6
Form/Type/PickEventType.php
View File

@ -120,8 +120,9 @@ class PickEventType extends AbstractType
$resolver->setDefaults(array( $resolver->setDefaults(array(
'class' => Event::class, 'class' => Event::class,
'choice_label' => function(Event $e) { 'choice_label' => function(Event $e) {
return $e->getDate()->format('d-m-Y'). ' ' .$e->getName(); return $e->getDate()->format('d/m/Y, H:i') . ' → ' .
// TODO ajouter si possible le type de l'événement ! // $e->getType()->getName()['fr'] . ': ' . // display the type of event
$e->getName();
}, },
'placeholder' => 'Pick an event', 'placeholder' => 'Pick an event',
'attr' => array('class' => 'select2 '), 'attr' => array('class' => 'select2 '),
@ -133,6 +134,7 @@ class PickEventType extends AbstractType
return new EventChoiceLoader($this->eventRepository, $centers); return new EventChoiceLoader($this->eventRepository, $centers);
} }
)); ));
} }
/** /**

4
Resources/views/Event/listByPerson.html.twig
View File

@ -27,8 +27,8 @@
<table class="events"> <table class="events">
<thead> <thead>
<tr> <tr>
<th class="chill-red">{{ 'Name'|trans }}</th>
<th class="chill-green">{{ 'Date'|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-orange">{{ 'Event type'|trans }}</th>
<th class="chill-red">{{ 'Role'|trans }}</th> <th class="chill-red">{{ 'Role'|trans }}</th>
<th class="chill-green">{{ 'Status'|trans }}</th> <th class="chill-green">{{ 'Status'|trans }}</th>
@ -38,8 +38,8 @@
<tbody> <tbody>
{% for participation in participations %} {% for participation in participations %}
<tr> <tr>
<td>{{ participation.event.name }}</td>
<td>{{ participation.event.date|localizeddate('long', 'short') }}</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.event.type.name|localize_translatable_string }}</td>
<td>{{ participation.role.name|localize_translatable_string }}</td> <td>{{ participation.role.name|localize_translatable_string }}</td>
<td>{{ participation.status.name|localize_translatable_string }}</td> <td>{{ participation.status.name|localize_translatable_string }}</td>

4
Search/EventSearch.php
View File

@ -120,7 +120,9 @@ class EventSearch extends AbstractSearch
foreach ($search as $item) { foreach ($search as $item) {
$results[] = [ $results[] = [
'id' => $item->getId(), '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 [ return [