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

Merge branch 'dev' into 8684-itemRefactorAndE2e
gitea/salix-front/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Pablo Natek 2025-05-20 06:39:07 +00:00
parent ca7d05f753 101298f681
commit 042fff67df
2 changed files with 65 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/components/common/VnInputDate.vue
View File

@ -51,6 +51,7 @@ const validateAndCleanInput = (value) => {
const manageDate = (date) => { const manageDate = (date) => {
inputValue.value = date.split('/').reverse().join('/'); inputValue.value = date.split('/').reverse().join('/');
formatDate();
isPopupOpen.value = false; isPopupOpen.value = false;
}; };
@ -170,7 +171,7 @@ const handleEnter = (event) => {
:input-style="{ color: textColor }" :input-style="{ color: textColor }"
@click="isPopupOpen = !isPopupOpen" @click="isPopupOpen = !isPopupOpen"
@keydown="isPopupOpen = false" @keydown="isPopupOpen = false"
@blur="formatDate" @focusout="formatDate"
@keydown.enter.prevent="handleEnter" @keydown.enter.prevent="handleEnter"
hide-bottom-space hide-bottom-space
:data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'" :data-cy="($attrs['data-cy'] ?? $attrs.label) + '_inputDate'"

124
src/router/modules/route.js
View File

@ -121,44 +121,45 @@ const agencyCard = {
], ],
}; };
const roadmapCard = { // Waiting for the roadmap to be implemented refs #8227
path: ':id', // const roadmapCard = {
name: 'RoadmapCard', // path: ':id',
component: () => import('src/pages/Route/Roadmap/RoadmapCard.vue'), // name: 'RoadmapCard',
redirect: { name: 'RoadmapSummary' }, // component: () => import('src/pages/Route/Roadmap/RoadmapCard.vue'),
meta: { // redirect: { name: 'RoadmapSummary' },
menu: ['RoadmapBasicData', 'RoadmapStops'], // meta: {
}, // menu: ['RoadmapBasicData', 'RoadmapStops'],
children: [ // },
{ // children: [
name: 'RoadmapSummary', // {
path: 'summary', // name: 'RoadmapSummary',
meta: { // path: 'summary',
title: 'summary', // meta: {
icon: 'open_in_new', // title: 'summary',
}, // icon: 'open_in_new',
component: () => import('pages/Route/Roadmap/RoadmapSummary.vue'), // },
}, // component: () => import('pages/Route/Roadmap/RoadmapSummary.vue'),
{ // },
name: 'RoadmapBasicData', // {
path: 'basic-data', // name: 'RoadmapBasicData',
meta: { // path: 'basic-data',
title: 'basicData', // meta: {
icon: 'vn:settings', // title: 'basicData',
}, // icon: 'vn:settings',
component: () => import('pages/Route/Roadmap/RoadmapBasicData.vue'), // },
}, // component: () => import('pages/Route/Roadmap/RoadmapBasicData.vue'),
{ // },
name: 'RoadmapStops', // {
path: 'stops', // name: 'RoadmapStops',
meta: { // path: 'stops',
title: 'stops', // meta: {
icon: 'vn:lines', // title: 'stops',
}, // icon: 'vn:lines',
component: () => import('pages/Route/Roadmap/RoadmapStops.vue'), // },
}, // component: () => import('pages/Route/Roadmap/RoadmapStops.vue'),
], // },
}; // ],
// };
const vehicleCard = { const vehicleCard = {
path: ':id', path: ':id',
@ -228,7 +229,7 @@ export default {
'RouteList', 'RouteList',
'RouteExtendedList', 'RouteExtendedList',
'RouteAutonomous', 'RouteAutonomous',
'RouteRoadmap', // 'RouteRoadmap', Waiting for the roadmap to be implemented refs #8227
'CmrList', 'CmrList',
'AgencyList', 'AgencyList',
'VehicleList', 'VehicleList',
@ -288,28 +289,29 @@ export default {
}, },
component: () => import('src/pages/Route/RouteAutonomous.vue'), component: () => import('src/pages/Route/RouteAutonomous.vue'),
}, },
{ // Waiting for the roadmap to be implemented refs #8227
path: 'roadmap', // {
name: 'RouteRoadmap', // path: 'roadmap',
redirect: { name: 'RoadmapList' }, // name: 'RouteRoadmap',
component: () => import('src/pages/Route/RouteRoadmap.vue'), // redirect: { name: 'RoadmapList' },
meta: { // component: () => import('src/pages/Route/RouteRoadmap.vue'),
title: 'RouteRoadmap', // meta: {
icon: 'vn:troncales', // title: 'RouteRoadmap',
}, // icon: 'vn:troncales',
children: [ // },
{ // children: [
name: 'RoadmapList', // {
path: 'list', // name: 'RoadmapList',
meta: { // path: 'list',
title: 'list', // meta: {
icon: 'view_list', // title: 'list',
}, // icon: 'view_list',
component: () => import('src/pages/Route/RouteRoadmap.vue'), // },
}, // component: () => import('src/pages/Route/RouteRoadmap.vue'),
roadmapCard, // },
], // roadmapCard,
}, // ],
// },
{ {
path: 'cmr', path: 'cmr',
name: 'CmrList', name: 'CmrList',