Merge branch '266-event-bundle-graphic' into 'master'

Resolve "Module évenements: finaliser les bugs graphiques"

Closes #266

See merge request Chill-Projet/chill-bundles!692

.changes/unreleased/UX-20240508-102757.yaml

@@ -0,0 +1,5 @@
+kind: UX
+body: Adjust certain graphical issues for better user experience
+time: 2024-05-08T10:27:57.220873296+02:00
+custom:
+  Issue: "266"

src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml

@@ -13,7 +13,7 @@ Update document: Modifier le document
 Edit attributes: Modifier les propriétés du document
 Existing document: Document existant
 No document to download: Aucun document à télécharger
-'Choose a document category': Choisissez une catégorie de document
+"Choose a document category": Choisissez une catégorie de document
 No document found: Aucun document trouvé
 The document is successfully registered: Le document est enregistré
 The document is successfully updated: Le document est mis à jour
@@ -36,7 +36,6 @@ Delete document ?: Supprimer le document ?
 Are you sure you want to remove this document ?: Êtes-vous sûr·e de vouloir supprimer ce document ?
 The document is successfully removed: Le document a été supprimé
 
-
 # dropzone upload
 File too big: Fichier trop volumineux
 Drop your file or click here: Cliquez ici ou faites glissez votre nouveau fichier dans cette zone

src/Bundle/ChillEventBundle/Form/EventType.php

@@ -18,9 +18,9 @@ use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateTimeType;
 use Chill\MainBundle\Form\Type\CommentType;
+use Chill\MainBundle\Form\Type\PickUserDynamicType;
 use Chill\MainBundle\Form\Type\PickUserLocationType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Form\Type\UserPickerType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\MoneyType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -45,14 +45,8 @@ class EventType extends AbstractType
                     'class' => '',
                 ],
             ])
-            ->add('moderator', UserPickerType::class, [
+            ->add('moderator', PickUserDynamicType::class, [
-                'center' => $options['center'],
+                'label' => 'Pick a moderator',
-                'role' => $options['role'],
-                'placeholder' => 'Pick a moderator',
-                'attr' => [
-                    'class' => '',
-                ],
-                'required' => false,
             ])
             ->add('location', PickUserLocationType::class, [
                 'label' => 'event.fields.location',

src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig

@@ -1,10 +1,14 @@
-{% extends '@ChillEvent/layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %} {% block js %}
+{{ encore_entry_script_tags("mod_async_upload") }}
+{{ encore_entry_script_tags("mod_pickentity_type") }}
 
-{% block title 'Event edit'|trans %}
+{% endblock %} {% block css %}
+{{ encore_entry_link_tags("mod_async_upload") }}
+{{ encore_entry_link_tags("mod_pickentity_type") }}
 
-{% block event_content -%}
+{% endblock %} {% block title 'Event edit'|trans %} {% block event_content -%}
 <div class="col-10">
-    <h1>{{ 'Event edit'|trans }}</h1>
+    <h1>{{ "Event edit" | trans }}</h1>
 
     {{ form_start(edit_form) }}
     {{ form_errors(edit_form) }}
@@ -12,7 +16,7 @@
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.date) }}
 
-    {{ form_row(edit_form.type, { 'label': 'Event type' }) }}
+    {{ form_row(edit_form.type, { label: "Event type" }) }}
     {{ form_row(edit_form.moderator) }}
     {{ form_row(edit_form.location) }}
     {{ form_row(edit_form.organizationCost) }}
@@ -22,16 +26,22 @@
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ chill_return_path_or('chill_event_event_list') }}" class="btn btn-cancel">
+            <a
-                {{ 'List of events'|trans|chill_return_path_label }}
+                href="{{ chill_return_path_or('chill_event_event_list') }}"
+                class="btn btn-cancel"
+            >
+                {{ "List of events" | trans | chill_return_path_label }}
             </a>
         </li>
         <li>
-            {{ form_widget(edit_form.submit, { 'attr' : { 'class' : 'btn btn-update' } }) }}
+            {{
+                form_widget(edit_form.submit, {
+                    attr: { class: "btn btn-update" }
+                })
+            }}
         </li>
     </ul>
 
     {{ form_end(edit_form) }}
-
 </div>
 {% endblock %}

src/Bundle/ChillEventBundle/Resources/views/Event/new.html.twig

