verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 79 Releases Wiki Activity

Merge pull request 'fix: refs #7385 rename forecast column to estimated' (!1814) from 7385-fixColumnNameReference into dev
gitea/salix-front/pipeline/head This commit looks good Details 

Reviewed-on: #1814
Reviewed-by: Pablo Natek <pablone@verdnatura.es>
This commit is contained in:
Jose Antonio Tubau 2025-05-19 10:39:48 +00:00
parent 86f1a5b9bb acd9c97324
commit 5c482cf738
4 changed files with 81 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,7 +4,7 @@ import { useRoute } from 'vue-router';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { useStateStore } from 'stores/useStateStore'; import { useStateStore } from 'stores/useStateStore';
import { QIcon } from 'quasar'; import { QIcon } from 'quasar';
import { dashIfEmpty, toCurrency, toDate, toHour } from 'src/filters'; import { dashIfEmpty, toCurrency, toDate, toDateHourMinSec, toHour } from 'src/filters';
import { openBuscaman } from 'src/utils/buscaman'; import { openBuscaman } from 'src/utils/buscaman';
import CardSummary from 'components/ui/CardSummary.vue'; import CardSummary from 'components/ui/CardSummary.vue';
import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue'; import WorkerDescriptorProxy from 'pages/Worker/Card/WorkerDescriptorProxy.vue';
@ -83,14 +83,14 @@ const ticketColumns = ref([
{ {
name: 'delivered', name: 'delivered',
label: t('route.delivered'), label: t('route.delivered'),
field: (row) => dashIfEmpty(toDate(row?.delivered)), field: (row) => dashIfEmpty(toDateHourMinSec(row?.delivered)),
sortable: false, sortable: false,
align: 'center', align: 'center',
}, },
{ {
name: 'forecast', name: 'estimated',
label: t('route.forecast'), label: t('route.estimated'),
field: (row) => dashIfEmpty(toDate(row?.forecast)), field: (row) => dashIfEmpty(toDateHourMinSec(row?.estimated)),
sortable: false, sortable: false,
align: 'center', align: 'center',
}, },
@ -103,7 +103,7 @@ const ticketColumns = ref([
}, },
{ {
name: 'volume', name: 'volume',
label: t('route.summary.m3'), label: 'm³',
field: (row) => row?.volume, field: (row) => row?.volume,
sortable: false, sortable: false,
align: 'center', align: 'center',

37
src/pages/Route/RouteTickets.vue
View File

@ -2,7 +2,7 @@
import VnPaginate from 'components/ui/VnPaginate.vue'; import VnPaginate from 'components/ui/VnPaginate.vue';
import { useI18n } from 'vue-i18n'; import { useI18n } from 'vue-i18n';
import { computed, ref } from 'vue'; import { computed, ref } from 'vue';
import { dashIfEmpty } from 'src/filters'; import { dashIfEmpty, toDateHourMinSec } from 'src/filters';
import VnInputDate from 'components/common/VnInputDate.vue'; import VnInputDate from 'components/common/VnInputDate.vue';
import VnInput from 'components/common/VnInput.vue'; import VnInput from 'components/common/VnInput.vue';
import axios from 'axios'; import axios from 'axios';
@ -66,15 +66,15 @@ const columns = computed(() => [
}, },
{ {
name: 'delivered', name: 'delivered',
label: t('route.ticket.delivered'), label: t('route.delivered'),
field: (row) => dashIfEmpty(row?.delivered), field: (row) => dashIfEmpty(toDateHourMinSec(row?.delivered)),
sortable: false, sortable: false,
align: 'left', align: 'left',
}, },
{ {
name: 'estimated', name: 'estimated',
label: t('route.ticket.estimated'), label: t('route.estimated'),
field: (row) => dashIfEmpty(row?.estimated), field: (row) => dashIfEmpty(toDateHourMinSec(row?.estimated)),
sortable: false, sortable: false,
align: 'left', align: 'left',
}, },
@ -254,7 +254,9 @@ const openSmsDialog = async () => {
<QDialog v-model="confirmationDialog"> <QDialog v-model="confirmationDialog">
<QCard style="min-width: 350px"> <QCard style="min-width: 350px">
<QCardSection> <QCardSection>
<p class="text-h6 q-ma-none">{{ t('route.ticket.selectStartingDate') }}</p> <p class="text-h6 q-ma-none">
{{ t('route.ticket.selectStartingDate') }}
</p>
</QCardSection> </QCardSection>
<QCardSection class="q-pt-none"> <QCardSection class="q-pt-none">
@ -265,7 +267,12 @@ const openSmsDialog = async () => {
/> />
</QCardSection> </QCardSection>
<QCardActions align="right"> <QCardActions align="right">
<QBtn flat :label="t('globals.cancel')" v-close-popup class="text-primary" /> <QBtn
flat
:label="t('globals.cancel')"
v-close-popup
class="text-primary"
/>
<QBtn color="primary" v-close-popup @click="cloneRoutes"> <QBtn color="primary" v-close-popup @click="cloneRoutes">
{{ t('globals.clone') }} {{ t('globals.clone') }}
</QBtn> </QBtn>
@ -302,11 +309,7 @@ const openSmsDialog = async () => {
class="q-mr-sm" class="q-mr-sm"
@click="setOrderedPriority" @click="setOrderedPriority"
> >
<QTooltip <QTooltip>{{ t('route.ticket.renumberAllTickets') }} </QTooltip>
>{{
t('route.ticket.renumberAllTickets')
}}
</QTooltip>
</QBtn> </QBtn>
<QBtn <QBtn
icon="sms" icon="sms"
@ -353,7 +356,11 @@ const openSmsDialog = async () => {
@click="setHighestPriority(row, rows)" @click="setHighestPriority(row, rows)"
> >
<QTooltip> <QTooltip>
{{ t('route.ticket.assignHighestPriority') }} {{
t(
'route.ticket.assignHighestPriority',
)
}}
</QTooltip> </QTooltip>
</QIcon> </QIcon>
<VnInput <VnInput
@ -368,7 +375,9 @@ const openSmsDialog = async () => {
<QTd> <QTd>
<span class="link" @click="goToBuscaman(row)"> <span class="link" @click="goToBuscaman(row)">
{{ value }} {{ value }}
<QTooltip>{{ t('route.ticket.openBuscaman') }}</QTooltip> <QTooltip>{{
t('route.ticket.openBuscaman')
}}</QTooltip>
</span> </span>
</QTd> </QTd>
</template> </template>

56
src/pages/Route/locale/en.yml
View File

@ -2,32 +2,32 @@ route:
filter: filter:
Served: Served Served: Served
summary: summary:
date: Date date: Date
agency: Agency agency: Agency
vehicle: Vehicle vehicle: Vehicle
driver: Driver driver: Driver
cost: Cost cost: Cost
started: Started time started: Started time
finished: Finished time finished: Finished time
kmStart: Km start kmStart: Km start
kmEnd: Km end kmEnd: Km end
volume: Volume volume: Volume
packages: Packages packages: Packages
description: Description description: Description
tickets: Tickets tickets: Tickets
order: Order order: Order
street: Street street: Street
city: City city: City
pc: PC pc: PC
client: Client client: Client
state: State state: State
m3: m³ m3: m³
packaging: Packaging packaging: Packaging
ticket: Ticket ticket: Ticket
closed: Closed closed: Closed
open: Open open: Open
yes: Yes yes: Yes
no: No no: No
extendedList: extendedList:
selectStartingDate: Select the starting date selectStartingDate: Select the starting date
startingDate: Starting date startingDate: Starting date
@ -103,7 +103,7 @@ route:
dated: Dated dated: Dated
preview: Preview preview: Preview
delivered: Delivered delivered: Delivered
forecast: Forecast estimated: Estimated
cmr: cmr:
search: Search Cmr search: Search Cmr
searchInfo: You can search Cmr by Id searchInfo: You can search Cmr by Id
@ -129,8 +129,6 @@ route:
PC: PC PC: PC
client: Client client: Client
warehouse: Warehouse warehouse: Warehouse
delivered: Delivered
estimated: Estimated
packages: Packages packages: Packages
packaging: Packaging packaging: Packaging
ticket: Ticket ticket: Ticket

52
src/pages/Route/locale/es.yml
View File

@ -2,30 +2,30 @@ route:
filter: filter:
Served: Servida Served: Servida
summary: summary:
date: Fecha date: Fecha
agency: Agencia agency: Agencia
vehicle: Vehículo vehicle: Vehículo
driver: Conductor driver: Conductor
cost: Costo cost: Costo
started: Hora inicio started: Hora inicio
finished: Hora fin finished: Hora fin
kmStart: Km inicio kmStart: Km inicio
kmEnd: Km fin kmEnd: Km fin
volume: Volumen volume: Volumen
packages: Bultos packages: Bultos
description: Descripción description: Descripción
tickets: Tickets tickets: Tickets
order: Orden order: Orden
street: Dirección fiscal street: Dirección fiscal
city: Población city: Población
pc: CP pc: CP
client: Cliente client: Cliente
state: Estado state: Estado
packaging: Encajado packaging: Encajado
closed: Cerrada closed: Cerrada
open: Abierta open: Abierta
yes: Sí yes: Sí
no: No no: No
extendedList: extendedList:
selectStartingDate: Seleccione la fecha de inicio selectStartingDate: Seleccione la fecha de inicio
statingDate: Fecha de inicio statingDate: Fecha de inicio
@ -102,7 +102,7 @@ route:
dated: Fecha dated: Fecha
preview: Vista previa preview: Vista previa
delivered: Entregado delivered: Entregado
forecast: Pronóstico estimated: Pronóstico
cmr: cmr:
list: list:
results: resultados results: resultados
@ -124,8 +124,6 @@ route:
PC: CP PC: CP
client: Cliente client: Cliente
warehouse: Almacén warehouse: Almacén
delivered: Entregado
estimated: Pronóstico
packages: Bultos packages: Bultos
packaging: Encajado packaging: Encajado
ticket: Ticket ticket: Ticket