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

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

@@ -127,7 +127,7 @@
             </div>
             <ul class="record_actions" v-if="evaluationsForAction.length > 0">
                <li>
-                  <button :title="$t('add_an_evaluation')" class="btn btn-create" @click="toggleAddEvaluation"></button>
+                  <button :title="$t('add_an_evaluation')" class="btn btn-create" @click="toggleAddEvaluation">{{ $t('add_an_evaluation') }}</button>
                </li>
             </ul>
             <div v-else>
@@ -151,6 +151,37 @@
          </ul>
       </div>
 
+      <div id="referrers" class="action-row">
+         <h3>{{ $t('referrers') }}</h3>
+
+         <div v-if="!hasReferrers">
+            <p class="chill-no-data-statement">{{ $t('no_referrers') }}</p>
+         </div>
+
+         <div v-else>
+            <ul class="list-suggest remove-items inline">
+                  <li v-for="u in referrers" :key="u.id" :title="$t('remove_referrer')"  @click="removeReferrer(u)">
+                     <span>
+                        {{ u.text }}
+                     </span>
+                  </li>
+            </ul>
+         </div>
+
+         <ul class="record_actions">
+            <li class="add-persons">
+               <add-persons
+                  ref="referrerPicker"
+                  :key="referrerPicker.key"
+                  :buttonTitle="$t('add_referrers')"
+                  :modalTitle="$t('choose_referrers')"
+                  :options="referrerPicker.options"
+                  @addNewPersons="addReferrers">
+               </add-persons>
+            </li>
+         </ul>
+      </div>
+
       <div id="handlingThirdParty" class="action-row">
          <h3>{{ $t('handling_thirdparty') }}</h3>
 
@@ -289,7 +320,6 @@ import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vu
 import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
 import { makeFetch } from 'ChillMainAssets/lib/api/apiMethods';
 
-
 const i18n = {
    messages: {
       fr: {
@@ -322,6 +352,10 @@ const i18n = {
          available_evaluations_text: "Documents disponibles pour ajout :",
          no_evaluations_available: "Aucune évaluation disponible",
          no_goals_available: "Aucun objectif disponible",
+         referrers: "Agents traitants",
+         no_referrers: "Aucun agent traitant",
+         choose_referrers: "Choisir des agents traitants",
+         remove_referrer: "Enlever l'agent"
       }
    }
 };
@@ -370,6 +404,17 @@ export default {
                }
             },
          },
+         referrerPicker: {
+            key: 'referrer',
+            options: {
+               type: ['user'],
+               priority: null,
+               uniq: false,
+               button: {
+                  display: false
+               }
+            },
+         },
       };
    },
   computed: {
@@ -381,6 +426,7 @@ export default {
          'personsReachables',
          'handlingThirdParty',
          'thirdParties',
+         'referrers',
          'isPosting',
          'errors',
          'templatesAvailablesForAction',
@@ -389,6 +435,7 @@ export default {
          'hasResultsForAction',
          'hasHandlingThirdParty',
          'hasThirdParties',
+         'hasReferrers'
       ]),
       startDate: {
          get() {
@@ -465,6 +512,14 @@ export default {
       removeThirdParty(t) {
          this.$store.commit('removeThirdParty', t);
       },
+      addReferrers({selected, modal}) {
+         this.$store.commit('addReferrers', selected.map(r => r.result));
+         this.$refs.referrerPicker.resetSearch();
+         modal.showModal = false;
+      },
+      removeReferrer(u) {
+         this.$store.commit('removeReferrer', u);
+      },
       goToGenerateWorkflow({link}) {
         console.log('save before leave to generate workflow')
         const callback = (data) => {
@@ -521,6 +576,7 @@ div#workEditor {
       "objectives objectives"
       "evaluations evaluations"
       "persons persons"
+      "referrers referrers"
       "handling handling"
       "tparties tparties"
       "errors errors";
@@ -543,6 +599,8 @@ div#workEditor {
       grid-area: handling; }
    #thirdParties {
       grid-area: tparties; }
+   #referrers {
+      grid-area: referrers; }
    #errors {
       grid-area: errors; }
 
@@ -657,5 +715,4 @@ div#workEditor {
    }
 }
 
