From 1f573b99220799083ff4a788b374fa2c8d9a81e4 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Mon, 7 Aug 2023 14:02:22 +0200
Subject: [PATCH 1/4] refs #6083 feat: ticketSms section

---
 src/i18n/en/index.js                |   9 ++-
 src/i18n/es/index.js                |   9 ++-
 src/pages/Ticket/Card/TicketSms.vue | 118 ++++++++++++++++++++++++++++
 src/router/modules/ticket.js        |  11 ++-
 4 files changed, 138 insertions(+), 9 deletions(-)
 create mode 100644 src/pages/Ticket/Card/TicketSms.vue

diff --git a/src/i18n/en/index.js b/src/i18n/en/index.js
index a43c5fe7c..0bd924608 100644
--- a/src/i18n/en/index.js
+++ b/src/i18n/en/index.js
@@ -161,6 +161,7 @@ export default {
             summary: 'Summary',
             basicData: 'Basic Data',
             boxing: 'Boxing',
+            sms: 'Sms',
         },
         list: {
             nickname: 'Nickname',
@@ -295,7 +296,7 @@ export default {
             result: 'Result',
             responsible: 'Responsible',
             worker: 'Worker',
-            redelivery: 'Redelivery'
+            redelivery: 'Redelivery',
         },
         basicData: {
             customer: 'Customer',
@@ -411,7 +412,7 @@ export default {
             wagonEdit: 'Edit wagon',
             typesList: 'Types List',
             typeCreate: 'Create type',
-            typeEdit: 'Edit type'
+            typeEdit: 'Edit type',
         },
         type: {
             name: 'Name',
@@ -431,7 +432,7 @@ export default {
             plate: 'Plate',
             volume: 'Volume',
             type: 'Type',
-            label: 'Label'
+            label: 'Label',
         },
         warnings: {
             noData: 'No data available',
@@ -444,7 +445,7 @@ export default {
             minHeightBetweenTrays: 'The minimum height between trays is ',
             maxWagonHeight: 'The maximum height of the wagon is ',
             uncompleteTrays: 'There are incomplete trays',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/i18n/es/index.js b/src/i18n/es/index.js
index 6328c8f5d..1edfcc020 100644
--- a/src/i18n/es/index.js
+++ b/src/i18n/es/index.js
@@ -63,7 +63,7 @@ export default {
             webPayments: 'Pagos Web',
             createCustomer: 'Crear cliente',
             basicData: 'Datos básicos',
-            summary: 'Resumen'
+            summary: 'Resumen',
         },
         list: {
             phone: 'Teléfono',
@@ -160,6 +160,7 @@ export default {
             summary: 'Resumen',
             basicData: 'Datos básicos',
             boxing: 'Encajado',
+            sms: 'Sms',
         },
         list: {
             nickname: 'Alias',
@@ -294,7 +295,7 @@ export default {
             result: 'Consecuencias',
             responsible: 'Responsable',
             worker: 'Trabajador',
-            redelivery: 'Devolución'
+            redelivery: 'Devolución',
         },
         basicData: {
             customer: 'Cliente',
@@ -411,7 +412,7 @@ export default {
             wagonEdit: 'Editar tipo',
             typesList: 'Listado tipos',
             typeCreate: 'Crear tipo',
-            typeEdit: 'Editar tipo'
+            typeEdit: 'Editar tipo',
         },
         type: {
             name: 'Nombre',
@@ -444,7 +445,7 @@ export default {
             minHeightBetweenTrays: 'La distancia mínima entre bandejas es ',
             maxWagonHeight: 'La altura máxima del vagón es ',
             uncompleteTrays: 'Hay bandejas sin completar',
-        }
+        },
     },
     components: {
         topbar: {},
diff --git a/src/pages/Ticket/Card/TicketSms.vue b/src/pages/Ticket/Card/TicketSms.vue
new file mode 100644
index 000000000..b145be50e
--- /dev/null
+++ b/src/pages/Ticket/Card/TicketSms.vue
@@ -0,0 +1,118 @@
+<script setup>
+import { date } from 'quasar';
+import { computed } from 'vue';
+import { useRouter } from 'vue-router';
+
+import { useSession } from 'src/composables/useSession';
+import VnPaginate from 'src/components/ui/VnPaginate.vue';
+import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
+
+const router = useRouter();
+const session = useSession();
+const token = session.getToken();
+
+const entityId = computed(function () {
+    return router.currentRoute.value.params.id;
+});
+
+const filter = {
+    fields: ['ticketFk', 'smsFk'],
+    include: {
+        relation: 'sms',
+        scope: {
+            fields: [
+                'senderFk',
+                'sender',
+                'destination',
+                'message',
+                'statusCode',
+                'status',
+                'created',
+            ],
+            include: {
+                relation: 'sender',
+                scope: {
+                    fields: ['name'],
+                },
+            },
+        },
+    },
+    where: {
+        ticketFk: entityId,
+    },
+};
+
+function formatNumer(number) {
+    if (number.length <= 10) return number;
+    return number.slice(0, 4) + ' ' + number.slice(4);
+}
+</script>
+
+<template>
+    <div class="column items-center">
+        <div class="list">
+            <VnPaginate
+                data-key="TicketSms"
+                url="TicketSms"
+                :filter="filter"
+                order="smsFk DESC"
+                :offset="100"
+                :limit="5"
+                auto-load
+            >
+                <template #body="{ rows }">
+                    <QCard
+                        flat
+                        bordered
+                        class="card q-pa-md"
+                        v-for="row of rows"
+                        :key="row.smsFk"
+                    >
+                        <QItem>
+                            <QItmSection top avatar>
+                                <QItemLabel class="column items-center">
+                                    <QAvatar>
+                                        <QImg
+                                            :src="`/api/Images/user/160x160/${row.sms.senderFk}/download?access_token=${token}`"
+                                            spinner-color="white"
+                                        />
+                                    </QAvatar>
+                                    <span class="link">
+                                        {{ row.sms.sender.name }}
+                                        <WorkerDescriptorProxy :id="row.sms.senderFk" />
+                                    </span>
+                                </QItemLabel>
+                            </QItmSection>
+                            <QSeparator spaced inset="item" />
+                            <QItemSection>
+                                <QItemLabel caption>{{
+                                    formatNumer(row.sms.destination)
+                                }}</QItemLabel>
+                                <QItemLabel>{{ row.sms.message }}</QItemLabel>
+                            </QItemSection>
+                            <QItemSection side top>
+                                <QItemLabel caption>{{
+                                    date.formatDate(
+                                        row.sms.created,
+                                        'YYYY-MM-DD HH:mm:ss'
+                                    )
+                                }}</QItemLabel>
+                                <QItemLabel>
+                                    <QChip
+                                        :color="
+                                            row.sms.status == 'OK'
+                                                ? 'positive'
+                                                : 'negative'
+                                        "
+                                    >
+                                        {{ row.sms.status }}
+                                    </QChip>
+                                </QItemLabel>
+                            </QItemSection>
+                        </QItem>
+                    </QCard>
+                </template>
+            </VnPaginate>
+        </div>
+    </div>
+</template>
diff --git a/src/router/modules/ticket.js b/src/router/modules/ticket.js
index 4f06a1808..73c441b4d 100644
--- a/src/router/modules/ticket.js
+++ b/src/router/modules/ticket.js
@@ -11,7 +11,7 @@ export default {
     redirect: { name: 'TicketMain' },
     menus: {
         main: ['TicketList'],
-        card: ['TicketBoxing'],
+        card: ['TicketBoxing', 'TicketSms'],
     },
     children: [
         {
@@ -74,6 +74,15 @@ export default {
                     },
                     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'),
+                },
             ],
         },
     ],

From 68935f2a4da7fb5e16e154e36b8694c2a0fca4f5 Mon Sep 17 00:00:00 2001
From: alexm <alexm@verdnatura.es>
Date: Tue, 8 Aug 2023 14:47:39 +0200
Subject: [PATCH 2/4] refs #6075 fix: add  $props.value

---
 src/components/ui/VnLv.vue | 55 +++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/components/ui/VnLv.vue b/src/components/ui/VnLv.vue
index b0b0316ad..83234b658 100644
--- a/src/components/ui/VnLv.vue
+++ b/src/components/ui/VnLv.vue
@@ -1,36 +1,37 @@
 <script setup>
 import { computed } from 'vue';
 const $props = defineProps({
-  label: { type: String, default: null },
-  value: {
-    type: [String, Boolean],
-    default: null,
-  },
-  info: { type: String, default: null },
+    label: { type: String, default: null },
+    value: {
+        type: [String, Boolean],
+        default: null,
+    },
+    info: { type: String, default: null },
 });
 const isBooleanValue = computed(() => typeof $props.value === 'boolean');
-
 </script>
 <template>
-  <div class="vn-label-value">
-    <div v-if="$props.label || $slots.label" class="label">
-      <div v-if="!$slots.label">{{ $props.label }}</div>
-      <slot name="label"></slot>
+    <div class="vn-label-value">
+        <div v-if="$props.label || $slots.label" class="label">
+            <slot name="label"> {{ $props.label }}</slot>
+        </div>
+        <div v-if="$props.value || $slots.value" class="value">
+            <span v-if="isBooleanValue">
+                <QIcon
+                    :name="$props.value ? `check` : `close`"
+                    :color="$props.value ? `positive` : `negative`"
+                />
+            </span>
+            <span v-else>
+                <slot name="value">{{ $props.value }}</slot>
+            </span>
+        </div>
+        <div class="info" v-if="$props.info">
+            <QIcon name="info">
+                <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
+                    {{ $props.info }}
+                </QTooltip>
+            </QIcon>
+        </div>
     </div>
-    <div v-if="$props.value || $slots.value" class="value">
-      <span v-if="isBooleanValue">
-        <QIcon :name="$props.value ? `check` : `close`" :color="$props.value ? `positive` : `negative`" />
-      </span>
-      <span v-else>
-        <slot name="value"></slot>
-      </span>
-    </div>
-    <div class="info" v-if="$props.info">
-      <QIcon name="info">
-        <QTooltip class="bg-dark text-white shadow-4" :offset="[10, 10]">
-          {{ $props.info }}
-        </QTooltip>
-      </QIcon>
-    </div>
-  </div>
 </template>

From 8d4faa270b3fa48565f238cb504be78d71aa8bfa Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 07:23:28 +0200
Subject: [PATCH 3/4] refs #5995 Added left space to subsection

---
 src/css/app.scss              | 13 +++++++++++++
 src/css/quasar.variables.scss |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/css/app.scss b/src/css/app.scss
index 29e5bb600..480a4d64b 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -30,3 +30,16 @@ body.body--light {
         color: #555;
     }
 }
+
+// Added left space to subsection
+.q-expansion-item__content {
+    padding-left: 15px;
+}
+.q-expansion-item--standard {
+    max-width: 256px;
+}
+
+// Reduced the space between the icon and the label in the left sidebar
+.q-item__section.column.q-item__section--side.justify-center.q-item__section--avatar {
+    margin-right: -15px;
+}
\ No newline at end of file
diff --git a/src/css/quasar.variables.scss b/src/css/quasar.variables.scss
index 6ebf7a7a7..f0d2d4e06 100644
--- a/src/css/quasar.variables.scss
+++ b/src/css/quasar.variables.scss
@@ -12,7 +12,7 @@
 // to match your app's branding.
 // Tip: Use the "Theme Builder" on Quasar's documentation website.
 
-$primary: #ff9800;
+$primary: #ec8916;
 $secondary: #26a69a;
 $accent: #9c27b0;
 

From 6d2436c9f717854bc705d179008b69d4816b9bbc Mon Sep 17 00:00:00 2001
From: guillermo <guillermo@verdnatura.es>
Date: Wed, 9 Aug 2023 10:09:37 +0200
Subject: [PATCH 4/4] refs #5988 Improved identation

---
 src/components/LeftMenu.vue     |  5 ++++-
 src/components/LeftMenuItem.vue |  2 +-
 src/css/app.scss                | 13 -------------
 3 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/src/components/LeftMenu.vue b/src/components/LeftMenu.vue
index 8839bd030..a9604eb45 100644
--- a/src/components/LeftMenu.vue
+++ b/src/components/LeftMenu.vue
@@ -115,7 +115,7 @@ async function togglePinned(item, event) {
 </script>
 
 <template>
-    <QList padding>
+    <QList padding class="column-max-width">
         <template v-if="$props.source === 'main'">
             <QItemLabel header>
                 {{ t('globals.pinnedModules') }}
@@ -207,4 +207,7 @@ async function togglePinned(item, event) {
 .pinned:hover .q-btn {
     visibility: visible;
 }
+.column-max-width {
+    max-width: 256px;
+}
 </style>
diff --git a/src/components/LeftMenuItem.vue b/src/components/LeftMenuItem.vue
index c889ac619..509dc9107 100644
--- a/src/components/LeftMenuItem.vue
+++ b/src/components/LeftMenuItem.vue
@@ -14,7 +14,7 @@ const props = defineProps({
 const item = computed(() => props.item); // eslint-disable-line vue/no-dupe-keys
 </script>
 <template>
-    <QItem active-class="text-primary" :to="{ name: item.name }" clickable v-ripple>
+    <QItem active-class="text-primary" :to="{ name: item.name }" clickable class="q-ml-md" v-ripple>
         <QItemSection avatar v-if="item.icon">
             <QIcon :name="item.icon" />
         </QItemSection>
diff --git a/src/css/app.scss b/src/css/app.scss
index 480a4d64b..7e39780a1 100644
--- a/src/css/app.scss
+++ b/src/css/app.scss
@@ -29,17 +29,4 @@ body.body--light {
         background-color: white;
         color: #555;
     }
-}
-
-// Added left space to subsection
-.q-expansion-item__content {
-    padding-left: 15px;
-}
-.q-expansion-item--standard {
-    max-width: 256px;
-}
-
-// Reduced the space between the icon and the label in the left sidebar
-.q-item__section.column.q-item__section--side.justify-center.q-item__section--avatar {
-    margin-right: -15px;
 }
\ No newline at end of file