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

7129-fixMigrationIssues #754

Merged
pablone merged 10 commits from 7129-fixMigrationIssues into dev 2024-09-26 12:53:45 +00:00
Conversation 0 Commits 10 Files Changed 15 +101 -115
9 changed files with 101 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 27b699ebf4 - Show all commits

8
src/i18n/locale/en.yml
View File

@ -111,7 +111,7 @@ globals:
basicData: Basic data
log: Logs
parkingList: Parkings list
agencyList: Agencies list
agencyList: Agencies
agency: Agency
workCenters: Work centers
modes: Modes
@ -207,7 +207,7 @@ globals:
roadmap: Roadmap
stops: Stops
routes: Routes
cmrsList: CMRs list
cmrsList: CMRs
RouteList: List
routeCreate: New route
RouteRoadmap: Roadmaps
@ -273,7 +273,7 @@ globals:
clientsActionsMonitor: Clients and actions
serial: Serial
medical: Mutual
RouteExtendedList: Extended list
RouteExtendedList: Router
supplier: Supplier
created: Created
worker: Worker
@ -880,7 +880,7 @@ route:
tickets: Tickets
log: Log
autonomous: Autonomous
RouteExtendedList: Extended list
RouteExtendedList: Router
cmr:
list:
results: results

6
src/i18n/locale/es.yml
View File

@ -113,7 +113,7 @@ globals:
basicData: Datos básicos
log: Historial
parkingList: Listado de parkings
agencyList: Listado de agencias
agencyList: Agencias
agency: Agencia
workCenters: Centros de trabajo
modes: Modos
@ -211,13 +211,13 @@ globals:
roadmap: Troncales
stops: Paradas
routes: Rutas
cmrsList: Listado de CMRs
cmrsList: CMRs
RouteList: Listado
routeCreate: Nueva ruta
RouteRoadmap: Troncales
RouteRoadmapCreate: Crear troncal
autonomous: Autónomos
RouteExtendedList: Listado extendido
RouteExtendedList: Enrutador
suppliers: Proveedores
supplier: Proveedor
supplierCreate: Nuevo proveedor

2
src/pages/Item/ItemFixedPrice.vue
View File

