Merge remote-tracking branch 'origin/master' into issue714_eval_time_spent

2025-09-04 22:04:59 +00:00 · 2023-03-24 17:51:37 +01:00
parent f07aaecc3d 88b4159ced
commit 23951f1997
158 changed files with 2482 additions and 797 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -22,7 +22,12 @@
               <i>{{ $t('course.open_at') }}{{ $d(accompanyingCourse.openingDate.datetime, 'text') }}</i>
            </span>
            <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
-               <span class="item-key">{{ $t('course.referrer') }}:</span> <b>{{ accompanyingCourse.user.text }}</b>
+               <span class="item-key">{{ $t('course.referrer') }}:</span>&nbsp;
+               <b>{{ accompanyingCourse.user.text }}</b>
+               <template v-if="accompanyingCourse.user.isAbsent">
+                 &nbsp;
+                 <span class="badge bg-danger rounded-pill" title="Absent">A</span>
+               </template>
            </span>
         </span>
      </span>
@@ -59,13 +64,15 @@
 import ToggleFlags from './Banner/ToggleFlags';
 import SocialIssue from './Banner/SocialIssue.vue';
 import PersonsAssociated from './Banner/PersonsAssociated.vue';
+import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';

 export default {
   name: 'Banner',
   components: {
      ToggleFlags,
      SocialIssue,
-      PersonsAssociated
+      PersonsAssociated,
+      UserRenderBoxBadge,
   },
   computed: {
      accompanyingCourse() {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -2,6 +2,29 @@
  <div class="vue-component">
    <h2><a id="section-80"></a>{{ $t('referrer.title') }}</h2>

+    <teleport to="body">
+      <modal v-if="modal.showModal"
+             :modalDialogClass="modal.modalDialogClass"
+             @close="cancelChange">
+        <template v-slot:header>
+          <h3 class="modal-title">{{ $t('confirm.title') }}</h3>
+        </template>
+
+        <template v-slot:body-head>
+          <div class="modal-body">
+            <p v-html="$t('confirm.sure_referrer', { referrer: this.value.text })"></p>
+          </div>
+        </template>
+
+        <template v-slot:footer>
+          <button class="btn btn-save"
+                  @click.prevent="this.confirmReferrer">
+            {{ $t('confirm.ok_referrer')}}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+
    <div>

      <label class="col-form-label" for="selectJob">
@@ -35,6 +58,8 @@
          :searchable="true"
          :placeholder="$t('referrer.placeholder')"
          v-model="value"
+          @select="updateReferrer"
+          @remove="removeReferrer"
          :options="users"
          :select-label="$t('multiselect.select_label')"
          :deselect-label="$t('multiselect.deselect_label')"
@@ -78,16 +103,24 @@ import VueMultiselect from 'vue-multiselect';
 import {makeFetch} from 'ChillMainAssets/lib/api/apiMethods';
 import {mapState, mapGetters} from 'vuex';
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
+import Modal from 'ChillMainAssets/vuejs/_components/Modal';

 export default {
  name: "Referrer",
  components: {
    UserRenderBoxBadge,
    VueMultiselect,
+    Modal
  },
  data() {
    return {
-      jobs: []
+      jobs: [],
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl"
+      },
+      value: this.$store.state.accompanyingCourse.user,
+      confirmed: false
    }
  },
  computed: {
@@ -118,22 +151,6 @@ export default {
            });
      }
    },
-    value: {
-      get() {
-        return this.$store.state.accompanyingCourse.user;
-      },
-      set(value) {
-        console.log('set referrer', value);
-        this.$store.dispatch('updateReferrer', value)
-            .catch(({name, violations}) => {
-              if (name === 'ValidationException' || name === 'AccessException') {
-                violations.forEach((violation) => this.$toast.open({message: violation}));
-              } else {
-                this.$toast.open({message: 'An error occurred'})
-              }
-            });
-      }
-    },
  },
  mounted() {
    this.getJobs();
@@ -141,6 +158,7 @@ export default {
  methods: {
    updateReferrer(value) {
      this.value = value;
+      this.toggleModal();
    },
    getJobs() {
      const url = '/api/1.0/main/user-job.json';
@@ -159,12 +177,38 @@ export default {
      const url = `/api/1.0/main/whoami.json`;
      makeFetch('GET', url)
          .then(user => {
-            this.value = user
+            // this.value = user
+            this.updateReferrer(user);
          })
-      /*.catch((error) => {
-         commit('catchError', error);
-         this.$toast.open({message: error.body})
-      })*/
+    },
+    toggleModal() {
+      this.modal.showModal = !this.modal.showModal;
+    },
+    confirmReferrer() {
+      this.$store.dispatch('updateReferrer', this.value)
+          .catch(({name, violations}) => {
+            if (name === 'ValidationException' || name === 'AccessException') {
+              violations.forEach((violation) => this.$toast.open({message: violation}));
+            } else {
+              this.$toast.open({message: 'An error occurred'})
+            }
+          });
+      this.toggleModal()
+    },
+    removeReferrer() {
+      console.log('remove option')  
+      this.$store.dispatch('updateReferrer', 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'})
+            }
+          });
+    },
+    cancelChange() {
+      this.value = this.$store.state.accompanyingCourse.user
+      this.toggleModal()
    }
  }
 }
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -178,7 +178,7 @@ export default {
               body.civility = {type: 'chill_main_civility', id: payload.data.civility.id};
            }
            if (null !== payload.data.profession) {
-               body.profession = {type: 'third_party_profession', id: payload.data.profession.id};
+               body.profession = payload.data.profession;
            }
            // console.log('body', body);

