Merge remote-tracking branch 'origin/master' into fix-person-tests

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

@@ -2,39 +2,24 @@
     <div class="grid-12 parent" id="header-accompanying_course-name" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
 
-            <div class="grid-5">{% set title = title %}
+            <div class="grid-6">{% set title = title %}
                 <h1>
                     <i class="fa fa-random fa-fw"></i>
-                    {{ 'Accompanying Course'|trans }}{# ou défini en amont
-                    {{ title|default('Accompanying Course'|trans)|raw }} #}
-                    <span style="font-weight: lighter; font-size: 65%;">(n°{{ accompanyingCourse.id  }})</span>
+                    {{ 'Accompanying Course'|trans }}
+                    <span style="font-weight: lighter; font-size: 50%;">(n°{{ accompanyingCourse.id  }})</span>
                 </h1>
             </div>
 
-            <div class="grid-4">
-                <ul class="record_actions">
-                    <li>ponctuel <i class="fa fa-toggle-on fa-fw"></i> régulier</li>
-                    <li>ouvert</li>
-                    <li>en file active</li>
-                    <li>urgent</li>
-                </ul>
-            </div>
+            <div class="grid-3" id="banner-flags"></div>
 
-            <div class="grid-3">
-                <p style="text-align: right;">
-                    <i>ouvert le 11 avril 2019</i><br>
-                    par <b>Soline Maillet | SIPAS</b>
-                </p>
-            </div>
+            <div class="grid-3" id="banner-status"></div>
 
         </div>
     </div>
     <div class="grid-12 parent" id="header-accompanying_course-details" >
         <div class="grid-10 push-1 grid-mobile-12 grid-tablet-12 push-mobile-0 push-tablet-0 parent">
 
-            <div class="grid-4">Problématiques sociales</div>
-            <div class="grid-4">_</div>
-            <div class="grid-4">_</div>
+            <div id="banner-social-issues"></div>
 
         </div>
     </div>

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

@@ -6,21 +6,23 @@
 
 {% block content %}
 
-    <h1>{{ block('title') }}</h1>
+  {% if 'DRAFT' == accompanyingCourse.step %}
+  <div class="grid-8 centered error flash_message">
+      <span>
+        {{ 'This accompanying course is still a draft'|trans }} 
+        <a href="{{ path('chill_person_accompanying_course_show', { 'accompanying_period_id': accompanyingCourse.id } ) }}">
+        {{ 'Edit & activate accompanying course'|trans }}
+        </a>
+      </span>
+  </div>
+  {% endif %}
 
-    <pre>
-{{ accompanyingCourse.id }}
-{{ accompanyingCourse.openingDate|format_date('short') }}
-{{ accompanyingCourse.closingDate|format_date('short') }}
-{{ accompanyingCourse.closingMotive|chill_entity_render_box }}
-{{ accompanyingCourse.remark|raw }}
-{{ accompanyingCourse.user }}
-usagers:
-{% for p in accompanyingCourse.participations %}
-    {{ p.person.id }} | <a href="{{ path('chill_person_accompanying_period_list', { person_id: p.person.id }) }}">{{ p.person.fullnamecanonical }}</a> | {{ p.startdate|format_date('short') }} | {{ p.enddate|format_date('short') }}
-{% endfor %}
-    </pre>
+  <h1>{{ 'Associated peoples'|trans }}</h1>
 
-    {{ dump() }}
+  <h1>{{ 'Resources'|trans }}</h1>
+
+  <h1>{{ 'Social actions'|trans }}</h1>
+  
+  <h1>{{ 'Last events on accompanying course'|trans }}</h1>
 
 {% endblock %}

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

@@ -1,12 +1,17 @@
 {% extends 'ChillPersonBundle:AccompanyingCourse:layout.html.twig' %}
 
+{% set title = 'DRAFT' == accompanyingCourse.step ? 'New accompanying course' : 'Edit accompanying course' %}
+
 {% block title %}
-    {{ 'Edit Accompanying Course'|trans }}
+    {{ title|trans }}
 {% endblock %}
 
 {% block content %}
-   <h1>{{ block('title') }}</h1>
-   <div id="accompanying-course"></div>    
+   <div id="accompanying-course"></div> {#  <== insert accompanyingCourse vue component  #}
+{% endblock %}
+
+{% block css %}
+   {{ encore_entry_link_tags('accompanying_course') }}
 {% endblock %}
 
 {% block js %}

src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig

@@ -49,4 +49,22 @@
 
     {{ form_end(form) }}
 
+
+    NEW FORM
+
+    {% block content %}
+        <h1>{{ block('title') }}</h1>
+        <div id="address"></div>
+    {% endblock %}
+
+    {% block stylesheets %}
+        <link href="{{ asset('build/address.css') }}" type="text/css" rel="stylesheet" />
+    {% endblock %}
+
+    {% block js %}
+        {{ encore_entry_script_tags('address') }}
+    {% endblock %}
+
+
+
 {% endblock personcontent %}