From 4effba1580c4afa70c1fe2c01e3685a0b8e5b420 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 16:38:41 -0300
Subject: [PATCH 1/8] Ticket dms

---
 src/i18n/locale/en.yml              |  1 +
 src/i18n/locale/es.yml              |  1 +
 src/pages/Ticket/Card/TicketDms.vue | 13 +++++++++++++
 src/router/modules/ticket.js        | 11 ++++++++++-
 4 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/Card/TicketDms.vue

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index b3a85eefa..63d5f630a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        dms: File management
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..92b77a351 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -441,6 +441,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        dms: Gestión documental
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
new file mode 100644
index 000000000..ae44fb795
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -0,0 +1,13 @@
+<script setup>
+import VnDmsList from 'src/components/common/VnDmsList.vue';
+</script>
+<template>
+    <VnDmsList
+        model="TicketDms"
+        update-model="tickets"
+        delete-model="TicketDms"
+        download-model="dms"
+        default-dms-code="ticket"
+        filter="ticket"
+    />
+</template>
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..05e323d50 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -12,7 +12,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
+        card: ['TicketBoxing', 'TicketSms', 'TicketSale', 'TicketDms'],
     },
     children: [
         {
@@ -93,6 +93,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'dms',
+                    name: 'TicketDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+                },
             ],
         },
     ],

From c500dd6346479852457472558403e5bdfcf6a1d1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 24 Jun 2024 16:58:26 -0300
Subject: [PATCH 2/8] Add allow import feature in VnDmsList

---
 src/components/common/VnDmsImportForm.vue | 81 +++++++++++++++++++++++
 src/components/common/VnDmsList.vue       | 12 ++++
 src/pages/Ticket/Card/TicketDms.vue       |  1 +
 3 files changed, 94 insertions(+)
 create mode 100644 src/components/common/VnDmsImportForm.vue

