Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix usage log #53

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix usage log #53

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
54056f4
Support toggling power state by clicking ON/OFF label
Jun 8, 2019
def3cc2
Prevent empty text when uptime is less than 60 seconds
Jun 8, 2019
8c6fd2f
Merge pull request #1 from tayl/toggle-power-state
tayl Jul 17, 2019
ed24975
Apply formatting
Jul 23, 2019
4cd7be2
Reinitialize usage log before appending existing entries
Jul 23, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
148 changes: 82 additions & 66 deletions public/javascripts/dash.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
var dash = {
ws: null,

deviceId: null,

realtimeGauge: null,
Expand All @@ -9,7 +11,7 @@ var dash = {
monthlyUsageChart: null,
usageLogChart: null,

init: function(deviceId) {
init: function (deviceId) {
this.deviceId = deviceId;

if (this.deviceId) {
Expand All @@ -21,13 +23,14 @@ var dash = {
this.initDailyUsageChart();
this.initMonthlyUsageChart();
this.initUsageLog();

this.initWsConnection();
this.initTogglePowerState();
},

initWsConnection: function() {
initWsConnection: function () {
var wsUri = 'ws://' + window.location.host + '/ws'
var ws = new WebSocket(wsUri);
ws = new WebSocket(wsUri);
ws.onopen = function () {
console.log('Websocket connection established');
$('#connection-error').hide(200);
Expand All @@ -40,40 +43,40 @@ var dash = {
}
ws.onmessage = dash.wsMessageHandler;

ws.onclose = function() {
ws.onclose = function () {
// Usually caused by mobile devices going to sleep or the user minimising the browser app.
// The setTimeout will begin once the device wakes from sleep or the browser regains focus.
$('#connection-error').show();
setTimeout(dash.initWsConnection, 2000);
}
},

wsMessageHandler: function(messageEvent) {
wsMessageHandler: function (messageEvent) {
let message = JSON.parse(messageEvent.data);
if(message.deviceId === dash.deviceId) {
if(message.dataType === 'realtimeUsage') {
if (message.deviceId === dash.deviceId) {
if (message.dataType === 'realtimeUsage') {
dash.refreshRealtimeDisplay(message.data);
}
else if(message.dataType === 'dailyUsage') {
else if (message.dataType === 'dailyUsage') {
dash.parseDailyUsageData(message.data);
}
else if(message.dataType === 'monthlyUsage') {
else if (message.dataType === 'monthlyUsage') {
dash.parseMonthlyUsageData(message.data);
}
else if(message.dataType === 'powerState') {
else if (message.dataType === 'powerState') {
dash.refreshPowerState(message.data);
}
else if(message.dataType === 'newLogEntry') {
else if (message.dataType === 'newLogEntry') {
dash.addLogEntry(message.data, true);
}
else if(message.dataType === 'loggedData') {
else if (message.dataType === 'loggedData') {
dash.loadLogEntries(message.data);
}
}

},

initRealtimeGauge: function() {
initRealtimeGauge: function () {
var opts = {
angle: 0,
lineWidth: 0.2,
Expand All @@ -85,7 +88,7 @@ var dash = {
limitMax: true,
limitMin: true,
generateGradient: true,
highDpiSupport: true,
highDpiSupport: true,
staticLabels: {
font: "12px sans-serif",
labels: [500, 1500, 3000]
Expand All @@ -97,14 +100,14 @@ var dash = {
]
};
var target = document.getElementById('rtu-gauge');

dash.realtimeGauge = new Gauge(target).setOptions(opts);
dash.realtimeGauge.maxValue = 3000;
dash.realtimeGauge.setMinValue(0);
dash.realtimeGauge.animationSpeed = 32;
},

initRealtimeTrendChart: function() {
initRealtimeTrendChart: function () {
var ctx = document.getElementById('rtt-chart').getContext('2d');
this.realtimeTrendChart = new Chart(ctx, {
type: 'line',
Expand All @@ -126,7 +129,7 @@ var dash = {
}],
yAxes: [{
ticks: {
beginAtZero:true
beginAtZero: true
}
}]
},
Expand All @@ -147,7 +150,7 @@ var dash = {
});
},

initDailyUsageChart: function() {
initDailyUsageChart: function () {
var ctx = document.getElementById('du-chart').getContext('2d');
this.dailyUsageChart = new Chart(ctx, {
type: 'bar',
Expand All @@ -166,7 +169,7 @@ var dash = {
scales: {
yAxes: [{
ticks: {
beginAtZero:true
beginAtZero: true
}
}]
},
Expand All @@ -178,7 +181,7 @@ var dash = {
});
},

initMonthlyUsageChart: function() {
initMonthlyUsageChart: function () {
var ctx = document.getElementById('mu-chart').getContext('2d');
this.monthlyUsageChart = new Chart(ctx, {
type: 'bar',
Expand All @@ -197,7 +200,7 @@ var dash = {
scales: {
yAxes: [{
ticks: {
beginAtZero:true
beginAtZero: true
}
}]
},
Expand All @@ -209,7 +212,7 @@ var dash = {
});
},

initUsageLog: function() {
initUsageLog: function () {
var ctx = document.getElementById('logged-usage-chart').getContext('2d');
this.usageLogChart = new Chart(ctx, {
type: 'line',
Expand Down Expand Up @@ -242,8 +245,20 @@ var dash = {
});
},

addLogEntry: function (logEntry, updateChart) {
initTogglePowerState: () => {
$('#power-state').on('click', () => {
if (ws) {
ws.send(JSON.stringify(
{
requestType: 'togglePowerState',
deviceId: dash.deviceId
}
));
}
});
},

addLogEntry: function (logEntry, updateChart) {
dash.usageLogChart.data.labels.push(moment(logEntry.ts, 'x').format("MMM Do HH:mm"));
dash.usageLogChart.data.datasets.forEach(function (dataset) {
dataset.data.push({
Expand All @@ -256,28 +271,30 @@ var dash = {
}
},

loadLogEntries: function(logEntries) {
logEntries.forEach(function(entry) {
loadLogEntries: function (logEntries) {
dash.initUsageLog();

logEntries.forEach(function (entry) {
dash.addLogEntry(entry, false);
})

dash.usageLogChart.update();
},

realtimeTrendChartOnRefresh: function(chart) {
chart.data.datasets.forEach(function(dataset) {
realtimeTrendChartOnRefresh: function (chart) {
chart.data.datasets.forEach(function (dataset) {
dataset.data.push({
x: Date.now(),
y: dash.realtimeTrendLastSample
});
});
},

refreshRealtimeDisplay: function(realtime) {
refreshRealtimeDisplay: function (realtime) {

var power = Math.round(('power_mw' in realtime) ? (realtime.power_mw/1000) : realtime.power);
var current = (('current_ma' in realtime) ? (realtime.current_ma/1000) : realtime.current).toFixed(2);
var voltage = Math.round(('voltage_mv' in realtime) ? (realtime.voltage_mv/1000) : realtime.voltage);
var power = Math.round(('power_mw' in realtime) ? (realtime.power_mw / 1000) : realtime.power);
var current = (('current_ma' in realtime) ? (realtime.current_ma / 1000) : realtime.current).toFixed(2);
var voltage = Math.round(('voltage_mv' in realtime) ? (realtime.voltage_mv / 1000) : realtime.voltage);

this.realtimeGauge.set(power);
// might switch to Vue.js if this gets tedious
Expand All @@ -289,95 +306,94 @@ var dash = {
},


parseDailyUsageData: function(usageData) {
parseDailyUsageData: function (usageData) {

// Clear previous data
dash.dailyUsageChart.data.labels = [];
dash.dailyUsageChart.data.datasets.forEach(function(dataset) {
dash.dailyUsageChart.data.datasets.forEach(function (dataset) {
dataset.data = [];
});

usageData.forEach(function(entry) {
usageData.forEach(function (entry) {
// Months from API response are 1 based
var day = moment([entry.year, entry.month - 1, entry.day]);

dash.dailyUsageChart.data.labels.push(day.format('MMM D'));
dash.dailyUsageChart.data.datasets.forEach(function(dataset) {
dataset.data.push(('energy_wh' in entry) ? (entry.energy_wh/1000) : entry.energy);
dash.dailyUsageChart.data.datasets.forEach(function (dataset) {
dataset.data.push(('energy_wh' in entry) ? (entry.energy_wh / 1000) : entry.energy);
});
});

dash.dailyUsageChart.update();
dash.setDailyUsageStats(usageData);
},

setDailyUsageStats: function(usageData) {
setDailyUsageStats: function (usageData) {

var dailyTotal = usageData.find(function(d) {
return d.day === moment().date() && d.month === (moment().month()+1) && d.year === moment().year()
var dailyTotal = usageData.find(function (d) {
return d.day === moment().date() && d.month === (moment().month() + 1) && d.year === moment().year()
});

var energy = ('energy_wh' in dailyTotal) ? (dailyTotal.energy_wh/1000) : dailyTotal.energy
var energy = ('energy_wh' in dailyTotal) ? (dailyTotal.energy_wh / 1000) : dailyTotal.energy
$("#total-day").text(energy.toFixed(2));

var total = usageData.reduce(function(t, d) {return t + (('energy_wh' in d) ? (d.energy_wh/1000) : d.energy)}, 0);
var avg = total/usageData.length;
var total = usageData.reduce(function (t, d) { return t + (('energy_wh' in d) ? (d.energy_wh / 1000) : d.energy) }, 0);
var avg = total / usageData.length;

$("#avg-day").text(avg.toFixed(2));

},

parseMonthlyUsageData: function(usageData) {
parseMonthlyUsageData: function (usageData) {

// Clear previous data
dash.monthlyUsageChart.data.labels = [];
dash.monthlyUsageChart.data.datasets.forEach(function(dataset) {
dash.monthlyUsageChart.data.datasets.forEach(function (dataset) {
dataset.data = [];
});

usageData.forEach(function(entry) {
usageData.forEach(function (entry) {
// Months from API response are 1 based
var month = moment().month(entry.month -1);
var month = moment().month(entry.month - 1);

dash.monthlyUsageChart.data.labels.push(month.format('MMM'));
dash.monthlyUsageChart.data.datasets.forEach(function(dataset) {
dataset.data.push(('energy_wh' in entry) ? (entry.energy_wh/1000) : entry.energy);
dash.monthlyUsageChart.data.datasets.forEach(function (dataset) {
dataset.data.push(('energy_wh' in entry) ? (entry.energy_wh / 1000) : entry.energy);
});
});

dash.monthlyUsageChart.update();
dash.setMonthlyUsageStats(usageData);
},

setMonthlyUsageStats: function(usageData) {
setMonthlyUsageStats: function (usageData) {

var monthlyTotal = usageData.find(function(m) {
return m.month === (moment().month()+1) && m.year === moment().year()
var monthlyTotal = usageData.find(function (m) {
return m.month === (moment().month() + 1) && m.year === moment().year()
});
var energy = ('energy_wh' in monthlyTotal) ? (monthlyTotal.energy_wh/1000) : monthlyTotal.energy
var energy = ('energy_wh' in monthlyTotal) ? (monthlyTotal.energy_wh / 1000) : monthlyTotal.energy
$("#total-month").text(energy.toFixed(2));

var total = usageData.reduce(function(t, m) {return t + (('energy_wh' in m) ? (m.energy_wh/1000) : m.energy)}, 0);
var avg = total/usageData.length;
var total = usageData.reduce(function (t, m) { return t + (('energy_wh' in m) ? (m.energy_wh / 1000) : m.energy) }, 0);
var avg = total / usageData.length;

$("#avg-month").text(avg.toFixed(2));
},

refreshPowerState: function(powerState) {
if(powerState.isOn) {
refreshPowerState: function (powerState) {
if (powerState.isOn) {
$("#power-state").text("ON").attr("class", "label label-success");
}
else {
$("#power-state").text("OFF").attr("class", "label label-danger");
}

if(powerState.uptime === 0) {
if (powerState.uptime === 0) {
$("#uptime").text("-");
} else if (powerState.uptime > 60) {
$("#uptime").text(moment.duration(powerState.uptime, "seconds").format("d[d] h[h] m[m]", { largest: 2 }));
} else {
$("#uptime").text(moment.duration(powerState.uptime, "seconds").format("m[m] s[s]", { largest: 2 }));
}
else {
$("#uptime").text(moment.duration(powerState.uptime, "seconds").format("d[d] h[h] m[m]", {largest: 2}));
}

},

};
}
};
Loading