diff --git a/src/service/dashboard/DashboardScenarioService.js b/src/service/dashboard/DashboardScenarioService.js index 6c221d2..ec78a26 100644 --- a/src/service/dashboard/DashboardScenarioService.js +++ b/src/service/dashboard/DashboardScenarioService.js @@ -46,7 +46,9 @@ export const DashboardScenarioService = { getScenarios(filters) { return axios.get('/scenarios-filter', { params: { - selectedAccount: filters + dateFrom: filters.dateFrom, + dateTo: filters.dateTo, + selectedAccount: filters.account } }); }, diff --git a/src/views/pages/DashExecution.vue b/src/views/pages/DashExecution.vue index 6df9683..8d95e87 100644 --- a/src/views/pages/DashExecution.vue +++ b/src/views/pages/DashExecution.vue @@ -758,13 +758,7 @@ watch(selectedAccount, (newAccount) => { // } // }) -watch(selectedScenarios, (newScenarios) => { - if (newScenarios && newScenarios.length > 0) { - console.log('Selected scenarios:', newScenarios); - } else { - console.log('No scenario selected'); - } -}); + //Nuova funzione function filterAppsByProjects(projectIds) { @@ -798,7 +792,14 @@ console.log('Selected scenarios:', selectedScenarios); //function per Scenarios async function loadScenariosByAccount(selectedAccount) { try { - await dashboardScenarioStore.loadScenarios(selectedAccount); + + const filterParams = { + dateFrom: formatLocalDate(dateRange.value?.[0]), + dateTo: null ? formatLocalDateTo(dateRange.value?.[0]):formatLocalDateTo(dateRange.value?.[1]), + account: selectedAccount || null, + } + + await dashboardScenarioStore.loadScenarios(filterParams); scenarioOptions.value = dashboardScenarioStore.allScenarios.map((scenario) => ({ ...scenario })); console.log('Scenarios loaded:', scenarioOptions.value);