From 0afd7f4ae1e32e35b97a6442ee975e1a30027ce4 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Wed, 19 Jun 2024 10:22:20 -0300
Subject: [PATCH 1/4] Ticket tracking

---
 src/i18n/locale/en.yml                        |   1 +
 src/i18n/locale/es.yml                        |   1 +
 .../Ticket/Card/TicketCreateTracking.vue      |  73 +++++++++++
 src/pages/Ticket/Card/TicketTracking.vue      | 121 ++++++++++++++++++
 src/pages/Ticket/locale/en.yml                |   4 +
 src/pages/Ticket/locale/es.yml                |   4 +
 src/router/modules/ticket.js                  |  11 +-
 7 files changed, 214 insertions(+), 1 deletion(-)
 create mode 100644 src/pages/Ticket/Card/TicketCreateTracking.vue
 create mode 100644 src/pages/Ticket/Card/TicketTracking.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 b3a85eefa..419c33f8a 100644
--- a/src/i18n/locale/en.yml
+++ b/src/i18n/locale/en.yml
@@ -443,6 +443,7 @@ ticket:
         sms: Sms
         notes: Notes
         sale: Sale
+        tracking: Tracking
     list:
         nickname: Nickname
         state: State
diff --git a/src/i18n/locale/es.yml b/src/i18n/locale/es.yml
index d03ee9d5c..192c17c90 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
+        tracking: Estados
     list:
         nickname: Alias
         state: Estado
diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
new file mode 100644
index 000000000..b340b406a
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -0,0 +1,73 @@
+<script setup>
+import { ref } from 'vue';
+import { useRoute } from 'vue-router';
+import { useI18n } from 'vue-i18n';
+
+import FormModelPopup from 'components/FormModelPopup.vue';
+import VnRow from 'components/ui/VnRow.vue';
+import VnSelect from 'src/components/common/VnSelect.vue';
+import FetchData from 'components/FetchData.vue';
+
+import { useState } from 'src/composables/useState';
+
+const emit = defineEmits(['onRequestCreated']);
+
+const route = useRoute();
+const { t } = useI18n();
+const state = useState();
+const user = state.getUser();
+const stateFetchDataRef = ref(null);
+
+const statesOptions = ref([]);
+const workersOptions = ref([]);
+
+const onStateFkChange = (formData) => (formData.userFk = user.value.id);
+</script>
+<template>
+    <FetchData
+        ref="stateFetchDataRef"
+        url="States"
+        auto-load
+        @on-fetch="(data) => (statesOptions = data)"
+    />
+    <FetchData
+        url="Workers/search"
+        :filter="{ fields: ['id', 'name'], order: 'name ASC' }"
+        auto-load
+        @on-fetch="(data) => (workersOptions = data)"
+    />
+    <FormModelPopup
+        :title="t('Create tracking')"
+        url-create="Tickets/state"
+        model="CreateTicketTracking"
+        :form-initial-data="{ ticketFk: route.params.id }"
+        @on-data-saved="() => emit('onRequestCreated')"
+    >
+        <template #form-inputs="{ data }">
+            <VnRow class="row q-gutter-md q-mb-md">
+                <VnSelect
+                    v-model="data.stateFk"
+                    :label="t('tracking.state')"
+                    :options="statesOptions"
+                    @update:model-value="onStateFkChange(data)"
+                    hide-selected
+                    option-label="name"
+                    option-value="id"
+                />
+                <VnSelect
+                    :label="t('tracking.worker')"
+                    v-model="data.userFk"
+                    :options="workersOptions"
+                    hide-selected
+                    option-label="nickname"
+                    option-value="id"
+                />
+            </VnRow>
+        </template>
+    </FormModelPopup>
+</template>
+
+<i18n>
+    es:
+        Create tracking: Crear estado
+</i18n>
diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
new file mode 100644
index 000000000..548bba831
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -0,0 +1,121 @@
+<script setup>
+import { ref, computed, watch, reactive } from 'vue';
+import { useI18n } from 'vue-i18n';
+import { useRoute } from 'vue-router';
+
+import WorkerDescriptorProxy from 'src/pages/Worker/Card/WorkerDescriptorProxy.vue';
+import TicketCreateTracking from './TicketCreateTracking.vue';
+import VnPaginate from 'components/ui/VnPaginate.vue';
+
+import { toDateTimeFormat } from 'src/filters/date.js';
+
+const route = useRoute();
+const { t } = useI18n();
+const createTrackingDialogRef = ref(null);
+const paginateRef = ref(null);
+
+watch(
+    () => route.params.id,
+    async (val) => {
+        paginateFilter.where.ticketFk = val;
+        paginateRef.value.fetch();
+    }
+);
+
+const paginateFilter = reactive({
+    include: [
+        {
+            relation: 'user',
+            scope: {
+                fields: ['id', 'name'],
+                include: {
+                    relation: 'worker',
+                    scope: {
+                        fields: ['id'],
+                    },
+                },
+            },
+        },
+        {
+            relation: 'state',
+            scope: {
+                fields: ['name'],
+            },
+        },
+    ],
+
+    order: ['created DESC'],
+    where: {
+        ticketFk: route.params.id,
+    },
+});
+
+const columns = computed(() => [
+    {
+        label: t('tracking.state'),
+        name: 'state',
+        field: 'state',
+        align: 'left',
+        format: (val) => val.name,
+    },
+    {
+        label: t('tracking.worker'),
+        name: 'worker',
+        align: 'left',
+    },
+    {
+        label: t('tracking.created'),
+        name: 'created',
+        field: 'created',
+        align: 'left',
+        format: (val) => toDateTimeFormat(val),
+    },
+]);
+
+const openCreateModal = () => createTrackingDialogRef.value.show();
+</script>
+
+<template>
+    <QPage class="column items-center q-pa-md">
+        <VnPaginate
+            ref="paginateRef"
+            data-key="TicketTracking"
+            :filter="paginateFilter"
+            url="TicketTrackings"
+            auto-load
+        >
+            <template #body="{ rows }">
+                <QTable
+                    :rows="rows"
+                    :columns="columns"
+                    row-key="id"
+                    :pagination="{ rowsPerPage: 0 }"
+                    class="full-width q-mt-md"
+                    :no-data-label="t('globals.noResults')"
+                >
+                    <template #body-cell-worker="{ row }">
+                        <QTd @click.stop>
+                            <QBtn flat color="primary">
+                                {{ row.user?.name }}
+                                <WorkerDescriptorProxy :id="row.user?.worker?.id" />
+                            </QBtn>
+                        </QTd>
+                    </template>
+                </QTable>
+            </template>
+        </VnPaginate>
+        <QDialog
+            ref="createTrackingDialogRef"
+            transition-show="scale"
+            transition-hide="scale"
+        >
+            <TicketCreateTracking @on-request-created="paginateRef.fetch()" />
+        </QDialog>
+        <QPageSticky :offset="[20, 20]">
+            <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
+            <QTooltip class="text-no-wrap">
+                {{ t('purchaseRequest.newRequest') }}
+            </QTooltip>
+        </QPageSticky>
+    </QPage>
+</template>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
new file mode 100644
index 000000000..88f5642cd
--- /dev/null
+++ b/src/pages/Ticket/locale/en.yml
@@ -0,0 +1,4 @@
+tracking:
+    state: State
+    worker: Worker
+    created: Created
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 5348b29b9..6f68842fb 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -1,2 +1,6 @@
+tracking:
+    state: Estado
+    worker: Trabajador
+    created: Fecha creación
 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..6f63eb75d 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', 'TicketTracking'],
     },
     children: [
         {
@@ -93,6 +93,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
+                {
+                    path: 'tracking',
+                    name: 'TicketTracking',
+                    meta: {
+                        title: 'tracking',
+                        icon: 'vn:eye',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketTracking.vue'),
+                },
             ],
         },
     ],

