diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.css b/src/app/content/hemat-app/monitoring/detail/detail.component.css index b276f26..9544824 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.css +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.css @@ -86,11 +86,11 @@ canvas { } .background-round { - background-color: #2F5137 !important; + background-color: #37A647 !important; padding: 8px; border-radius: 50%; - border: 2px solid #2F5137; - border-color: #2F5137 !important; + border: 2px solid #37A647; + border-color: #37A647 !important; } .custom-label { diff --git a/src/app/content/hemat-app/monitoring/detail/detail.component.html b/src/app/content/hemat-app/monitoring/detail/detail.component.html index af8aa4e..b719df4 100644 --- a/src/app/content/hemat-app/monitoring/detail/detail.component.html +++ b/src/app/content/hemat-app/monitoring/detail/detail.component.html @@ -19,7 +19,7 @@
{ this.barChartData[0].data.push(entry.kwh); + this.barChartData[1].data.push(entry.kwh); this.barChartLabels.push(entry.day); }); - const weeklyKwh = this.aggregateKwhWeekly(this.chartKwhWater); - let weekIndex = 0; - console.log(this.barChartData[0].data); + // const weeklyKwh = this.aggregateKwhWeekly(this.chartKwhWater); + // let weekIndex = 0; + // console.log(this.barChartData[0].data); - for (let i = 0; i < this.barChartData[0].data.length; i++) { - if (i % 7 === 6 && weekIndex < weeklyKwh.length) { - this.barChartData[1].data[i] = weeklyKwh[weekIndex++]; - } else { - this.barChartData[1].data[i] = null; - } - } + // for (let i = 0; i < this.barChartData[0].data.length; i++) { + // if (i % 7 === 6 && weekIndex < weeklyKwh.length) { + // this.barChartData[1].data[i] = weeklyKwh[weekIndex++]; + // } else { + // this.barChartData[1].data[i] = null; + // } + // } }); }