wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity

Merge branch '6772_reload_sections' of https://gitea.verdnatura.es/verdnatura/salix-front into 6772_reload_sections

This commit is contained in:
Javier Segarra 2024-04-18 13:16:18 +02:00
parent 3359d5b6ae 33fe01ad78
commit 56333937ce
15 changed files with 96 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@ -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

4
src/components/ui/VnPaginate.vue
View File

@ -135,7 +135,6 @@ async function paginate() {
}
function endPagination() {
hasMoreData.value = arrayData.hasMoreData.value;
isLoading.value = false;
emit('onFetch', store.data);
emit('onPaginate');
@ -191,11 +190,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"
>

4
src/composables/useArrayData.js
View File

@ -114,7 +114,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);
@ -185,7 +185,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;

4
src/pages/Customer/locale/en.yml
View File

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

4
src/pages/Customer/locale/es.yml
View File

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

8
src/pages/Entry/locale/en.yml
View File

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

8
src/pages/Entry/locale/es.yml
View File

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

2
src/pages/InvoiceIn/Card/InvoiceInDescriptor.vue
View File

@ -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`);

11
src/pages/Route/Card/RouteFilter.vue
View File

@ -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>

6
src/pages/Route/Card/RouteForm.vue
View File

@ -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 {useStateStore} from "stores/useStateStore";
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
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>

17
src/pages/Route/Card/RouteSummary.vue
View File

@ -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>

38
src/pages/Route/RouteList.vue
View File

@ -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>

8
src/pages/Travel/locale/en.yml
View File

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

8
src/pages/Travel/locale/es.yml
View File

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

5
vitest.config.js
View File

@ -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(),
],