merge master into branch

src/Bundle/ChillPersonBundle/Resources/public/chill/chillperson.scss

@@ -33,6 +33,8 @@ div.banner {
         padding-top: 1em;
         padding-bottom: 1em;
         div.contact {
+            display: flex;
+            align-content: center;
             & > * {
                 margin-right: 1em;
             }

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue

@@ -14,24 +14,27 @@
 
             <ckeditor
                name="content"
-               v-bind:placeholder="$t('comment.content')"
+               :placeholder="$t('comment.content')"
                :editor="editor"
                v-model="content"
                tag-name="textarea">
             </ckeditor>
 
-            <div v-if="pinnedComment" class="metadata">
-               {{ $t('comment.created_by', [
-               pinnedComment.creator.text,
-               $d(pinnedComment.createdAt.datetime, 'long')
-            ]) }}
+            <div class="sub-comment">
+               <div v-if="pinnedComment !== null && typeof pinnedComment.creator !== 'undefined'" class="metadata">
+                  {{ $t('comment.created_by', [
+                        pinnedComment.creator.text,
+                        $d(pinnedComment.updatedAt.datetime, 'long')
+                     ])
+                  }}
+               </div>
+               <div class="loading">
+                  <i v-if="loading" class="fa fa-circle-o-notch fa-spin" :title="$t('loading')"></i>
+               </div>
             </div>
 
             <div>
                <ul class="record_actions">
-                  <li>
-                     <button type="submit" class="btn btn-save">{{ $t('action.save') }}</button>
-                  </li>
                   <li v-if="pinnedComment !== null">
                      <a class="btn btn-delete"
                         @click="removeComment">
@@ -50,6 +53,7 @@
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
 import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import { mapState } from "vuex";
 
 export default {
    name: "Comment",
@@ -59,22 +63,58 @@ export default {
    data() {
       return {
          editor: ClassicEditor,
-         formdata: {
-            type: "accompanying_period_comment",
-            content: ''
-         }
+         loading: false,
+         lastRecordedContent: null,
       }
    },
    computed: {
-      pinnedComment() {
-         return this.$store.state.accompanyingCourse.pinnedComment;
-      },
+      ...mapState({
+         pinnedComment: state => state.accompanyingCourse.pinnedComment,
+      }),
       content: {
          set(value) {
-            this.formdata.content = value;
+           console.log('new comment value', value);
+            console.log('previous value', this.lastRecordedContent);
+            this.lastRecordedContent = value;
+
+           setTimeout(() => {
+               console.log('performing test on ', value);
+               if (this.lastRecordedContent === value) {
+                 this.loading = true;
+                 if (value !== '') {
+                   this.$store.dispatch('updatePinnedComment', value)
+                       .then(() => {
+                         this.loading = false;
+                       })
+                       .catch(({name, violations}) => {
+                         if (name === 'ValidationException' || name === 'AccessException') {
+                           violations.forEach((violation) => this.$toast.open({message: violation}));
+                         } else {
+                           this.$toast.open({message: 'An error occurred'})
+                         }
+                       });
+                 } else {
+                   if (this.$store.state.accompanyingCourse.pinnedComment !== null) {
+                     this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
+                         .then(() => {
+                           this.loading = false;
+                           this.lastRecoredContent = null;
+                         })
+                         .catch(({name, violations}) => {
+                           if (name === 'ValidationException' || name === 'AccessException') {
+                             violations.forEach((violation) => this.$toast.open({message: violation}));
+                           } else {
+                             this.$toast.open({message: 'An error occurred'})
+                           }
+                         });
+                   }
+                 }
+               }
+           }, 3000);
+
          },
-         get() {
-            return (this.pinnedComment)? this.pinnedComment.content : {};
+        get() {
+          return this.pinnedComment ? this.pinnedComment.content : '';
          }
       },
       errors() {
@@ -82,18 +122,11 @@ export default {
       }
    },
    methods: {
-      submitform() {
-         this.$store.dispatch('postFirstComment', this.formdata)
-            .catch(({name, violations}) => {
-               if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
-               } else {
-                  this.$toast.open({message: 'An error occurred'})
-               }
-            });
+      onContentChange() {
+         let lastRecordedContent = this.formData.content;
       },
       removeComment() {
-         this.$store.dispatch('postFirstComment', {})
+         this.$store.dispatch('removePinnedComment', {id: this.pinnedComment.id})
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
                   violations.forEach((violation) => this.$toast.open({message: violation}));
@@ -104,15 +137,18 @@ export default {
       }
    }
 }
-/*
-* TODO
-* - [x] delete button in ul record_actions, but not in form
-* - [ ] display updatedAt => pinnedComment fetch PATCH content changes MUST NOT change object id !!
-*/
 </script>
 
 <style lang="scss">
 div.ck-editor.ck-reset {
    margin: 0.6em 0;
 }
+div.sub-comment {
+   display: flex;
+   justify-content: space-between;
+   div.loading {
+      margin-right: 6px;
+      margin-left: 6px;
+   }
+}
 </style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue

@@ -9,7 +9,7 @@
          <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
          {{ $t('requestor.is_anonymous') }}
       </label>
-      <confidential :positionBtn="false" v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
          <template v-slot:confidential-content>
             <third-party-render-box
                :thirdparty="accompanyingCourse.requestor"
@@ -33,7 +33,7 @@
          </template>
       </confidential>
 
-      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
                :person="accompanyingCourse.requestor"
@@ -339,5 +339,6 @@ div.flex-table {
 
 .confidential {
    display: block;
+   margin-right: 0px !important;
 }
 </style>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js

@@ -122,7 +122,7 @@ const appMessages = {
          title: "Observations",
          label: "Ajout d'une note",
          content: "Rédigez une première note…",
-         created_by: "créé par {0}, le {1}"
+         created_by: "créé par {0}, mis à jour le {1}"
       },
       confirm: {
          title: "Confirmation",

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/store/index.js

@@ -42,7 +42,11 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
             referrersSuggested: [],
             // all the users available
             users: [],
-            permissions: {}
+            permissions: {},
+            // controller for updating comment
+            updateCommentAbortController: null,
+            // waiting response for inserting first comment
+            postFirstPinnedCommentResponse: null,
          },
          getters: {
             isParticipationValid(state) {
@@ -203,9 +207,35 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                //console.log('### mutation: toggleConfidential');
                state.accompanyingCourse.confidential = value;
             },
-            postFirstComment(state, comment) {
-               //console.log('### mutation: postFirstComment', comment);
-               state.accompanyingCourse.pinnedComment = comment;
+            setPinnedComment(state, content) {
+               if (null === state.accompanyingCourse.pinnedComment) {
+                  state.accompanyingCourse.pinnedComment = {
+                     id: -1,
+                     content,
+                     type: "accompanying_period_comment",
+                  };
+               } else {
+                  state.accompanyingCourse.pinnedComment.content = content;
+               }
+            },
+            setPinnedCommentDetails(state, value) {
+               state.accompanyingCourse.pinnedComment.id = value.id;
+               if (typeof value.creator !== 'undefined') {
+                  state.accompanyingCourse.pinnedComment.creator = value.creator;
+                  state.accompanyingCourse.pinnedComment.updatedBy = value.updatedBy;
+                  state.accompanyingCourse.pinnedComment.updatedAt = value.updatedAt;
+                  state.accompanyingCourse.pinnedComment.createdAt = value.createdAt;
+
+               }
+            },
+            removePinnedComment(state, value) {
+               state.accompanyingCourse.pinnedComment = null;
+            },
+            setPinCommentAbortController(state, value) {
+               state.updateCommentAbortController = value;
+            },
+            setPostFirstPinnedCommentResponse(state, value) {
+               state.postFirstPinnedCommentResponse = value;
             },
             updateSocialIssues(state, value) {
                console.log('updateSocialIssues', value);
@@ -337,6 +367,87 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                      throw error;
                   })
             },
+            /**
+             * Add/remove pinnedComment
+             */
+            removePinnedComment({ commit }, payload) {
+               const body = {type: "accompanying_period_comment", id: payload.id};
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('DELETE', url, body)
+                  .then((response) => {
+                     commit('removePinnedComment');
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
+            /**
+             * internal method to insert a new comment
+             *
+             * @param commit
+             * @param dispatch
+             * @param content
+             * @returns {*}
+             */
+            addPinnedComment({ commit, dispatch }, content) {
+               const url = `/api/1.0/person/accompanying-course/${id}/comment.json`;
+
+               return makeFetch('POST', url, {type: "accompanying_period_comment", content})
+                  .then((response) => {
+                     commit('setPinnedCommentDetails', response);
+                     return dispatch('patchFirstComment', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
+            },
+            updatePinnedComment({ commit, state, dispatch }, content) {
+               commit('setPinnedComment', content);
+               if (state.accompanyingCourse.pinnedComment.id === -1 && state.postFirstPinnedCommentResponse === null) {
+                  let r = dispatch('addPinnedComment', content).then(() => {
+                     commit('setPostFirstPinnedCommentResponse', null);
+                  });
+                  commit('setPostFirstPinnedCommentResponse', r);
+               } else {
+                  (state.postFirstPinnedCommentResponse === null ? Promise.resolve() : state.postFirstPinnedCommentResponse).then(() => {
+                     dispatch('updateExistingPinnedComment', content);
+                  });
+               }
+            },
+            /**
+             * internal method to patch an existing comment
+             *
+             * @param commit
+             * @param state
+             * @param comment
+             * @returns {*}
+             */
+            updateExistingPinnedComment({ commit, state }, content) {
+               const payload = {type: "accompanying_period_comment",  content, id: state.accompanyingCourse.pinnedComment.id};
+               const url = `/api/1.0/person/accompanying-period/comment/${payload.id}.json`;
+
+               if (state.updateCommentAbortController !== null) {
+                  state.updateCommentAbortController.abort();
+                  commit('setPinCommentAbortController', null);
+               }
+
+               let controller = new AbortController();
+               commit('setPinCommentAbortController', controller);
+
+               return makeFetch('PATCH', url, payload, { signal: controller.signal })
+                  .then((response) => {
+                     commit('setPinCommentAbortController', null);
+                     commit('setPinnedCommentDetails', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     commit('setPinCommentAbortController', null);
+                     throw error;
+                  })
+            },
             /**
              * Add/remove/display anonymous requestor
              */
@@ -606,18 +717,20 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
 
                return Promise.all(promises);
             },
-            postFirstComment({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
-               const body = { type: "accompanying_period", pinnedComment: payload }
-
+            patchFirstComment({ commit }, payload) {
+               const url = `/api/1.0/person/accompanying-course/${id}.json`;
+               const body = {
+                  type: "accompanying_period",
+                  pinnedComment: {
+                     type: "accompanying_period_comment",
+                     id: payload.id
+                  }
+               };
                return makeFetch('PATCH', url, body)
-                  .then((response) => {
-                     commit('postFirstComment', response.pinnedComment);
-                  })
                   .catch((error) => {
                      commit('catchError', error);
                      throw error;
-                  })
+                  });
             },
             updateSocialIssues({ state, commit, dispatch }, { payload, body, method }) {
                const url = `/api/1.0/person/accompanying-course/${id}/socialissue.json`;

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue

@@ -87,10 +87,14 @@ export default {
     currentMembers() {
       let members = this.household.members.filter(m => this.household.current_members_id.includes(m.id))
         .sort((a, b) => {
-          if (a.position.ordering < b.position.ordering) {
+
+          const orderA = a.position ? a.position.ordering : 0;
+          const orderB = b.position ? b.position.ordering : 0;
+
+          if (orderA < orderB) {
             return -1;
           }
-          if (a.position.ordering > b.position.ordering) {
+          if (orderA > orderB) {
             return 1;
           }
           if (a.holder && !b.holder) {

src/Bundle/ChillPersonBundle/Resources/views/HouseholdComposition/create.html.twig

@@ -0,0 +1,26 @@
+{% extends '@ChillPerson/Household/layout.html.twig' %}
+
+{% block title 'household_composition.create'|trans %}
+
+{% block block_post_menu %}
+    <div class="post-menu"></div>
+{% endblock %}
+
+{% block content %}
+
+<h1>{{ 'household_composition.Create'|trans }}</h1>
+
+    <div>
+        {{ form_start(form) }}
+
+        {{ form_widget(form) }}
+
+        <ul class="record_actions">
+            <li>
+                <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
+            </li>
+        </ul>
+        {{ form_end(form) }}
+    </div>
+
+{% endblock %}

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

@@ -15,7 +15,7 @@
     {% else %}
         <div class="flex-table">
             {% for c in compositions %}
-                {% if c.id != editId %}
+                {# {% if c.id != editId %} #}
                     <div class="item-bloc">
                         <div class="item-row">
                             <div class="item-col">
@@ -42,7 +42,7 @@
                             <div class="item-row">
                                 <ul class="record_actions">
                                     <li>
-                                        <a href="{{ path('chill_person_household_composition_index', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
+                                        <a href="{{ path('chill_person_household_composition_new', {'id': c.household.id, 'edit': c.id}) }}" class="btn btn-edit"></a>
                                     </li>
                                     <li>
                                         <a href="{{ chill_path_add_return_path('chill_person_household_composition_delete', {'composition_id': c.id,
@@ -54,45 +54,17 @@
                             </div>
                         {% endif %}
                     </div>
-                {% else %}
-                    {{ form_start(form) }}
-
-                    {{ form_widget(form) }}
-
-                    <ul class="record_actions">
-                        <li class="cancel" style="margin-right: auto;">
-                            <a class="btn btn-cancel" href="{{ path('chill_person_household_composition_index', {'id': c.household.id}) }}">{{ 'Cancel'|trans }}</a>
-                        </li>
-                        <li>
-                            <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-                        </li>
-                    </ul>
-                    {{ form_end(form) }}
-                {% endif %}
             {% endfor %}
         </div>
     {% endif %}
 
-    <div id="collapseForm" class="{% if not isPosted %}collapse{% endif %}">
-        {{ form_start(form) }}
-
-        {{ form_widget(form) }}
-
-        <ul class="record_actions">
-           <li>
-               <button type="submit" class="btn btn-create">{{ 'Save'|trans }}</button>
-           </li>
-        </ul>
-        {{ form_end(form) }}
-    </div>
-
-    {% if editId == -1 %}
+    {% if is_granted('CHILL_PERSON_HOUSEHOLD_EDIT', household) %}
         <ul class="record_actions sticky-form-buttons">
-                <li>
-                    <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                        {{ 'Create'|trans }}
-                    </button>
-                </li>
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_person_household_composition_new', {'id': household.id,}) }}"
+                        class="btn btn-new"
+                        title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+            </li>
         </ul>
     {% endif %}
 </div>

src/Bundle/ChillPersonBundle/Resources/views/PersonResource/create.html.twig

@@ -1,15 +1,25 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+{% set activeRouteKey = 'chill_person_resource_list' %}
+
+{% block title %}{{ 'Person resources'|trans|capitalize ~ ' ' ~ person|chill_entity_render_string }}{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_script_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_link_tags('page_person_resource_showhide_input') }}
+    {{ encore_entry_link_tags('mod_pickentity_type') }}
+{% endblock %}
+
+{% block personcontent %}
+
+<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
+
 <div class="col-md col-xxl">
-    <div id="collapseForm" class="{% if not form.vars.submitted %}collapse{% endif %}">
         <h3 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h3>
         {% include "@ChillPerson/PersonResource/form.html.twig" %}
-    </div>
-
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <button class="btn btn-primary btn-create change-icon" type="button" data-bs-toggle="collapse" data-bs-target="#collapseForm" aria-expanded="false" aria-controls="collapseForm">
-                {{ 'Add a person resource'|trans }}
-            </button>
-        </li>
-    </ul>
-
-</div>
+</div>
+{% endblock %}

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

@@ -85,8 +85,14 @@
     <p class="chill-no-data-statement">{{ 'There are no available resources'|trans }}</p>
 {% endif %}
 
-<h1 style="margin-bottom: 2rem;">{{ 'Add a person resource'|trans }}</h1>
-
-{% include "@ChillPerson/PersonResource/create.html.twig" %}
+{% if is_granted('CHILL_PERSON_UPDATE', person) %}
+<ul class="record_actions sticky-form-buttons">
+    <li>
+        <a href="{{ chill_path_add_return_path('chill_person_resource_new', {'person_id': person.id,}) }}"
+                class="btn btn-new"
+                title="{{ 'Create'|trans }}">{{ 'Create'|trans }}</a>
+    </li>
+</ul>
+{% endif %}
 
 {% endblock %}

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

@@ -49,7 +49,12 @@
                                         <li>
                                             <i class="fa fa-li fa-home"></i>
                                             <span class="item-key">{{ "Address of"|trans}} </span>
-                                            <span class="chill-entity entity-person badge-person">{{ a.hostPerson|chill_entity_render_box }}</span>
+                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                    action: 'show', displayBadge: true,
+                                                    targetEntity: { name: 'person', id: a.hostPerson.id },
+                                                    buttonText: a.hostPerson|chill_entity_render_string,
+                                                    isDead: a.hostPerson.deathdate is not null
+                                                } %}
                                         </li>
                                         <li>
                                             {% set address_date = date(a.startDate|date("m/d/Y")) %}
@@ -62,7 +67,12 @@
                                         <li>
                                             <i class="fa fa-li fa-home"></i>
                                             <span class="item-key">{{ "Address of"|trans}}</span>
-                                            <span class="chill-entity entity-person badge-thirdparty">{{ a.hostThirdParty|chill_entity_render_box }}</span>
+                                            {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                action: 'show', displayBadge: true,
+                                                targetEntity: { name: 'thirdparty', id: a.hostThirdParty.id },
+                                                buttonText: a.hostThirdParty|chill_entity_render_string,
+                                                isDead: false,
+                                            } %}
                                         </li>
                                         <li>
                                             {% if a.hostThirdParty.address is not null %}