diff --git a/www/app/controllers/account.js b/www/app/controllers/account.js index 49fb33c..44580cd 100644 --- a/www/app/controllers/account.js +++ b/www/app/controllers/account.js @@ -18,10 +18,10 @@ export default Ember.Controller.extend({ load: function() { var series = this.series[0]; setInterval(function() { - var x = (new Date).getTime(), + var x = (new Date()).getTime(), y = e.getWithDefault("model.currentHashrate") / 1000000; - series.addPoint([x, y], true, true) - }, 109000000) + series.addPoint([x, y], true, true); + }, 109000000); } } }, @@ -58,7 +58,7 @@ export default Ember.Controller.extend({ }, tooltip: { formatter: function() { - return this.y > 1000000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000000).toFixed(2) + " TH/s" : this.y > 1000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000).toFixed(2) + " GH/s" : this.y > 1000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000).toFixed(2) + " MH/s" : "" + this.point.d + "
Hashrate " + this.y.toFixed(2) + " H/s" + return this.y > 1000000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000000).toFixed(2) + " TH/s" : this.y > 1000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000).toFixed(2) + " GH/s" : this.y > 1000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000).toFixed(2) + " MH/s" : "" + this.point.d + "
Hashrate " + this.y.toFixed(2) + " H/s"; }, @@ -72,61 +72,68 @@ export default Ember.Controller.extend({ name: "Average hashrate", data: function() { var e, a = []; - if (null != t) + if (null != t) { for (e = 0; e <= t.length - 1; e += 1) { var n = 0, r = 0, l = 0; - r = new Date(1e3 * t[e].x), l = r.toLocaleString(), n = t[e].minerLargeHash, a.push({ + r = new Date(1e3 * t[e].x); + l = r.toLocaleString(); + n = t[e].minerLargeHash; + a.push({ x: r, d: l, y: n - }) - } else a.push({ + }); + } + } else { + a.push({ x: 0, d: 0, y: 0 }); - return a + } + return a; }() }, { name: "Current hashrate", data: function() { var e, a = []; - if (null != t) + if (null != t) { for (e = 0; e <= t.length - 1; e += 1) { var n = 0, r = 0, l = 0; - r = new Date(1e3 * t[e].x), l = r.toLocaleString(), n = t[e].minerHash, a.push({ + r = new Date(1e3 * t[e].x); + l = r.toLocaleString(); + n = t[e].minerHash; + a.push({ x: r, d: l, y: n - }) - } else a.push({ + }); + } + } else { + a.push({ x: 0, d: 0, y: 0 - }); - return a + }); + } + return a; }() }] }; - return a + return a; } }), - roundPercent: Ember.computed('stats', 'model', { get() { - var percent = this.get('model.roundShares') / this.get('stats.nShares'); + var percent = this.get('model.roundShares') / this.get('stats.roundShares'); if (!percent) { return 0; } - if(percent>100){ - return 100; - } - return percent; } }) -}); +}); \ No newline at end of file diff --git a/www/app/controllers/account/index.js b/www/app/controllers/account/index.js index c4fa2dd..6511969 100644 --- a/www/app/controllers/account/index.js +++ b/www/app/controllers/account/index.js @@ -2,8 +2,10 @@ import Ember from 'ember'; export default Ember.Controller.extend({ applicationController: Ember.inject.controller('application'), - config: Ember.computed.reads('applicationController.config'), + netstats: Ember.computed.reads('applicationController'), stats: Ember.computed.reads('applicationController.model.stats'), + config: Ember.computed.reads('applicationController.config'), + chartOptions: Ember.computed("model.hashrate", { get() { var e = this, @@ -13,15 +15,15 @@ export default Ember.Controller.extend({ backgroundColor: "rgba(255, 255, 255, 0.1)", type: "spline", marginRight: 10, - height: 400, + height: 200, events: { load: function() { var series = this.series[0]; setInterval(function() { - var x = (new Date).getTime(), + var x = (new Date()).getTime(), y = e.getWithDefault("model.currentHashrate") / 1000000; - series.addPoint([x, y], true, true) - }, 109000000) + series.addPoint([x, y], true, true); + }, 1090000000); } } }, @@ -44,9 +46,10 @@ export default Ember.Controller.extend({ }, yAxis: { title: { - text: "HASHRATE" + text: "Hashrate by Account" }, - min: 0 + //softMin: e.getWithDefault("model.currentHashrate") / 1000000, + //softMax: e.getWithDefault("model.currentHashrate") / 1000000, }, plotLines: [{ value: 0, @@ -58,7 +61,7 @@ export default Ember.Controller.extend({ }, tooltip: { formatter: function() { - return this.y > 1000000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000000).toFixed(2) + " TH/s" : this.y > 1000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000).toFixed(2) + " GH/s" : this.y > 1000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000).toFixed(2) + " MH/s" : "" + this.point.d + "
Hashrate " + this.y.toFixed(2) + " H/s" + return this.y > 1000000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000000).toFixed(2) + " TH/s" : this.y > 1000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000).toFixed(2) + " GH/s" : this.y > 1000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000).toFixed(2) + " MH/s" : "" + this.point.d + "
Hashrate " + this.y.toFixed(2) + " H/s"; }, @@ -69,60 +72,62 @@ export default Ember.Controller.extend({ }, series: [{ color: "#E99002", - name: "Average hashrate", + name: "3 hours average hashrate", data: function() { var e, a = []; - if (null != t) + if (null != t) { for (e = 0; e <= t.length - 1; e += 1) { var n = 0, r = 0, l = 0; - r = new Date(1e3 * t[e].x), l = r.toLocaleString(), n = t[e].minerLargeHash, a.push({ + r = new Date(1e3 * t[e].x); + l = r.toLocaleString(); + n = t[e].minerLargeHash; + a.push({ x: r, d: l, y: n - }) - } else a.push({ + }); + } + } else { + a.push({ x: 0, d: 0, y: 0 - }); - return a + }); + } + return a; }() }, { - name: "Current hashrate", + name: "30 minutes average hashrate", data: function() { var e, a = []; - if (null != t) + if (null != t) { for (e = 0; e <= t.length - 1; e += 1) { var n = 0, r = 0, l = 0; - r = new Date(1e3 * t[e].x), l = r.toLocaleString(), n = t[e].minerHash, a.push({ + r = new Date(1e3 * t[e].x); + l = r.toLocaleString(); + n = t[e].minerHash; + a.push({ x: r, d: l, y: n - }) - } else a.push({ - x: 0, - d: 0, - y: 0 - }); - return a + }); + } + } else { + a.push({ + x: 0, + d: 0, + y: 0 + }); + } + return a; }() }] }; - return a + return a; } - }), - - roundPercent: Ember.computed('stats', 'model', { - get() { - var percent = this.get('model.roundShares') / this.get('stats.nShares'); - if (!percent) { - return 0; - } - return percent; - } - }) -}); + }) +}); \ No newline at end of file diff --git a/www/app/controllers/account/payouts.js b/www/app/controllers/account/payouts.js index 96a9f9f..8855053 100644 --- a/www/app/controllers/account/payouts.js +++ b/www/app/controllers/account/payouts.js @@ -29,10 +29,10 @@ export default Ember.Controller.extend({ load: function() { var series = this.series[0]; setInterval(function() { - var x = (new Date).getDate(), + var x = (new Date()).getDate(), y = e.getWithDefault("model.paymentCharts"); - series.addPoint([x, y], true, true) - }, 1090000000) + series.addPoint([x, y], true, true); + }, 1090000000); } } }, @@ -64,7 +64,7 @@ export default Ember.Controller.extend({ }, tooltip: { formatter: function() { - return "" + Highcharts.dateFormat('%Y-%m-%d', new Date(this.x)) + "
Payment " + this.y.toFixed(8) + " ESN" + return "" + Highcharts.dateFormat('%Y-%m-%d', new Date(this.x)) + "
Payment " + this.y.toFixed(8) + " ESN"; }, useHTML: true }, @@ -76,28 +76,32 @@ export default Ember.Controller.extend({ name: "Payment Series", data: function() { var e, a = []; - if (null != t) + if (null != t) { for (e = 0; e <= t.length - 1; e += 1) { var n = 0, r = 0, l = 0; - r = new Date(1e3 * t[e].x), - l = r.toLocaleString(), - n = t[e].amount / 1000000000, a.push({ - x: r, - d: l, - y: n - }) - } else a.push({ - x: 0, - d: 0, - y: 0 - }); - return a + r = new Date(1e3 * t[e].x); + l = r.toLocaleString(); + n = t[e].amount / 1000000000; + a.push({ + x: r, + d: l, + y: n + }); + } + } else { + a.push({ + x: 0, + d: 0, + y: 0 + }); + } + return a; }() }] }; - return a + return a; } }) -}); +}); \ No newline at end of file diff --git a/www/app/controllers/index.js b/www/app/controllers/index.js index e8db2f6..2960479 100644 --- a/www/app/controllers/index.js +++ b/www/app/controllers/index.js @@ -28,7 +28,10 @@ export default Ember.Controller.extend({ events: { load: function() { var series = this.series[0]; - setInterval(function() {var x = (new Date).getTime(), y = e.getWithDefault("model.Hashrate") / 1000000; series.addPoint([x, y], true, true)}, 1090000000) + setInterval(function() { + var x = (new Date()).getTime(), y = e.getWithDefault("model.Hashrate") / 1000000; + series.addPoint([x, y], true, true); + }, 1090000000); } } }, @@ -68,7 +71,7 @@ export default Ember.Controller.extend({ }, tooltip: { formatter: function() { - return this.y > 1000000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000000).toFixed(2) + " TH/s" : this.y > 1000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000).toFixed(2) + " GH/s" : this.y > 1000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000).toFixed(2) + " MH/s" : "" + this.point.d + "
Hashrate " + this.y.toFixed(2) + " H/s" + return this.y > 1000000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000000).toFixed(2) + " TH/s" : this.y > 1000000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000000).toFixed(2) + " GH/s" : this.y > 1000000 ? "" + this.point.d + "
Hashrate " + (this.y / 1000000).toFixed(2) + " MH/s" : "" + this.point.d + "
Hashrate " + this.y.toFixed(2) + " H/s"; }, useHTML: true }, @@ -80,26 +83,31 @@ export default Ember.Controller.extend({ name: "Hashrate", data: function() { var e, a = []; - if (null != t) + if (null != t) { for (e = 0; e <= t.length - 1; e += 1) { var n = 0, r = 0, l = 0; - r = new Date(1e3 * t[e].x), l = r.toLocaleString(), n = t[e].y, a.push({ + r = new Date(1e3 * t[e].x); + l = r.toLocaleString(); + n = t[e].y; a.push({ x: r, d: l, y: n - }) - } else a.push({ + }); + } + } else { + a.push({ x: 0, d: 0, y: 0 - }); - return a + }); + } + return a; }() }] }; - return a + return a; } }) -}); +}); \ No newline at end of file