Merge branch 'master' into 8264-hotFix_globalInvoicing_paralellism

2025-01-08 13:29:39 +00:00 · 2025-01-08 13:29:39 +00:00 · 83d4997c89
parent ebb4d36fda 60191b61ce
commit 83d4997c89
9 changed files with 80 additions and 44 deletions
--- a/package.json
+++ b/package.json
@ -25,6 +25,7 @@
        "axios": "^1.4.0",
        "chromium": "^3.0.3",
        "croppie": "^2.6.5",
+        "moment": "^2.30.1",
        "pinia": "^2.1.3",
        "quasar": "^2.14.5",
        "validator": "^13.9.0",
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@ -20,6 +20,9 @@ dependencies:
  croppie:
    specifier: ^2.6.5
    version: 2.6.5
+  moment:
+    specifier: ^2.30.1
+    version: 2.30.1
  pinia:
    specifier: ^2.1.3
    version: 2.1.7(typescript@5.5.4)(vue@3.4.19)
@ -832,8 +835,8 @@ packages:
      vue-i18n:
        optional: true
    dependencies:
-      '@intlify/message-compiler': 10.0.0
-      '@intlify/shared': 10.0.0
+      '@intlify/message-compiler': 11.0.0-rc.1
+      '@intlify/shared': 11.0.0-rc.1
      jsonc-eslint-parser: 1.4.1
      source-map: 0.6.1
      vue-i18n: 9.9.1(vue@3.4.19)
@ -847,11 +850,11 @@ packages:
      '@intlify/message-compiler': 9.9.1
      '@intlify/shared': 9.9.1

-  /@intlify/message-compiler@10.0.0:
-    resolution: {integrity: sha512-OcaWc63NC/9p1cMdgoNKBj4d61BH8sUW1Hfs6YijTd9656ZR4rNqXAlRnBrfS5ABq0vjQjpa8VnyvH9hK49yBw==}
+  /@intlify/message-compiler@11.0.0-rc.1:
+    resolution: {integrity: sha512-TGw2uBfuTFTegZf/BHtUQBEKxl7Q/dVGLoqRIdw8lFsp9g/53sYn5iD+0HxIzdYjbWL6BTJMXCPUHp9PxDTRPw==}
    engines: {node: '>= 16'}
    dependencies:
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
      source-map-js: 1.0.2
    dev: true

@ -862,8 +865,8 @@ packages:
      '@intlify/shared': 9.9.1
      source-map-js: 1.0.2

-  /@intlify/shared@10.0.0:
-    resolution: {integrity: sha512-6ngLfI7DOTew2dcF9WMJx+NnMWghMBhIiHbGg+wRvngpzD5KZJZiJVuzMsUQE1a5YebEmtpTEfUrDp/NqVGdiw==}
+  /@intlify/shared@11.0.0-rc.1:
+    resolution: {integrity: sha512-8tR1xe7ZEbkabTuE/tNhzpolygUn9OaYp9yuYAF4MgDNZg06C3Qny80bes2/e9/Wm3aVkPUlCw6WgU7mQd0yEg==}
    engines: {node: '>= 16'}
    dev: true

@ -887,7 +890,7 @@ packages:
        optional: true
    dependencies:
      '@intlify/bundle-utils': 4.0.0(vue-i18n@9.9.1)
-      '@intlify/shared': 10.0.0
+      '@intlify/shared': 11.0.0-rc.1
      '@rollup/pluginutils': 4.2.1
      '@vue/compiler-sfc': 3.4.19
      debug: 4.3.4(supports-color@8.1.1)
@ -4960,6 +4963,10 @@ packages:
      uuid: 8.3.2
    dev: true

+  /moment@2.30.1:
+    resolution: {integrity: sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==}
+    dev: false
+
  /ms@2.0.0:
    resolution: {integrity: sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==}

--- a/src/pages/Entry/EntryBuysTableDialog.vue
+++ b/src/pages/Entry/EntryBuysTableDialog.vue
@ -1,24 +1,24 @@
 <script setup>
