diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 668385b8a..bab64018a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -521,12 +521,12 @@ export default {
          this.$store.commit('removeReferrer', u);
       },
       goToGenerateWorkflow({link}) {
-        console.log('save before leave to generate workflow')
-        const callback = (data) => {
-          window.location.assign(link);
-        };
+         // console.log('save before leave to generate workflow')
+         const callback = (data) => {
+            window.location.assign(link);
+         };
 
-        return this.$store.dispatch('submit', callback)
+         return this.$store.dispatch('submit', callback)
             .catch(e => { console.log(e); throw e; });
       },
       submit() {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index cad070de3..ca0d16eec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -298,38 +298,39 @@ export default {
       }
    },
    computed: {
-     ...mapState([
-       'isPosting'
-     ]),
+      ...mapState([
+         'isPosting'
+      ]),
       getTemplatesAvailables() {
-        return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
+         return this.$store.getters.getTemplatesAvailablesForEvaluation(this.evaluation.evaluation);
       },
       canGenerate() {
-        return !this.$store.state.isPosting && this.template !== null;
+         return !this.$store.state.isPosting && this.template !== null;
       },
       startDate: {
-        get() {
-          return this.evaluation.startDate;
-        },
-        set(v) {
-          this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v });
-        }
+         get() {
+            console.log('evaluation', this.evaluation);
+            return this.evaluation.startDate;
+         },
+         set(v) {
+            this.$store.commit('setEvaluationStartDate', { key: this.evaluation.key, date: v });
+         }
       },
       endDate: {
-        get() {
-          return this.evaluation.endDate;
-        },
-        set(v) {
-          this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v });
-        }
+         get() {
+            return this.evaluation.endDate;
+         },
+         set(v) {
+            this.$store.commit('setEvaluationEndDate', { key: this.evaluation.key, date: v });
+         }
       },
       maxDate: {
-        get() {
-          return this.evaluation.maxDate;
-        },
-        set(v) {
-          this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v });
-        }
+         get() {
+            return this.evaluation.maxDate;
+         },
+         set(v) {
+            this.$store.commit('setEvaluationMaxDate', { key: this.evaluation.key, date: v });
+         }
       },
       warningInterval: {
          get() { return this.evaluation.warningInterval; },
@@ -344,7 +345,7 @@ export default {
       ISOToDatetime,
       canEditDocument(document) {
          return 'storedObject' in document ?
-           this.mime.includes(document.storedObject.type) && document.storedObject.keyInfos.length === 0 : false;
+            this.mime.includes(document.storedObject.type) && document.storedObject.keyInfos.length === 0 : false;
       },
       listAllStatus() {
          console.log('load all status');
@@ -360,16 +361,16 @@ export default {
       },
       buildEditLink(storedObject) {
          return `/wopi/edit/${storedObject.uuid}?returnPath=` + encodeURIComponent(
-           window.location.pathname + window.location.search + window.location.hash);
+            window.location.pathname + window.location.search + window.location.hash);
       },
       submitBeforeGenerate({template}) {
-        const callback = (data) => {
-          let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
+         const callback = (data) => {
+            let evaluationId = data.accompanyingPeriodWorkEvaluations.find(e => e.key === this.evaluation.key).id;
 
-          window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
-        };
+            window.location.assign(buildLink(template, evaluationId, 'Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation'));
+         };
 
-        return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
+         return this.$store.dispatch('submit', callback).catch(e => { console.log(e); throw e; });
       },
       onInputDocumentTitle(event) {
          const id = Number(event.target.id);
@@ -395,20 +396,20 @@ export default {
       },
       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});
+            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));
-       };
+         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; });
-     },
+         return this.$store.dispatch('submit', callback)
+            .catch(e => { console.log(e); throw e; });
+      },
    },
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
index 0bfe61d94..570a3b670 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js
@@ -132,9 +132,9 @@ const store = createStore({
         var k = Object.assign(e, {
           key: index,
           editEvaluation: false,
-          startDate: e.startDate !== null ? ISOToDatetime(e.startDate.datetime) : null,
-          endDate: e.endDate !== null ? ISOToDatetime(e.endDate.datetime) : null,
-          maxDate: e.maxDate !== null ? ISOToDatetime(e.maxDate.datetime) : null,
+          startDate: e.startDate !== null ? dateToISO(new Date(e.startDate.datetime)) : null,
+          endDate: e.endDate !== null ? dateToISO(new Date(e.endDate.datetime)) : null,
+          maxDate: e.maxDate !== null ? dateToISO(new Date(e.maxDate.datetime)) : null,
           warningInterval: e.warningInterval !== null ? intervalISOToDays(e.warningInterval) : null,
           documents: e.documents.map((d, docIndex) => {
             return Object.assign(d, {
@@ -264,6 +264,7 @@ const store = createStore({
           .startDate = date;
     },
     setEvaluationEndDate(state, {key, date}) {
+      console.log('commit date', date)
       state.evaluationsPicked.find(e => e.key === key)
           .endDate = date;
     },