From c807b5feb278c6918bec7f02189d226c5810f9ee Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Mon, 17 Jun 2024 08:21:43 -0300
Subject: [PATCH 1/5] Weekly tickets

---
 src/i18n/locale/en.yml            |   1 +
 src/i18n/locale/es.yml            |   1 +
 src/pages/Ticket/TicketWeekly.vue | 327 ++++++++++++++++++++++++++++++
 src/pages/Ticket/locale/en.yml    |   9 +
 src/pages/Ticket/locale/es.yml    |   9 +
 src/router/modules/ticket.js      |  11 +-
 6 files changed, 357 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/TicketWeekly.vue
 create mode 100644 src/pages/Ticket/locale/en.yml

diff --git a/src/i18n/locale/en.yml b/src/i18n/locale/en.yml
index 5ef3a5472..7f212ca30 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -442,6 +442,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        weeklyTickets: Weekly tickets
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index cfadd57b3..ff357492b 100644
--- a/src/i18n/locale/es.yml
+++ b/src/i18n/locale/es.yml
@@ -440,6 +440,7 @@ ticket:
         sms: Sms
         notes: Notas
         sale: Lineas del pedido
+        weeklyTickets: Tickets programados
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
new file mode 100644
index 000000000..50b4c0451
--- /dev/null
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -0,0 +1,327 @@
+<script setup>
+import { onMounted, ref, computed, reactive, onUnmounted } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRouter } from 'vue-router';
+
+import FetchData from 'components/FetchData.vue';
+import TableVisibleColumns from 'src/components/common/TableVisibleColumns.vue';
+import VnInput from 'src/components/common/VnInput.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import CustomerDescriptorProxy from 'src/pages/Customer/Card/CustomerDescriptorProxy.vue';
+import TicketDescriptorProxy from 'src/pages/Ticket/Card/TicketDescriptorProxy.vue';
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
+import VnSearchbar from 'src/components/ui/VnSearchbar.vue';
+
+import { useStateStore } from 'stores/useStateStore';
+import { dashIfEmpty } from 'src/filters';
+import { useVnConfirm } from 'composables/useVnConfirm';
+import { useArrayData } from 'composables/useArrayData';
+import useNotify from 'src/composables/useNotify.js';
+import axios from 'axios';
+
+const router = useRouter();
+const stateStore = useStateStore();
+const { t } = useI18n();
+const { openConfirmationModal } = useVnConfirm();
+const { notify } = useNotify();
+
+const paginateRef = ref(null);
+const agencyModesOptions = ref([]);
+const visibleColumns = ref([]);
+const allColumnNames = ref([]);
+
+const arrayData = useArrayData('WeeklyTickets');
+const { store } = arrayData;
+
+const weekdays = [
+    { id: 0, name: t('weekdays.mon') },
+    { id: 1, name: t('weekdays.tue') },
+    { id: 2, name: t('weekdays.wed') },
+    { id: 3, name: t('weekdays.thu') },
+    { id: 4, name: t('weekdays.fri') },
+    { id: 5, name: t('weekdays.sat') },
+    { id: 6, name: t('weekdays.sun') },
+];
+
+const exprBuilder = (param, value) => {
+    switch (param) {
+        case 'clientName':
+            return { 'c.name': value };
+        case 'nickName':
+            return { 'u.name': value };
+    }
+};
+
+const params = reactive({});
+
+const applyColumnFilter = async (col) => {
+    try {
+        const paramKey = col.columnFilter?.filterParamKey || col.field;
+        params[paramKey] = col.columnFilter.filterValue;
+        console.log('paramKey', paramKey, 'params', params);
+        await paginateRef.value.addFilter(null, params);
+    } catch (err) {
+        console.error('Error applying column filter', err);
+    }
+};
+
+const getInputEvents = (col) => ({ 'update:modelValue': () => applyColumnFilter(col) });
+
+const columns = computed(() => [
+    {
+        label: t('weeklyTickets.id'),
+        name: 'id',
+        field: 'ticketFk',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.client'),
+        name: 'client',
+        field: 'clientName',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            attrs: {
+                dense: true,
+            },
+        },
+        format: (val) => dashIfEmpty(val),
+    },
+    {
+        label: t('weeklyTickets.shipment'),
+        name: 'shipment',
+        field: 'weekDay',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.agency'),
+        name: 'agency',
+        field: 'agencyModeFk',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.warehouse'),
+        name: 'warehouse',
+        field: 'warehouseName',
+        align: 'left',
+        sortable: true,
+        columnFilter: null,
+    },
+    {
+        label: t('weeklyTickets.salesperson'),
+        field: 'salesperson',
+        name: 'salesperson',
+        align: 'left',
+        sortable: true,
+        columnFilter: {
+            component: VnInput,
+            type: 'text',
+            filterValue: null,
+            event: getInputEvents,
+            filterParamKey: 'nickName',
+            attrs: {
+                dense: true,
+            },
+        },
+    },
+    {
+        label: '',
+        name: 'actions',
+        align: 'left',
+        columnFilter: null,
+    },
+]);
+
+const redirectToTicketSummary = (ticketFk) =>
+    router.push({ name: 'TicketSummary', params: { id: ticketFk } });
+
+const deleteWeekly = async (ticketFk) => {
+    try {
+        await axios.delete(`TicketWeeklies/${ticketFk}`);
+        notify(t('globals.dataSaved'), 'positive');
+        const ticketIndex = store.data.findIndex((e) => e.ticketFk == ticketFk);
+        store.data.splice(ticketIndex, 1);
+    } catch (err) {
+        console.error('Error deleting weekly', err);
+    }
+};
+
+const onUpdate = async (ticketFk, field, value) => {
+    try {
+        const params = { ticketFk, [field]: value };
+        await axios.patch('TicketWeeklies', params);
+    } catch (err) {
+        console.error('Error updating weekly', err);
+    }
+};
+
+onMounted(async () => {
+    stateStore.rightDrawer = true;
+    const filteredColumns = columns.value.filter((col) => col.name !== 'actions');
+    allColumnNames.value = filteredColumns.map((col) => col.name);
+});
+
+onUnmounted(() => (stateStore.rightDrawer = false));
+</script>
+
+<template>
+    <FetchData
+        url="AgencyModes/isActive"
+        :filter="{ fields: ['id', 'name'], order: 'name' }"
+        auto-load
+        @on-fetch="(data) => (agencyModesOptions = data)"
+    />
+    <VnSearchbar
+        data-key="WeeklyTickets"
+        :label="t('weeklyTickets.search')"
+        :info="t('weeklyTickets.searchInfo')"
+    />
+    <VnSubToolbar>
+        <template #st-data>
+            <TableVisibleColumns
+                :all-columns="allColumnNames"
+                table-code="itemsIndex"
+                labels-traductions-path="weeklyTickets"
+                @on-config-saved="visibleColumns = [...$event, 'actions']"
+            />
+        </template>
+    </VnSubToolbar>
+    <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="WeeklyTickets"
+            url="TicketWeeklies/filter"
+            :order="['weekDay', 'ticketFk']"
+            :limit="20"
+            :expr-builder="exprBuilder"
+            :user-params="params"
+            :offset="50"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :visible-columns="visibleColumns"
+                    :no-data-label="t('globals.noResults')"
+                    @row-click="(_, row) => redirectToTicketSummary(row.ticketFk)"
+                >
+                    <template #top-row="{ cols }">
+                        <QTr>
+                            <QTd
+                                v-for="(col, index) in cols"
+                                :key="index"
+                                style="max-width: 100px"
+                            >
+                                <component
+                                    :is="col.columnFilter.component"
+                                    v-if="col.columnFilter"
+                                    v-model="col.columnFilter.filterValue"
+                                    v-bind="col.columnFilter.attrs"
+                                    v-on="col.columnFilter.event(col)"
+                                    dense
+                                />
+                            </QTd>
+                        </QTr>
+                    </template>
+                    <template #body-cell-id="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.ticketFk }}
+                                <TicketDescriptorProxy :id="row.ticketFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-salesperson="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.userName }}
+                                <WorkerDescriptorProxy :id="row.workerFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-client="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary" dense>
+                                {{ row.clientName }}
+                                <CustomerDescriptorProxy :id="row.clientFk" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                    <template #body-cell-shipment="{ row }">
+                        <QTd @click.stop>
+                            <VnSelect
+                                :options="weekdays"
+                                hide-selected
+                                option-label="name"
+                                option-value="id"
+                                v-model="row.weekDay"
+                                @update:model-value="
+                                    onUpdate(row.ticketFk, 'weekDay', $event)
+                                "
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-agency="{ row }">
+                        <QTd @click.stop>
+                            <VnSelect
+                                :options="agencyModesOptions"
+                                hide-selected
+                                option-label="name"
+                                option-value="id"
+                                v-model="row.agencyModeFk"
+                                @update:model-value="
+                                    onUpdate(row.ticketFk, 'agencyModeFk', $event)
+                                "
+                            />
+                        </QTd>
+                    </template>
+                    <template #body-cell-actions="{ row }">
+                        <QTd>
+                            <QIcon
+                                @click.stop="
+                                    openConfirmationModal(
+                                        t('You are going to delete this weekly ticket'),
+                                        t(
+                                            'This ticket will be removed from weekly tickets! Continue anyway?'
+                                        ),
+                                        () => deleteWeekly(row.ticketFk)
+                                    )
+                                "
+                                class="q-ml-sm cursor-pointer"
+                                color="primary"
+                                name="delete"
+                                size="sm"
+                            >
+                                <QTooltip>
+                                    {{ t('globals.delete') }}
+                                </QTooltip>
+                            </QIcon>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+    </QPage>
+</template>
+
+<i18n>
+es:
+    You are going to delete this weekly ticket: Vas a eliminar este ticket programado
+    This ticket will be removed from weekly tickets! Continue anyway?: Este ticket se eliminará de tickets programados! ¿Continuar de todas formas?
+</i18n>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..a4c5b78ac
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,9 @@
+weeklyTickets:
+    id: Ticket ID
+    client: Client
+    shipment: Shipment
+    agency: Agency
+    warehouse: Warehouse
+    salesperson: Salesperson
+    search: Search weekly tickets
+    searchInfo: Search weekly tickets by id or client id
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..0e2f77d73 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,11 @@
+weeklyTickets:
+    id: ID Ticket
+    client: Cliente
+    shipment: Salida
+    agency: Agencia
+    warehouse: Almacén
+    salesperson: Comercial
+    search: Buscar por tickets programados
+    searchInfo: Buscar tickets programados por el identificador o el identificador del cliente
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 6cb7291dc..e92ba6650 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -11,7 +11,7 @@ export default {
     component: RouterView,
     redirect: { name: 'TicketMain' },
     menus: {
-        main: ['TicketList'],
+        main: ['TicketList', 'TicketWeekly'],
         card: ['TicketBoxing', 'TicketSms', 'TicketSale'],
     },
     children: [
@@ -40,6 +40,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
+                {
+                    name: 'TicketWeekly',
+                    path: 'weekly',
+                    meta: {
+                        title: 'weeklyTickets',
+                        icon: 'access_time',
+                    },
+                    component: () => import('src/pages/Ticket/TicketWeekly.vue'),
+                },
             ],
         },
         {

From d488a2d52391e12f4d1f89ddfdf5a86ba6ab1b4f Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 18 Jun 2024 11:50:15 -0300
Subject: [PATCH 2/5] small change

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

diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index 50b4c0451..022f1bb30 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -67,7 +67,7 @@ const applyColumnFilter = async (col) => {
     }
 };
 
