Merge branch 'master' into 616_rapid-action

2025-10-01 10:59:45 +00:00 · 2023-07-12 15:38:51 +02:00
parent b946f8c10a 197d69ef4a
commit 1ae27152c2
404 changed files with 11850 additions and 1276 deletions
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/accompanying_period_work.scss
@@ -1,3 +1,25 @@
+.badge-accompanying-work-type {
+    display: inline-block;
+    background-color: #f3f3f3;
+
+    .title_label {
+        @include chill_badge(#e2793d);
+    }
+
+    .title_action {
+        padding: var(--bs-badge-padding-y) var(--bs-badge-padding-x);
+        margin-right: 1rem;
+
+        font-size: var(--bs-badge-font-size);
+        font-weight: var(--bs-badge-font-weight);
+        line-height: 1;
+        color: var(--bs-badge-color);
+        text-align: center;
+        white-space: nowrap;
+        vertical-align: baseline;
+    }
+}
+
 /// AccompanyingCourse Work Pages
 div.accompanying-course-work {

--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -122,7 +122,8 @@
         <add-evaluation
            v-for="e in pickedEvaluations"
            v-bind:key="e.key"
-            v-bind:evaluation="e">
+            v-bind:evaluation="e"
+            v-bind:docAnchorId="this.docAnchorId">
         </add-evaluation>

         <!-- box to add new evaluation -->
@@ -296,7 +297,21 @@
            @go-to-generate-workflow="goToGenerateWorkflow"
         ></list-workflow-modal>
      </li>
-
+      
+      <li>
+         <button v-if="AmIRefferer"
+             class="btn btn-notify"
+             @click="goToGenerateNotification(false)"
+         ></button>
+         <template v-else>
+            <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" :title="$t('notification_send')" data-bs-toggle="dropdown" aria-expanded="false">&nbsp;</button>
+            <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+               <li><a class="dropdown-item" @click="goToGenerateNotification(true)">{{ $t('notification_notify_referrer') }}</a></li>
+               <li><a class="dropdown-item" @click="goToGenerateNotification(false)">{{ $t('notification_notify_any') }}</a></li>
+            </ul>
+         </template>
+      </li>
+      
      <li v-if="!isPosting">
         <button class="btn btn-save" @click="submit">
            {{ $t('action.save') }}
@@ -366,7 +381,10 @@ const i18n = {
         no_referrers: "Aucun agent traitant",
         choose_referrers: "Choisir des agents traitants",
         remove_referrer: "Enlever l'agent",
-         private_comment: "Commentaire privé"
+         private_comment: "Commentaire privé",
+         notification_notify_referrer: "Notifier le référent",
+         notification_notify_any: "Notifier d'autres utilisateurs",
+         notification_send: "Envoyer une notification",
      }
   }
 };
