Ajout informations manquantes dans la page "summary" des

AccompanyingCourse

src/Bundle/ChillPersonBundle/Resources/public/index.js

@@ -1,3 +1,4 @@
 require('./sass/person.scss');
 require('./sass/person_with_period.scss');
 require('./sass/household_banner.scss');
+require('./sass/accompanying_period_work.scss');

src/Bundle/ChillPersonBundle/Resources/public/modules/accompanying_course_work_list/index.scss

@@ -46,6 +46,15 @@
     }
   }
 
+  &.short {
+    .item {
+      padding-bottom: 0;
+      ul.record_actions {
+        margin-bottom: 0;
+      }
+    }
+  }
+
   .updatedBy {
     margin-top: 1rem;
     text-align: right;
@@ -94,3 +103,4 @@ ul.timeline {
     }
   }
 }
+

src/Bundle/ChillPersonBundle/Resources/public/sass/accompanying_period_work.scss

@@ -0,0 +1,6 @@
+
+.chill-entity__social-action {
+  .badge-primary {
+    background-color: var(--chill-green);
+  }
+}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourse/index.html.twig

@@ -122,6 +122,97 @@
     {% endfor %}
     </div>
 
+    <h2>{{ 'Requestor'|trans }}</h2>
+
+    {% if accompanyingCourse.requestor == null %}
+      <p>{{ 'Any requestor to this accompanying course'|trans }}</p>
+    {% elseif accompanyingCourse.requestorPerson is not empty %}
+      {% set r = accompanyingCourse.requestorPerson %}
+      <div class="item-row">
+          <div class="item-col">
+              <h3>
+                  {{ r.firstname ~ ' ' ~ r.lastname }}
+                  <span class="badge badge-pill badge-secondary">{{ 'Usager' }}</span>
+              </h3>
+              <p>
+                  {% set born = (r.gender == 'woman') ? 'née': 'né' %}
+                  {% set gender = (r.gender == 'woman') ? 'fa-venus' :
+                      (r.gender == 'man') ? 'fa-mars' : 'fa-neuter' %}
+                  {% set genderTitle = (r.gender == 'woman') ? 'femme' :
+                      (r.gender == 'homme') ? 'fa-mars' : 'neutre' %}
+                  <i class="fa fa-fw {{ gender }}" title="{{ genderTitle }}"></i>{{ born ~ ' le ' ~ r.birthdate|format_date('short') }}
+              </p>
+          </div>
+          <div class="item-col">
+              <ul class="list-content fa-ul">
+                  <li>
+                      {% if r.mobilenumber %}
+                          <i class="fa fa-li fa-mobile"></i><a href="{{ 'tel:' ~ r.mobilenumber }}">{{ r.mobilenumber }}</a>
+                      {% else %}
+                          <i class="fa fa-li fa-phone"></i>
+                          {% if r.phonenumber %}
+                              <a href="{{ 'tel:' ~ r.phonenumber }}">{{ r.phonenumber }}</a>
+                          {% else %}
+                              <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                          {% endif %}
+                      {% endif %}
+                  </li>
+                  <li>
+                      <i class="fa fa-li fa-map-marker"></i>
+                      {%- if r.lastAddress is not empty -%}
+                          {{ r.getLastAddress|chill_entity_render_box({'with_valid_from': false}) }}
+                      {%- else -%}
+                          <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+                      {%- endif -%}
+                  </li>
+              </ul>
+              <ul class="record_actions">
+                  <li>
+                      <a href="{{ path('chill_person_view', { person_id: r.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
+                  </li>
+              </ul>
+          </div>
+      </div>
+
+  {% elseif accompanyingCourse.requestorThirdParty is not empty %}
+    {% set r = accompanyingCourse.requestorThirdParty %}
+      <div class="item-row">
+          <div class="item-col">
+              <h3>
+                  {{ r.name }}
+                  <span class="badge badge-pill badge-secondary">{{ 'Tiers' }}</span>
+              </h3>
+          </div>
+          <div class="item-col">
+              <ul class="list-content fa-ul">
+                  <li><i class="fa fa-li fa-envelope-o"></i>
+                      <a href="{{ 'mailto:' ~ r.email }}">
+                          {{ r.email|chill_print_or_message("thirdparty.No_email") }}
+                      </a>
+                  </li>
+                  <li><i class="fa fa-li fa-phone"></i>
+                      {% if r.telephone %}
+                          <a href="{{ 'tel:' ~ r.telephone }}">{{ r.telephone }}</a>
+                      {% else %}
+                          <span class="chill-no-data-statement">{{ 'thirdparty.No_phonenumber'|trans }}</span>
+                      {% endif %}
+                  </li>
+                  <li><i class="fa fa-li fa-map-marker"></i>
+                      {%- if r.address is not empty -%}
+                          {{ r.getAddress|chill_entity_render_box({'with_valid_from': false}) }}
+                      {%- else -%}
+                          <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
+                      {%- endif -%}
+                  </li>
+              </ul>
+              <ul class="record_actions">
+                  <li>
+                      <a href="{{ path('chill_3party_3party_show', { thirdparty_id: r.id }) }}" class="sc-button bt-show" target="_blank" title="Voir"></a>
+                  </li>
+              </ul>
+          </div>
+      </div>
+    {% endif %}
 
     <h2>{{ 'Resources'|trans }}</h2>
 
