diff --git a/src/services/openweathermap/Chart.ts b/src/services/openweathermap/Chart.ts index 8464335..fd483ad 100644 --- a/src/services/openweathermap/Chart.ts +++ b/src/services/openweathermap/Chart.ts @@ -53,10 +53,11 @@ export default { }, tooltips: { intersect: false, + mode: 'index', callbacks: { - title(tooltipItem: any, myData: any) { - const item = myData.datasets[tooltipItem[0].datasetIndex].data[tooltipItem[0].index] - return moment(item.x || item.t).format('HH[h]') + title(tooltipItems: any, myData: any) { + const item = myData.datasets[tooltipItems[0].datasetIndex].data[tooltipItems[0].index] + return moment(item.x || item.t).format('HH[h]') + (item.d ? ` - ${item.d}` : '') }, label(tooltipItem: any, myData: any) { let label = myData.datasets[tooltipItem.datasetIndex].label || '' diff --git a/src/services/openweathermap/OpenWeatherMap.vue b/src/services/openweathermap/OpenWeatherMap.vue index 5037c3c..c5afa1d 100644 --- a/src/services/openweathermap/OpenWeatherMap.vue +++ b/src/services/openweathermap/OpenWeatherMap.vue @@ -44,6 +44,9 @@ interface Forecast { rain?: { '3h': number } + weather: Array<{ + description: string + }>, } const AUTH = { TOKEN: 'token' } @@ -83,9 +86,9 @@ export default class OpenWeatherMap extends ConnectedService { borderWidth: 1, fill: false, data: fs.map(line => ({ - x: line.dt * 1000, y: line.main.temp + x: line.dt * 1000, y: line.main.temp, d: line.weather[0].description })) - },{ + }, { type: 'bar', label: 'Percipitation', yAxisID: 'y-axis-rain',