Merge branch 'master' into small_issues_421_424

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"
+          @go-to-generate-workflow="goToGenerateWorkflow"
        ></list-workflow-modal>
     </li>
 
@@ -284,6 +285,7 @@ import OnTheFly from 'ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue';
 import ListWorkflowModal from 'ChillMainAssets/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue';
 import PickWorkflow from 'ChillMainAssets/vuejs/_components/EntityWorkflow/PickWorkflow.vue';
 import PersonText from 'ChillPersonAssets/vuejs/_components/Entity/PersonText.vue';
+import {buildLinkCreate} from 'ChillMainAssets/lib/entity-workflow/api.js';
 
 const i18n = {
    messages: {
@@ -334,7 +336,6 @@ export default {
       ListWorkflowModal,
       OnTheFly,
       PickWorkflow,
-      OnTheFly,
       PersonText,
    },
    i18n,
@@ -461,6 +462,15 @@ export default {
       removeThirdParty(t) {
          this.$store.commit('removeThirdParty', t);
       },
+      goToGenerateWorkflow({link}) {
+        console.log('save before leave to generate workflow')
+        const callback = (data) => {
+          window.location.assign(link);
+        };
+
+        return this.$store.dispatch('submit', callback)
+            .catch(e => { console.log(e); throw e; });
+      },
       submit() {
          this.$store.dispatch('submit');
       },

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

@@ -10,16 +10,16 @@
 
         <ul class="record_actions">
            <li v-if="evaluation.workflows_availables.length > 0">
-             
+
               <list-workflow-modal
                  :workflows="evaluation.workflows"
                  :allowCreate="true"
-                 relatedEntityClass="faked"
+                 relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
                  :relatedEntityId="evaluation.id"
                  :workflowsAvailables="evaluation.workflows_availables"
-                 @goToGenerateWorkflow="goToGenerateWorkflow"
+                 @go-to-generate-workflow="goToGenerateWorkflow"
              ></list-workflow-modal>
-             
+
            </li>
             <li>
                <a class="btn btn-delete" @click="modal.showModal = true" :title="$t('action.delete')"></a>
@@ -106,8 +106,7 @@ export default {
          this.toggleEditEvaluation();
       },
       goToGenerateWorkflow({event, link, workflowName}) {
-        event.preventDefault();
-        console.log(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;

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

@@ -92,7 +92,8 @@
            entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
            :id="evaluation.id"
            :templates="getTemplatesAvailables"
-           :beforeMove="submitBeforeGenerate"
+           :preventDefaultMoveToGenerate="true"
+           @go-to-generate-document="submitBeforeGenerate"
        >
          <template v-slot:title>
            <label class="col-sm-4 col-form-label">{{ $t('evaluation_generate_a_document') }}</label>
@@ -109,6 +110,7 @@ import CKEditor from '@ckeditor/ckeditor5-vue';
 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';
 
 const i18n = {
    messages: {
@@ -123,7 +125,7 @@ const i18n = {
          evaluation_public_comment: "Note publique",
          evaluation_comment_placeholder: "Commencez à écrire ...",
          evaluation_generate_a_document: "Générer un document",
-         evaluation_choose_a_template: "Choisir un gabarit",
+         evaluation_choose_a_template: "Choisir un modèle",
          evaluation_add_a_document: "Ajouter un document",
          evaluation_add: "Ajouter une évaluation",
          Documents: "Documents",
@@ -207,10 +209,11 @@ export default {
        return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
            window.location.pathname + window.location.search + window.location.hash);
      },
-     submitBeforeGenerate() {
+     submitBeforeGenerate({template}) {
         const callback = (data) => {
           let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
-          return Promise.resolve({entityId: evaluationId});
+
+          window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
         };
 
         return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });

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

@@ -210,6 +210,7 @@ const store = createStore({
         editEvaluation: true,
         workflows_availables: state.work.workflows_availables_evaluation,
         documents: [],
+        workflows: [],
       };
       state.evaluationsPicked.push(e);
     },