From 154f9767622a1c09fed8aa38f04431e1d448edaa Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 23 Feb 2022 15:46:21 +0100 Subject: [PATCH 01/20] DocStore bundle: create a vue component for uploading document --- .../vuejs/_components/AddAsyncUpload.vue | 58 +++++++++++++++++++ .../chill.webpack.config.js | 3 + .../components/FormEvaluation.vue | 18 ++++++ 3 files changed, 79 insertions(+) create mode 100644 src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue new file mode 100644 index 000000000..a94455308 --- /dev/null +++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/_components/AddAsyncUpload.vue @@ -0,0 +1,58 @@ + + + + + diff --git a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js index 833052ef4..c9b2b8877 100644 --- a/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js +++ b/src/Bundle/ChillDocStoreBundle/chill.webpack.config.js @@ -1,4 +1,7 @@ module.exports = function(encore) { + encore.addAliases({ + ChillDocStoreAssets: __dirname + '/Resources/public' + }); encore.addEntry('mod_async_upload', __dirname + '/Resources/public/module/async_upload/index.js'); }; 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 cabebf973..5f630f70f 100644 --- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue +++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue @@ -88,6 +88,7 @@
+
{{ $t('document_add') }} :
{{ $t('evaluation_generate_a_document') }} +
+ +
    +
  • + + +
  • +
+
+
@@ -111,6 +124,7 @@ 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'; +import AddAsyncUpload from 'ChillDocStoreAssets/vuejs/_components/AddAsyncUpload.vue'; const i18n = { messages: { @@ -129,6 +143,9 @@ const i18n = { evaluation_add_a_document: "Ajouter un document", evaluation_add: "Ajouter une évaluation", Documents: "Documents", + document_add: "Générer ou téléverser un document", + document_upload: "Téléverser un document", + browse: "Ajouter un document" } } }; @@ -139,6 +156,7 @@ export default { components: { ckeditor: CKEditor.component, PickTemplate, + AddAsyncUpload }, i18n, data() { From 5f71b46bb753b1a28c8c3488f93e0292d2632c62 Mon Sep 17 00:00:00 2001 From: nobohan Date: Wed, 23 Feb 2022 17:21:35 +0100 Subject: [PATCH 02/20] tentative to add asyncupload into modal --- .../public/vuejs/_components/PickTemplate.vue | 4 +- .../public/module/async_upload/uploader.js | 103 +++++++++--------- .../vuejs/_components/AddAsyncUpload.vue | 30 +++-- .../components/FormEvaluation.vue | 2 +- 4 files changed, 78 insertions(+), 61 deletions(-) diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue index cd5121fc9..2ab033f2e 100644 --- a/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue +++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue @@ -16,8 +16,8 @@