@@ -1,41 +1,41 @@
-{% extends '@ChillEvent/layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %} {% block js %}
+{{ encore_entry_script_tags("mod_async_upload") }}
+{{ encore_entry_script_tags("mod_pickentity_type") }}
 
-{% block js %}
+{% endblock %} {% block css %}
-    {{ encore_entry_script_tags('mod_async_upload') }}
+{{ encore_entry_link_tags("mod_async_upload") }}
-{% endblock %}
+{{ encore_entry_link_tags("mod_pickentity_type") }}
 
-{% block css %}
+{% endblock %} {% block title 'Event creation'|trans %} {% block event_content
-    {{ encore_entry_link_tags('mod_async_upload') }}
+-%}
-{% endblock %}
-
-{% block title 'Event creation'|trans %}
-
-{% block event_content -%}
 <div class="col-10">
-    <h1>{{ 'Event creation'|trans }}</h1>
+    <h1>{{ "Event creation" | trans }}</h1>
 
     {{ form_start(form) }}
     {{ form_errors(form) }}
     {{ form_row(form.circle) }}
     {{ form_row(form.name) }}
     {{ form_row(form.date) }}
-
+    {{ form_row(form.type, { label: "Event type" }) }}
-    {{ form_row(form.type, { 'label': 'Event type' }) }}
     {{ form_row(form.moderator) }}
     {{ form_row(form.location) }}
     {{ form_row(form.organizationCost) }}
-
     {{ form_row(form.comment) }}
     {{ form_row(form.documents) }}
 
     <ul class="record_actions sticky-form-buttons">
         <li class="cancel">
-            <a href="{{ path('chill_event_list_most_recent') }}" class="btn btn-cancel">
+            <a
-                {{ 'Back to the most recent events'|trans }}
+                href="{{ path('chill_event_list_most_recent') }}"
+                class="btn btn-cancel"
+            >
+                {{ "Back to the most recent events" | trans }}
             </a>
         </li>
         <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class' : 'btn btn-create' } }) }}
+            {{
+                form_widget(form.submit, { attr: { class: "btn btn-create" } })
+            }}
         </li>
     </ul>
 

src/Bundle/ChillEventBundle/Resources/views/Event/page_list.html.twig

@@ -1,92 +1,126 @@
-{% extends '@ChillEvent/layout.html.twig' %}
+{% extends '@ChillEvent/layout.html.twig' %} {% block title 'Events'|trans %} {%
+block js %}
+{{ parent() }}
+{{ encore_entry_script_tags("mod_pickentity_type") }}
+{% endblock %} {% block css %}
+{{ parent() }}
+{{ encore_entry_link_tags("mod_pickentity_type") }}
+{% endblock %} {% block content %}
+<div class="col-10">
+    <h1>{{ block("title") }}</h1>
 
-{% block title 'Events'|trans %}
+    {{ filter | chill_render_filter_order_helper }}
 
-{% block js %}
+    {# {% if is_granted('CHILL_EVENT_CREATE') %} #}
-    {{ parent() }}
+    <ul class="record_actions">
-    {{ encore_entry_script_tags('mod_pickentity_type') }}
+        <li>
-{% endblock %}
+            <a
-
+                class="btn btn-create"
-{% block css %}
+                href="{{
-    {{ parent() }}
+                    chill_path_add_return_path(
-    {{ encore_entry_link_tags('mod_pickentity_type') }}
+                        'chill_event__event_new_pickcenter'
-{% endblock %}
+                    )
-
+                }}"
-{% block content %}
+                >{{ "Add an event" | trans }}</a
-    <h1>{{ block('title') }}</h1>
+            >
-
+        </li>
-    {{ filter|chill_render_filter_order_helper }}
+    </ul>
-
+    {# {% endif %} #} {% if events|length > 0 %}
-{# {% if is_granted('CHILL_EVENT_CREATE') %} #}
+    <div class="flex-table">
-        <ul class="record_actions">
+        {% for e in events %}
-            <li><a class="btn btn-create" href="{{ chill_path_add_return_path('chill_event__event_new_pickcenter') }}">{{ 'Add an event'|trans }}</a></li>
+        <div class="item-bloc">
-        </ul>
+            <div class="item-row">
-   {#  {% endif %} #}
+                <div class="item-col">
-    {% if events|length > 0 %}
+                    <div class="denomination h2">
-        <div class="flex-table">
+                        {{ e.name }}
-            {% for e in events %}
-                <div class="item-bloc">
-                    <div class="item-row">
-                        <div class="item-col">
-                            <div class="denomination h2">
-                                {{ e.name }}
-                            </div>
-                            <p>{{ e.type.name|localize_translatable_string }}</p>
-                            {% if e.moderator is not null %}
-                                <p>{{ 'Moderator'|trans }}: {{ e.moderator|chill_entity_render_box }}</p>
-                            {% endif %}
-                        </div>
-                        <div class="item-col">
-                            <div class="container" style="text-align: right;">
-                                <p>{{ e.date|format_datetime('medium', 'medium') }}</p>
-                                <p>{{ 'count participations to this event'|trans({'count': e.participations|length}) }}</p>
-                            </div>
-                        </div>
                     </div>
-                    {% if e.participations|length > 0 %}
+                    <p>{{ e.type.name | localize_translatable_string }}</p>
-                        <div class="item-row separator">
+                    {% if e.moderator is not null %}
-                            <strong>{{ 'Participations'|trans }}&nbsp;: </strong>
+                    <p>
-                            {% for part in e.participations|slice(0, 20) %}
+                        {{ "Moderator" | trans }}:
-                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                        {{ e.moderator | chill_entity_render_box }}
-                                    targetEntity: { name: 'person', id: part.person.id },
+                    </p>
-                                    action: 'show',
-                                    displayBadge: true,
-                                    buttonText: part.person|chill_entity_render_string,
-                                    isDead: part.person.deathdate is not null
-                                } %}
-                            {% endfor %}
-                            {% if e.participations|length > 20 %}
-                                {{ 'events.and_other_count_participants'|trans({'count': e.participations|length - 20}) }}
-                            {% endif %}
-                        </div>
                     {% endif %}
-                    <div class="item-row">
+                </div>
-                        <div class="item-col">
+                <div class="item-col">
-                            {{ form_start(eventForms[e.id]) }}
+                    <div class="container" style="text-align: right">
-                            {{ form_widget(eventForms[e.id].person_id) }}
+                        <p>{{ e.date|format_datetime('medium', 'medium') }}</p>
-                            {{ form_end(eventForms[e.id]) }}
+                        <p>
-                        </div>
+                            {{ 'count participations to this event'|trans({'count': e.participations|length}) }}
-                    </div>
+                        </p>
-                    <div class="item-row separator">
-                        <div class="item-col item-meta">
-                        </div>
-                        <div class="item-col">
-                            <ul class="record_actions">
-                                {% if is_granted('CHILL_EVENT_UPDATE', e) %}
-                                    <li><a href="{{ chill_path_add_return_path('chill_event__event_delete', {'event_id': e.id}) }}" class="btn btn-delete"></a></li>
-                                {% endif %}
-                                {% if is_granted('CHILL_EVENT_UPDATE', e) %}
-                                    <li><a href="{{ chill_path_add_return_path('chill_event__event_edit', {'event_id': e.id}) }}" class="btn btn-edit"></a></li>
-                                {% endif %}
-                                <li><a href="{{ chill_path_add_return_path('chill_event__event_show', {'event_id': e.id}) }}" class="btn btn-show"></a></li>
-                            </ul>
-                        </div>
                     </div>
                 </div>
-            {% endfor %}
+            </div>
+            {% if e.participations|length > 0 %}
+            <div class="item-row separator">
+                <strong>{{ "Participations" | trans }}&nbsp;: </strong>
+                {% for part in e.participations|slice(0, 20) %} {% include
+                '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                targetEntity: { name: 'person', id: part.person.id }, action:
+                'show', displayBadge: true, buttonText:
+                part.person|chill_entity_render_string, isDead:
+                part.person.deathdate is not null } %} {% endfor %} {% if
+                e.participations|length > 20 %}
+                {{ 'events.and_other_count_participants'|trans({'count': e.participations|length - 20}) }}
+                {% endif %}
+            </div>
+            {% endif %}
+            <div class="item-row">
+                <div class="item-col">
+                    {{ form_start(eventForms[e.id]) }}
+                    {{ form_widget(eventForms[e.id].person_id) }}
+                    {{ form_end(eventForms[e.id]) }}
+                </div>
+            </div>
+            <div class="item-row separator">
+                <div class="item-col item-meta"></div>
+                <div class="item-col">
+                    <ul class="record_actions">
+                        {% if is_granted('CHILL_EVENT_UPDATE', e) %}
+                        <li>
+                            <a
+                                href="{{
+                                    chill_path_add_return_path(
+                                        'chill_event__event_delete',
+                                        { event_id: e.id }
+                                    )
+                                }}"
+                                class="btn btn-delete"
+                            ></a>
+                        </li>
+                        {% endif %} {% if is_granted('CHILL_EVENT_UPDATE', e) %}
+                        <li>
+                            <a
+                                href="{{
+                                    chill_path_add_return_path(
+                                        'chill_event__event_edit',
+                                        { event_id: e.id }
+                                    )
+                                }}"
+                                class="btn btn-edit"
+                            ></a>
+                        </li>
+                        {% endif %}
+                        <li>
+                            <a
+                                href="{{
+                                    chill_path_add_return_path(
+                                        'chill_event__event_show',
+                                        { event_id: e.id }
+                                    )
+                                }}"
+                                class="btn btn-show"
+                            ></a>
+                        </li>
+                    </ul>
+                </div>
+            </div>
         </div>
+        {% endfor %}
+    </div>
     {% endif %}
+</div>
 
-    {{ chill_pagination(pagination) }}
+{{ chill_pagination(pagination) }}
 
 {% endblock %}

src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig

@@ -173,10 +173,10 @@
                         {{ form_widget(entry) }}
                         {{ form_errors(entry) }}
                     </div>
-                </li>
+                </li> 
             {% else %}
                 <li data-collection-empty-explain="1">
-                    <span class="chill-no-data-statement">{{ form.vars.empty_collection_explain|default('No item')|trans }}</span>
+                    <span class="chill-no-data-statement">{{ form.vars.empty_collection_explain|default('No entities')|trans }}</span>
                 </li>
             {% endfor %}
         </ul>