-const getInputEvents = (col) => ({ 'update:modelValue': () => applyColumnFilter(col) });
+const getInputEvents = (col) => ({ 'keyup.enter': () => applyColumnFilter(col) });
 
 const columns = computed(() => [
     {

From de0ef06d926b01293350fe5a4ce76ad16307464e Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 18 Jun 2024 19:28:05 -0300
Subject: [PATCH 3/5] remove console.log

---
 src/pages/Ticket/TicketWeekly.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/pages/Ticket/TicketWeekly.vue b/src/pages/Ticket/TicketWeekly.vue
index 022f1bb30..5dbc99d22 100644
--- a/src/pages/Ticket/TicketWeekly.vue
+++ b/src/pages/Ticket/TicketWeekly.vue
@@ -60,7 +60,6 @@ const applyColumnFilter = async (col) => {
     try {
         const paramKey = col.columnFilter?.filterParamKey || col.field;
         params[paramKey] = col.columnFilter.filterValue;
-        console.log('paramKey', paramKey, 'params', params);
         await paginateRef.value.addFilter(null, params);
     } catch (err) {
         console.error('Error applying column filter', err);

From d29bf095358a62cd9db21719b65cbda66ec34531 Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 14:48:39 +0200
Subject: [PATCH 4/5] remove warnings

---
 src/components/ui/VnImg.vue                 |  2 +-
 src/pages/Account/Card/AccountBasicData.vue |  1 -
 src/pages/Route/RouteList.vue               |  1 -
 src/pages/Route/RouteRoadmap.vue            |  2 +-
 src/pages/Ticket/Card/TicketSale.vue        | 17 ++++++++---------
 5 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/src/components/ui/VnImg.vue b/src/components/ui/VnImg.vue
index a88c02898..37c1edefc 100644
--- a/src/components/ui/VnImg.vue
+++ b/src/components/ui/VnImg.vue
@@ -32,7 +32,7 @@ const url = computed(
     () =>
         `/api/${$props.storage}/${$props.collection}/${$props.size}/${$props.id}/download?access_token=${token}&${timeStamp.value}`
 );
-const reload = (emit = false) => {
+const reload = () => {
     timeStamp.value = `timestamp=${Date.now()}`;
 };
 defineExpose({
diff --git a/src/pages/Account/Card/AccountBasicData.vue b/src/pages/Account/Card/AccountBasicData.vue
index 3a9d5c9bf..42b77419f 100644
--- a/src/pages/Account/Card/AccountBasicData.vue
+++ b/src/pages/Account/Card/AccountBasicData.vue
@@ -3,7 +3,6 @@ import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
 import VnSelect from 'src/components/common/VnSelect.vue';
 import FormModel from 'components/FormModel.vue';
-import VnRow from 'components/ui/VnRow.vue';
 import VnInput from 'src/components/common/VnInput.vue';
 import { ref, watch } from 'vue';
 
diff --git a/src/pages/Route/RouteList.vue b/src/pages/Route/RouteList.vue
index edec43fec..de60d164e 100644
--- a/src/pages/Route/RouteList.vue
+++ b/src/pages/Route/RouteList.vue
@@ -1,5 +1,4 @@
 <script setup>
-import { useStateStore } from 'stores/useStateStore';
 import { useI18n } from 'vue-i18n';
 import { computed, onMounted, ref } from 'vue';
 import { dashIfEmpty, toHour } from 'src/filters';
diff --git a/src/pages/Route/RouteRoadmap.vue b/src/pages/Route/RouteRoadmap.vue
index bc4a7a3e7..2c9234c6e 100644
--- a/src/pages/Route/RouteRoadmap.vue
+++ b/src/pages/Route/RouteRoadmap.vue
@@ -128,7 +128,7 @@ function confirmRemove() {
         .onOk(() => refreshKey.value++);
 }
 
-function navigateToRoadmapSummary(event, { id }) {
+function navigateToRoadmapSummary(_, { id }) {
     router.push({ name: 'RoadmapSummary', params: { id } });
 }
 </script>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 7cc8539cf..9fdbd4738 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -353,15 +353,14 @@ const newOrderFromTicket = async () => {
 };
 
 const goToLog = (saleId) => {
-    //TODO: Redireccionar cuando exista la vista TicketLog
-    // router.push({
-    //     name: 'TicketLog',
-    //     params: {
-    //         originId: route.params.id,
-    //         changedModel: 'Sale',
-    //         changedModelId: saleId,
-    //     },
-    // });
+    router.push({
+        name: 'TicketLog',
+        params: {
+            originId: route.params.id,
+            changedModel: 'Sale',
+            changedModelId: saleId,
+        },
+    });
 };
 
 const changeTicketState = async (val) => {

From 6e6c6301d2bcdf9e4308b5a14044395585153804 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 15:27:48 -0300
Subject: [PATCH 5/5] fix log view not refreshing when changing id param

---
 src/pages/Ticket/Card/TicketLog.vue  | 5 ++++-
 src/pages/Ticket/Card/TicketSale.vue | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketLog.vue b/src/pages/Ticket/Card/TicketLog.vue
index 94b63a117..94cff4dfc 100644
--- a/src/pages/Ticket/Card/TicketLog.vue
+++ b/src/pages/Ticket/Card/TicketLog.vue
@@ -1,7 +1,10 @@
 <script setup>
 import VnLog from 'src/components/common/VnLog.vue';
+import { useRoute } from 'vue-router';
+
+const route = useRoute();
 </script>
 
 <template>
-    <VnLog model="Ticket" url="/TicketLogs"></VnLog>
+    <VnLog model="Ticket" url="/TicketLogs" :key="route.params.id"></VnLog>
 </template>
diff --git a/src/pages/Ticket/Card/TicketSale.vue b/src/pages/Ticket/Card/TicketSale.vue
index 9fdbd4738..32408bf67 100644
--- a/src/pages/Ticket/Card/TicketSale.vue
+++ b/src/pages/Ticket/Card/TicketSale.vue
@@ -724,8 +724,9 @@ onUnmounted(() => (stateStore.rightDrawer = false));
             </QTd>
         </template>
         <template #body-cell-history="{ row }">
-            <QTd v-if="row.hasLogs">
+            <QTd>
                 <QBtn
+                    v-if="row.$hasLogs"
                     @click.stop="goToLog(row.id)"
                     color="primary"
                     icon="history"