7525-devToTest #419

Merged
alexm merged 177 commits from 7525-devToTest into test 2024-06-04 08:06:27 +00:00
2 changed files with 21 additions and 10 deletions
Showing only changes of commit a78e86a0b9 - Show all commits

View File

@ -91,6 +91,15 @@ export default {
log: 'Historial',
parkingList: 'Listado de parkings',
},
worker: 'Trabajador',
vehicle: 'Vehículo',
hourStarted: 'Hora inicio',
hourFinished: 'Hora fin',
newRoute: 'Nueva Ruta',
StatingDate: 'Fecha de inicio',
Cancel: 'Cancelar',
Clone: 'Clonar',
ID: 'ID',
},
errors: {
statusUnauthorized: 'Acceso denegado',

View File

@ -29,7 +29,7 @@ const { validate } = useValidator();
const quasar = useQuasar();
const session = useSession();
const { viewSummary } = useSummaryDialog();
const visibleColumns = ref([]);
const selectedRows = ref([]);
const columns = computed(() => [
{
@ -139,8 +139,8 @@ const columns = computed(() => [
},
},
{
name: 'started',
label: t('Hour started'),
name: 'hourStarted',
label: t('hourStarted'),
field: (row) => toHour(row.started),
sortable: true,
align: 'left',
@ -152,8 +152,8 @@ const columns = computed(() => [
},
},
{
name: 'finished',
label: t('Hour finished'),
name: 'hourFinished',
label: t('hourFinished'),
field: (row) => toHour(row.finished),
sortable: true,
align: 'left',
@ -328,7 +328,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
class="LeftIcon"
:all-columns="allColumnNames"
table-code="routesList"
labels-traductions-path="route.list"
labels-traductions-path="globals"
@on-config-saved="visibleColumns = [...$event]"
/>
</template>
@ -385,7 +385,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
hide-pagination
:no-data-label="t('globals.noResults')"
>
<template #top-row="{ cols }">
<!-- <template #top-row="{ cols }">
<QTr>
<QTd />
<QTd
@ -394,8 +394,10 @@ onUnmounted(() => (stateStore.rightDrawer = false));
style="max-width: 100px"
>
<component
:is="col.columnFilter.component"
v-if="col.name !== 'picture'"
:is="col?.columnFilter?.component"
v-if="
col.columnFilter && col.name !== 'actions'
"
v-model="col.columnFilter.filterValue"
v-bind="col.columnFilter.attrs"
v-on="col.columnFilter.event(col)"
@ -403,7 +405,7 @@ onUnmounted(() => (stateStore.rightDrawer = false));
/>
</QTd>
</QTr>
</template>
</template> -->
<template #body-cell-worker="{ row }">
<QTd>
<VnSelectFilter