diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue index c71fb2b10..4ca2d49a1 100644 --- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue +++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue @@ -78,7 +78,7 @@ function closeModal(): void { > {{ trans(DOCUMENT_ADD) }} - -
-
{{ trans(EVALUATION_DOCUMENTS) }} :
-
-
-
-
- -
- -
-
-
-
-
-

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

-
-
-
-
- -
+
+
+

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

+
+
+ +
-
- { - selectedDocumentToDuplicate.value = d; - /** ensure selectedDocumentToMove is null */ - selectedDocumentToMove.value = null; + selectedDocumentToDuplicate.value = d; + /** ensure selectedDocumentToMove is null */ + selectedDocumentToMove.value = null; - showAccompanyingPeriodSelector.value = true; + showAccompanyingPeriodSelector.value = true; }; const prepareDocumentMoveToWork = (d) => { - selectedDocumentToMove.value = d; - /** ensure selectedDocumentToDuplicate is null */ - selectedDocumentToDuplicate.value = null; + selectedDocumentToMove.value = d; + /** ensure selectedDocumentToDuplicate is null */ + selectedDocumentToDuplicate.value = null; - showAccompanyingPeriodSelector.value = true; + showAccompanyingPeriodSelector.value = true; }; watch(selectedEvaluation, (val) => { - if (selectedDocumentToDuplicate.value) { - emit("duplicateDocumentToEvaluation", { - evaluation: val, - document: selectedDocumentToDuplicate.value, - }); - } else { - emit("moveDocumentToEvaluation", { - evaluationDest: val, - document: selectedDocumentToMove.value, - }); - } + if (selectedDocumentToDuplicate.value) { + emit("duplicateDocumentToEvaluation", { + evaluation: val, + document: selectedDocumentToDuplicate.value, + }); + } else { + emit("moveDocumentToEvaluation", { + evaluationDest: val, + document: selectedDocumentToMove.value, + }); + } }); 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 bb173fe62..571226b98 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -20,20 +20,22 @@ - + { - $toast.open({ - message: trans(EVALUATION_DOCUMENT_MOVE_SUCCESS), - }); - }) - .catch((e) => { - console.log(e); - }); + console.log("dest eval in formEvaluation", evaluationDest); + store + .dispatch("moveDocumentToEvaluation", { + evaluationInitial: props.evaluation, + evaluationDest: evaluationDest, + document: document, + }) + .then(() => { + $toast.open({ + message: trans(EVALUATION_DOCUMENT_MOVE_SUCCESS), + }); + }) + .catch((e) => { + console.log(e); + }); } function onStatusDocumentChanged(newStatus) { diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js index d19954045..00a7ddde7 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js @@ -656,7 +656,10 @@ const store = createStore({ { evaluationInitial, evaluationDest, document }, ) { try { - const response = await moveDocumentToEvaluation(document.id, evaluationDest.id); + const response = await moveDocumentToEvaluation( + document.id, + evaluationDest.id, + ); commit("moveDocumentToEvaluation", { evaluationInitial, evaluationDest, diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts index e36387b8e..a5dcd4f2c 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts @@ -21,11 +21,11 @@ export const duplicateDocumentToEvaluation = async ( }; export const moveDocumentToEvaluation = async ( - document_id: number, - evaluation_id: number, + document_id: number, + evaluation_id: number, ): Promise => { - return makeFetch( - "POST", - `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/move`, - ); + return makeFetch( + "POST", + `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/move`, + ); }; diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml index 97a895d2f..020aca794 100644 --- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml +++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml @@ -777,6 +777,8 @@ evaluation: notification_notify_any: Notifier d'autres utilisateurs notification_send: Envoyer une notification document: + edit: Modifier + delete: Supprimer move: Déplacer duplicate: Dupliquer duplicate_here: Dupliquer ici