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

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue

@@ -58,7 +58,7 @@ export default {
          this.$store.dispatch('toggleIntensity', value)
             .catch(({name, violations}) => {
                if (name === 'ValidationException' || name === 'AccessException') {
-                  violations.forEach((violation) => this.$toast.open({message: violation}));
+                  this.$toast.open({message: this.$t('Only the referrer can toggle the intensity of an accompanying course')})
                } else {
                   this.$toast.open({message: 'An error occurred'})
                }
@@ -75,20 +75,15 @@ export default {
             });
       },
       toggleConfidential() {
-         this.$store.dispatch('fetchPermissions').then(() => {
-           if (!this.$store.getters.canTogglePermission) {
-             this.$toast.open({message: "Seul le référent peut modifier la confidentialité"});
-             return Promise.resolve();
-           } else {
-             return this.$store.dispatch('toggleConfidential', (!this.isConfidential));
-           }
-         }).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.$store.dispatch('toggleConfidential')
+            .catch(({name, violations}) => {
+               console.log(name);
+               if (name === 'ValidationException' || name === 'AccessException') {
+                  this.$toast.open({message: this.$t('Only the referrer can toggle the confidentiality of an accompanying course')})
+               } else {
+                  this.$toast.open({message: 'An error occurred'})
+               }
+            });
       },
    },
 }

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 v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+      <confidential :positionBtn="false" 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 v-else-if="accompanyingCourse.requestor.type === 'person'">
+      <confidential :positionBtnFar="false" v-else-if="accompanyingCourse.requestor.type === 'person'">
          <template v-slot:confidential-content>
             <person-render-box render="bloc"
                :person="accompanyingCourse.requestor"

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

@@ -168,7 +168,7 @@ export default {
          }
          else if (payload.type === 'thirdparty') {
             console.log('data', payload.data)
-            body.name = payload.data.text;
+            body.name = payload.data.name;
             body.email = payload.data.email;
             body.telephone = payload.data.phonenumber;
             body.address = payload.data.address ? { id: payload.data.address.address_id } :  null;

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

@@ -46,6 +46,12 @@ if (root === 'banner') {
       })
       .use(store)
       .use(i18n)
+      .use(VueToast, {
+         position: "bottom-right",
+         type: "error",
+         duration: 5000,
+         dismissible: true
+      })
       .component('banner', Banner)
       .mount('#banner-accompanying-course');
    });

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

@@ -167,6 +167,8 @@ const appMessages = {
       'Error while retriving users.': "Erreur du serveur lors du chargement de la liste des travailleurs.",
       'Error while getting whoami.': "Erreur du serveur lors de la requête 'qui suis-je ?'",
       'Error while retriving origin\'s list.': "Erreur du serveur lors du chargement de la liste des origines de la demande.",
+      'Only the referrer can toggle the intensity of an accompanying course': "Seul le référent peut modifier l'intensité d'un parcours.",
+      'Only the referrer can toggle the confidentiality of an accompanying course': "Seul le référent peut modifier la confidentialité d'un parcours."
    }
 };
 

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

@@ -420,24 +420,24 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                const url = `/api/1.0/person/accompanying-course/resource/${id}.json`;
 
                return makeFetch('PATCH', url, body)
