Merge remote-tracking branch 'origin/master' into track-address-reference-update

2025-08-23 08:03:49 +00:00 · 2023-04-12 09:45:19 +02:00
parent 99cdf0ebaf d70a0fa08b
commit b0ac8ce5af
273 changed files with 8869 additions and 3001 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/index.js
@@ -1,15 +1,22 @@
-import { createApp } from 'vue';
-import { _createI18n } from 'ChillMainAssets/vuejs/_js/i18n';
-import { store } from './store';
-import { personMessages } from 'ChillPersonAssets/vuejs/_js/i18n'
+import {createApp} from 'vue';
+import {_createI18n} from 'ChillMainAssets/vuejs/_js/i18n';
+import {store} from './store';
+import {personMessages} from 'ChillPersonAssets/vuejs/_js/i18n'
 import App from './App.vue';
+import VueToast from "vue-toast-notification";

 const i18n = _createI18n(personMessages);

 const app = createApp({
-   template: `<app></app>`,
+    template: `<app></app>`,
 })
-.use(store)
-.use(i18n)
-.component('app', App)
-.mount('#accompanying_course_work_create');
+    .use(store)
+    .use(i18n)
+    .use(VueToast, {
+        position: "bottom-right",
+        type: "error",
+        duration: 10000,
+        dismissible: true,
+    })
+    .component('app', App)
+    .mount('#accompanying_course_work_create');
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/store.js
@@ -107,6 +107,9 @@ const store = createStore({
    setPostingWork(state) {
      state.isPostingWork = true;
    },
+    setPostingWorkDone(state) {
+      state.isPostingWork = false;
+    },
    setStartDate(state, date) {
      state.startDate = date;
    },
@@ -150,11 +153,12 @@ const store = createStore({
      const url = `/api/1.0/person/accompanying-course/${state.accompanyingCourse.id}/work.json`;
      commit('setPostingWork');

-      makeFetch('POST', url, payload)
+      return makeFetch('POST', url, payload)
        .then((response) => {
          window.location.assign(`/fr/person/accompanying-period/work/${response.id}/edit`)
        })
        .catch((error) => {
+          commit('setPostingWorkDone');
          throw error;
        });
    },
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -549,7 +549,14 @@ export default {
            .catch(e => { console.log(e); throw e; });
      },
      submit() {
-         this.$store.dispatch('submit');
+         this.$store.dispatch('submit').catch((error) => {
+            if (error.name === 'ValidationException' || error.name === 'AccessException') {
+               error.violations.forEach((violation) => this.$toast.open({message: violation}));
+            } else {
+               this.$toast.open({message: 'An error occurred'});
+               throw error;
+            }
+         });
      },
      saveFormOnTheFly(payload) {
         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -49,6 +49,20 @@
         </div>
      </div>

+     <div class="row mb-3">
+       <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+         {{ $t('evaluation_time_spent') }}
+       </label>
+       <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+         <select class="form-control form-control-sm" type="time" v-model="timeSpent">
+           <option disabled value="">{{ $t('select_time_spent') }}</option>
+           <option v-for="time in timeSpentChoices" :value="time.value">
+             {{ time.text }}
+           </option>
+         </select>
+       </div>
+     </div>
+
      <div class="row mb-3">
         <label class="col-sm-4 col-form-label visually-hidden">{{ $t('evaluation_public_comment') }}</label>
         <div class="col-sm-12">
@@ -191,6 +205,8 @@ const i18n = {
         evaluation_choose_a_template: "Choisir un modèle",
         evaluation_add_a_document: "Ajouter un document",
         evaluation_add: "Ajouter une évaluation",
+         evaluation_time_spent: "Temps de rédaction",
+         select_time_spent: "Indiquez le temps de rédaction",
         Documents: "Documents",
         document_add: "Générer ou téléverser un document",
         document_upload: "Téléverser un document",
@@ -224,6 +240,22 @@ export default {
            maxPostSize: 15000000,
            required: false,
         },
+         timeSpentChoices: [
+           { text: '1 minute', value: 60 }, { text: '2 minutes', value: 120 },
+           { text: '3 minutes', value: 180 }, { text: '4 minutes', value: 240 },
+           { text: '5 minutes', value: 300 }, { text: '10 minutes', value: 600 },
+           { text: '15 minutes', value: 900 },{ text: '20 minutes', value: 1200 },
+           { text: '25 minutes', value: 1500 }, { text: '30 minutes', value: 1800 },
+           { text: '45 minutes', value: 2700 },{ text: '1 hour', value: 3600 },
+           { text: '1 hour 15 minutes', value: 4500 }, { text: '1 hour 30 minutes', value: 5400 },
+           { text: '1 hour 45 minutes', value: 6300 }, { text: '2 hours', value: 7200 },
+           { text: '2 hours 30 minutes', value: 9000 }, { text: '3 hours', value: 10800 },
+           { text: '3 hours 30 minutes', value: 12600 },{ text: '4 hours', value: 14400 },
+           { text: '4 hours 30 minutes', value: 16200 },{ text: '5 hours', value: 18000 },
+           { text: '5 hours 30 minutes', value: 19800 },{ text: '6 hours', value: 21600 },
+           { text: '6 hours 30 minutes', value: 23400 },{ text: '7 hours', value: 25200 },
+           { text: '7 hours 30 minutes', value: 27000 },{ text: '8 hours', value: 28800 },
+         ]
      }
   },
   computed: {
@@ -265,6 +297,10 @@ export default {
         get() { return this.evaluation.warningInterval; },
         set(v) { this.$store.commit('setEvaluationWarningInterval', { key: this.evaluation.key, days: v }); }
      },
+     timeSpent: {
+        get() { return this.evaluation.timeSpent },
+        set(v) { this.$store.commit('setEvaluationTimeSpent', { key: this.evaluation.key, time: v}) }
+     },
      comment: {
         get() { return this.evaluation.comment; },
         set(v) { this.$store.commit('setEvaluationComment', { key: this.evaluation.key, comment: v }); }
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js
@@ -15,7 +15,7 @@ const app = createApp({
 .use(VueToast, {
   position: "bottom-right",
   type: "error",
-   duration: 5000,
+   duration: 10000,
   dismissible: true
 })
 .use(i18n)
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -116,6 +116,7 @@ const store = createStore({
            endDate: e.endDate === null || e.endDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.endDate)) },
            maxDate: e.maxDate === null || e.maxDate === '' ? null : { datetime: datetimeToISO(ISOToDate(e.maxDate)) },
            warningInterval: intervalDaysToISO(e.warningInterval),
+            timeSpent: e.timeSpent,
            comment: e.comment,
            documents: e.documents
          };
@@ -138,6 +139,7 @@ const store = createStore({
          endDate: e.endDate !== null ? dateToISO(new Date(e.endDate.datetime)) : null,
          maxDate: e.maxDate !== null ? dateToISO(new Date(e.maxDate.datetime)) : null,
          warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
+          timeSpent: e.timeSpent !== null ? e.timeSpent : null,
          documents: e.documents.map((d, docIndex) => {
            return Object.assign(d, {
              key: docIndex
@@ -258,6 +260,7 @@ const store = createStore({
        endDate:  null,
        maxDate:  null,
        warningInterval: null,
+        timeSpent: null,
        comment: "",
        editEvaluation: true,
        workflows_availables: state.work.workflows_availables_evaluation,
@@ -286,6 +289,10 @@ const store = createStore({
      state.evaluationsPicked.find(e => e.key === key)
          .warningInterval = days;
    },
+    setEvaluationTimeSpent(state, {key, time}) {
+      state.evaluationsPicked.find(e => e.key === key)
+          .timeSpent = time;
+    },
    setEvaluationComment(state, {key, comment}) {
      state.evaluationsPicked.find(e => e.key === key)
          .comment = comment;
@@ -482,7 +489,7 @@ const store = createStore({
      ;
      commit('setIsPosting', true);

-      console.log('payload', payload);
+      console.log('the social action', payload);

      return makeFetch('PUT', url, payload)
        .then(data => {
@@ -493,9 +500,8 @@ const store = createStore({
            window.location.assign(`/fr/person/accompanying-period/${state.work.accompanyingPeriod.id}/work`);
          }
        }).catch(error => {
-          console.log('error on submit', error);
          commit('setIsPosting', false);
-          commit('setErrors', error.violations);
+          throw error;
        });
    },
    updateDocumentTitle({commit}, payload) {
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -118,6 +118,18 @@
                                        </li>
                                    {% endif %}
                                {% endif %}
+
+                                {% if e.timeSpent is not null and e.timeSpent > 0 %}
+                                    <li>
+                                        {% set minutes = (e.timeSpent / 60) %}
+                                        <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                    </li>
+                                {% elseif displayContent is defined and displayContent == 'long' %}
+                                    <li>
+                                        <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+                                        <span class="chill-no-data-statement">{{ 'Not given'|trans }}</span>
+                                    </li>
+                                {% endif %}
                            </ul>
                        </li>
                    </ul>
@@ -143,7 +155,7 @@
                        {% else %}
                            <span class="chill-no-data-statement">{{ 'No document found'|trans }}</span>
                        {% endif %}
-                        
+

                    {% endif %}
                </td>
--- a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig
@@ -36,7 +36,7 @@
 {%- macro links(person, options) -%}
 <ul>

-    <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'activités' : 'activité' }}</li>
+    <li><b>{{ person.counters.nb_activity }}</b> {{ (person.counters.nb_activity > 1)? 'échanges' : 'échange' }}</li>
    <li><b>{{ person.counters.nb_task }}</b> {{ (person.counters.nb_task > 1)? 'tâches' : 'tâche' }}</li>
    <li><b>{{ person.counters.nb_document }}</b> {{ (person.counters.nb_document > 1)? 'documents' : 'document' }}</li>
    <li><b>{{ person.counters.nb_event }}</b> {{ (person.counters.nb_event > 1)? 'événements' : 'événement' }}</li>