diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue index 67f624ce5..e931f1b68 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue +++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue @@ -139,7 +139,6 @@ export default { this.modal.showModal = false; }) .catch((error) => { - console.log(error); //TODO error handling if (error.name === 'ValidationException') { for (let v of error.violations) { this.$toast.open({message: v }); 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 d68320de7..4c4fa000f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -67,9 +67,9 @@
-
{{ d.template.name.fr }}
+
{{ d.template.name.fr }}
-

Créé par {{ d.createdBy.text }}
+

Créé par {{ d.createdBy.text }}
Le {{ $d(ISOToDatetime(d.createdAt.datetime), 'long') }}

@@ -246,6 +246,17 @@ export default { addDocument(storedObject) { console.log(storedObject); console.log('Add document'); + //TODO build here the document object + let document = { + type: 'accompanying_period_work_evaluation_document', + storedObject: storedObject, + template: { // TODO remove + name: { + fr: storedObject.filename + } + }, + }; + this.$store.commit('addDocument', {key: this.evaluation.key, document: document}); } }, } diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index b5421ea48..953f9f586 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/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; @@ -197,6 +198,15 @@ const store = createStore({ found.results = found.results.filter(r => r.id !== result.id); }, + addDocument(state, payload) { + state.evaluationsPicked.forEach( + e => { + if (e.key === payload.key) { + e.documents.push(payload.document); + } + } + ) + }, addEvaluation(state, evaluation) { let e = { type: "accompanying_period_work_evaluation", @@ -374,13 +384,15 @@ const store = createStore({ }); } }, + addDocument({commit}, payload) { + commit('addDocument', 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)