Skip to content
This repository has been archived by the owner on Jul 22, 2024. It is now read-only.

Commit

Permalink
Bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
@Yevgenium
Yevgenium committed Aug 23, 2021
1 parent a9f795f commit 79778e7
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 43 deletions.
2 changes: 1 addition & 1 deletion rollup.config.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ const serveopts = {
export default {
input: 'src/main.js',
output: {
file: 'dist/weather-chart-card-bundle.js',
file: 'dist/weather-chart-card.js',
format: 'umd',
name: 'WeatherChartCard',
sourcemap: dev ? true : false,
Expand Down
68 changes: 26 additions & 42 deletions src/main.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ class WeatherChartCard extends LitElement {
return this._hass.config.unit_system[unit] || '';
}

getWeatherIcon(condition) {
getWeatherIcon(condition, sun) {
if (this.config.icons) {
return `${this.config.icons}${
this.sun.state == 'below_horizon'
sun == 'below_horizon'
? weatherIconsNight[condition]
: weatherIconsDay[condition]}.svg`
}
Expand Down Expand Up @@ -120,7 +120,6 @@ class WeatherChartCard extends LitElement {
if (this.forecastChart) {
this.forecastChart.destroy();
}
var mode = config.mode ? config.mode : 'daily';
var tempHiColor = config.temp1_color ? config.temp1_color : 'rgba(230, 100, 100, 1.0)';
var tempLoColor = config.temp2_color ? config.temp2_color : 'rgba(68, 115, 158, 1.0)';
var precipColor = config.precip_color ? config.precip_color : 'rgba(132, 209, 253, 1.0)';
Expand All @@ -139,18 +138,12 @@ class WeatherChartCard extends LitElement {
var precip = [];
for (i = 0; i < forecast.length; i++) {
var d = forecast[i];
if (d.datetime) {
dateTime.push(d.datetime);
}
if (d.temperature) {
tempHigh.push(d.temperature);
}
if (d.templow) {
dateTime.push(d.datetime);
tempHigh.push(d.temperature);
if (typeof d.templow !== 'undefined') {
tempLow.push(d.templow);
}
if (d.precipitation) {
precip.push(d.precipitation);
}
precip.push(d.precipitation);
}
var style = getComputedStyle(document.body);
var backgroundColor = style.getPropertyValue('--card-background-color');
Expand All @@ -160,6 +153,11 @@ class WeatherChartCard extends LitElement {

Chart.defaults.color = textColor;
Chart.defaults.scale.grid.color = dividerColor;
Chart.defaults.elements.line.fill = false;
Chart.defaults.elements.line.tension = 0.3;
Chart.defaults.elements.line.borderWidth = 1.5;
Chart.defaults.elements.point.radius = 2;
Chart.defaults.elements.point.hitRadius = 10;

this.forecastChart = new Chart(ctx, {
type: 'bar',
Expand All @@ -172,9 +170,6 @@ class WeatherChartCard extends LitElement {
yAxisID: 'TempAxis',
borderColor: tempHiColor,
backgroundColor: tempHiColor,
borderWidth: 1.5,
pointHitRadius: 10,
fill: false
},
{
label: this.ll('tempLo'),
Expand All @@ -183,9 +178,6 @@ class WeatherChartCard extends LitElement {
yAxisID: 'TempAxis',
borderColor: tempLoColor,
backgroundColor: tempLoColor,
borderWidth: 1.5,
pointHitRadius: 10,
fill: false
},
{
label: this.ll('precip'),
Expand All @@ -202,21 +194,21 @@ class WeatherChartCard extends LitElement {
},
formatter: function(value, context) {
if (context.dataset.data[context.dataIndex] > 9) {
return Math.round(context.dataset.data[context.dataIndex]) + ' мм';
return Math.round(context.dataset.data[context.dataIndex]) + ' ' + precipUnit;
}
return context.dataset.data[context.dataIndex].toFixed(1) + ' мм';
return context.dataset.data[context.dataIndex].toFixed(1) + ' ' + precipUnit;
},
align: 'top',
anchor: 'start',
offset: -8
offset: -8,
}
}]
},
options: {
maintainAspectRatio: false,
layout: {
padding: {
bottom: 10
bottom: 10,
}
},
scales: {
Expand All @@ -228,7 +220,6 @@ class WeatherChartCard extends LitElement {
zeroLineColor: dividerColor,
},
ticks: {
display: true,
maxRotation: 0,
padding: 8,
callback: function(value, index, values) {
Expand All @@ -241,8 +232,8 @@ class WeatherChartCard extends LitElement {
return time;
}
return weekday;
},
},
}
}
},
TempAxis: {
position: 'left',
Expand All @@ -256,7 +247,7 @@ class WeatherChartCard extends LitElement {
},
ticks: {
display: false,
},
}
},
PrecipAxis: {
position: 'right',
Expand Down Expand Up @@ -286,7 +277,7 @@ class WeatherChartCard extends LitElement {
font: {
size: 10,
weight: 'bold',
lineHeight: 0.6
lineHeight: 0.6,
},
formatter: function(value, context) {
return context.dataset.data[context.dataIndex] + '°';
Expand Down Expand Up @@ -333,18 +324,12 @@ class WeatherChartCard extends LitElement {
var precip = [];
for (i = 0; i < forecast.length; i++) {
var d = forecast[i];
if (d.datetime) {
dateTime.push(d.datetime);
}
if (d.temperature) {
tempHigh.push(d.temperature);
}
if (d.templow) {
dateTime.push(d.datetime);
tempHigh.push(d.temperature);
if (typeof d.templow !== 'undefined') {
tempLow.push(d.templow);
}
if (d.precipitation) {
precip.push(d.precipitation);
}
precip.push(d.precipitation);
}
if (forecastChart) {
forecastChart.data.labels = dateTime;
Expand Down Expand Up @@ -438,7 +423,6 @@ class WeatherChartCard extends LitElement {
right: 4px;
color: var(--secondary-text-color);
}
</style>
<ha-card header="${config.title}">
Expand Down Expand Up @@ -471,7 +455,7 @@ class WeatherChartCard extends LitElement {
`;
}

renderMain({ config, weather, temperature } = this) {
renderMain({ config, sun, weather, temperature } = this) {
if (config.show_main == false)
return html``;
return html`
Expand All @@ -484,7 +468,7 @@ class WeatherChartCard extends LitElement {
${config.icons ?
html`
<img
src="${this.getWeatherIcon(weather.state)}"
src="${this.getWeatherIcon(weather.state, sun.state)}"
alt=""
>
`:
Expand Down Expand Up @@ -537,7 +521,7 @@ class WeatherChartCard extends LitElement {
`;
}

renderSun({ _hass, sun, language } = this) {
renderSun({ sun, language } = this) {
if ( sun == undefined)
return html``;
return html`
Expand Down

0 comments on commit 79778e7

Please sign in to comment.