Merge branch 'master' of gitlab.com:Chill-Projet/chill-bundles

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -10,6 +10,14 @@
          </persons-bloc>
       </div>
 
+     <div v-if="getContext === 'accompanyingCourse' && filterSuggestedPersons.length > 0">
+        <ul>
+          <li v-for="p in filterSuggestedPersons" @click="addNewPerson(p)">
+             {{ p.text }}
+          </li>
+        </ul>
+     </div>
+
       <add-persons
          buttonTitle="activity.add_persons"
          modalTitle="activity.add_persons"
@@ -23,7 +31,7 @@
 </template>
 
 <script>
-import { mapState } from 'vuex';
+import { mapState, mapGetters } from 'vuex';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
 import PersonsBloc from './ConcernedGroups/PersonsBloc.vue';
 
@@ -79,6 +87,9 @@ export default {
          users: state => state.activity.users,
          accompanyingCourse: state => state.activity.accompanyingPeriod
       }),
+      ...mapGetters([
+          'filterSuggestedPersons'
+      ]),
       getContext() {
          return (this.accompanyingCourse) ? "accompanyingCourse" : "person";
       },
@@ -161,7 +172,11 @@ export default {
          this.$refs.addPersons.resetSearch(); // to cast child method
          modal.showModal = false;
          this.setPersonsInBloc();
-      }
+      },
+      addNewPerson(person) {
+        this.$store.dispatch('addPersonsInvolved', { result: person, type: 'person' });
+        this.setPersonsInBloc();
+      },
    }
 }
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js

@@ -25,8 +25,18 @@ const store = createStore({
     socialIssuesOther: [],
     socialActionsList: [],
   },
+  getters: {
+    filterSuggestedPersons(state) {
+      if (typeof(state.activity.accompanyingPeriod) === 'undefined') {
+        return [];
+      }
+      let existingPersonIds = state.activity.persons.map(p => p.id);
+      return state.activity.accompanyingPeriod.participations.filter(p => p.endDate === null)
+        .map(p => p.person)
+        .filter(p => !existingPersonIds.includes(p.id))
+    }
+  },
   mutations: {
-      
     // SocialIssueAcc
     addIssueInList(state, issue) {
       //console.log('add issue list', issue.id);

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

@@ -116,6 +116,7 @@
                                class="btn btn-show" title="{{ 'See accompanying period'|trans }}">{# {{ 'See this period'|trans }} #}</a>
                         </li>
 
+                        <!-- if new accompanying course, this is not necessary
                         {% if person is defined %}
                             <li>
                                 <a  href="{{ path('chill_person_accompanying_period_update', {'person_id' : person.id, 'period_id' : accompanying_period.id } ) }}"
@@ -142,6 +143,7 @@
                         {% elseif household is defined %}
                             {# TODO buttons specific for household ? #}
                         {% endif %}
+                        -->
                     </ul>
 
                 </div>

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

@@ -18,8 +18,8 @@
             </a>
         </li>
         <li class="dropdown">
-            <a class="btn btn-create change-icon dropdown-toggle"
+            <a class="btn btn-create change-icon"
-               href="#" role="button" id="newAccompanyingPeriod" data-bs-toggle="dropdown" aria-expanded="false">
+               href="{{ path ('chill_person_accompanying_course_new', {'person_id' : [ person.id ] } ) }}" role="button" id="newAccompanyingPeriod">
                 {{ 'Create an accompanying period'|trans }}
             </a>
             <ul class="dropdown-menu" aria-labelledby="newAccompanyingPeriod">

src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig

@@ -1,6 +1,6 @@
 {%  macro button_person(person) %}
     <li>
-        <a href="{{ path('chill_person_accompanying_course_new') }}"
+        <a href="{{ path('chill_person_accompanying_course_new', { 'person_id': [ person.id ]}) }}"
            class="btn btn-sm btn-create change-icon" title="{{ 'Create an accompanying period'|trans }}"><i class="fa fa-random"></i></a>
     </li>
 {% endmacro %}

src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig

@@ -186,48 +186,6 @@ This view should receive those arguments:
             <figure class="person-details">
                 <h2 class="chill-blue"><i class="fa fa-envelope-o"></i>&nbsp;{{ 'Contact information'|trans }}</h2>
 
-                {%- if chill_person.fields.address == 'visible' -%}
-                <dl>
-                    <dt>{{ 'Address'|trans }}</dt>
-                    <dd>
-                        {%- if person.lastAddress is not empty -%}
-                        {{ person.lastAddress|chill_entity_render_box({
-                            'render': 'bloc',
-                            'multiline': true,
-                            'extended_infos': true,
-                            'has_no_address': true
-                        }) }}
-
-                        <ul class="list-inline text-right mt-2">
-                            <li class="list-inline-item">
-                                {# include vue_address component #}
-                                {% include '@ChillPerson/Address/_insert_vue_address.html.twig' with {
-                                    mode: 'edit',
-                                    address_id: person.lastAddress.id,
-                                    backUrl: path('chill_person_view', { 'person_id': person.id }),
-                                    modalTitle: 'Edit address', buttonText: 'Edit address',
-                                    buttonSize: 'btn-sm',
-                                    buttonDisplayText: false
-                                } %}
-                            </li>
-                            <li class="list-inline-item">
-                                <a class="btn btn-secondary btn-sm" title="{{ "Addresses history"|trans }}"
-                                   href="{{ path('chill_person_address_list', { 'person_id': person.id } ) }}">
-                                    <i class="fa fa-list fa-fw"></i>
-                                </a>
-                            </li>
-                        </ul>
-
-                        {%- else -%}
-                        <span class="chill-no-data-statement">{{ 'No address given'|trans }}</span>
-                        <a href="{{ path('chill_person_address_new', { 'person_id' : person.id } ) }}" class="">
-                            {{ 'Add an address'|trans }}
-                        </a>
-                        {%- endif -%}
-                    </dd>
-                </dl>
-                {%- endif -%}
-
                 {%- if chill_person.fields.email == 'visible' -%}
                 <dl>
                     <dt>{{ 'Email'|trans }}&nbsp;:</dt>