-import { computed } from 'vue';
+import { computed, ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import { QBtn } from 'quasar';

 import VnPaginate from 'src/components/ui/VnPaginate.vue';
 import { usePrintService } from 'composables/usePrintService';
-const { openReport } = usePrintService();

+const { openReport } = usePrintService();
+const buyRows = ref([]);
 const route = useRoute();
 const { t } = useI18n();
 const $props = defineProps({
    id: {
-        type: String,
+        type: Number,
        required: false,
        default: null,
    },
 });
 const entityId = computed(() => $props.id || route.params.id);
-
 const entriesTableColumns = computed(() => [
    {
        align: 'left',
@ -63,34 +63,39 @@ const entriesTableColumns = computed(() => [
        field: 'grouping',
    },
 ]);
-</script>

+function downloadCSV(rows) {
+    const headers = ['id', 'itemFk', 'name', 'stickers', 'packing', 'comment'];
+
+    const csvRows = rows.map((row) => {
+        const buy = row;
+        const item = buy.item || {};
+
+        return [
+            buy.id,
+            buy.itemFk,
+            item.name || '',
+            buy.stickers,
+            buy.packing,
+            item.comment || '',
+        ].join(',');
+    });
+
+    const csvContent = [headers.join(','), ...csvRows].join('\n');
+
+    const blob = new Blob([csvContent], { type: 'text/csv;charset=utf-8;' });
+    const url = URL.createObjectURL(blob);
+    const link = document.createElement('a');
+    link.href = url;
+    link.setAttribute('download', `${entityId.value}data.csv`);
+    document.body.appendChild(link);
+    link.click();
+    document.body.removeChild(link);
+}
+</script>
 <template>
    <QDialog ref="dialogRef">
        <QCard style="min-width: 800px">
-            <QCardSection class="row items-center q-pb-none">
-                <QAvatar
-                    :icon="icon"
-                    color="primary"
-                    text-color="white"
-                    size="xl"
-                    v-if="icon"
-                />
-                <span class="text-h6 text-grey">{{ title }}</span>
-                <QSpace />
-                <QBtn icon="close" :disable="isLoading" flat round dense v-close-popup />
-            </QCardSection>
-            <QCardActions align="right">
-                <QBtn
-                    :label="t('myEntries.printLabels')"
-                    color="primary"
-                    icon="print"
-                    :loading="isLoading"
-                    @click="openReport(`Entries/${entityId}/labelSupplier`)"
-                    unelevated
-                    autofocus
-                />
-            </QCardActions>
            <QCardSection class="row items-center">
                <VnPaginate
                    ref="entryBuysPaginateRef"
@ -101,6 +106,7 @@ const entriesTableColumns = computed(() => [
                >
                    <template #body="{ rows }">
                        <QTable
+                            ref="buyRows"
                            :rows="rows"
                            :columns="entriesTableColumns"
                            row-key="id"
@ -110,6 +116,26 @@ const entriesTableColumns = computed(() => [
                            :grid="$q.screen.lt.md"
                            :no-data-label="t('globals.noResults')"
                        >
+                            <template #top-left>
+                                <QBtn
+                                    :label="t('myEntries.downloadCsv')"
+                                    color="primary"
+                                    icon="csv"
+                                    @click="downloadCSV(rows)"
+                                    unelevated
+                                />
+                            </template>
+                            <template #top-right>
+                                <QBtn
+                                    class="q-mr-lg"
+                                    :label="t('myEntries.printLabels')"
+                                    color="primary"
+                                    icon="print"
+                                    @click="
+                                        openReport(`Entries/${entityId}/labelSupplier`)
+                                    "
+                                />
+                            </template>
                            <template #body="props">
                                <QTr>
                                    <QTd v-for="col in props.cols" :key="col.name">
@ -118,7 +144,6 @@ const entriesTableColumns = computed(() => [
                                    <QBtn
                                        icon="visibility"
                                        v-if="props.row.stickers > 0"
-                                        :loading="isLoading"
                                        @click="
                                            openReport(
                                                `Entries/${props.row.id}/buy-label-supplier`
--- a/src/pages/Entry/MyEntries.vue
+++ b/src/pages/Entry/MyEntries.vue
@ -102,7 +102,7 @@ const columns = computed(() => [
        actions: [
            {
                title: t('myEntries.printLabels'),
-                icon: 'print',
+                icon: 'move_item',
                isPrimary: true,
                action: (row) => printBuys(row.id),
            },
--- a/src/pages/Entry/locale/en.yml
+++ b/src/pages/Entry/locale/en.yml
@ -17,5 +17,6 @@ myEntries:
    warehouseInFk: Warehouse in
    daysOnward: Days onward
    daysAgo: Days ago
+    downloadCsv: Download CSV
 wasteRecalc:
    recalcOk: The wastes were successfully recalculated
--- a/src/pages/Entry/locale/es.yml
+++ b/src/pages/Entry/locale/es.yml
@ -20,5 +20,6 @@ myEntries:
    warehouseInFk: Alm. entrada
    daysOnward: Días adelante
    daysAgo: Días atras
+    downloadCsv: Descargar CSV
 wasteRecalc:
    recalcOk: Se han recalculado las mermas correctamente
--- a/src/pages/Ticket/Card/TicketExpedition.vue
+++ b/src/pages/Ticket/Card/TicketExpedition.vue
@ -201,7 +201,7 @@ const getExpeditionState = async (expedition) => {

 const openGrafana = (expeditionFk) => {
    useOpenURL(
-        `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
+        `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}`
    );
 };

--- a/src/pages/Worker/Card/WorkerTimeControl.vue
+++ b/src/pages/Worker/Card/WorkerTimeControl.vue
@ -22,6 +22,7 @@ import { useVnConfirm } from 'composables/useVnConfirm';
 import { useArrayData } from 'composables/useArrayData';
 import { toTimeFormat, secondsToHoursMinutes } from 'filters/date.js';
 import toDateString from 'filters/toDateString.js';
+import moment from 'moment';
 import { date } from 'quasar';

 const route = useRoute();
@ -64,6 +65,7 @@ const selectedDateFormatted = ref(toDateString(defaultDate.value));

 const arrayData = useArrayData('workerData');
 const acl = useAcl();
+const selectedDateYear = computed(() => moment(selectedDate.value).isoWeekYear());
 const worker = computed(() => arrayData.store?.data);
 const canSend = computed(() =>
    acl.hasAny([{ model: 'WorkerTimeControl', props: 'sendMail', accessType: 'WRITE' }])
@ -278,7 +280,7 @@ const fetchHours = async () => {

 const fetchWeekData = async () => {
    const where = {
-        year: selectedDate.value.getFullYear(),
+        year: selectedDateYear.value,
        week: selectedWeekNumber.value,
    };
    const mail = (
@ -370,7 +372,7 @@ const showReasonForm = () => {

 const updateWorkerTimeControlMail = async (state, reason) => {
    const params = {
-        year: selectedDate.value.getFullYear(),
+        year: selectedDateYear.value,
        week: selectedWeekNumber.value,
        state,
    };
@ -400,7 +402,7 @@ const resendEmail = async () => {
    const params = {
        recipient: worker.value[0]?.user?.emailUser?.email,
        week: selectedWeekNumber.value,
-        year: selectedDate.value.getFullYear(),
+        year: selectedDateYear.value,
        workerId: Number(route.params.id),
        state: 'SENDED',
    };
--- a/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
+++ b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue
@ -102,8 +102,7 @@ const getWorkWeekElements = () => {
 };

 const paintWorkWeeks = async () => {
-    for (var i = 0; i < workWeeksElements.value.length; i++) {
-        const element = workWeeksElements.value[i];
+    for (const element of workWeeksElements.value) {
        const week = Number(element.innerHTML);
        const weekState = workerTimeControlMailsMap.value.get(week);
        const { className, title } = stateClasses[weekState] || {};