diff --git a/src/main/angular/src/app/api/series/constants.ts b/src/main/angular/src/app/api/series/constants.ts index 560071b..1c5c382 100644 --- a/src/main/angular/src/app/api/series/constants.ts +++ b/src/main/angular/src/app/api/series/constants.ts @@ -32,8 +32,8 @@ export const MILLIS_PER_YEAR = 24 * 60 * 60 * 365 * 1000; export const ELECTRICITY_GRID_PURCHASED_FEW = 7.7; export const ELECTRICITY_GRID_PURCHASED_MUCH = 9.7; - export const ELECTRICITY_GRID_POWER_MUCH = 400; + export const ELECTRICITY_PHOTOVOLTAIC_PRODUCED_FEW = 0.7; export const ELECTRICITY_PHOTOVOLTAIC_PRODUCED_MUCH = 2; export const ELECTRICITY_PHOTOVOLTAIC_POWER_FEW = 50; diff --git a/src/main/angular/src/app/pages/dashboard/amortisation/dashboard-amortisation.component.ts b/src/main/angular/src/app/pages/dashboard/amortisation/dashboard-amortisation.component.ts index 57627d3..f373a82 100644 --- a/src/main/angular/src/app/pages/dashboard/amortisation/dashboard-amortisation.component.ts +++ b/src/main/angular/src/app/pages/dashboard/amortisation/dashboard-amortisation.component.ts @@ -46,7 +46,7 @@ export class DashboardAmortisationComponent { const amortisationTotalYears = amortisationTotalMillis.div(MILLIS_PER_YEAR).withUnit('Jahre'); const amortisationDate = amortisationRestMillis.plus(this.now.getTime()); const constRestEuro = PV_COST_TOTAL_EURO.minus(costsSaved); - const amortisationDateString = 'Erwarte volle Amortisation am: ' + this.datePipe.transform(amortisationDate.map(v => new Date(v)), 'dd. MMM yyyy'); + const amortisationDateString = 'Erwarte volle Amortisation am: ' + this.datePipe.transform(amortisationDate.map(v => new Date(v)), 'dd. MMM yyyy hh:mm:ss'); return [ new DisplayValue('Ausgaben', PV_COST_TOTAL_EURO), new DisplayValue('Ersparnis', costsSaved),