Apply workerDms changes

src/components/common/VnDms.vue

@@ -198,9 +198,11 @@ function addDefaultData(data) {
 en:
     contentTypesInfo: Allowed file types {allowedContentTypes}
     EntryDmsDescription: Reference {reference}
+    WorkersDescription: Working of employee id {reference}
 es:
     Generate identifier for original file: Generar identificador para archivo original
     contentTypesInfo: Tipos de archivo permitidos {allowedContentTypes}
     EntryDmsDescription: Referencia {reference}
+    WorkersDescription: Laboral del empleado {reference}
 
 </i18n>

src/components/common/VnDmsList.vue

@@ -5,11 +5,12 @@ import { useRoute } from 'vue-router';
 import { useQuasar, QCheckbox, QBtn, QInput } from 'quasar';
 import axios from 'axios';
 
-import FetchData from 'components/FetchData.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
 import VnDms from 'src/components/common/VnDms.vue';
 import VnConfirm from 'components/ui/VnConfirm.vue';
+import VnInputDate from 'components/common/VnInputDate.vue';
+import VnUserLink from '../ui/VnUserLink.vue';
 import { downloadFile } from 'src/composables/downloadFile';
-import { getUrlFindOne } from 'composables/getUrl';
 
 const route = useRoute();
 const quasar = useQuasar();
@@ -27,6 +28,11 @@ const $props = defineProps({
         type: String,
         default: null,
     },
+    downloadModel: {
+        type: String,
+        required: false,
+        default: null,
+    },
     defaultDmsCode: {
         type: String,
         required: true,
@@ -75,7 +81,7 @@ const dmsFilter = {
             ],
         },
     },
-    order: ['dmsFk DESC'],
+    where: { [$props.filter]: route.params.id },
 };
 
 const columns = computed(() => [
@@ -95,12 +101,12 @@ const columns = computed(() => [
         props: (prop) => ({
             readonly: true,
             borderless: true,
-            'model-value': prop.row.dmsType.name,
+            'model-value': prop.row.dmsType?.name,
         }),
     },
     {
         align: 'left',
-        field: 'order',
+        field: 'hardCopyNumber',
         label: t('globals.order'),
         name: 'order',
         component: 'span',
@@ -118,6 +124,7 @@ const columns = computed(() => [
         label: t('globals.description'),
         name: 'description',
         component: 'span',
+        props: (prop) => ({ value: prop.value?.toUpperCase() }),
     },
     {
         align: 'left',
@@ -137,6 +144,28 @@ const columns = computed(() => [
         name: 'file',
         component: 'span',
     },
+    {
+        align: 'left',
+        field: 'worker',
+        label: t('globals.worker'),
+        name: 'worker',
+        component: VnUserLink,
+        props: (prop) => ({
+            name: prop.row.worker?.user?.name.toLowerCase(),
+            workerId: prop.row.worker?.id,
+        }),
+    },
+    {
+        align: 'left',
+        field: 'created',
+        label: t('globals.created'),
+        name: 'created',
+        component: VnInputDate,
+        props: (prop) => ({
+            disable: true,
+            'model-value': prop.row.created,
+        }),
+    },
     {
         field: 'options',
         name: 'options',
@@ -144,16 +173,24 @@ const columns = computed(() => [
             {
                 component: QBtn,
                 name: 'download',
+                isDocuware: true,
                 props: () => ({
                     icon: 'cloud_download',
                     flat: true,
                     color: 'primary',
                 }),
-                click: (prop) => downloadFile(prop.row.id, prop.row.isDocuware),
+                click: (prop) =>
+                    downloadFile(
+                        prop.row.id,
+                        $props.downloadModel,
+                        null,
+                        prop.row.download
+                    ),
             },
             {
                 component: QBtn,
                 name: 'edit',
+                external: false,
                 props: () => ({
                     icon: 'edit',
                     flat: true,
@@ -164,6 +201,7 @@ const columns = computed(() => [
             {
                 component: QBtn,
                 name: 'delete',
+                external: false,
                 props: () => ({
                     icon: 'delete',
                     flat: true,
@@ -173,20 +211,22 @@ const columns = computed(() => [
             },
             {
                 component: QBtn,
-                name: 'openDocuware',
+                name: 'open',
+                external: true,
                 props: () => ({
                     icon: 'open_in_new',
                     flat: true,
                     color: 'primary',
                 }),
-                click: () => openDocuware(),
+                click: (prop) => open(prop.row.url),
             },
         ],
     },
 ]);
 
 function setData(data) {
-    const newData = data.map((value) => value.dms);
+    const newData = data.map((value) => value.dms || value);
+    newData.sort((a, b) => new Date(b.created) - new Date(a.created));
     rows.value = newData;
 }
 
@@ -221,25 +261,26 @@ function parseDms(data) {
     return data;
 }
 
-async function openDocuware() {
+async function open(url) {
-    const url = await getUrlFindOne('WebClient', 'docuware');
+    window.open(url).focus();
-    if (url) window.open(url).focus();
 }
 
-function shouldRenderButton(buttonName, isDocuware = false) {
+function shouldRenderButton(button, isExternal = false) {
-    // Renderizar el botón si no se llama 'openDocuware' o (se llama 'openDocuware' y props.row.isDocuware = true)
+    if (button.name == 'download') return true;
-    return buttonName !== 'openDocuware' || (buttonName === 'openDocuware' && isDocuware);
+    return button.external === isExternal;
 }
 </script>
 <template>
-    <FetchData
+    <VnPaginate
         ref="dmsRef"
+        :data-key="$props.model"
         :url="$props.model"
         :filter="dmsFilter"
-        :where="{ [$props.filter]: route.params.id }"
+        :order="['dmsFk DESC']"
+        :auto-load="true"
         @on-fetch="setData"
-        auto-load
+    >
-    />
+        <template #body>
             <QTable
                 :columns="columns"
                 :rows="rows"
@@ -264,10 +305,12 @@ function shouldRenderButton(buttonName, isDocuware = false) {
                             </component>
                         </QTr>
 
-                <div class="flex justify-center" v-if="props.col.name == 'options'">
+                        <div class="row no-wrap" v-if="props.col.name == 'options'">
                             <div v-for="button of props.col.components" :key="button.id">
                                 <component
-                            v-if="shouldRenderButton(button.name, props.row.isDocuware)"
+                                    v-if="
+                                        shouldRenderButton(button, props.row.isDocuware)
+                                    "
                                     :is="button.component"
                                     v-bind="button.props(props)"
                                     @click="button.click(props)"
@@ -315,6 +358,8 @@ function shouldRenderButton(buttonName, isDocuware = false) {
                     </div>
                 </template>
             </QTable>
+        </template>
+    </VnPaginate>
     <QDialog v-model="formDialog.show">
         <VnDms
             :model="updateModel ?? model"

src/components/ui/VnPaginate.vue

@@ -110,7 +110,7 @@ async function paginate() {
     if (!arrayData.hasMoreData.value) {
         if (store.userParamsChanged) arrayData.hasMoreData.value = true;
         store.userParamsChanged = false;
-        isLoading.value = false;
+        endPagination();
         return;
     }
 
@@ -120,12 +120,14 @@ async function paginate() {
     pagination.value.sortBy = sortBy;
     pagination.value.descending = descending;
 
-    isLoading.value = false;
+    endPagination();
+}
 
+function endPagination() {
+    isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
 }
-
 async function onLoad(index, done) {
     if (!store.data) {
         return done();
@@ -188,6 +190,12 @@ async function onLoad(index, done) {
             <QSpinner color="orange" size="md" />
         </div>
     </QInfiniteScroll>
+    <div
+        v-if="!isLoading && arrayData.hasMoreData"
+        class="w-full flex justify-center q-mt-md"
+    >
+        <QBtn color="primary" :label="t('Load more data')" @click="paginate()" />
+    </div>
 </template>
 
 <style lang="scss" scoped>
@@ -204,4 +212,5 @@ async function onLoad(index, done) {
 es:
     No data to display: Sin datos que mostrar
     No results found: No se han encontrado resultados
+    Load more data: Cargar más resultados
 </i18n>

src/components/ui/VnTree.vue

@@ -76,7 +76,7 @@ const removeNode = (node) => {
                 notify(t('department.departmentRemoved'), 'positive');
                 await fetchNodeLeaves(parentFk);
             } catch (err) {
-                console.log('Error removing department');
+                console.error('Error removing department');
             }
         });
 };

src/composables/downloadFile.js

@@ -4,9 +4,8 @@ import { getUrl } from './getUrl';
 const { getTokenMultimedia } = useSession();
 const token = getTokenMultimedia();
 
-export async function downloadFile(dmsId, isDocuware = false) {
+export async function downloadFile(id, model = 'dms', urlPath = '/downloadFile', url) {
     let appUrl = await getUrl('', 'lilium');
     appUrl = appUrl.replace('/#/', '');
-    const urlPath = isDocuware ? '/docuwareDownload' : '/downloadFile';
+    window.open(url ?? `${appUrl}/api/${model}/${id}${urlPath}?access_token=${token}`);
-    window.open(`${appUrl}/api/dms/${dmsId}${urlPath}?access_token=${token}`);
 }

src/composables/getUrl.js

@@ -1,7 +1,4 @@
 import axios from 'axios';
-import useNotify from 'src/composables/useNotify.js';
-
-const { notify } = useNotify();
 
 export async function getUrl(route, app = 'salix') {
     let url;
@@ -11,24 +8,3 @@ export async function getUrl(route, app = 'salix') {
     });
     return url;
 }
-
-export async function getUrlFindOne(route, app = 'salix') {
-    try {
-        const env = process.env.NODE_ENV;
-
-        const filter = {
-            where: { and: [{ appName: app }, { environment: env }] },
-        };
-
-        const { data } = await axios.get('Urls/findOne', {
-            params: { filter: JSON.stringify(filter) },
-        });
-
-        if (!data) return null;
-
-        return data.url + route;
-    } catch (err) {
-        notify('Direction not found', 'negative');
-        console.error('Error finding url: ', err);
-    }
-}

src/composables/useArrayData.js

@@ -98,7 +98,7 @@ export function useArrayData(key, userOptions) {
 
         const { limit } = filter;
 
-        hasMoreData.value = response.data.length === limit;
+        hasMoreData.value = response.data.length >= limit;
 
         if (append) {
             if (!store.data) store.data = [];

src/i18n/en/index.js

@@ -92,6 +92,8 @@ export default {
             log: 'Logs',
             parkingList: 'Parkings list',
         },
+        created: 'Created',
+        worker: 'Worker',
     },
     errors: {
         statusUnauthorized: 'Access denied',

src/i18n/es/index.js

@@ -92,6 +92,8 @@ export default {
             log: 'Historial',
             parkingList: 'Listado de parkings',
         },
+        created: 'Fecha creación',
+        worker: 'Trabajador',
     },
     errors: {
         statusUnauthorized: 'Acceso denegado',

src/pages/Department/Card/DepartmentDescriptor.vue

@@ -63,7 +63,7 @@ const removeDepartment = () => {
                 router.push({ name: 'WorkerDepartment' });
                 notify('department.departmentRemoved', 'positive');
             } catch (err) {
-                console.log('Error removing department');
+                console.error('Error removing department');
             }
         });
 };

src/pages/Worker/Card/WorkerDms.vue

@@ -1,11 +1,14 @@
 <script setup>
 import VnDmsList from 'src/components/common/VnDmsList.vue';
+import { useRoute } from 'vue-router';
+const route = useRoute();
 </script>
 <template>
     <VnDmsList
-        model="WorkerDms"
+        :model="`WorkerDms/${route.params.id}/filter`"
         update-model="Workers"
+        download-model="WorkerDms"
         default-dms-code="hhrrData"
-        filter="workerFk"
+        filter="worker"
     />
 </template>