layout of page calendar list

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -1,3 +1,14 @@
+{#
+    WARNING: this file is in use in both ActivityBundle and CalendarBundle.
+
+    Take care when editing this file.
+
+    Maybe should we think about abstracting this file a bit more ? Moving it to PersonBundle ?
+#}
+{% if context == 'calendar_accompanyingCourse' %}
+    {% import "@ChillCalendar/_invite.html.twig" as invite %}
+{% endif %}
+
 {% macro href(pathname, key, value) %}
     {% set parms = { (key): value } %}
     {{ path(pathname, parms) }}
@@ -132,6 +143,12 @@
                             {% if bloc.type == 'user' %}
                                 <span class="badge-user">
                                     {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                                    {%- if context == 'calendar_accompanyingCourse' %}
+                                        {% set invite = entity.inviteForUser(item) %}
+                                        {% if invite is not null %}
+                                        {{ invite.invite_span(invite) }}
+                                        {% endif %}
+                                    {%- endif -%}
                                 </span>
                             {% else %}
                                 {{ _self.insert_onthefly(bloc.type, item) }}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig

@@ -33,63 +33,35 @@
             <div class="item-bloc">
                 <div class="item-row main">
                     <div class="item-col">
+                        <div class="wrap-header">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                        <p class="date-label">{{ calendar.startDate|format_datetime('short', 'short') }} - {{ calendar.endDate|format_datetime('short', 'short') }}</p>
+                                    {% else %}
+                                        <p class="date-label">{{ calendar.startDate|format_datetime('short', 'short') }} - {{ calendar.endDate|format_datetime('none', 'short') }}</p>
+                                    {% endif %}
 
-                        {% if calendar.startDate and calendar.endDate %}
+                                    <div class="duration">
-                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                        <p>
-                                <h3>{{ "From the day"|trans }} {{ calendar.startDate|format_datetime('medium', 'short') }} </h3>
+                                            <i class="fa fa-fw fa-hourglass-end"></i>
-                                <h3>{{ "to the day"|trans }} {{ calendar.endDate|format_datetime('medium', 'short') }}</h3>
+                                            {{ calendar.duration|date('%H:%I')}}
-                            {% else %}
+                                        </p>
-                                <h3>{{ calendar.startDate|format_date('full') }} </h3>
+                                    </div>
-                                <h3>{{ calendar.startDate|format_datetime('none', 'short', locale='fr') }} - {{ calendar.endDate|format_datetime('none', 'short', locale='fr') }}</h3>
 
-                                <div class="duration">
-                                    <p>
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.duration|date('%H:%I')}}
-                                    </p>
                                 </div>
-                            {% endif %}
+                            </div>
+                        </div>
 
-                        {% endif %}
+                        <div class="item-col">
+                            <ul class="list-content">
+                                {% if calendar.mainUser is not empty %}
+                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box }}</span>
+                                {% endif %}
+                            </ul>
+                        </div>
 
                     </div>
-                    <div class="item-col">
-                        <ul class="list-content">
-                            {% if calendar.mainUser is not empty %}
-                            <li>
-                                <b>{{ 'main user concerned'|trans }}: {{ calendar.mainUser.usernameCanonical }}</b>
-                            </li>
-                            {% endif %}
-
-                        </ul>
-                        <ul class="record_actions">
-                            {% if (calendar.isInvited(app.user)) %}
-                                {% set invite = calendar.inviteForUser(app.user) %}
-                                <li>
-                                    <div invite-answer data-status="{{ invite.status|e('html_attr') }}" data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
-                                </li>
-                            {% endif %}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
-                            </li>
-                            {# TOOD
-                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
-                            #}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
-                            </li>
-                            {# TOOD
-                            {% endif %}
-                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
-                            #}
-                            <li>
-                                <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
-                            </li>
-                            {#
-                            {% endif %}
-                            #}
-                        </ul>
-                    </div>
                 </div>
 
                 {%
@@ -98,11 +70,11 @@
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0
                 %}
-                <div class="item-row details">
+                <div class="item-row details separator">
                     <div class="item-col">
                         {% include 'ChillActivityBundle:Activity:concernedGroups.html.twig' with {
                             'context': 'calendar_accompanyingCourse',
-                            'render': 'row',
+                            'render': 'wrap-list',
                             'entity': calendar
                         } %}
                     </div>
@@ -115,6 +87,37 @@
                 </div>
                 {% endif %}
 
+                <div class="item-row separator">
+                    <ul class="record_actions">
+                        {% if (calendar.isInvited(app.user)) %}
+                            {% set invite = calendar.inviteForUser(app.user) %}
+                            <li>
+                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}" data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
+                            </li>
+                        {% endif %}
+                        <li>
+                            <a href="{{ path('chill_calendar_calendar_show', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-show "></a>
+                        </li>
+                        {# TOOD
+                            {% if is_granted('CHILL_ACTIVITY_UPDATE', calendar) %}
+                        #}
+                        <li>
+                            <a href="{{ path('chill_calendar_calendar_edit', { 'id': calendar.id, 'user_id': user_id, 'accompanying_period_id': accompanying_course_id }) }}" class="btn btn-update "></a>
+                        </li>
+                        {# TOOD
+                            {% endif %}
+                            {% if is_granted('CHILL_ACTIVITY_DELETE', calendar) %}
+                        #}
+                        <li>
+                            <a href="{{ path('chill_calendar_calendar_delete', { 'id': calendar.id, 'user_id' : user_id, 'accompanying_period_id': accompanying_course_id } ) }}" class="btn btn-delete "></a>
+                        </li>
+                        {#
+                        {% endif %}
+                        #}
+                    </ul>
+
+                </div>
+
             </div>
         {% endfor %}
 

src/Bundle/ChillCalendarBundle/Resources/views/_invite.html.twig

@@ -0,0 +1,14 @@
+{% macro invite_span(invite) %}
+    {% if invite.status == 'accepted' %}
+        {% set fa = 'check' %}
+    {% elseif invite.status == 'declined' %}
+        {% set fa = 'times' %}
+    {% elseif invite.status == 'pending' %}
+        {% set fa = 'hourglass' %}
+    {% elseif invite.status == 'tentative' %}
+        {% set fa = 'question' %}
+    {% else %}
+        {% set fa = invite.status %}
+    {% endif %}
+    <i class="fa fa-{{ fa }}" title="{{ ('invite.'~invite.status)|trans|e('html_attr') }}"></i>
+{% endmacro %}

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

@@ -56,3 +56,9 @@ remote_ms_graph:
 
 remote_calendar:
     calendar_range_title: Plage de disponibilité Chill
+
+invite:
+    accepted: Accepté
+    declined: Refusé
+    pending: En attente
+    tentative: Accepté provisoirement