-                   .then((response) => {
-                      commit('patchResource', response);
-                   })
-                   .catch((error) => {
-                      commit('catchError', error);
-                      throw error;
-                   })
+                  .then((response) => {
+                     commit('patchResource', response);
+                  })
+                  .catch((error) => {
+                     commit('catchError', error);
+                     throw error;
+                  })
             },
             /**
              * Update accompanying course intensity/emergency/confidentiality
              */
             toggleIntensity({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const url = `/api/1.0/person/accompanying-course/${id}/intensity.json`
                const body = { type: "accompanying_period", 'intensity': payload }
 
-               return makeFetch('PATCH', url, body)
+               return makeFetch('POST', url, body)
                   .then((response) => {
-                     commit('toggleIntensity', response.intensity);
+                     commit('toggleIntensity', response);
 
                   })
                   .catch((error) => {
@@ -459,14 +459,18 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   })
             },
             toggleConfidential({ commit }, payload) {
-               const url = `/api/1.0/person/accompanying-course/${id}.json`
+               const url = `/api/1.0/person/accompanying-course/${id}/confidential.json`
                const body = { type: "accompanying_period", confidential: payload }
 
-               return makeFetch('PATCH', url, body)
+               console.log('url', url, 'body', body);
+
+               return makeFetch('POST', url, body)
                   .then((response) => {
-                     commit('toggleConfidential', response.confidential);
+                     console.log('response', response);
+                     commit('toggleConfidential', response);
                   })
                   .catch((error) => {
+                     console.log('error', error)
                      commit('catchError', error);
                      throw error;
                   })
@@ -737,10 +741,10 @@ let initPromise = (root) => Promise.all([getScopesPromise(root), accompanyingCou
                   "object": {
                      "type": "accompanying_period",
                      "id": id
-                   },
-                   "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
-                   "roles": [
-                      "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
+                  },
+                  "class": "Chill\\PersonBundle\\Entity\\AccompanyingPeriod",
+                  "roles": [
+                     "CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL"
                      ]
                }
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue

@@ -251,6 +251,7 @@
           relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
           :relatedEntityId="this.work.id"
           :workflowsAvailables="this.work.workflows_availables"
+          :preventDefaultMoveToGenerate="true"
           @go-to-generate-workflow="goToGenerateWorkflow"
        ></list-workflow-modal>
     </li>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue

@@ -106,8 +106,6 @@ export default {
          this.toggleEditEvaluation();
       },
       goToGenerateWorkflow({event, link, workflowName}) {
-        console.log('goToGenerate in evaluation', event, link, workflowName);
-
         const callback = (data) => {
           let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
           window.location.assign(buildLinkCreate(workflowName,

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue

@@ -65,29 +65,55 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="d in evaluation.documents">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.key">
            <div class="item-row">
-             <div class="item-col"><h6>{{ d.template.name.fr }}</h6></div>
-             <div class="item-col">
-               <p>Créé par {{ d.createdBy.text }}<br/>
-               Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
-
-             </div>
+               <div class="input-group input-group-lg mb-3">
+                  <div>
+                     <input
+                         class="form-control form-control-lg"
+                         style="font-weight: bold;"
+                         type="text"
+                         :value="d.title"
+                         :id="d.id"
+                         @input="onInputDocumentTitle"/>
+                  </div>
+               </div>
            </div>
            <div class="item-row">
-            <ul class="record_actions" >
-             <li>
-               <a :href="buildEditLink(d.storedObject)" class="btn btn-action btn-sm">
-                 <i class="fa fa-edit"></i>
-               </a>
-             </li>
-            </ul>
+               <div class="item-col item-meta">
+                  <p v-if="d.createdBy" class="createdBy">Créé par {{ d.createdBy.text }}<br/>
+                  Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
+               </div>
+               <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>
+                   <li>
+                     <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
+                   </li>
+                   <li>
+                     <a class="btn btn-delete" @click="removeDocument(d)">
+                     </a>
+                   </li>
+                 </ul>
+               </div>
            </div>
          </div>
        </div>
      </div>
 
      <div class="row mb-3">
+      <h6>{{ $t('document_add') }} :</h6>
        <pick-template
            entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
            :id="evaluation.id"
@@ -99,6 +125,20 @@
            <label class="col-sm-4 col-form-label">{{ $t('evaluation_generate_a_document') }}</label>
          </template>
        </pick-template>
+      <div>
+         <label class="col-sm-4 col-form-label">{{ $t('document_upload') }}</label>
+         <ul class="record_actions">
+            <li>
+               <add-async-upload
+                  :buttonTitle="$t('browse')"
+                  :options="asyncUploadOptions"
+                  @addDocument="addDocument"
+               >
+               </add-async-upload>
+            </li>
+         </ul>
+      </div>
+
      </div>
    </div>
 </div>
@@ -111,6 +151,9 @@ import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
 import { mapGetters, mapState } from 'vuex';
 import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
+import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload.vue';
+import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
+import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
 
 const i18n = {
    messages: {
@@ -129,6 +172,11 @@ const i18n = {
          evaluation_add_a_document: "Ajouter un document",
          evaluation_add: "Ajouter une évaluation",
          Documents: "Documents",
+         document_add: "Générer ou téléverser un document",
+         document_upload: "Téléverser un document",
+         document_title: "Titre du document",
+         template_title: "Nom du template",
+         browse: "Ajouter un document"
       }
    }
 };
@@ -139,12 +187,19 @@ export default {
    components: {
       ckeditor: CKEditor.component,
       PickTemplate,
+      AddAsyncUpload,
+      ListWorkflowModal,
    },
    i18n,
    data() {
       return {
          editor: ClassicEditor,
          template: null,
+         asyncUploadOptions: {
+            maxFiles: 1,
+            maxPostSize: 15000000,
+            required: false,
+         }
       }
    },
    computed: {
@@ -162,7 +217,6 @@ export default {
           return dateToISO(this.evaluation.startDate);
         },
         set(v) {
-          console.log(v);
           this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: ISOToDate(v) });
         }
       },
@@ -205,11 +259,11 @@ export default {
          })
          ;
       },
-     buildEditLink(storedObject) {
-       return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
+      buildEditLink(storedObject) {
+         return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
            window.location.pathname + window.location.search + window.location.hash);
-     },
-     submitBeforeGenerate({template}) {
+      },
+      submitBeforeGenerate({template}) {
         const callback = (data) => {
           let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
 
@@ -217,7 +271,36 @@ export default {
         };
 
         return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
-      }
+      },
+      onInputDocumentTitle(event) {
+         const id = Number(event.target.id);
+         const title = event.target.value;
+         this.$store.commit('updateDocumentTitle', {id: id, evaluationKey: this.evaluation.key, title: title});
+      },
+      addDocument(storedObject) {
+         let document = {
+            type: 'accompanying_period_work_evaluation_document',
+            storedObject: storedObject,
+            title: 'Nouveau document',
+         };
+         this.$store.commit('addDocument', {key: this.evaluation.key, document: document});
+      },
+      removeDocument(document) {
+         if (window.confirm("Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre \"" + document.title +"\" ?")) {
+           this.$store.commit('removeDocument', {key: this.evaluation.key, document: document});
+         }
+      },
+      goToGenerateWorkflowEvaluationDocument({event, link, workflowName, payload}) {
+       const callback = (data) => {
+         let evaluation = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key);
+         let updatedDocument = evaluation.documents.find(d => d.key === payload.doc.key);
+         window.location.assign(buildLinkCreate(workflowName,
+             'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument', updatedDocument.id));
+       };
+
+       return this.$store.dispatch('submit', callback)
+           .catch(e => { console.log(e); throw e; });
+     },
    },
 }
 </script>

src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js

@@ -110,6 +110,7 @@ const store = createStore({
             maxDate: e.maxDate !== null ? { datetime: datetimeToISO(e.maxDate) } : null,
             warningInterval: intervalDaysToISO(e.warningInterval),
             comment: e.comment,
+            documents: e.documents
           };
           if (e.id !== undefined) {
             o.id = e.id;
@@ -130,6 +131,11 @@ const store = createStore({
           endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
           maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
           warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
+          documents: e.documents.map((d, dindex) => {
+            return Object.assign(d, {
+              key: index
+            });
+          }),
         });
 
         return k;
@@ -197,6 +203,24 @@ const store = createStore({
 
       found.results = found.results.filter(r => r.id !== result.id);
     },
+    addDocument(state, payload) {
+      let evaluation = state.evaluationsPicked.find(e => e.key === payload.key);
+      evaluation.documents.push(Object.assign(
+        payload.document, {
+          key: evaluation.documents.length + 1,
+          workflows_availables: state.work.workflows_availables_evaluation_documents,
+          workflows: [],
+        }));
+    },
+    removeDocument(state, {key, document}) {
+      let evaluations = state.evaluationsPicked.find(e => e.key === key);
+
+      if (evaluations === undefined) {
+        return;
+      }
+
+      evaluations.documents = evaluations.documents.filter(d => d.key !== document.key);
+    },
     addEvaluation(state, evaluation) {
       let e = {
         type: "accompanying_period_work_evaluation",
@@ -284,6 +308,10 @@ const store = createStore({
     setIsPosting(state, st) {
       state.isPosting = st;
     },
+    updateDocumentTitle(state, payload) {
+      state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
+          .documents.find(d => d.id === payload.id).title = payload.title;
+    }
   },
   actions: {
     updateThirdParty({ commit }, payload) {
@@ -374,13 +402,18 @@ const store = createStore({
           });
       }
     },
+    addDocument({commit}, payload) {
+      commit('addDocument', payload);
+    },
+    removeDocument({commit}, payload) {
+      commit('removeDocument', payload);
+    },
     submit({ getters, state, commit }, callback) {
       let
         payload = getters.buildPayload,
         url = `/api/1.0/person/accompanying-course/work/${state.work.id}.json`,
         errors = []
       ;
-
       commit('setIsPosting', true);
 
       return makeFetch('PUT', url, payload)
@@ -397,6 +430,9 @@ const store = createStore({
           commit('setErrors', error.violations);
         });
     },
+    updateDocumentTitle({commit}, payload) {
+      commit('updateDocumentTitle', payload)
+    }
   }
 });
 

src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue

@@ -1,6 +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 class="name">
           {{ item.result.text }}&nbsp;
         </span>
@@ -110,19 +111,24 @@ export default {
 
 <style lang="scss" scoped>
 .tpartycontainer {
- .tpartyparent {
-    .name {
-      font-weight: bold;
-      font-variant: all-small-caps;
+  .tpartyparent {
+      .name {
+        font-weight: bold;
+        font-variant: all-small-caps;
+      }
+  }
+  .tparty-identification {
+    span:not(.name) {
+      margin-left: 0.5em;
+      opacity: 0.5;
+      font-size: 90%;
+      font-style: italic;
     }
- }
- .tparty-identification {
-   span:not(.name) {
-     margin-left: 0.5em;
-     opacity: 0.5;
-     font-size: 90%;
-     font-style: italic;
-   }
- }
+    .profession {
+      font-weight: 800;
+      color: black;
+      font-style: normal !important;
+    }
+  }
 }
 </style>