From 1a72eda35955afb42e0094f9b72003408808a7a2 Mon Sep 17 00:00:00 2001 From: robert Date: Wed, 8 Jan 2025 12:44:35 +0100 Subject: [PATCH 1/2] fix: refs #8001 change link grafana --- src/pages/Ticket/Card/TicketExpedition.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/Ticket/Card/TicketExpedition.vue b/src/pages/Ticket/Card/TicketExpedition.vue index 7da049124..56e2c6455 100644 --- a/src/pages/Ticket/Card/TicketExpedition.vue +++ b/src/pages/Ticket/Card/TicketExpedition.vue @@ -201,7 +201,7 @@ const getExpeditionState = async (expedition) => { const openGrafana = (expeditionFk) => { useOpenURL( - `https://grafana.verdnatura.es/d/d552ab74-85b4-4e7f-a279-fab7cd9c6124/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}` + `https://grafana.verdnatura.es/d/de1njb6p5answd/control-de-expediciones?orgId=1&var-expeditionFk=${expeditionFk}` ); }; From e69332316679e7e9fd4397140bb0397bbc79a523 Mon Sep 17 00:00:00 2001 From: alexm Date: Wed, 8 Jan 2025 12:57:15 +0100 Subject: [PATCH 2/2] fix: workerTimeControl state week colors --- src/pages/Worker/Card/WorkerTimeControl.vue | 2 +- src/pages/Worker/Card/WorkerTimeControlCalendar.vue | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/pages/Worker/Card/WorkerTimeControl.vue b/src/pages/Worker/Card/WorkerTimeControl.vue index 0870c78b7..65fbf4b43 100644 --- a/src/pages/Worker/Card/WorkerTimeControl.vue +++ b/src/pages/Worker/Card/WorkerTimeControl.vue @@ -345,7 +345,7 @@ const getMailStates = async (date) => { const prevMonth = month == 1 ? 12 : month - 1; const params = { month, - year: selectedDateYear.value, + year: date.getFullYear(), }; const curMonthStates = (await axios.get(url, { params })).data; diff --git a/src/pages/Worker/Card/WorkerTimeControlCalendar.vue b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue index 2717a71f4..46ae4b698 100644 --- a/src/pages/Worker/Card/WorkerTimeControlCalendar.vue +++ b/src/pages/Worker/Card/WorkerTimeControlCalendar.vue @@ -102,8 +102,7 @@ const getWorkWeekElements = () => { }; const paintWorkWeeks = async () => { - for (var i = 0; i < workWeeksElements.value.length; i++) { - const element = workWeeksElements.value[i]; + for (const element of workWeeksElements.value) { const week = Number(element.innerHTML); const weekState = workerTimeControlMailsMap.value.get(week); const { className, title } = stateClasses[weekState] || {};