diff --git a/mean-app/src/app/dashboard.component.ts b/mean-app/src/app/dashboard.component.ts index 8170472..e12e8e7 100644 --- a/mean-app/src/app/dashboard.component.ts +++ b/mean-app/src/app/dashboard.component.ts @@ -17,6 +17,8 @@ export class DashboardComponent implements OnInit, OnDestroy { public data1:LineData; public data2:LineData; + public label:LabelData; + public mloaded:boolean = false; public kloaded:boolean = false; @@ -39,17 +41,13 @@ export class DashboardComponent implements OnInit, OnDestroy { refreshData() { console.log("Refreshing data"); + this.label = ({data: ["Huidig opgenomen", "Huidig terug"]}); this.dataService .usage("4530303035303031353538313833363134") .subscribe(res => { - //this.data1 = ({data: [res.HOV, res.HTV], label: "Verbruik Martijn"}); - this.data1 = ({data: [21, 25], label: "Verbruik Martijn"}); - - console.log("data "); - console.log(this.data1); - + this.data1 = ({data: [res.HOV, res.HTV], label: "Verbruik Martijn"}); this.mloaded = true; }); @@ -58,9 +56,7 @@ export class DashboardComponent implements OnInit, OnDestroy { .usage("4530303235303030303636383733323136") .subscribe(res => { - //this.data1 = ({data: [res.HOV, res.HTV], label: "Verbruik Kenneth"}); - this.data2 = ({data: [18, 13], label: "Verbruik Kenneth"}); - + this.data2 = ({data: [res.HOV, res.HTV], label: "Verbruik Kenneth"}); this.kloaded = true; }); diff --git a/mean-app/src/app/detail.component.html b/mean-app/src/app/detail.component.html index 21d8d35..83b2609 100644 --- a/mean-app/src/app/detail.component.html +++ b/mean-app/src/app/detail.component.html @@ -29,5 +29,20 @@
+ + + + +
+ +
+ +
+ +
+ +
+ +
diff --git a/mean-app/src/app/detail.component.ts b/mean-app/src/app/detail.component.ts index b3c0655..46407fa 100644 --- a/mean-app/src/app/detail.component.ts +++ b/mean-app/src/app/detail.component.ts @@ -26,12 +26,21 @@ export class DetailComponent implements OnInit, OnDestroy { public data3:LineData; public data4:LineData; + public datapie1:LineData; + public datapie2:LineData; + public datapie3:LineData; + + public labelpie1:LabelData; + public labelpie2:LabelData; + public labelpie3:LabelData; + public hov:number = 0; public htv:number = 0; public ht:string = "loading"; public money:number = 0; public loaded:boolean = false; + public pieloaded:boolean = false; public subscription:Subscription; @@ -55,6 +64,9 @@ export class DetailComponent implements OnInit, OnDestroy { refreshData(id:string) { console.log("Refreshing data for ", this.id); + this.labelpie1 = ({data: ["Huidig opgenomen", "Huidig terug"]}); + this.labelpie2 = ({data: ["Totaal opgenomen 2", "Totaal terug 2"]}); + this.labelpie3 = ({data: ["Totaal opgenomen 1", "Totaal terug 1"]}); this.dataService .get(id) @@ -81,6 +93,12 @@ export class DetailComponent implements OnInit, OnDestroy { this.money = ((res.TOE1 - res.TTE1) * res.tarief1) + ((res.TOE2 - res.TTE2) * res.tarief2); + this.datapie1 = ({data: [res.HOV, res.HTV], label: "Huidig verbruik"}); + this.datapie2 = ({data: [res.TOE2, res.TTE2], label: "Totaal 2"}); + this.datapie3 = ({data: [res.TOE1, res.TTE1], label: "Totaal 1"}); + + this.pieloaded = true; + }); this.dataService diff --git a/mean-app/src/app/piechart.component.ts b/mean-app/src/app/piechart.component.ts index 229df46..9371043 100644 --- a/mean-app/src/app/piechart.component.ts +++ b/mean-app/src/app/piechart.component.ts @@ -24,10 +24,6 @@ export class PieChartComponent implements OnInit, OnChanges { ngOnInit(): void { - console.log("Data in piechart"); - console.log(this.data); - console.log(this.label); - this.pieChartLabels = this.label.data.slice(); this.pieChartData = this.data.data.slice(); }