-
 </style>

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

@@ -27,7 +27,7 @@
 
            </li>
             <li v-if="canDelete">
-               <a class="btn btn-delete" @click="modal.showModal = true" :title="$t('action.delete')"></a>
+               <a class="btn btn-delete" @click="modal.showModal = true" :title="$t('action.delete')">{{ $t('delete_evaluation')}}</a>
             </li>
          </ul>
       </div>
@@ -72,7 +72,8 @@ const i18n = {
             sure: "Êtes-vous sûr?",
             sure_description: "Cette évaluation sera supprimée de cette action d'accompagnement",
             ok: "Supprimer"
-         }
+         },
+         delete_evaluation: "Supprimer l'évaluation",
       }
    }
 };

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

@@ -65,7 +65,7 @@
        <h5>{{ $t('Documents') }} :</h5>
 
        <div class="flex-table">
-         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.key">
+         <div class="item-bloc" v-for="(d, i) in evaluation.documents" :key="d.id">
            <div class="item-row">
                <div class="input-group input-group-lg mb-3">
                   <div>
@@ -75,6 +75,7 @@
                          type="text"
                          :value="d.title"
                          :id="d.id"
+                         :data-key="i"
                          @input="onInputDocumentTitle"/>
                   </div>
                </div>
@@ -84,6 +85,8 @@
                   <p v-if="d.createdBy" class="createdBy">Créé par {{ d.createdBy.text }}<br/>
                   Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}</p>
                </div>
+            </div>
+            <div class="item-row">
                <div class="item-col">
                  <ul class="record_actions" >
                    <li v-if="d.workflows_availables.length > 0">
@@ -98,6 +101,23 @@
                          @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>
+                   </li>
+                   <li>
+                     <add-async-upload-downloader
+                        :buttonTitle="$t('download')"
+                        :storedObject="d.storedObject"
+                     >
+                     </add-async-upload-downloader>
+
+                   </li>
                    <li>
                      <a :href="buildEditLink(d.storedObject)" class="btn btn-wopilink"></a>
                    </li>
@@ -152,6 +172,7 @@ 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 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';
 
@@ -176,7 +197,9 @@ const i18n = {
          document_upload: "Téléverser un document",
          document_title: "Titre du document",
          template_title: "Nom du template",
-         browse: "Ajouter un document"
+         browse: "Ajouter un document",
+         replace: "Remplacer",
+         download: "Télécharger le fichier existant"
       }
    }
 };
@@ -188,6 +211,7 @@ export default {
       ckeditor: CKEditor.component,
       PickTemplate,
       AddAsyncUpload,
+      AddAsyncUploadDownloader,
       ListWorkflowModal,
    },
    i18n,
@@ -274,8 +298,9 @@ export default {
       },
       onInputDocumentTitle(event) {
          const id = Number(event.target.id);
+         const key = Number(event.target.dataset.key) + 1;
          const title = event.target.value;
-         this.$store.commit('updateDocumentTitle', {id: id, evaluationKey: this.evaluation.key, title: title});
+         this.$store.commit('updateDocumentTitle', {id: id, key: key, evaluationKey: this.evaluation.key, title: title});
       },
       addDocument(storedObject) {
          let document = {
@@ -285,6 +310,14 @@ export default {
          };
          this.$store.commit('addDocument', {key: this.evaluation.key, document: document});
       },
+      replaceDocument(oldDocument, storedObject) {
+         let document = {
+            type: 'accompanying_period_work_evaluation_document',
+            storedObject: storedObject,
+            title: oldDocument.title
+         };
+         this.$store.commit('replaceDocument', {key: this.evaluation.key, document: document, oldDocument: oldDocument});
+      },
       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});

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