@ -600,11 +600,9 @@ function handleOnDataSave({ CrudModelRef }) {
.q-table th,
.q-table td {
padding-inline: 5px !important;
// text-align: -webkit-right;
}
.q-table tbody td {
max-width: none;
.q-td.col {
& .vnInputDate {
min-width: 90px;

1
src/pages/Route/Agency/AgencyList.vue
View File

@ -76,7 +76,6 @@ const columns = computed(() => [
<div class="list-container">
<div class="list">
<VnTable
ref="tableRef"
data-key="AgencyList"
pablone marked this conversation as resolved
jsegarra commented 2024-09-24 11:58:21 +00:00
Review
Copy Link

Hacemos operaciones sobre la tabla tipo redirect o reload?
Lo digo, por crear la variable que no tendría ninguna utilidad o quitar la propiedad

Hacemos operaciones sobre la tabla tipo redirect o reload? Lo digo, por crear la variable que no tendría ninguna utilidad o quitar la propiedad
url="Agencies"
order="name"

119
src/pages/Route/RouteExtendedList.vue
View File

@ -1,11 +1,11 @@
<script setup>
import { computed, ref } from 'vue';
import { useI18n } from 'vue-i18n';
import { useSession } from 'composables/useSession';
import { useSummaryDialog } from 'src/composables/useSummaryDialog';
import { useQuasar } from 'quasar';
import { toDate } from 'src/filters';
import { useRouter } from 'vue-router';
import { usePrintService } from 'src/composables/usePrintService';
import axios from 'axios';
import RouteSearchbar from 'pages/Route/Card/RouteSearchbar.vue';
@ -13,17 +13,14 @@ import RouteListTicketsDialog from 'pages/Route/Card/RouteListTicketsDialog.vue'
import RouteSummary from 'pages/Route/Card/RouteSummary.vue';
import RightMenu from 'src/components/common/RightMenu.vue';
import RouteFilter from 'pages/Route/Card/RouteFilter.vue';
import VnSubToolbar from 'src/components/ui/VnSubToolbar.vue';
import VnInputDate from 'components/common/VnInputDate.vue';
import VnTable from 'components/VnTable/VnTable.vue';
import { usePrintService } from 'src/composables/usePrintService';
const { openReport } = usePrintService();
const { t } = useI18n();
const { viewSummary } = useSummaryDialog();
const quasar = useQuasar();
const session = useSession();
const selectedRows = ref([]);
const tableRef = ref([]);
const confirmationDialog = ref(false);
pablone marked this conversation as resolved
jsegarra commented 2024-09-24 11:58:18 +00:00
Review
Copy Link

session no se usa

session no se usa
@ -53,7 +50,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'workerFk',
label: t('Worker'),
label: t('route.Worker'),
create: true,
component: 'select',
attrs: {
@ -76,7 +73,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'agencyModeFk',
label: t('Agency'),
label: t('route.Agency'),
isTitle: true,
cardVisible: true,
create: true,
@ -94,7 +91,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'vehicleFk',
label: t('Vehicle'),
label: t('route.Vehicle'),
cardVisible: true,
create: true,
component: 'select',
@ -115,7 +112,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'created',
label: t('Date'),
label: t('route.Date'),
columnFilter: false,
cardVisible: true,
create: true,
@ -125,7 +122,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'from',
label: t('From'),
label: t('route.From'),
visible: false,
cardVisible: true,
create: true,
@ -135,7 +132,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'to',
label: t('To'),
label: t('route.To'),
visible: false,
cardVisible: true,
create: true,
@ -145,28 +142,28 @@ const columns = computed(() => [
{
align: 'center',
name: 'm3',
label: t('Volume'),
label: 'm3',
cardVisible: true,
columnClass: 'shrink',
},
{
align: 'left',
name: 'started',
label: t('hourStarted'),
label: t('route.hourStarted'),
component: 'time',
columnFilter: false,
},
{
align: 'left',
name: 'finished',
label: t('hourFinished'),
label: t('route.hourFinished'),
component: 'time',
columnFilter: false,
},
{
align: 'center',
name: 'kmStart',
label: t('KmStart'),
label: t('route.KmStart'),
columnClass: 'shrink',
create: true,
visible: false,
@ -174,7 +171,7 @@ const columns = computed(() => [
{
align: 'center',
name: 'kmEnd',
label: t('KmEnd'),
label: t('route.KmEnd'),
columnClass: 'shrink',
create: true,
visible: false,
@ -182,7 +179,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'description',
label: t('Description'),
label: t('route.Description'),
isTitle: true,
create: true,
component: 'input',
@ -191,7 +188,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'isOk',
label: t('Served'),
label: t('route.Served'),
component: 'checkbox',
columnFilter: false,
columnClass: 'shrink',
@ -201,20 +198,22 @@ const columns = computed(() => [
name: 'tableActions',
actions: [
{
title: t('Add tickets'),
title: t('route.Add tickets'),
icon: 'vn:ticketAdd',
action: (row) => openTicketsDialog(row?.id),
isPrimary: true,
},
{
title: t('components.smartCard.viewSummary'),
title: t('route.components.smartCard.viewSummary'),
icon: 'preview',
action: (row) => viewSummary(row?.id, RouteSummary),
isPrimary: true,
},
{
title: t('Route summary'),
title: t('route.Route summary'),
icon: 'arrow_forward',
isPrimary: true,
action: (row) => navigate(row?.id),
isPrimary: true,
},
],
},
@ -226,7 +225,7 @@ function navigate(id) {
const cloneRoutes = () => {
if (!selectedRows.value.length || !startingDate.value) return;
axios.post('Routes/clone', {
axios.post('route.Routes/clone', {
pablone marked this conversation as resolved Outdated
jsegarra commented 2024-09-25 09:21:44 +00:00
Outdated
Review
Copy Link

Esto es un endpoint válido?

Esto es un endpoint válido?
pablone commented 2024-09-25 09:52:22 +00:00
Outdated
Review
Copy Link

me he colado con las traducciones

me he colado con las traducciones
created: startingDate.value,
ids: selectedRows.value.map((row) => row?.id),
});
@ -273,20 +272,25 @@ const openTicketsDialog = (id) => {
<QDialog v-model="confirmationDialog">
<QCard style="min-width: 350px">
<QCardSection>
<p class="text-h6 q-ma-none">{{ t('Select the starting date') }}</p>
<p class="text-h6 q-ma-none">{{ t('route.Select the starting date') }}</p>
</QCardSection>
<QCardSection class="q-pt-none">
<VnInputDate
:label="t('Stating date')"
:label="t('route.Stating date')"
v-model="startingDate"
autofocus
/>
</QCardSection>
<QCardActions align="right">
<QBtn flat :label="t('Cancel')" v-close-popup class="text-primary" />
<QBtn
flat
:label="t('route.Cancel')"
v-close-popup
class="text-primary"
/>
<QBtn color="primary" v-close-popup @click="cloneRoutes">
{{ t('globals.clone') }}
{{ t('route.globals.clone') }}
</QBtn>
</QCardActions>
</QCard>
@ -310,7 +314,7 @@ const openTicketsDialog = (id) => {
:row-click="false"
:create="{
urlCreate: 'Routes',
title: t('Create route'),
title: t('route.createRoute'),
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {},
}"
@ -331,7 +335,7 @@ const openTicketsDialog = (id) => {
:disable="!selectedRows?.length"
@click="confirmationDialog = true"
>
<QTooltip>{{ t('Clone Selected Routes') }}</QTooltip>
<QTooltip>{{ t('route.Clone Selected Routes') }}</QTooltip>
</QBtn>
<QBtn
icon="cloud_download"
@ -340,7 +344,7 @@ const openTicketsDialog = (id) => {
:disable="!selectedRows?.length"
@click="showRouteReport"
>
<QTooltip>{{ t('Download selected routes as PDF') }}</QTooltip>
<QTooltip>{{ t('route.Download selected routes as PDF') }}</QTooltip>
</QBtn>
<QBtn
icon="check"
@ -349,63 +353,8 @@ const openTicketsDialog = (id) => {
:disable="!selectedRows?.length"
@click="markAsServed()"
>
<QTooltip>{{ t('Mark as served') }}</QTooltip>
<QTooltip>{{ t('route.Mark as served') }}</QTooltip>
</QBtn>
</template>
</VnTable>
</template>
<style lang="scss" scoped>
.table-input-cell {
max-width: 143px;
}
.route-list {
width: 100%;
max-height: 100%;
}
.table-actions {
gap: 12px;
}
th:last-child,
td:last-child {
background-color: var(--vn-section-color);
position: sticky;
right: 0;
}
</style>
<i18n>
en:
newRoute: New Route
hourStarted: Started hour
hourFinished: Finished hour
es:
From: Desde
To: Hasta
Worker: Trabajador
Agency: Agencia
Vehicle: Vehículo
Volume: Volumen
Date: Fecha
Description: Descripción
Hour started: Hora inicio
Hour finished: Hora fin
KmStart: Km inicio
KmEnd: Km fin
Served: Servida
newRoute: Nueva Ruta
Clone Selected Routes: Clonar rutas seleccionadas
Select the starting date: Seleccione la fecha de inicio
Stating date: Fecha de inicio
Cancel: Cancelar
Mark as served: Marcar como servidas
Download selected routes as PDF: Descargar rutas seleccionadas como PDF
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
hourStarted: Hora de inicio
hourFinished: Hora de fin
</i18n>

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

@ -38,7 +38,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'workerFk',
label: t('Worker'),
label: t('route.Worker'),
create: true,
cardVisible: true,
format: (row, dashIfEmpty) => dashIfEmpty(row.travelRef),
@ -47,7 +47,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'agencyName',
label: t('Agency'),
label: t('route.Agency'),
cardVisible: true,
create: true,
columnClass: 'expand',
@ -56,7 +56,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'vehiclePlateNumber',
label: t('Vehicle'),
label: t('route.Vehicle'),
cardVisible: true,
create: true,
columnFilter: false,
@ -64,7 +64,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'started',
label: t('hourStarted'),
label: t('route.hourStarted'),
cardVisible: true,
columnFilter: false,
format: (row) => toHour(row.started),
@ -72,7 +72,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'finished',
label: t('hourFinished'),
label: t('route.hourFinished'),
cardVisible: true,
columnFilter: false,
format: (row) => toHour(row.started),
@ -80,7 +80,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'description',
label: t('Description'),
label: t('route.Description'),
cardVisible: true,
isTitle: true,
create: true,
@ -90,7 +90,7 @@ const columns = computed(() => [
{
align: 'left',
name: 'isOk',
label: t('Served'),
label: t('route.Served'),
component: 'checkbox',
columnFilter: false,
columnClass: 'shrink',
@ -103,7 +103,7 @@ const columns = computed(() => [
title: t('components.smartCard.viewSummary'),
icon: 'preview',
action: (row) => viewSummary(row?.id, RouteSummary),
color: 'primary',
isPrimary: true,
pablone marked this conversation as resolved Outdated
jsegarra commented 2024-09-24 11:58:00 +00:00
Outdated
Review
Copy Link

no hace falta definirlo

no hace falta definirlo
},
],
},
@ -117,7 +117,6 @@ const columns = computed(() => [
</template>
</RightMenu>
<VnTable
ref="tableRef"
data-key="RouteList"
url="Routes/filter"
:columns="columns"
@ -126,7 +125,7 @@ const columns = computed(() => [
redirect="route"
:create="{
urlCreate: 'Routes',
title: t('Create route'),
title: t('route.createRoute'),
onDataSaved: ({ id }) => tableRef.redirect(id),
formInitialData: {},
}"
@ -140,12 +139,3 @@ const columns = computed(() => [
</template>
</VnTable>
</template>
<i18n>
es:
Worker: Trabajador
Agency: Agencia
Vehicle: Vehículo
Description: Descripción
Hour started: Hora inicio
Hour finished: Hora fin
</i18n>

25
src/pages/Route/locale/en.yml Normal file
View File

@ -0,0 +1,25 @@
route:
Worker: Worker
Agency: Agency
Vehicle: Vehicle
Description: Description
hourStarted: H.Start
hourFinished: H.End
createRoute: Create route
From: From
To: To
Date: Date
KmStart: Km start
KmEnd: Km end
Served: Served
Clone Selected Routes: Clone selected routes
Select the starting date: Select the starting date
Stating date: Starting date
Cancel: Cancel
Mark as served: Mark as served
Download selected routes as PDF: Download selected routes as PDF
Add ticket: Add ticket
Preview: Preview
Summary: Summary
Route is closed: Route is closed
Route is not served: Route is not served

25
src/pages/Route/locale/es.yml Normal file
View File

@ -0,0 +1,25 @@
route:
Worker: Trabajador
Agency: Agencia
Vehicle: Vehículo
Description: Descripción
hourStarted: H.Inicio
hourFinished: H.Fin
createRoute: Crear ruta
From: Desde
To: Hasta
Date: Fecha
KmStart: Km inicio
KmEnd: Km fin
Served: Servida
Clone Selected Routes: Clonar rutas seleccionadas
Select the starting date: Seleccione la fecha de inicio
Stating date: Fecha de inicio
Cancel: Cancelar
Mark as served: Marcar como servidas
Download selected routes as PDF: Descargar rutas seleccionadas como PDF
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

2
src/pages/Travel/Card/TravelSummary.vue
View File

@ -319,7 +319,7 @@ const getLink = (param) => `#/travel/${entityId.value}/${param}`;
</template>
<template #body-cell-id="{ col, value }">
<QTd>
<QBtn v-if="col.name === 'id'" flat color="blue">
<QBtn v-if="col.name === 'id'" flat class="link">
{{ value }}
<EntryDescriptorProxy :id="value" />
</QBtn>