Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 6480-improveCard

CHANGELOG.md

@@ -22,6 +22,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 -   (Tickets) => Se añade la opción de clonar ticket. #6951
 -   (Parking) => Se añade la sección Parking. #5186
 
+-   (Rutas) => Se añade el campo "servida" a la tabla y se añade también a los filtros. #7130
+
 ### Changed
 
 ### Fixed

src/components/ui/VnPaginate.vue

@@ -127,7 +127,6 @@ async function paginate() {
 }
 
 function endPagination() {
-    hasMoreData.value = arrayData.hasMoreData.value;
     isLoading.value = false;
     emit('onFetch', store.data);
     emit('onPaginate');
@@ -183,11 +182,12 @@ defineExpose({ fetch, addFilter });
             </QCard>
         </div>
     </div>
+    
     <QInfiniteScroll
         v-if="store.data"
         @load="onLoad"
         :offset="offset"
-        :disable="disableInfiniteScroll || !arrayData.hasMoreData.value"
+        :disable="disableInfiniteScroll || !arrayData.hasMoreData"
         class="full-width"
         v-bind="$attrs"
     >

src/composables/useArrayData.js

@@ -98,7 +98,7 @@ export function useArrayData(key, userOptions) {
         const { limit } = filter;
 
         hasMoreData.value = response.data.length >= limit;
-
+        store.hasMoreData = hasMoreData.value;
         if (append) {
             if (!store.data) store.data = [];
             for (const row of response.data) store.data.push(row);
@@ -169,7 +169,7 @@ export function useArrayData(key, userOptions) {
     }
 
     async function loadMore() {
-        if (!hasMoreData.value) return;
+        if (!hasMoreData.value && !store.hasMoreData) return;
 
         store.skip = store.limit * page.value;
         page.value += 1;

src/pages/Customer/locale/en.yml

@@ -1,4 +1,4 @@
 customerFilter:
     filter:
-        name: 'Name'
+        name: Name
-        socialName: 'Social name'
+        socialName: Social name

src/pages/Customer/locale/es.yml

@@ -1,4 +1,4 @@
 customerFilter:
     filter:
-        name: 'Nombre'
+        name: Nombre
-        socialName: 'Razón Social'
+        socialName: Razón Social

src/pages/Entry/Card/EntryBasicData.vue

@@ -2,6 +2,7 @@
 import { ref } from 'vue';
 import { useRoute } from 'vue-router';
 import { useI18n } from 'vue-i18n';
+import { useRole } from 'src/composables/useRole';
 
 import FetchData from 'components/FetchData.vue';
 import FormModel from 'components/FormModel.vue';
@@ -15,6 +16,8 @@ import { toDate } from 'src/filters';
 
 const route = useRoute();
 const { t } = useI18n();
+const { hasAny } = useRole();
+const isAdministrative = () => hasAny(['administrative']);
 
 const suppliersOptions = ref([]);
 const travelsOptions = ref([]);
@@ -206,6 +209,7 @@ const onFilterTravelSelected = (formData, id) => {
                 </div>
                 <div class="col">
                     <QCheckbox
+                        v-if="isAdministrative()"
                         v-model="data.isBooked"
                         :label="t('entry.basicData.booked')"
                     />

src/pages/Entry/locale/en.yml

@@ -1,8 +1,8 @@
 entryList:
     list:
-        inventoryEntry: 'Inventory entry'
+        inventoryEntry: Inventory entry
-        virtualEntry: 'Virtual entry'
+        virtualEntry: Virtual entry
 entryFilter:
     filter:
-        search: 'General search'
+        search: General search
-        reference: 'Reference'
+        reference: Reference

src/pages/Entry/locale/es.yml

@@ -1,8 +1,8 @@
 entryList:
     list:
-        inventoryEntry: 'Es inventario'
+        inventoryEntry: Es inventario
-        virtualEntry: 'Es una redada'
+        virtualEntry: Es una redada
 entryFilter:
     filter:
-        search: 'Búsqueda general'
+        search: Búsqueda general
-        reference: 'Referencia'
+        reference: Referencia

src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue

@@ -257,7 +257,7 @@ const requiredFieldRule = (val) => val || t('globals.requiredField');
 const isAdministrative = () => hasAny(['administrative']);
 
 const isAgricultural = () =>
-    invoiceIn.value.supplier.sageWithholdingFk == config.value[0].sageWithholdingFk;
+    invoiceIn.value?.supplier?.sageWithholdingFk === config.value[0]?.sageWithholdingFk;
 
 function showPdfInvoice() {
     if (isAgricultural()) openReport(`InvoiceIns/${entityId.value}/invoice-in-pdf`);

src/pages/Route/Card/RouteFilter.vue

@@ -197,6 +197,15 @@ const warehouseList = ref([]);
                     />
                 </QItemSection>
             </QItem>
+            <QItem>
+                <QItemSection>
+                    <QCheckbox
+                        v-model="params.isOk"
+                        :label="t('Served')"
+                        toggle-indeterminate
+                    />
+                </QItemSection>
+            </QItem>
         </template>
     </VnFilterPanel>
 </template>
@@ -212,6 +221,7 @@ en:
         workerFk: Worker
         from: From
         to: To
+        Served: Served
 es:
     params:
         warehouseFk: Almacén
@@ -229,4 +239,5 @@ es:
     Worker: Trabajador
     From: Desde
     To: Hasta
+    Served: Servida
 </i18n>

src/pages/Route/Card/RouteForm.vue

@@ -11,8 +11,8 @@ import VnInputDate from 'components/common/VnInputDate.vue';
 import VnInput from 'components/common/VnInput.vue';
 import axios from 'axios';
 import VnInputTime from 'components/common/VnInputTime.vue';
-import RouteSearchbar from "pages/Route/Card/RouteSearchbar.vue";
+import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
-import {useStateStore} from "stores/useStateStore";
+import { useStateStore } from 'stores/useStateStore';
 
 const { t } = useI18n();
 const route = useRoute();
@@ -26,6 +26,7 @@ const defaultInitialData = {
     description: '',
     vehicleFk: null,
     workerFk: null,
+    isOk: false,
 };
 
 const workerList = ref([]);
@@ -211,6 +212,7 @@ const onSave = (data, response) => {
                             size="sm"
                             v-model="data.isOk"
                             :label="t('Is served')"
+                            clearable
                         />
                     </div>
                 </VnRow>

src/pages/Route/Card/RouteSummary.vue

@@ -187,6 +187,15 @@ const ticketColumns = ref([
                         :label="t('route.summary.packages')"
                         :value="getTotalPackages(entity.tickets)"
                     />
+                    <QCheckbox
+                        :label="
+                            entity.route.isOk
+                                ? t('route.summary.closed')
+                                : t('route.summary.open')
+                        "
+                        v-model="entity.route.isOk"
+                        :disable="true"
+                    />
                 </QCard>
                 <QCard class="vn-one">
                     <div class="header">
@@ -278,6 +287,10 @@ en:
             m3: m³
             packaging: Packaging
             ticket: Ticket
+            closed: Closed
+            open: Open
+            yes: Yes
+            no: No
 es:
     route:
         summary:
@@ -301,4 +314,8 @@ es:
             client: Cliente
             warehouse: Almacén
             packaging: Encajado
+            closed: Cerrada
+            open: Abierta
+            yes: Sí
+            no: No
 </i18n>

src/pages/Route/RouteList.vue

@@ -95,6 +95,13 @@ const columns = computed(() => [
         sortable: true,
         align: 'left',
     },
+    {
+        name: 'isServed',
+        label: t('Served'),
+        field: (row) => Boolean(row.isOk),
+        sortable: true,
+        align: 'left',
+    },
     {
         name: 'actions',
         label: '',
@@ -265,7 +272,7 @@ const openTicketsDialog = (id) => {
                 auto-load
             >
                 <template #body="{ rows }">
-                    <div class="q-pa-md">
+                    <div class="q-pa-md route-table">
                         <QTable
                             v-model:selected="selectedRows"
                             :columns="columns"
@@ -279,7 +286,7 @@ const openTicketsDialog = (id) => {
                             :no-data-label="t('globals.noResults')"
                         >
                             <template #body-cell-worker="{ row }">
-                                <QTd>
+                                <QTd class="table-input-cell">
                                     <VnSelectFilter
                                         :label="t('Worker')"
                                         v-model="row.workerFk"
@@ -312,7 +319,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-agency="{ row }">
-                                <QTd>
+                                <QTd class="table-input-cell">
                                     <VnSelectFilter
                                         :label="t('Agency')"
                                         v-model="row.agencyModeFk"
@@ -329,7 +336,7 @@ const openTicketsDialog = (id) => {
                                 </QTd>
                             </template>
                             <template #body-cell-vehicle="{ row }">
-                                <QTd>
+                                <QTd class="table-input-cell">
                                     <VnSelectFilter
                                         :label="t('Vehicle')"
                                         v-model="row.vehicleFk"
@@ -397,6 +404,19 @@ const openTicketsDialog = (id) => {
                                     />
                                 </QTd>
                             </template>
+                            <template #body-cell-isServed="props">
+                                <QTd>
+                                    <QCheckbox v-model="props.value" disable>
+                                        <QTooltip>
+                                            {{
+                                                props.value
+                                                    ? t('Route is closed')
+                                                    : t('Route is not served')
+                                            }}
+                                        </QTooltip>
+                                    </QCheckbox>
+                                </QTd>
+                            </template>
                             <template #body-cell-actions="props">
                                 <QTd :props="props">
                                     <div class="flex items-center no-wrap table-actions">
@@ -455,7 +475,7 @@ const openTicketsDialog = (id) => {
 
 <style lang="scss" scoped>
 .table-input-cell {
-    min-width: 150px;
+    max-width: 143px;
 }
 
 .route-list {
@@ -466,6 +486,11 @@ const openTicketsDialog = (id) => {
 .table-actions {
     gap: 12px;
 }
+
+.lock-icon-cell {
+    text-align: center;
+    margin-left: -20%;
+}
 </style>
 <i18n>
 en:
@@ -479,6 +504,7 @@ es:
     Description: Descripción
     Hour started: Hora inicio
     Hour finished: Hora fin
+    Served: Servida
     newRoute: Nueva Ruta
     Clone Selected Routes: Clonar rutas seleccionadas
     Select the starting date: Seleccione la fecha de inicio
@@ -490,4 +516,6 @@ es:
     Add ticket: Añadir tickets
     Preview: Vista previa
     Summary: Resumen
+    Route is closed: La ruta está cerrada
+    Route is not served: La ruta no está servida
 </i18n>

src/pages/Travel/locale/en.yml

@@ -1,6 +1,6 @@
 travelFilter:
     filter:
-        warehouseOutFk: 'Warehouse Out'
+        warehouseOutFk: Warehouse Out
-        warehouseInFk: 'Warehouse In'
+        warehouseInFk: Warehouse In
-        agencyModeFk: 'Agency'
+        agencyModeFk: Agency
-        scopeDays: 'Days onward'
+        scopeDays: Days onward

src/pages/Travel/locale/es.yml

@@ -1,6 +1,6 @@
 travelFilter:
     filter:
-        warehouseInFk: 'Alm. entrada'
+        warehouseInFk: Alm. entrada
-        warehouseOutFk: 'Alm. salida'
+        warehouseOutFk: Alm. salida
-        agencyModeFk: 'Agencia'
+        agencyModeFk: Agencia
-        scopeDays: 'Días adelante'
+        scopeDays: Días adelante

vitest.config.js

@@ -27,7 +27,10 @@ export default defineConfig({
             sassVariables: 'src/quasar-variables.scss',
         }),
         VueI18nPlugin({
-            include: path.resolve(__dirname, 'src/i18n/**'),
+            include: [
+                path.resolve(__dirname, 'src/i18n/**'),
+                path.resolve(__dirname, 'src/pages/**/locale/**'),
+            ],
         }),
         jsconfigPaths(),
     ],