From 1529e2dd4f15dd693abed81c2732c335f618aa84 Mon Sep 17 00:00:00 2001
From: wbuezas <wbuezas@verdnatura.es>
Date: Tue, 25 Jun 2024 12:58:49 -0300
Subject: [PATCH 2/4] Add tooltip to add state button

---
 src/pages/Ticket/Card/TicketTracking.vue | 2 +-
 src/pages/Ticket/locale/en.yml           | 1 +
 src/pages/Ticket/locale/es.yml           | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/pages/Ticket/Card/TicketTracking.vue b/src/pages/Ticket/Card/TicketTracking.vue
index 548bba831..2ddb278fa 100644
--- a/src/pages/Ticket/Card/TicketTracking.vue
+++ b/src/pages/Ticket/Card/TicketTracking.vue
@@ -114,7 +114,7 @@ const openCreateModal = () => createTrackingDialogRef.value.show();
         <QPageSticky :offset="[20, 20]">
             <QBtn @click="openCreateModal()" color="primary" fab icon="add" />
             <QTooltip class="text-no-wrap">
-                {{ t('purchaseRequest.newRequest') }}
+                {{ t('tracking.addState') }}
             </QTooltip>
         </QPageSticky>
     </QPage>
diff --git a/src/pages/Ticket/locale/en.yml b/src/pages/Ticket/locale/en.yml
index 88f5642cd..4fe6072b2 100644
--- a/src/pages/Ticket/locale/en.yml
+++ b/src/pages/Ticket/locale/en.yml
@@ -2,3 +2,4 @@ tracking:
     state: State
     worker: Worker
     created: Created
+    addState: Add state
diff --git a/src/pages/Ticket/locale/es.yml b/src/pages/Ticket/locale/es.yml
index 6f68842fb..d116abb12 100644
--- a/src/pages/Ticket/locale/es.yml
+++ b/src/pages/Ticket/locale/es.yml
@@ -2,5 +2,6 @@ tracking:
     state: Estado
     worker: Trabajador
     created: Fecha creación