--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -29,7 +29,8 @@ const appMessages = {
         emergency: "urgent",
         confidential: "confidentiel",
         regular: "régulier",
-         occasional: "ponctuel"
+         occasional: "ponctuel",
+         absent: "Absent",
      },
      origin: {
         title: "Origine de la demande",
@@ -138,8 +139,10 @@ const appMessages = {
         set_a_scope: "indiquez au moins un service",
         sure: "Êtes-vous sûr ?",
         sure_description: "Une fois le changement confirmé, il ne sera plus possible de le remettre à l'état de brouillon !",
+         sure_referrer: "Êtes-vous sûr de vouloir assigner ce parcours à <b>{referrer}</b>",
         ok: "Confirmer le parcours",
         delete: "Supprimer le parcours",
+         ok_referrer: "Confirmer le référent",
         no_suggested_referrer: "Il n'y a aucun référent qui puisse être suggéré pour ce parcours. Vérifiez la localisation du parcours, les métiers et service indiqués. Si les données sont correctes, vous pouvez confirmer ce parcours.",
         one_suggested_referrer: "Un unique référent peut être suggéré pour ce parcours",
         choose_suggested_referrer: "Voulez-vous le désigner directement ?",
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -130,6 +130,7 @@
                         :filename="d.title"
                         :can-edit="true"
                         :execute-before-leave="submitBeforeLeaveToEditor"
+                         @on-stored-object-status-change="onStatusDocumentChanged"
                     ></document-action-buttons-group>
                   </li>
                   <li v-if="d.workflows.length === 0">
@@ -374,6 +375,10 @@ export default {
            this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
         }
      },
+      onStatusDocumentChanged(newStatus) {
+        console.log('onStatusDocumentChanged', newStatus);
+        this.$store.commit('statusDocumentChanged', {key: this.evaluation.key, newStatus: newStatus});
+      },
      goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
         const callback = (data) => {
            let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -367,7 +367,22 @@ const store = createStore({
        state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
          .documents.find(d => d.id === payload.id).title = payload.title;
      }
-    }
+    },
+    statusDocumentChanged(state, {newStatus, key}) {
+      const e = state.evaluationsPicked.find(e => e.key === key);
+      if (typeof e === 'undefined') {
+        console.error('evaluation not found for given key', {key});
+      }
+
+      const doc = e.documents.find(d => d.storedObject?.id === newStatus.id);
+      if (typeof doc === 'undefined') {
+        console.error('document not found', {newStatus});
+      }
+
+      doc.storedObject.status = newStatus.status;
+      doc.storedObject.type = newStatus.type;
+      doc.storedObject.filename = newStatus.filename;
+    },
  },
  actions: {
    updateThirdParty({ commit }, payload) {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -1,7 +1,7 @@
 <template>
    <div class="container tpartycontainer">
      <div class="tparty-identification">
-        <span v-if="item.result.profession" class="profession">{{ item.result.profession.name.fr }}</span>
+        <span v-if="item.result.profession" class="profession">{{ item.result.profession }}</span>
        <span class="name">
          {{ item.result.text }}&nbsp;
        </span>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -1,9 +1,7 @@
 <template>
    <div class="container usercontainer">
      <div class="user-identification">
-        <span class="name">
-           {{ item.result.text }}
-        </span>
+        <user-render-box-badge :user="item.result"></user-render-box-badge>
      </div>
    </div>
    <div class="right_actions">
@@ -16,10 +14,12 @@

 <script>
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
+import UserRenderBoxBadge from 'ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue';

 export default {
   name: 'SuggestionUser',
   components: {
+     UserRenderBoxBadge,
      BadgeEntity
   },
   props: ['item'],