diff --git a/src/main/angular/src/app/location/detail/location-detail.html b/src/main/angular/src/app/location/detail/location-detail.html index be22186..f1f4c03 100644 --- a/src/main/angular/src/app/location/detail/location-detail.html +++ b/src/main/angular/src/app/location/detail/location-detail.html @@ -2,7 +2,7 @@ - +
  diff --git a/src/main/angular/src/app/location/energy/charts/energy-charts.ts b/src/main/angular/src/app/location/energy/charts/energy-charts.ts index eef2963..2904bf7 100644 --- a/src/main/angular/src/app/location/energy/charts/energy-charts.ts +++ b/src/main/angular/src/app/location/energy/charts/energy-charts.ts @@ -25,6 +25,12 @@ const COLOR_BACK_CONSUME = "#ffc07a"; }) class EnergyCharts { + @Input() + unit: string = ""; + + @Input() + factor: number = 1; + @Input() maxY: number | undefined = undefined; @@ -99,9 +105,9 @@ class EnergyCharts { categoryPercentage: 1.0, barPercentage: 0.95, data: pointSeries.points.map(p => { - return {x: p[0] * 1000, y: p[1] * factor}; + return {x: p[0] * 1000, y: p[1] * factor * this.factor}; }), - label: `${pointSeries.series.name} [${pointSeries.series.unit}]`, + label: `${pointSeries.series.name} [${this.unit || pointSeries.series.unit}]`, borderColor: color, backgroundColor: color, stack: stack ? stack : undefined, diff --git a/src/main/angular/src/app/location/energy/location-energy.html b/src/main/angular/src/app/location/energy/location-energy.html index 79ce66b..ad7f964 100644 --- a/src/main/angular/src/app/location/energy/location-energy.html +++ b/src/main/angular/src/app/location/energy/location-energy.html @@ -86,6 +86,6 @@
- + diff --git a/src/main/angular/src/app/location/energy/location-energy.ts b/src/main/angular/src/app/location/energy/location-energy.ts index 5183254..b84b249 100644 --- a/src/main/angular/src/app/location/energy/location-energy.ts +++ b/src/main/angular/src/app/location/energy/location-energy.ts @@ -62,6 +62,12 @@ export class LocationEnergy implements OnInit, AfterViewInit, OnDestroy { return this._o_; } + @Input() + unit: string = ""; + + @Input() + factor: number = 1; + @Input() maxY: number | undefined = undefined;