@@ -389,6 +407,7 @@ export default {
   i18n,
   data() {
      return {
+         docAnchorId: null,
         isExpanded: false,
         editor: ClassicEditor,
         showAddObjective: false,
@@ -428,7 +447,14 @@ export default {
         },
      };
   },
-   computed: {
+   beforeMount() {
+       const urlParams = new URLSearchParams(window.location.search);
+       this.docAnchorId = urlParams.get('doc_id');
+   },
+   mounted() {
+     this.scrollToElement(this.docAnchorId);
+   },
+  computed: {
      ...mapState([
         'work',
         'resultsForAction',
@@ -441,6 +467,7 @@ export default {
         'isPosting',
         'errors',
         'templatesAvailablesForAction',
+         'me',
      ]),
      ...mapGetters([
         'hasResultsForAction',
@@ -498,6 +525,10 @@ export default {
            this.$store.commit('setPersonsPickedIds', v);
         }
      },
+      AmIRefferer() {
+         return (!(this.work.accompanyingPeriod.user && this.me
+            && (this.work.accompanyingPeriod.user.id !== this.me.id)));
+      }
   },
   methods: {
      toggleSelect() {
@@ -548,6 +579,19 @@ export default {
         return this.$store.dispatch('submit', callback)
            .catch(e => { console.log(e); throw e; });
      },
+      goToGenerateNotification(tos) {
+         console.log('save before leave to notification');
+         const callback = (data) => {
+            if (tos === true) {
+               window.location.assign(`/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&tos[0]=${this.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`);
+            } else {
+               window.location.assign(`/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`);
+            }
+         }
+
+         return this.$store.dispatch('submit', callback)
+             .catch(e => {console.log(e); throw e});
+      },
      submit() {
         this.$store.dispatch('submit').catch((error) => {
            if (error.name === 'ValidationException' || error.name === 'AccessException') {
@@ -559,7 +603,7 @@ export default {
         });
      },
      saveFormOnTheFly(payload) {
-         console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+         // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);

         let body = { type: payload.type };
         body.name = payload.data.text;
@@ -581,6 +625,12 @@ export default {
                     this.$toast.open({message: 'An error occurred'});
               }
            })
+      },
+      scrollToElement(docAnchorId) {
+         const documentEl = document.getElementById(`document_${docAnchorId}`);
+         if (documentEl) {
+           documentEl.scrollIntoView({behavior: 'smooth'});
+         }
      }
   }
 };
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -11,7 +11,7 @@
      </div>

      <div>
-         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation"></form-evaluation>
+         <form-evaluation ref="FormEvaluation" :key="evaluation.key" :evaluation="evaluation" :docAnchorId="docAnchorId"></form-evaluation>

        <ul class="record_actions">
           <li v-if="evaluation.workflows_availables.length > 0">
@@ -85,7 +85,7 @@ export default {
      Modal,
      ListWorkflowModal,
   },
-   props: ['evaluation'],
+   props: ['evaluation', 'docAnchorId'],
   i18n,
   data() {
      return {
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -79,8 +79,8 @@
       <h5>{{ $t('Documents') }} :</h5>

       <div class="flex-table">
-         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
-           <div class="item-row">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id" :class="[parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing']">
+           <div :id="`document_${d.id}`" class="item-row">
            <div class="input-group input-group-lg mb-3 row">
                  <label class="col-sm-3 col-form-label">Titre du document:</label>
                  <div class="col-sm-9">
@@ -92,7 +92,7 @@
                        :data-key="i"
                        @input="onInputDocumentTitle"/>
                </div>
-               </div>
+           </div>
           </div>
           <div class="item-row">
               <div class="item-col item-meta">
@@ -102,27 +102,32 @@
            </div>
            <div class="item-row">
               <div class="item-col">
-                 <ul class="record_actions" >
-                   <li v-if="d.workflows_availables.length > 0">
-                     <list-workflow-modal
-                         :workflows="d.workflows"
-                         :allowCreate="true"
-                         relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
-                         :relatedEntityId="d.id"
-                         :workflowsAvailables="d.workflows_availables"
-                         :preventDefaultMoveToGenerate="true"
-                         :goToGenerateWorkflowPayload="{doc: d}"
-                         @go-to-generate-workflow="goToGenerateWorkflowEvaluationDocument"
-                     ></list-workflow-modal>
-                   </li>
+                 <ul class="record_actions">
+                    <li v-if="d.workflows_availables.length > 0">
+                       <list-workflow-modal
+                          :workflows="d.workflows"
+                          :allowCreate="true"
+                          relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
+                          :relatedEntityId="d.id"
+                          :workflowsAvailables="d.workflows_availables"
+                          :preventDefaultMoveToGenerate="true"
+                          :goToGenerateWorkflowPayload="{doc: d}"
+                          @go-to-generate-workflow="goToGenerateWorkflowEvaluationDocument"
+                       ></list-workflow-modal>
+                    </li>
                   <li>
-                     <add-async-upload
-                        :buttonTitle="$t('replace')"
-                        :options="asyncUploadOptions"
-                        :btnClasses="{'btn': true, 'btn-edit': true}"
-                        @addDocument="(arg) => replaceDocument(d, arg)"
-                     >
-                     </add-async-upload>
+                      <button
+                         v-if="AmIRefferer"
+                         class="btn btn-notify"
+                         @click="goToGenerateDocumentNotification(d, false)">
+                      </button>
+                      <template v-else>
+                         <button id="btnGroupNotifyButtons" type="button" class="btn btn-notify dropdown-toggle" :title="$t('notification_send')" data-bs-toggle="dropdown" aria-expanded="false">&nbsp;</button>
+                         <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+                            <li><a class="dropdown-item" @click="goToGenerateDocumentNotification(d, true)">{{ $t('notification_notify_referrer') }}</a></li>
+                            <li><a class="dropdown-item" @click="goToGenerateDocumentNotification(d, false)">{{ $t('notification_notify_any') }}</a></li>
+                         </ul>
+                      </template>
                   </li>
                   <li>
                     <document-action-buttons-group
@@ -133,6 +138,15 @@
                         @on-stored-object-status-change="onStatusDocumentChanged"
                     ></document-action-buttons-group>
                   </li>
+                    <li>
+                       <add-async-upload
+                          :buttonTitle="$t('replace')"
+                          :options="asyncUploadOptions"
+                          :btnClasses="{'btn': true, 'btn-edit': true}"
+                          @addDocument="(arg) => replaceDocument(d, arg)"
+                       >
+                       </add-async-upload>
+                    </li>
                   <li v-if="d.workflows.length === 0">
                     <a class="btn btn-delete" @click="removeDocument(d)">
                     </a>
@@ -187,6 +201,7 @@ import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload
 import AddAsyncUploadDownloader from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUploadDownloader.vue';
 import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
+import {buildLinkCreate as buildLinkCreateNotification} from 'ChillMainAssets/lib/entity-notification/api';
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";

 const i18n = {
@@ -214,14 +229,17 @@ const i18n = {
         template_title: "Nom du template",
         browse: "Ajouter un document",
         replace: "Remplacer",
-         download: "Télécharger le fichier existant"
+         download: "Télécharger le fichier existant",
+         notification_notify_referrer: "Notifier le référent",
+         notification_notify_any: "Notifier d'autres utilisateurs",
+         notification_send: "Envoyer une notification",
      }
   }
 };

 export default {
   name: "FormEvaluation",
-   props: ['evaluation'],
+   props: ['evaluation', 'docAnchorId'],
   components: {
      ckeditor: CKEditor.component,
      PickTemplate,
@@ -260,8 +278,14 @@ export default {
   },
   computed: {
      ...mapState([
-         'isPosting'
+         'isPosting',
+         'work',
+         'me',
      ]),
+      AmIRefferer() {
+         return (!(this.$store.state.work.accompanyingPeriod.user && this.$store.state.me
+            && (this.$store.state.work.accompanyingPeriod.user.id !== this.$store.state.me.id)));
+      },
      getTemplatesAvailables() {
         return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
      },
@@ -390,6 +414,20 @@ export default {
         return this.$store.dispatch('submit', callback)
            .catch(e => { console.log(e); throw e; });
      },
+       goToGenerateDocumentNotification(document, tos) {
+          const callback = (data) => {
+             let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+             let updatedDocument = evaluation.documents.find(d => d.key === document.key);
+             window.location.assign(buildLinkCreateNotification(
+                 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument',
+                 updatedDocument.id,
+                 tos === true ? this.$store.state.work.accompanyingPeriod.user.id : null,
+                 window.location.pathname + window.location.search + window.location.hash
+             ));
+          };
+           return this.$store.dispatch('submit', callback)
+               .catch(e => {console.log(e); throw e});
+       }
   },
 }
 </script>
@@ -402,4 +440,19 @@ export default {
   ul.document-upload {
      justify-content: flex-start;
   }
+
+   .bg-blink{
+     color: #050000;
+     padding: 10px;
+     display: inline-block;
+     border-radius: 5px;
+     animation: blinkingBackground 2.2s infinite;
+     animation-iteration-count: 2;
+   }
+
+   @keyframes blinkingBackground{
+     0%		{ background-color: #ed776d;}
+     50%		{ background-color: #ffffff;}
+     100%	  { background-color: #ed776d;}
+   }
 </style>
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -35,6 +35,7 @@ const store = createStore({
    referrers: window.accompanyingCourseWork.referrers,
    isPosting: false,
    errors: [],
+    me: null
  },
  getters: {
    socialAction(state) {
@@ -130,6 +131,9 @@ const store = createStore({
    }
  },
  mutations: {
+    setWhoAmiI(state, me) {
+        state.me = me;
+    },
    setEvaluationsPicked(state, evaluations) {
      state.evaluationsPicked = evaluations.map((e, index) => {
        var k = Object.assign(e, {
@@ -385,6 +389,19 @@ const store = createStore({
    },
  },
  actions: {
+    getWhoAmI({ commit }) {
+        let url = `/api/1.0/main/whoami.json`;
+        window.fetch(url)
+            .then(response => {
+                if (response.ok) {
+                    return response.json();
+                }
+                throw { m: 'Error while retriving results for goal', s: response.status, b: response.body };
+            })
+            .then(data => {
+                commit('setWhoAmiI', data);
+            });
+    },
    updateThirdParty({ commit }, payload) {
      commit('updateThirdParty', payload);
    },
@@ -514,6 +531,7 @@ store.commit('setEvaluationsPicked', window.accompanyingCourseWork.accompanyingP
 store.dispatch('getReachablesResultsForAction');
 store.dispatch('getReachablesGoalsForAction');
 store.dispatch('getReachablesEvaluationsForAction');
+store.dispatch('getWhoAmI');

 store.state.evaluationsPicked.forEach(evaluation => {
  store.dispatch('fetchTemplatesAvailablesForEvaluation', evaluation.evaluation)
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -178,7 +178,7 @@
 </template>

 <script>
-import {dateToISO} from 'ChillMainAssets/chill/js/date';
+import {dateToISO, ISOToDate} from 'ChillMainAssets/chill/js/date';
 import AddressRenderBox from 'ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue';
 import Confidential from 'ChillMainAssets/vuejs/_components/Confidential.vue';
 import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue';
@@ -233,7 +233,7 @@ export default {
    },
    birthdate: function () {
      if (this.person.birthdate !== null || this.person.birthdate === "undefined") {
-        return new Date(this.person.birthdate.datetime);
+        return ISOToDate(this.person.birthdate.datetime);
      } else {
        return "";
      }