Merge branch 'master' into 292_activity_acl

2025-08-21 07:03:49 +00:00 · 2021-12-13 09:21:32 +01:00
parent 118b208f68 e21f12d96c
commit 6e1340be27
80 changed files with 2202 additions and 927 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/api.js
@@ -22,9 +22,9 @@ const getUsers = () => {
 };

 const getReferrersSuggested = (course) => {
-  const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`;
+   const url = `/api/1.0/person/accompanying-course/${course.id}/referrers-suggested.json`;

-  return fetchResults(url);
+   return fetchResults(url);
 }

 /*
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
@@ -4,7 +4,7 @@

      <div class="mb-4">
         <label for="selectOrigin">
-            {{ $t('origin.label') }}
+            {{ $t('origin.label.fr') }}
         </label>

         <VueMultiselect
@@ -75,8 +75,7 @@ export default {
            });
      },
      transText ({ text }) {
-         const parsedText = JSON.parse(text);
-         return parsedText.fr;
+         return text.fr;
      },
   }
 }
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -132,6 +132,10 @@ const appMessages = {
         sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
         ok: "Confirmer le parcours"
      },
+      action: {
+         choose_other_social_issue: "Veuillez choisir un autre problématique",
+         cancel: "Annuler",
+      },
      // catch errors
      'Error while updating AccompanyingPeriod Course.': "Erreur du serveur lors de la mise à jour du parcours d'accompagnement.",
      'Error while retriving AccompanyingPeriod Course.': "Erreur du serveur lors du chargement du parcours d'accompagnement.",
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -5,24 +5,47 @@

  <div id="awc_create_form">

-    <div id="picking">
-      <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
-
-      <div v-for="si in socialIssues">
-        <input type="radio" v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"><span class="badge bg-chill-l-gray text-dark">{{ si.text }}</span>
+      <div id="picking">
+          <p>{{ $t('pick_social_issue_linked_with_action') }}</p>
+          <div v-for="si in socialIssues">
+            <input type="radio" checked v-bind:value="si.id" name="socialIssue" v-model="socialIssuePicked"><span class="badge bg-chill-l-gray text-dark">{{ si.text }}</span>
+          </div>
+      <div class="my-3">
+        <div class="col-8">
+          <vue-multiselect
+              name="otherIssues"
+              label="text"
+              track-by="id"
+              open-direction="bottom"
+              :close-on-select="true"
+              :preserve-search="false"
+              :reset-after="true"
+              :hide-selected="true"
+              :taggable="false"
+              :multiple="false"
+              :searchable="true"
+              :allow-empty="true"
+              :show-labels="false"
+              :loading="issueIsLoading"
+              :placeholder="$t('action.choose_other_social_issue')"
+              :options="socialIssuesOther"
+              @select="addIssueInList">
+          </vue-multiselect>
+        </div>
      </div>
-
      <div v-if="hasSocialIssuePicked">
        <h2>{{ $t('pick_an_action') }}</h2>
-        <vue-multiselect
-          v-model="socialActionPicked"
-          label="text"
-          :options="socialActionsReachables"
-          :searchable="true"
-          :close-on-select="true"
-          :show-labels="true"
-          track-by="id"
-        ></vue-multiselect>
+        <div class="col-8">
+          <vue-multiselect
+            v-model="socialActionPicked"
+            label="text"
+            :options="socialActionsReachables"
+            :searchable="true"
+            :close-on-select="true"
+            :show-labels="true"
+            track-by="id"
+          ></vue-multiselect>
+        </div>
      </div>

      <div v-if="isLoadingSocialActions">
@@ -63,9 +86,9 @@
      <div>
        <ul class="record_actions">
          <li class="cancel">
-            <a href="#" class="btn btn-cancel">
+            <button class="btn btn-cancel" @click="goToPrevious">
              {{ $t('action.cancel') }}
-            </a>
+            </button>
          </li>
          <li v-if="hasSocialActionPicked">
            <button class="btn btn-save" v-show="!isPostingWork" @click="submit">
@@ -82,43 +105,7 @@

 </template>

-<style lang="scss">

-#awc_create_form {
-  display: grid;
-  grid-template-areas:
-    "picking picking"
-    "start_date end_date"
-    "confirm confirm"
-    ;
-  grid-template-columns: 50% 50%;
-  column-gap: 1.5rem;
-
-  #picking {
-    grid-area: picking;
-
-    #persons {
-      ul {
-        padding: 0;
-
-        list-style-type: none;
-      }
-    }
-  }
-
-  #start_date {
-    grid-area: start_date;
-  }
-
-  #end_date {
-    grid-area: end_date;
-  }
-
-  #confirm {
-    grid-area: confirm;
-  }
-}
-</style>

 <script>
 import { mapState, mapActions, mapGetters } from 'vuex';
@@ -145,17 +132,38 @@ export default {
  name: 'App',
  components: {
    VueMultiselect,
-     PersonRenderBox,
+    PersonRenderBox,
  },
  methods: {
    submit() {
-      this.$store.dispatch('submit');
-    }
+      this.$store.dispatch('submit')
+          .catch(({name, violations}) => {
+          if (name === 'ValidationException' || name === 'AccessException') {
+            violations.forEach((violation) => this.$toast.open({message: violation}));
+          } else {
+            this.$toast.open({message: 'An error occurred'})
+          }
+      });
+    },
+    addIssueInList(value) {
+      this.$store.commit('addIssueInList', value);
+      this.$store.commit('removeIssueInOther', value);
+      this.$store.dispatch('pickSocialIssue', value.id);
+    },
+    goToPrevious() {
+      let params = new URLSearchParams(window.location.search);
+      if (params.has('returnPath')) {
+        window.location.replace(params.get('returnPath'));
+      } else {
+        return;
+      }
+    },
  },
  i18n,
  computed: {
    ...mapState([
      'socialIssues',
+      'socialIssuesOther',
      'socialActionsReachables',
      'errors',
      'personsReachables',
@@ -170,12 +178,12 @@ export default {
    personsPicked: {
      get() {
        let s = this.$store.state.personsPicked.map(p => p.id);
-        console.log('persons picked', s);
+        // console.log('persons picked', s);

        return s;
      },
      set(v) {
-        console.log('persons picked', v);
+        // console.log('persons picked', v);
        this.$store.commit('setPersonsPickedIds', v);
      }
    },
@@ -228,10 +236,48 @@ export default {
@import 'ChillPersonAssets/chill/scss/mixins';
@import 'ChillMainAssets/chill/scss/chill_variables';
 span.badge {
-   @include badge_social($social-issue-color);
-   font-size: 95%;
-   margin-bottom: 5px;
-   margin-right: 1em;
-   margin-left: 1em;
+  @include badge_social($social-issue-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
+  margin-left: 1em;
+}
+</style>
+
+<style lang="scss">
+
+#awc_create_form {
+  display: grid;
+  grid-template-areas:
+    "picking picking"
+    "start_date end_date"
+    "confirm confirm"
+    ;
+  grid-template-columns: 50% 50%;
+  column-gap: 1.5rem;
+
+  #picking {
+    grid-area: picking;
+
+    #persons {
+      ul {
+        padding: 0;
+
+        list-style-type: none;
+      }
+    }
+  }
+
+  #start_date {
+    grid-area: start_date;
+  }
+
+  #end_date {
+    grid-area: end_date;
+  }
+
+  #confirm {
+    grid-area: confirm;
+  }
 }
 </style>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
@@ -2,7 +2,8 @@
 import { createStore } from 'vuex';
 import { datetimeToISO } from 'ChillMainAssets/chill/js/date.js';
 import { findSocialActionsBySocialIssue } from 'ChillPersonAssets/vuejs/_api/SocialWorkSocialAction.js';
-import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
+// import { create } from 'ChillPersonAssets/vuejs/_api/AccompanyingCourseWork.js';
+import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';

 const debug = process.env.NODE_ENV !== 'production';

@@ -12,6 +13,7 @@ const store = createStore({
    accompanyingCourse: window.accompanyingCourse,
    socialIssues: window.accompanyingCourse.socialIssues,
    socialIssuePicked: null,
+    socialIssuesOther: [],
    socialActionsReachables: [],
    socialActionPicked: null,
    personsPicked: window.accompanyingCourse.participations.filter(p => p.endDate == null)
@@ -26,7 +28,6 @@ const store = createStore({
  },
  getters: {
    hasSocialActionPicked(state) {
-      console.log(state.socialActionPicked);
      return null !== state.socialActionPicked;
    },
    hasSocialIssuePicked(state) {
@@ -73,27 +74,43 @@ const store = createStore({
  },
  mutations: {
    setSocialActionsReachables(state, actions) {
-      console.log('set social action reachables');
-      console.log(actions);
+      // console.log('set social action reachables');
+      // console.log(actions);

      state.socialActionsReachables = actions;
    },
    setSocialAction(state, socialAction) {
-      console.log('socialAction', socialAction);
+      // console.log('socialAction', socialAction);
      state.socialActionPicked = socialAction;
    },
    setSocialIssue(state, socialIssueId) {
-      console.log('set social issue', socialIssueId);
+      // console.log('set social issue', socialIssueId);
      if (socialIssueId === null) {
        state.socialIssuePicked = null;
      } else {
        let mapped = state.socialIssues
          .find(e => e.id === socialIssueId);
-        console.log('mapped', mapped);
        state.socialIssuePicked = mapped;
-        console.log('social issue setted', state.socialIssuePicked);
+        // console.log('social issue setted', state.socialIssuePicked);
      }
    },
+    addIssueInList(state, issue) {
+      //console.log('add issue list', issue.id);
+      state.socialIssues.push(issue);
+    },
+    updateIssuesOther(state, payload) {
+      //console.log('update issues other');
+      state.socialIssuesOther = payload;
+    },
+    removeIssueInOther(state, issue) {
+      //console.log('remove issue other', issue.id);
+      state.socialIssuesOther = state.socialIssuesOther.filter(
+          (i) => i.id !== issue.id
+      );
+    },
+    updateSelected(state, payload) {
+      state.socialIssueSelected = payload;
+    },
    setIsLoadingSocialActions(state, s) {
      state.isLoadingSocialActions = s;
    },
@@ -131,8 +148,6 @@ const store = createStore({

      findSocialActionsBySocialIssue(socialIssueId).then(
        (response) => {
-          console.log(response);
-          console.log(response.results);
          commit('setSocialIssue', socialIssueId);
          commit('setSocialActionsReachables', response.results);
          commit('setIsLoadingSocialActions', false);
@@ -142,34 +157,34 @@ const store = createStore({
        });
    },
    submit({ commit, getters, state }) {
-      console.log('submit');
-      let
-        payload = getters.buildPayloadCreate,
-        errors = [];
-
+      let payload = getters.buildPayloadCreate;
+      const url = `/api/1.0/person/accompanying-course/${state.accompanyingCourse.id}/work.json`;
      commit('setPostingWork');

-      create(state.accompanyingCourse.id, payload)
-        .then( ({status, data}) => {
-          console.log('created return', { status, data});
-          if (status === 200) {
-            console.log('created, nothing to do here any more. Bye-bye!');
-            window.location.assign(`/fr/person/accompanying-period/work/${data.id}/edit`);
-          } else if (status === 422) {
-            console.log(data);
-            for (let i in data.violations) {
-              console.log(i);
-              console.log(data.violations[i].title);
-              errors.push(data.violations[i].title);
-            }
-            console.log('errors after reseponse handling', errors);
-            console.log({errors, cancel_posting: true});
-            commit('addErrors', { errors, cancel_posting: true });
-          }
+      makeFetch('POST', url, payload)
+        .then((response) => {
+          window.location.assign(`/fr/person/accompanying-period/work/${response.id}/edit`)
+        })
+        .catch((error) => {
+          throw error;
        });
    },
+    fetchOtherSocialIssues({commit}) {
+      const url = `/api/1.0/person/social-work/social-issue.json`;
+      return makeFetch('GET', url)
+        .then((response) => {
+          commit('updateIssuesOther', response.results);
+        })
+        .catch((error) => {
+          throw error;
+        })
+    }
  },

+
+
 });

+store.dispatch('fetchOtherSocialIssues');
+
 export { store };
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AccompanyingCourseWork.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AccompanyingCourseWork.js
@@ -1,30 +1,30 @@
-const create = (accompanying_period_id, payload) => {
-  const url = `/api/1.0/person/accompanying-course/${accompanying_period_id}/work.json`;
-  let status;
-  console.log('create', payload);
+// const create = (accompanying_period_id, payload) => {
+//   const url = `/api/1.0/person/accompanying-course/${accompanying_period_id}/work.json`;
+//   let status;
+//   console.log('create', payload);

-  return fetch(url, {
-    method: 'POST',
-    headers: {
-      'Content-Type': 'application/json',
-    },
-    body: JSON.stringify(payload),
-  })
-    .then(response => {
-      if (response.ok || response.status === 422) {
-        status = response.status;
+//   return fetch(url, {
+//     method: 'POST',
+//     headers: {
+//       'Content-Type': 'application/json',
+//     },
+//     body: JSON.stringify(payload),
+//   })
+//     .then(response => {
+//       if (response.ok || response.status === 422) {
+//         status = response.status;

-        return response.json();
-      }
+//         return response.json();
+//       }

-      throw new Error("Error while retrieving social actions: " + response.status +
-        " " + response.statusText);
-    })
-    .then(data => {
-      return new Promise((resolve, reject) => {
-        resolve({ status, data });
-      });
-    });
-};
+//       throw new Error("Error while retrieving social actions: " + response.status +
+//         " " + response.statusText);
+//     })
+//     .then(data => {
+//       return new Promise((resolve, reject) => {
+//         resolve({ status, data });
+//       });
+//     });
+// };

-export { create };
+// export { create };
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -18,6 +18,7 @@

                   <span class="firstname">{{ person.firstName }}</span>
                   <span class="lastname">{{ person.lastName }}</span>
+                   <span v-if="person.deathdate" class="deathdate"> (‡)</span>
                   <span v-if="person.altNames && options.addAltNames ==  true" class="altnames">
                       <span :class="'altname altname-' + altNameKey">{{ altNameLabel }}</span>
                   </span>
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -10,6 +10,7 @@
    * addAge        bool
    * addCenter     bool
    * hLevel        integer
+    * addDeath      bool
    * address_multiline     bool
    * customButtons [
        'before'    Twig\Markup, (injected with macro)
@@ -24,7 +25,12 @@

 {% macro raw(person, options) %}
    <span class="firstname">{{ person.firstName }}</span>
-    <span class="lastname">{{ person.lastName }}</span>
+    <span class="lastname">
+        {{ person.lastName }}
+        {%- if options['addDeath'] -%}
+            {% if person.deathdate is not null %} (‡){% endif %}
+        {% endif %}
+    </span>
    {%- if options['addAltNames'] -%}
        <span class="altnames">
        {%- for n in person.altNames -%}
@@ -82,21 +88,17 @@
                    {{ 'Date of death'|trans }}:
                {%- endif -%}
                {#- must be on one line to avoid spaces with dash -#}
-                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'Deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
-                {% if options['addAge'] %}
-                    <span class="age">
-                        ({{ 'years_old'|trans({ 'age': person.age }) }})
-                    </span>
-                {% endif %}
+                <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
+                {%- if options['addAge'] -%}
+                    <span class="age">{{ 'years_old'|trans({ 'age': person.age }) }}</span>
+                {%- endif -%}
            {%- elseif person.birthdate is not null -%}
                <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
                {{ 'Born the date'|trans({'gender': person.gender,
                    'birthdate': person.birthdate|format_date("medium") }) }}
                </time>
                {%- if options['addAge'] -%}
-                    <span class="age">
-                        {{- 'years_old'|trans({ 'age': person.age }) -}}
-                    </span>
+                    <span class="age">{{- 'years_old'|trans({ 'age': person.age }) -}}</span>
                {%- endif -%}
            {%- endif -%}
            </p>
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -83,7 +83,7 @@
    <ul class="record_actions sticky-form-buttons">
        <li class="dropdown">
            <a class="btn btn-create dropdown-toggle"
-               href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
+            href="#" role="button" id="newPersonMore" data-bs-toggle="dropdown" aria-expanded="false">
                {{ 'Add the person'|trans }}
            </a>
            <ul class="dropdown-menu" aria-labelledby="newPersonMore">
@@ -93,10 +93,7 @@
                <li>
                    {{ form_widget(form.createPeriod, { 'attr': { 'class': 'dropdown-item' }}) }}
                </li>
-                <li>
-                    {{ form_widget(form.createHousehold, { 'attr': { 'class': 'dropdown-item' }}) }}
-                </li>
-            </ul>
+           </ul>
        </li>
    </ul>

@@ -106,5 +103,5 @@
 {% endblock content %}

 {% block js %}
-    {{ encore_entry_script_tags('mod_disablebuttons') }}
+    {# {{ encore_entry_script_tags('mod_disablebuttons') }} #}
 {% endblock js %}
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/view.html.twig
@@ -92,6 +92,13 @@ This view should receive those arguments:
                        {%- endif -%}
                    </dd>

+                    {%- if chill_person.fields.deathdate == 'visible' -%}
+                        {%- if person.deathdate is not null -%}
+                        <dt>{{ 'Date of death'|trans }}&nbsp;:</dt>
+                        <dd>{{ person.deathdate|format_date('long') }}</dd>
+                        {%- endif -%}
+                    {%- endif -%}
+
                    {%- if chill_person.fields.place_of_birth == 'visible' -%}
                    <dt>{{ 'Place of birth'|trans }}&nbsp;:</dt>
                    {% if person.placeOfBirth is not empty %}
@@ -111,6 +118,7 @@ This view should receive those arguments:
                                {% endif %}
                            {% endapply %}</dd>
                    {%- endif -%}
+
                </dl>
            </figure>
        </div>
@@ -159,12 +167,27 @@ This view should receive those arguments:
                    </dd>
                </dl>
                {%- endif -%}
+                {%- if chill_person.fields.number_of_children == 'visible' -%}
+                <dl>
+                    <dt>{{'Number of children'|trans}}&nbsp;:</dt>
+                    <dd>
+                    {% if person.numberOfChildren is not null %}
+                        {{ person.numberOfChildren }}
+                    {% else %}
+                        <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
+                    {% endif %}
+                    </dd>
+                </dl>
+                {%- endif -%}
                {%- if chill_person.fields.marital_status == 'visible' -%}
                <dl>
                    <dt>{{'Marital status'|trans}}&nbsp;:</dt>
                    <dd>
                        {% if person.maritalStatus is not null %}
                            {{ person.maritalStatus.name|localize_translatable_string }}
+                            {% if person.maritalStatusDate is not null %}
+                                {{ 'person.from_the'|trans }} {{ person.maritalStatusDate|format_date('long') }}
+                            {% endif %}
                        {% else %}
                            <span class="chill-no-data-statement">{{ 'No data given'|trans }}</span>
                        {% endif %}
@@ -217,6 +240,7 @@ This view should receive those arguments:
                <dl>
                    <dt>{{ 'Mobilenumber'|trans }}&nbsp;:</dt>
                    <dd>{% if person.mobilenumber is not empty %}<a href="tel:{{ person.mobilenumber }}">{{ person.mobilenumber|chill_format_phonenumber }}</a>{% else %}<span class="chill-no-data-statement">{{ 'No data given'|trans }}{% endif %}</dd>
+                    <p>{% if person.acceptSMS %}{{ 'Accept short text message'|trans }}{% endif %}</p>
                </dl>
                {% endif %}