@@ -31,6 +31,7 @@ const store = createStore({
       .map(p => p.person),
     handlingThirdParty: window.accompanyingCourseWork.handlingThierParty,
     thirdParties: window.accompanyingCourseWork.thirdParties,
+    referrers: window.accompanyingCourseWork.referrers,
     isPosting: false,
     errors: [],
   },
@@ -54,6 +55,9 @@ const store = createStore({
     hasHandlingThirdParty(state) {
       return state.handlingThirdParty !== null;
     },
+    hasReferrers(state) {
+      return state.referrers.length > 0;
+    },
     hasThirdParties(state) {
       return state.thirdParties.length > 0;
     },
@@ -82,6 +86,7 @@ const store = createStore({
         },
         results: state.resultsPicked.map(r => ({id: r.id, type: r.type})),
         thirdParties: state.thirdParties.map(t => ({id: t.id, type: t.type})),
+        referrers: state.referrers.map(t => ({id: t.id, type: t.type})),
         goals: state.goalsPicked.map(g => {
           let o = {
             type: g.type,
@@ -131,9 +136,9 @@ 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) => {
+          documents: e.documents.map((d, docIndex) => {
             return Object.assign(d, {
-              key: index
+              key: docIndex
             });
           }),
         });
@@ -213,13 +218,26 @@ const store = createStore({
         }));
     },
     removeDocument(state, {key, document}) {
-      let evaluations = state.evaluationsPicked.find(e => e.key === key);
-
-      if (evaluations === undefined) {
+      let evaluation = state.evaluationsPicked.find(e => e.key === key);
+      if (evaluation === undefined) {
+        return;
+      }
+      evaluation.documents = evaluation.documents.filter(d => d.key !== document.key);
+    },
+    replaceDocument(state, payload) {
+      let evaluation = state.evaluationsPicked.find(e => e.key === payload.key);
+      if (evaluation === undefined) {
         return;
       }
 
-      evaluations.documents = evaluations.documents.filter(d => d.key !== document.key);
+      let newDocument = Object.assign(
+        payload.document, {
+          key: evaluation.documents.length + 1,
+          workflows_availables: state.work.workflows_availables_evaluation_documents,
+          workflows: [],
+        }
+      );
+      evaluation.documents = evaluation.documents.map(d => d.id === payload.oldDocument.id ? newDocument : d);
     },
     addEvaluation(state, evaluation) {
       let e = {
@@ -302,6 +320,18 @@ const store = createStore({
       state.thirdParties = state.thirdParties
         .filter(t => t.id !== thirdParty.id);
     },
+    addReferrers(state, referrers) {
+      let ids = state.referrers.map(t => t.id);
+      let unexistings = referrers.filter(t => !ids.includes(t.id));
+
+      for (let i in unexistings) {
+        state.referrers.push(unexistings[i]);
+      }
+    },
+    removeReferrer(state, user) {
+      state.referrers = state.referrers
+        .filter(u => u.id !== user.id);
+    },
     setErrors(state, errors) {
       state.errors = errors;
     },
@@ -309,13 +339,17 @@ const store = createStore({
       state.isPosting = st;
     },
     updateDocumentTitle(state, payload) {
-      state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
+      if (payload.id === 0) {
+        state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
+          .documents.find(d => d.key === payload.key).title = payload.title;
+      } else {
+        state.evaluationsPicked.find(e => e.key === payload.evaluationKey)
           .documents.find(d => d.id === payload.id).title = payload.title;
+      }
     }
   },
   actions: {
     updateThirdParty({ commit }, payload) {
-      console.log(payload);
       commit('updateThirdParty', payload);
     },
     getReachablesGoalsForAction({ getters, commit, dispatch }) {
@@ -408,6 +442,9 @@ const store = createStore({
     removeDocument({commit}, payload) {
       commit('removeDocument', payload);
     },
+    replaceDocument({commit}, payload) {
+      commit('replaceDocument', payload);
+    },
     submit({ getters, state, commit }, callback) {
       let
         payload = getters.buildPayload,