Added tte1/tte2/htv

mean-app/dist/main.bundle.js

@@ -69,14 +69,20 @@ function mapData(response) {
     var TOE1S = response.json().map(toe1ToData);
     var TOE2S = response.json().map(toe2ToData);
     var HOV = response.json().map(hovToData);
+    var TTE1S = response.json().map(tte1ToData);
+    var TTE2S = response.json().map(tte2ToData);
+    var HTV = response.json().map(htvToData);
     var HT = response.json().map(htToData);
     var times = response.json().map(timeToData);
     var Toe1Line = ({ data: TOE1S, label: "Totaal Energieverbruik tarief 1" });
     var Toe2Line = ({ data: TOE2S, label: "Totaal Energieverbruik tarief 2" });
     var HovLine = ({ data: HOV, label: "Huidig Energieverbruik" });
+    var Tte1Line = ({ data: TTE1S, label: "Totaal terug Energieverbruik tarief 1" });
+    var Tte2Line = ({ data: TTE2S, label: "Totaal terug Energieverbruik tarief 2" });
+    var HtvLine = ({ data: HTV, label: "Huidig terug Energieverbruik" });
     var HtLine = ({ data: HT, label: "Huidig Tarief" });
     var label = ({ data: times });
-    var graph = ({ TOE1: Toe1Line, TOE2: Toe2Line, HOV: HovLine, HT: HtLine, labels: label });
+    var graph = ({ TOE1: Toe1Line, TOE2: Toe2Line, HOV: HovLine, TTE1: Tte1Line, TTE2: Tte2Line, HTV: HtvLine, HT: HtLine, labels: label });
     return graph;
 }
 function toe1ToData(r) {
@@ -91,6 +97,18 @@ function hovToData(r) {
     var HOV = r.HOV;
     return HOV;
 }
+function tte1ToData(r) {
+    var TTE1 = r.TTE1;
+    return TTE1;
+}
+function tte2ToData(r) {
+    var TTE2 = r.TTE2;
+    return TTE2;
+}
+function htvToData(r) {
+    var HTV = r.HTV;
+    return HTV;
+}
 function htToData(r) {
     var HT = r.HT;
     return HT;
@@ -202,8 +220,8 @@ var DetailComponent = (function () {
             .get(id)
             .subscribe(function (res) {
             _this.label = res.labels;
-            _this.data = res.TOE1;
-            _this.data2 = res.HOV;
+            _this.data = res.TTE1;
+            _this.data2 = res.HTV;
             _this.loaded = true;
         });
         this.dataService

mean-app/server/routes/webapi.js

@@ -32,7 +32,7 @@ router.get('/data/:device', function(req, res) {
   let devid = req.params.device;
 
   connection.query(
-    'SELECT s.* FROM ( SELECT TOE1, TOE2, HOV, HT, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,25 ) s ORDER BY s.time ASC', [devid],
+    'SELECT s.* FROM ( SELECT TOE1, TOE2, TTE1, TTE2, HOV, HTV, HT, time FROM measurement WHERE device = ? ORDER BY time DESC LIMIT 0,25 ) s ORDER BY s.time ASC', [devid],
                      function (error, results, fields) {
    if (error) throw error;
 

mean-app/src/app/data.service.ts

@@ -71,15 +71,21 @@ function mapData(response:Response): GraphData {
   let TOE1S = response.json().map(toe1ToData);
   let TOE2S = response.json().map(toe2ToData);
   let HOV = response.json().map(hovToData);
+  let TTE1S = response.json().map(tte1ToData);
+  let TTE2S = response.json().map(tte2ToData);
+  let HTV = response.json().map(htvToData);
   let HT = response.json().map(htToData);
   let times = response.json().map(timeToData);
 
   let Toe1Line:LineData = <LineData>({data: TOE1S, label: "Totaal Energieverbruik tarief 1"});
   let Toe2Line:LineData = <LineData>({data: TOE2S, label: "Totaal Energieverbruik tarief 2"});
   let HovLine:LineData = <LineData>({data: HOV, label: "Huidig Energieverbruik"});
+  let Tte1Line:LineData = <LineData>({data: TTE1S, label: "Totaal terug Energieverbruik tarief 1"});
+  let Tte2Line:LineData = <LineData>({data: TTE2S, label: "Totaal terug Energieverbruik tarief 2"});
+  let HtvLine:LineData = <LineData>({data: HTV, label: "Huidig terug Energieverbruik"});
   let HtLine:LineData = <LineData>({data: HT, label: "Huidig Tarief"});
   let label:LabelData = <LabelData>({data: times});
-  let graph:GraphData = <GraphData>({TOE1:Toe1Line,TOE2:Toe2Line,HOV:HovLine,HT:HtLine,labels:label});
+  let graph:GraphData = <GraphData>({TOE1:Toe1Line,TOE2:Toe2Line,HOV:HovLine,TTE1:Tte1Line,TTE2:Tte2Line,HTV:HtvLine,HT:HtLine,labels:label});
   return graph;
 }
 
@@ -98,6 +104,21 @@ function hovToData(r:any){
   return HOV;
 }
 
+function tte1ToData(r:any){
+  let TTE1 = r.TTE1;
+  return TTE1;
+}
+
+function tte2ToData(r:any){
+  let TTE2 = r.TTE2;
+  return TTE2;
+}
+
+function htvToData(r:any){
+  let HTV = r.HTV;
+  return HTV;
+}
+
 function htToData(r:any){
   let HT = r.HT;
   return HT;

mean-app/src/app/detail.component.ts

@@ -38,8 +38,8 @@ export class DetailComponent implements OnInit {
       .subscribe(res => {
 
         this.label = res.labels;
-        this.data = res.TOE1;
-        this.data2 = res.HOV;
+        this.data = res.TTE1;
+        this.data2 = res.HTV;
 
         this.loaded = true;
 

mean-app/src/app/graph-data.ts

@@ -5,6 +5,9 @@ export class GraphData {
   public TOE1: LineData;
   public TOE2: LineData;
   public HOV: LineData;
+  public TTE1: LineData;
+  public TTE2: LineData;
+  public HTV: LineData;
   public HT: LineData;
   public labels: LabelData;
 }