@@ -227,88 +318,25 @@
 
     <h2>{{ 'Social actions'|trans }}</h2>
 
-    <div id="accompanying_course_work_list">
+    <div id="accompanying_course_work_list" class="short">
       {% for w in works %}
       <div class="item">
           <div class="title">
+          <p class="title_label">{{ 'accompanying_course_work.action'|trans }}</p >
             <h2 class="action_title">
               {{ w.socialAction|chill_entity_render_box({ 'no-badge': false }) }}
             </h2>
           </div>
 
-          <div class="timeline">
+        <div class="actions">
-            <ul class="timeline">
+          <ul class="record_actions">
-              <li class="completed">
+            <li>
-                <div class="date">
+              <a 
-                  <span>{{ w.createdAt|format_date('long') }}</span>
+                class="sc-button bt-edit"
-                </div>
+                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a>
-                <div class="label">
+            </li>
-                  <span>{{ 'accompanying_course_work.create_date'|trans }}</span>
+          </ul>
-                </div>
+        </div>
-              </li>
-              <li class="completed">
-                <div class="date">
-                  <span>{{ w.startDate|format_date('long') }}</span>
-                </div>
-                <div class="label">
-                  <span>{{ 'accompanying_course_work.start_date'|trans }}</span>
-                </div>
-              </li>
-              <li class="{%if date(w.endDate) < date('now') %}completed{% endif %}">
-                <div class="date">
-                  <span>{{ w.endDate|format_date('long') }}</span>
-                </div>
-                <div class="label">
-                  <span>{{ 'accompanying_course_work.end_date'|trans }}</span>
-                </div>
-              </li>
-            </ul>
-          </div>
-
-          {% if w.results|length > 0 %}
-            <div class="objective_results objective_results__without-objectives">
-              <div class="obj without_objective">
-                <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
-                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
-              </div>
-              <div class="res results">
-                <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
-                <ul class="result_list">
-                  {% for r in w.results %}
-                    <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
-                  {% endfor %}
-                </ul>
-              </div>
-            </div>
-          {% endif %}
-
-          {% if w.goals|length > 0 %}
-            {% for g in w.goals %}
-              <div class="objective_results objective_results--with-objectives">
-                <div class="objective obj">
-                  <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
-                  <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
-                </div>
-                <div class="results res">
-                  {% if g.results|length == 0 %}
-                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
-                    <p class="chill-no-data-statement">{{ 'accompanying_course_work.no_results'|trans }}</p>
-                  {% else %}
-                    <p class="title_label">{{ 'accompanying_course_work.results'|trans }}</p>
-                    <ul class="result_list">
-                      {% for r in g.results %}
-                        <li class="badge badge-primary">{{ r.title|localize_translatable_string }}</li>
-                      {% endfor %}
-                    </ul>
-                  {% endif %}
-                </div>
-              </div>
-            {% endfor %}
-          {% endif %}
-
-          <div class="updatedBy">
-            {{ 'Last updated by'|trans}}: {{ w.updatedBy|chill_entity_render_box }}, {{ w.updatedAt|format_datetime('long', 'short') }}
-          </div>
 
       </div>
       {% else %}

src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/list_by_accompanying_period.html.twig

@@ -12,7 +12,7 @@
         <div class="title">
           <p class="title_label">{{ 'accompanying_course_work.action'|trans }}</p >
           <h2 class="action_title">
-            {{ w.socialAction|chill_entity_render_box({ 'no-badge': true }) }}
+            {{ w.socialAction|chill_entity_render_box }}
           </h2>
         </div>
 
@@ -67,7 +67,7 @@
             <div class="objective_results objective_results--with-objectives">
               <div class="objective obj">
                 <p class="title_label">{{ 'accompanying_course_work.goal'|trans }}</p>
-                <h3 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h3>
+                <h4 class="goal_title">{{ g.goal.title|localize_translatable_string }}</h4>
               </div>
               <div class="results res">
                 {% if g.results|length == 0 %}
@@ -96,7 +96,7 @@
             <li>
               <a 
                 class="sc-button bt-edit"
-                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Update'|trans }}</a>
+                href="{{ chill_path_add_return_path('chill_person_accompanying_period_work_edit', { 'id': w.id }) }}">{{ 'Edit'|trans }}</a>
             </li>
           </ul>
         </div>

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

@@ -181,6 +181,8 @@ Create an accompanying course: Créer un parcours
 This accompanying course is still a draft: Ce parcours est à l'état brouillon
 Associated peoples: Usagers concernés
 Resources: Interlocuteurs privilégiés
+Requestor: Demandeur
+Any requestor to this accompanying course: Aucun demandeur pour ce parcours
 Social actions: Actions d'accompagnement
 Social issues: Problématiques sociales
 Last events on accompanying course: Dernières actions de suivi