diff --git a/src/components/common/VnDmsImportForm.vue b/src/components/common/VnDmsImportForm.vue
new file mode 100644
index 000000000..b31197bbc
--- /dev/null
+++ b/src/components/common/VnDmsImportForm.vue
@@ -0,0 +1,81 @@
+<script setup>
+import { ref } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import VnSelect from 'src/components/common/VnSelect.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import FormModelPopup from 'components/FormModelPopup.vue';
+import FetchData from 'components/FetchData.vue';
+
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const emit = defineEmits(['onDataSaved']);
+
+const { t } = useI18n();
+const { notify } = useNotify();
+const route = useRoute();
+
+const dmsOptions = ref([]);
+const dmsId = ref(null);
+
+const onDataSaved = (formData, requestResponse) => {
+    emit('onDataSaved', formData, requestResponse);
+};
+
+const importDms = async () => {
+    try {
+        if (!dmsId.value) throw new Error(t(`The document indentifier can't be empty`));
+
+        const data = {
+            ticketFk: route.params.id,
+            dmsFk: dmsId.value,
+        };
+
+        await axios.post('ticketDms', data);
+        notify(t('globals.dataSaved'), 'positive');
+        dmsId.value = null;
+        emit('onDataSaved');
+    } catch (e) {
+        throw new Error(e.message);
+    }
+};
+</script>
+
+<template>
+    <FetchData
+        url="Dms"
+        :filter="{ fields: ['id'], order: 'id ASC' }"
+        auto-load
+        @on-fetch="(data) => (dmsOptions = data)"
+    />
+    <FormModelPopup
+        url-create="genera"
+        model="DmsImport"
+        :title="t('Select document id')"
+        :form-initial-data="{}"
+        :save-fn="importDms"
+        @on-data-saved="onDataSaved"
+    >
+        <template #form-inputs>
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    :label="t('Document')"
+                    :options="dmsOptions"
+                    hide-selected
+                    option-label="id"
+                    option-value="id"
+                    v-model="dmsId"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+es:
+    Select document id: Introduzca id de gestion documental
+    Document: Documento
+    The document indentifier can't be empty: El número de documento no puede estar vacío
+</i18n>
diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 769ba9959..0576ba266 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -3,6 +3,7 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
+import VnDmsImportForm from 'src/components/common/VnDmsImportForm.vue';
 import axios from 'axios';
 
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -18,6 +19,7 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
+const showImportDialog = ref(false);
 
 const $props = defineProps({
     model: {
@@ -45,6 +47,10 @@ const $props = defineProps({
         type: String,
         required: true,
     },
+    allowImport: {
+        type: Boolean,
+        default: false,
+    },
 });
 
 const dmsFilter = {
@@ -373,9 +379,15 @@ function shouldRenderButton(button, isExternal = false) {
             :description="$props.description"
         />
     </QDialog>
+    <QDialog v-model="showImportDialog">
+        <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
+    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
     </QPageSticky>
+    <QPageSticky v-if="allowImport" position="bottom-right" :offset="[25, 90]">
+        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
+    </QPageSticky>
 </template>
 <style scoped>
 .q-gutter-y-ms {
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index ae44fb795..423e15467 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -9,5 +9,6 @@ import VnDmsList from 'src/components/common/VnDmsList.vue';
         download-model="dms"
         default-dms-code="ticket"
         filter="ticket"
+        allow-import
     />
 </template>

From 826e8ed068f52b76b7316eab3e9700dddaa89ba1 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 26 Jun 2024 17:19:07 -0300
Subject: [PATCH 3/8] changes

---
 src/pages/Ticket/Card/TicketDms.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index 423e15467..7369ee7b2 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -8,7 +8,7 @@ import VnDmsList from 'src/components/common/VnDmsList.vue';
         delete-model="TicketDms"
         download-model="dms"
         default-dms-code="ticket"
-        filter="ticket"
+        filter="ticketFk"
         allow-import
     />
 </template>

From 2d2fff1bf390b88fdb97f996c136c59f30ad8e3d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Fri, 28 Jun 2024 13:22:39 +0200
Subject: [PATCH 4/8] perf: Dms buttons tooltip

---
 src/components/common/VnDmsList.vue | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 0576ba266..a5f0fa44e 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -383,10 +383,30 @@ function shouldRenderButton(button, isExternal = false) {
         <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
+        <QBtn
+            fab
+            color="primary"
+            icon="publish"
+            @click="showFormDialog()"
+            class="fill-icon"
+        >
+            <QTooltip>
+                {{ t('Import from existing') }}
+            </QTooltip>
+        </QBtn>
     </QPageSticky>
     <QPageSticky v-if="allowImport" position="bottom-right" :offset="[25, 90]">
-        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
+        <QBtn
+            fab
+            color="primary"
+            icon="file_copy"
+            @click="showImportDialog = true"
+            class="fill-icon"
+        >
+            <QTooltip>
+                {{ t('Upload file') }}
+            </QTooltip>
+        </QBtn>
     </QPageSticky>
 </template>
 <style scoped>
@@ -404,4 +424,7 @@ en:
 es:
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     Generate identifier for original file: Generar identificador para archivo original
-</i18n>
+    Upload file: Subir fichero
+    Import from existing: Importar desde existente
+
+    </i18n>

From f23b7837b78e0527e6150df5beabc18bc8ce4d83 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Mon, 1 Jul 2024 09:58:05 +0200
Subject: [PATCH 5/8] perf: Dms buttons tooltip

---
 src/components/common/VnDmsList.vue | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index a5f0fa44e..9f7b07c0e 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -383,15 +383,9 @@ function shouldRenderButton(button, isExternal = false) {
         <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
     </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
-        <QBtn
-            fab
-            color="primary"
-            icon="publish"
-            @click="showFormDialog()"
-            class="fill-icon"
-        >
+        <QBtn fab color="primary" icon="add" @click="showFormDialog()" class="fill-icon">
             <QTooltip>
-                {{ t('Import from existing') }}
+                {{ t('Upload file') }}
             </QTooltip>
         </QBtn>
     </QPageSticky>
@@ -404,7 +398,7 @@ function shouldRenderButton(button, isExternal = false) {
             class="fill-icon"
         >
             <QTooltip>
-                {{ t('Upload file') }}
+                {{ t('Import from existing') }}
             </QTooltip>
         </QBtn>
     </QPageSticky>

From c3a064eeda37837c78ef2128656f3dc41e5e38f3 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 1 Jul 2024 09:48:27 -0300
Subject: [PATCH 6/8] Change dms import form ubication

---
 src/components/common/VnDmsList.vue              | 16 ++++------------
 src/pages/Ticket/Card/TicketDms.vue              | 14 ++++++++++++++
 .../Ticket/Card/TicketDmsImportForm.vue}         |  2 +-
 3 files changed, 19 insertions(+), 13 deletions(-)
 rename src/{components/common/VnDmsImportForm.vue => pages/Ticket/Card/TicketDmsImportForm.vue} (95%)

diff --git a/src/components/common/VnDmsList.vue b/src/components/common/VnDmsList.vue
index 0576ba266..31d3303d9 100644
--- a/src/components/common/VnDmsList.vue
+++ b/src/components/common/VnDmsList.vue
@@ -3,7 +3,6 @@ import { ref, computed } from 'vue';
 import { useI18n } from 'vue-i18n';
 import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
-import VnDmsImportForm from 'src/components/common/VnDmsImportForm.vue';
 import axios from 'axios';
 
 import VnPaginate from 'components/ui/VnPaginate.vue';
@@ -19,7 +18,6 @@ const { t } = useI18n();
 const rows = ref();
 const dmsRef = ref();
 const formDialog = ref({});
-const showImportDialog = ref(false);
 
 const $props = defineProps({
     model: {
@@ -47,10 +45,6 @@ const $props = defineProps({
         type: String,
         required: true,
     },
-    allowImport: {
-        type: Boolean,
-        default: false,
-    },
 });
 
 const dmsFilter = {
@@ -279,6 +273,10 @@ function shouldRenderButton(button, isExternal = false) {
     if (button.name == 'download') return true;
     return button.external === isExternal;
 }
+
+defineExpose({
+    dmsRef,
+});
 </script>
 <template>
     <VnPaginate
@@ -379,15 +377,9 @@ function shouldRenderButton(button, isExternal = false) {
             :description="$props.description"
         />
     </QDialog>
-    <QDialog v-model="showImportDialog">
-        <VnDmsImportForm @on-data-saved="dmsRef.fetch()" />
-    </QDialog>
     <QPageSticky position="bottom-right" :offset="[25, 25]">
         <QBtn fab color="primary" icon="add" @click="showFormDialog()" />
     </QPageSticky>
-    <QPageSticky v-if="allowImport" position="bottom-right" :offset="[25, 90]">
-        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
-    </QPageSticky>
 </template>
 <style scoped>
 .q-gutter-y-ms {
diff --git a/src/pages/Ticket/Card/TicketDms.vue b/src/pages/Ticket/Card/TicketDms.vue
index 7369ee7b2..b63578527 100644
--- a/src/pages/Ticket/Card/TicketDms.vue
+++ b/src/pages/Ticket/Card/TicketDms.vue
@@ -1,8 +1,16 @@
 <script setup>
+import { ref } from 'vue';
 import VnDmsList from 'src/components/common/VnDmsList.vue';
+import TicketDmsImportForm from 'src/pages/Ticket/Card/TicketDmsImportForm.vue';
+
+const dmsListRef = ref(null);
+const showImportDialog = ref(false);
+
+const onDataSaved = () => dmsListRef.value.dmsRef.fetch();
 </script>
 <template>
     <VnDmsList
+        ref="dmsListRef"
         model="TicketDms"
         update-model="tickets"
         delete-model="TicketDms"
@@ -11,4 +19,10 @@ import VnDmsList from 'src/components/common/VnDmsList.vue';
         filter="ticketFk"
         allow-import
     />
+    <QDialog v-model="showImportDialog">
+        <TicketDmsImportForm @on-data-saved="onDataSaved()" />
+    </QDialog>
+    <QPageSticky position="bottom-right" :offset="[25, 90]">
+        <QBtn fab color="primary" icon="file_copy" @click="showImportDialog = true" />
+    </QPageSticky>
 </template>
diff --git a/src/components/common/VnDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
similarity index 95%
rename from src/components/common/VnDmsImportForm.vue
rename to src/pages/Ticket/Card/TicketDmsImportForm.vue
index b31197bbc..ff876affd 100644
--- a/src/components/common/VnDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -26,7 +26,7 @@ const onDataSaved = (formData, requestResponse) => {
 
 const importDms = async () => {
     try {
-        if (!dmsId.value) throw new Error(t(`The document indentifier can't be empty`));
+        if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`));
 
         const data = {
             ticketFk: route.params.id,

From 6482dbad226bb0b159007204c80a838b67f744c7 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 09:13:44 +0200
Subject: [PATCH 7/8] fix: TicketDmsImportForm

---
 src/pages/Ticket/Card/TicketDmsImportForm.vue | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketDmsImportForm.vue b/src/pages/Ticket/Card/TicketDmsImportForm.vue
index ff876affd..869e166ca 100644
--- a/src/pages/Ticket/Card/TicketDmsImportForm.vue
+++ b/src/pages/Ticket/Card/TicketDmsImportForm.vue
@@ -20,10 +20,6 @@ const route = useRoute();
 const dmsOptions = ref([]);
 const dmsId = ref(null);
 
-const onDataSaved = (formData, requestResponse) => {
-    emit('onDataSaved', formData, requestResponse);
-};
-
 const importDms = async () => {
     try {
         if (!dmsId.value) throw new Error(t(`The document identifier can't be empty`));
@@ -56,7 +52,6 @@ const importDms = async () => {
         :title="t('Select document id')"
         :form-initial-data="{}"
         :save-fn="importDms"
-        @on-data-saved="onDataSaved"
     >
         <template #form-inputs>
             <VnRow class="row q-gutter-md q-mb-md">

From 3f2b675d074c484caa4dff4b190306f36a5c7008 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 9 Jul 2024 09:15:20 +0200
Subject: [PATCH 8/8] feat: change ticketDms leftMenuItem position

---
 src/router/modules/ticket.js | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 42a8fc44f..0a8fed551 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -202,15 +202,7 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketPackage.vue'),
                 },
-                {
-                    path: 'dms',
-                    name: 'TicketDms',
-                    meta: {
-                        title: 'dms',
-                        icon: 'cloud_upload',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
-                },
+
                 {
                     path: 'components',
                     name: 'TicketComponents',
@@ -220,6 +212,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketComponents.vue'),
                 },
+                {
+                    path: 'dms',
+                    name: 'TicketDms',
+                    meta: {
+                        title: 'dms',
+                        icon: 'cloud_upload',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketDms.vue'),
+                },
                 {
                     path: 'boxing',
                     name: 'TicketBoxing',