+    addState: Añadir estado
 Search ticket: Buscar ticket
 You can search by ticket id or alias: Puedes buscar por id o alias del ticket

From d409b9ea8688658593c8cdb04a83a20ed5f157da Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 22:51:26 +0200
Subject: [PATCH 3/4] fix: WorkerSelect option format

---
 src/pages/Ticket/Card/TicketCreateTracking.vue | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/pages/Ticket/Card/TicketCreateTracking.vue b/src/pages/Ticket/Card/TicketCreateTracking.vue
index b340b406a..399663571 100644
--- a/src/pages/Ticket/Card/TicketCreateTracking.vue
+++ b/src/pages/Ticket/Card/TicketCreateTracking.vue
@@ -59,9 +59,22 @@ const onStateFkChange = (formData) => (formData.userFk = user.value.id);
                     v-model="data.userFk"
                     :options="workersOptions"
                     hide-selected
-                    option-label="nickname"
+                    option-label="name"
                     option-value="id"
-                />
+                >
+                    <template #option="{ opt, itemProps }">
+                        <QItem v-bind="itemProps">
+                            <QItemSection>
+                                <QItemLabel>
+                                    {{ opt.name }}
+                                </QItemLabel>
+                                <QItemLabel caption>
+                                    {{ opt.nickname }}, {{ opt.code }}
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </template></VnSelect
+                >
             </VnRow>
         </template>
     </FormModelPopup>

From 151978160b0f1cf2f02d3ca474d051817f0da14d Mon Sep 17 00:00:00 2001
From: Javier Segarra <jsegarra@verdnatura.es>
Date: Tue, 25 Jun 2024 23:01:26 +0200
Subject: [PATCH 4/4] fix: ticket order

---
 src/router/modules/ticket.js | 61 +++++++++++++++++++++---------------
 1 file changed, 35 insertions(+), 26 deletions(-)

diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 475552585..2766d034a 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', 'TicketAdvance', 'TicketFuture'],
+        main: ['TicketList', 'TicketAdvance', 'TicketWeekly', 'TicketFuture'],
         card: [
             'TicketBasicData',
             'TicketBoxing',
@@ -49,13 +49,13 @@ export default {
                     component: () => import('src/pages/Ticket/TicketCreate.vue'),
                 },
                 {
-                    name: 'TicketAdvance',
-                    path: 'advance',
+                    name: 'TicketWeekly',
+                    path: 'weekly',
                     meta: {
-                        title: 'ticketAdvance',
-                        icon: 'keyboard_double_arrow_left',
+                        title: 'weeklyTickets',
+                        icon: 'access_time',
                     },
-                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
+                    component: () => import('src/pages/Ticket/TicketWeekly.vue'),
                 },
                 {
                     name: 'TicketFuture',
@@ -66,6 +66,15 @@ export default {
                     },
                     component: () => import('src/pages/Ticket/TicketFuture.vue'),
                 },
+                {
+                    name: 'TicketAdvance',
+                    path: 'advance',
+                    meta: {
+                        title: 'ticketAdvance',
+                        icon: 'keyboard_double_arrow_left',
+                    },
+                    component: () => import('src/pages/Ticket/TicketAdvance.vue'),
+                },
             ],
         },
         {
@@ -103,22 +112,14 @@ export default {
                     component: () => import('src/pages/Ticket/Card/TicketSale.vue'),
                 },
                 {
-                    path: 'boxing',
-                    name: 'TicketBoxing',
+                    path: 'request',
+                    name: 'TicketPurchaseRequest',
                     meta: {
-                        title: 'boxing',
-                        icon: 'vn:package',
+                        title: 'purchaseRequest',
+                        icon: 'vn:buyrequest',
                     },
-                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
-                },
-                {
-                    path: 'sms',
-                    name: 'TicketSms',
-                    meta: {
-                        title: 'sms',
-                        icon: 'sms',
-                    },
-                    component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
+                    component: () =>
+                        import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
                 },
                 {
                     path: 'tracking',
@@ -139,14 +140,22 @@ export default {
                     component: () => import('src/pages/Ticket/Card/TicketLog.vue'),
                 },
                 {
-                    path: 'request',
-                    name: 'TicketPurchaseRequest',
+                    path: 'boxing',
+                    name: 'TicketBoxing',
                     meta: {
-                        title: 'purchaseRequest',
-                        icon: 'vn:buyrequest',
+                        title: 'boxing',
+                        icon: 'vn:package',
                     },
-                    component: () =>
-                        import('src/pages/Ticket/Card/TicketPurchaseRequest.vue'),
+                    component: () => import('src/pages/Ticket/Card/TicketBoxing.vue'),
+                },
+                {
+                    path: 'sms',
+                    name: 'TicketSms',
+                    meta: {
+                        title: 'sms',
+                        icon: 'sms',
+                    },
+                    component: () => import('src/pages/Ticket/Card/TicketSms.vue'),
                 },
             ],
         },