accompanying course summary (WIP)

src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php

@@ -75,9 +75,17 @@ class AccompanyingPeriodController extends AbstractController
         ]);
         $this->eventDispatcher->dispatch(PrivacyEvent::PERSON_PRIVACY_EVENT, $event);
 
+        $accompanyingPeriods = $person->getAccompanyingPeriodsOrdered();
+        dump($accompanyingPeriods);
+        $participatingPersons = array();
+        foreach ($accompanyingPeriods as $ap){
+            $participatingPersons[] = ($ap->getOpenParticipationContainsPerson($person));
+        }
+
         return $this->render('ChillPersonBundle:AccompanyingPeriod:list.html.twig', [
-            'accompanying_periods' => $person->getAccompanyingPeriodsOrdered(),
+            'accompanying_periods' => $accompanyingPeriods,
-            'person' => $person
+            'person' => $person,
+            'participating_persons' => $participatingPersons
         ]);
     }
 

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/list.html.twig

@@ -8,22 +8,28 @@
 
 <h1>{{ 'Accompanying period list'|trans }}</h1>
 
-<table class="rounded">
-    <thead>
-        <tr>
-            <th class="chill-red">{{ 'accompanying_period.dates'|trans }}</th>
-            {% if chill_accompanying_periods.fields.user == 'visible'  %}
-                <th class="chill-blue">{{ 'Accompanying user'|trans }}</th>
-            {% endif %}
-            <th class="chill-orange">{{ 'Remark'|trans }}</th>
-            <th>&nbsp;</th>
-        </tr>
 
-    </thead>
-    <tbody>
     {% for accompanying_period in accompanying_periods %}
-        <tr>
+
-            <td>
+    <div class="flex-table">
+        <div class="item-bloc">
+            <div class="item-row">
+                <div class="item-col">
+                    {{'Accompanying period'|trans}} #{{ accompanying_period.id }}
+                </div>
+
+                <div class="item-col">
+                {% if chill_accompanying_periods.fields.user == 'visible'  %}
+                    {% if accompanying_period.user %}
+                    {{ accompanying_period.user.username }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
+                    {% endif %}
+                {% endif %}
+                </div>
+
+            </div>
+            <div class="item-row">
                 {% if accompanying_period.closingDate == null %}
                     {{ 'accompanying_period.dates_from_%opening_date%'|trans({ '%opening_date%': accompanying_period.openingDate|format_date('long') } ) }}
                 {% else %}
@@ -40,28 +46,38 @@
                     {% endif %}
 
                 {% endif %}
-            </td>
+            </div>
-            {% if chill_accompanying_periods.fields.user == 'visible'  %}
+            <div class="item-row">
-            <td>
-                {% if accompanying_period.user %}
-                {{ accompanying_period.user.username }}
-                {% else %}
-                    <span class="chill-no-data-statement">{{ 'No accompanying user'|trans }}</span>
-                {% endif %}
-            </td>
-            {% endif %}
-            <td>
-                {% if accompanying_period is not empty %}
-                    <blockquote class="chill-user-quote">
-                    {{ accompanying_period.remark|chill_markdown_to_html }}
-                    </blockquote>
-                {% else %}
-                    {{ null|chill_print_or_message('No remark', 'blockquote') }}
-                {% endif %}
-            </td>
-            <td>
-                <ul class="record_actions">
 
+                    <h3>{{ 'Participants'|trans }}</h3>
+                    {% if accompanying_period.participations.count > 0 %}
+                        {% for p in accompanying_period.participations %}
+                        <p>
+                            <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">
+                                {{ p.person.firstname ~ ' ' ~ p.person.lastname }}
+                            </a>
+                        </p>
+                        {% endfor %}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+            </div>
+            <div class="item-col">
+                <h3>{{ 'Requestors'|trans }}</h3>
+                {% if accompanying_period.requestorPerson is not null or accompanying_period.requestorThirdParty is not null %}
+                    {% if accompanying_period.requestorPerson is not null %}
+                    <p>{{ accompanying_period.requestorPerson.firstname ~ ' ' ~ accompanying_period.requestorPerson.lastname }}</p>
+                    {% endif %}
+                    {% if accompanying_period.requestorThirdParty is not null %}
+                    <p>{{ accompanying_period.requestorThirdParty.firstname ~ ' ' ~ accompanying_period.requestorThirdParty.lastname }}</p>
+                    {% endif %}
+                {% else %}
+                    <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                {% endif %}
+            </div>
+
+            <div class="item-row">
+                <ul class="record_actions">
                     {# TODO if enable_accompanying_course_with_multiple_persons is true ... #}
                     <li>
                         <a href="{{ path('chill_person_accompanying_course_index', { 'accompanying_period_id': accompanying_period.id }) }}" class="sc-button bt-show"></a>
@@ -85,12 +101,13 @@
                     </li>
                     {% endif %}
                 </ul>
+            </div>
 
-            </td>
+        </div>
-        </tr>
+    </div>
+    <p></p>
     {% endfor %}
-    </tbody>
+
-</table>
 
 <div  class="form_control">
     <ul class="record_actions">

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

@@ -165,6 +165,7 @@ An accompanying period starts: Une période d'accompagnement est ouverte
 Any accompanying periods are open: Aucune période d'accompagnement ouverte
 An accompanying period is open: Une période d'accompagnement est ouverte
 Accompanying period list: Périodes d'accompagnement
+Accompanying period: Période d'accompagnement
 New accompanying course: Nouveau parcours d'accompagnement
 Choose a motive: Motif de fermeture
 Re-open accompanying period: Ré-ouvrir