Avans/smarthome
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added costs

Browse Source
This commit is contained in:
kennyboy55
2017-04-11 12:15:43 +02:00
parent 9b48480bfe
commit 5eded935a6
8 changed files with 65 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mean-app/dist/inline.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/dist/main.bundle.js
Vendored
+21 -8
View File
@@ -122,10 +122,21 @@ function mapUsage(response) {
return usage[0];
}
function toUsage(r) {
var htname = "night";
if (r.HT == 2) {
htname = "day";
}
var usage = ({
hov: r.HOV,
htv: r.HTV,
ht: r.HT
HOV: r.HOV,
HTV: r.HTV,
HT: r.HT,
HTN: htname,
TOE1: r.TOE1,
TOE2: r.TOE2,
TTE1: r.TTE1,
TTE2: r.TTE2,
tarief1: r.tarief1,
tarief2: r.tarief2
});
return usage;
}
@@ -214,7 +225,8 @@ var DetailComponent = (function () {
this.name = "Loading";
this.hov = 0;
this.htv = 0;
this.ht = 0;
this.ht = "loading";
this.money = 0;
this.loaded = false;
}
DetailComponent.prototype.ngOnInit = function () {
@@ -242,9 +254,10 @@ var DetailComponent = (function () {
this.dataService
.usage(id)
.subscribe(function (res) {
_this.hov = res.hov;
_this.htv = res.htv;
_this.ht = res.ht;
_this.hov = res.HOV;
_this.htv = res.HTV;
_this.ht = res.HTN;
_this.money = ((res.TOE1 - res.TTE1) * res.tarief1) + ((res.TOE2 - res.TTE2) * res.tarief2);
});
this.dataService
.name(id)
@@ -666,7 +679,7 @@ module.exports = "<div>\r\n\t\r\n</div>"
/***/ 673:
/***/ (function(module, exports) {
module.exports = "<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<h2>{{name}}</h2>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<b>HOV:</b> {{hov}}, <b>HTV:</b> {{htv}}, <b>HT:</b> {{ht}}\r\n\t</div>\r\n\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data1\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data3\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data4\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
module.exports = "<span *ngIf=\"loaded\">\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<h2>{{name}}</h2>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-12\">\r\n\t\t<div class=\"well\">\r\n\t\t\t<b>Huidig opgenomen vermogen:</b> {{hov}} kW</br>\r\n\t\t\t<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW</br>\r\n\t\t\t<b>Huidig tarief:</b> {{ht}} </br>\r\n\t\t\t<b>Totale kosten:</b> €{{money}}\r\n\t\t</div>\r\n\t</div>\r\n\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data1\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data2\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data3\"></line-chart>\r\n\t</div>\r\n\r\n\t<div class=\"col-md-6\">\r\n\t\t<line-chart [label]=\"label\" [data]=\"data4\"></line-chart>\r\n\t</div>\r\n\r\n</span>\r\n"
/***/ }),
mean-app/dist/main.bundle.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
mean-app/server/routes/webapi.js
+1 -1
View File
@@ -84,7 +84,7 @@ router.get('/data/:device/group/:group/:year1-:month1-:day1/:year2-:month2-:day2
if (results.length > 0) {
res.status(200);
res.send(JSON.stringify(results));
res.send(JSON.stringify(results[1]));
}
});
mean-app/src/app/data.service.ts
+17 -3
View File
@@ -137,10 +137,24 @@ function mapUsage(response:Response): Usage {
function toUsage(r:any): Usage
{
let htname = "night";
if(r.HT == 2)
{
htname = "day";
}
let usage = <Usage>({
hov: r.HOV,
htv: r.HTV,
ht: r.HT
HOV: r.HOV,
HTV: r.HTV,
HT: r.HT,
HTN: htname,
TOE1: r.TOE1,
TOE2: r.TOE2,
TTE1: r.TTE1,
TTE2: r.TTE2,
tarief1: r.tarief1,
tarief2: r.tarief2
});
return usage;
mean-app/src/app/detail.component.html
+6 -1
View File
@@ -5,7 +5,12 @@
</div>
<div class="col-md-12">
<b>HOV:</b> {{hov}}, <b>HTV:</b> {{htv}}, <b>HT:</b> {{ht}}
<div class="well">
<b>Huidig opgenomen vermogen:</b> {{hov}} kW</br>
<b>Huidig teruggeleverd vermogen:</b> {{htv}} kW</br>
<b>Huidig tarief:</b> {{ht}} </br>
<b>Totale kosten:</b> €{{money}}
</div>
</div>
mean-app/src/app/detail.component.ts
+7 -4
View File
@@ -28,7 +28,8 @@ export class DetailComponent implements OnInit, OnDestroy {
public hov:number = 0;
public htv:number = 0;
public ht:number = 0;
public ht:string = "loading";
public money:number = 0;
public loaded:boolean = false;
@@ -74,9 +75,11 @@ export class DetailComponent implements OnInit, OnDestroy {
.usage(id)
.subscribe(res => {
this.hov = res.hov;
this.htv = res.htv;
this.ht = res.ht;
this.hov = res.HOV;
this.htv = res.HTV;
this.ht = res.HTN;
this.money = ((res.TOE1 - res.TTE1) * res.tarief1) + ((res.TOE2 - res.TTE2) * res.tarief2);
});
mean-app/src/app/usage.ts
+11 -3
View File
@@ -1,5 +1,13 @@
export class Usage {
public hov: number;
public htv: number;
public ht: number;
public TOE1: number;
public TOE2: number;
public TTE1: number;
public TTE2: number;
public HOV: number;
public HTV: number;
public HT: number;
public HTN: string;
public tarief1: number;
public tarief2: number;
}