Merge pull request #2443 from myxor/health_interface
Health: View monthly data per day via Web interface in table and bar chartsmaster
Gordon Williams
GitHub
commit
d0eb4d3665
|
|
@ -4,4 +4,5 @@ apps/schoolCalendar/fullcalendar/main.js
|
|||
apps/authentiwatch/qr_packed.js
|
||||
apps/qrcode/qr-scanner.umd.min.js
|
||||
apps/gipy/pkg/gpconv.js
|
||||
apps/health/chart.min.js
|
||||
*.test.js
|
||||
|
|
|
|||
|
|
@ -50,3 +50,7 @@ and run `EspruinoDocs/bin/minify.js lib.js lib.min.js`
|
|||
* Yearly view
|
||||
* Heart rate 'zone' graph
|
||||
* .. other
|
||||
|
||||
## License
|
||||
|
||||
The graphs on the web interface use Chart.js, licensed under MIT License.
|
||||
|
|
|
|||
File diff suppressed because one or more lines are too long
|
|
@ -3,9 +3,10 @@
|
|||
<link rel="stylesheet" href="../../css/spectre.min.css">
|
||||
</head>
|
||||
<body>
|
||||
<div id="table"></div>
|
||||
<div id="content"></div>
|
||||
|
||||
<script src="../../core/lib/interface.js"></script>
|
||||
<script type="module" src="chart.min.js"></script>
|
||||
<script>
|
||||
const DB_RECORD_LEN = 4;
|
||||
const DB_RECORDS_PER_HR = 6;
|
||||
|
|
@ -14,7 +15,7 @@ const DB_RECORDS_PER_MONTH = DB_RECORDS_PER_DAY*31;
|
|||
const DB_HEADER_LEN = 8;
|
||||
const DB_FILE_LEN = DB_HEADER_LEN + DB_RECORDS_PER_MONTH*DB_RECORD_LEN;
|
||||
|
||||
var domTable = document.getElementById("table");
|
||||
var domContent = document.getElementById("content");
|
||||
|
||||
function saveCSV(data, date, title) {
|
||||
// date = "2021-9"/ etc
|
||||
|
|
@ -59,7 +60,7 @@ function downloadHealth(filename, callback) {
|
|||
}
|
||||
function getMonthList() {
|
||||
Util.showModal("Loading...");
|
||||
domTable.innerHTML = "";
|
||||
domContent.innerHTML = "";
|
||||
Puck.eval(`require("Storage").list(/^health-.*\\.raw$/)`,files=>{
|
||||
files = files.map(f => {
|
||||
var m = f.match(/^health-([^\.]+)\.raw$/);
|
||||
|
|
@ -69,7 +70,7 @@ function getMonthList() {
|
|||
str : new Date(m[1]).toLocaleString(undefined, {month:'long',year:'numeric'})
|
||||
}
|
||||
})
|
||||
var html = `<table class="table table-striped table-hover">
|
||||
var htmlOverview = `<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Month</th>
|
||||
|
|
@ -78,36 +79,39 @@ function getMonthList() {
|
|||
</thead>
|
||||
<tbody>\n`;
|
||||
files.forEach(f => {
|
||||
html += `
|
||||
htmlOverview += `
|
||||
<tr>
|
||||
<td>${f.str}</td>
|
||||
<td>
|
||||
<button class="btn btn-primary" filename="${f.filename}" date="${f.date}" task="downloadcsv">Download CSV</button>
|
||||
<button class="btn btn-default" filename="${f.filename}" date="${f.date}" task="delete">Delete</button>
|
||||
<button class="btn btn-primary" filename="${f.filename}" date="${f.date}" monthstr="${f.str}" task="monthtable">Table</button>
|
||||
<button class="btn btn-primary" filename="${f.filename}" date="${f.date}" monthstr="${f.str}" task="monthgraph">Graph</button>
|
||||
<button class="btn btn-error" filename="${f.filename}" date="${f.date}" task="delete" style="float: right;margin-right: 5px;">Delete</button>
|
||||
</td>
|
||||
</tr>
|
||||
`;
|
||||
});
|
||||
if (files.length==0) {
|
||||
html += `
|
||||
htmlOverview += `
|
||||
<tr>
|
||||
<td>No data recorded</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
`;
|
||||
}
|
||||
html += `
|
||||
htmlOverview += `
|
||||
</tbody>
|
||||
</table>`;
|
||||
domTable.innerHTML = html;
|
||||
domContent.innerHTML = htmlOverview;
|
||||
Util.hideModal();
|
||||
var buttons = domTable.querySelectorAll("button");
|
||||
var buttons = domContent.querySelectorAll("button");
|
||||
for (var i=0;i<buttons.length;i++) {
|
||||
buttons[i].addEventListener("click",event => {
|
||||
var button = event.currentTarget;
|
||||
var filename = button.getAttribute("filename");
|
||||
var date = button.getAttribute("date");
|
||||
if (!filename || !date) return;
|
||||
var monthstr = button.getAttribute("monthstr");
|
||||
var task = button.getAttribute("task");
|
||||
if (task=="delete") {
|
||||
Util.showModal("Deleting...");
|
||||
|
|
@ -119,11 +123,179 @@ function getMonthList() {
|
|||
if (task=="downloadcsv") {
|
||||
downloadHealth(filename, data => saveCSV(data, date, `Bangle.js Health ${date}`));
|
||||
}
|
||||
if (task=="monthtable") {
|
||||
viewMonthDataAsTable(filename, date, monthstr);
|
||||
}
|
||||
if (task=="monthgraph") {
|
||||
viewMonthDataAsGraph(filename, date, monthstr);
|
||||
}
|
||||
});
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
function getDailyData(data) {
|
||||
var dailyData = [];
|
||||
var idx = DB_HEADER_LEN;
|
||||
for (var day = 0; day < 31; day++) {
|
||||
var dayData = {steps: 0, bpm: 0, movement: 0};
|
||||
for (var hr = 0; hr < 24; hr++) { // actually 25, see below
|
||||
for (var m = 0; m < DB_RECORDS_PER_HR; m++) {
|
||||
var h = data.substr(idx, DB_RECORD_LEN);
|
||||
if (h != "\xFF\xFF\xFF\xFF") {
|
||||
var h = {
|
||||
day : day + 1,
|
||||
hr : hr,
|
||||
min : m * 10,
|
||||
steps : (h.charCodeAt(0) << 8) | h.charCodeAt(1),
|
||||
bpm : h.charCodeAt(2),
|
||||
movement : h.charCodeAt(3)
|
||||
};
|
||||
dayData.steps += h.steps; // sum
|
||||
dayData.bpm = (dayData.bpm + h.bpm) / 2; // average
|
||||
dayData.movement += h.movement; // sum
|
||||
}
|
||||
idx += DB_RECORD_LEN;
|
||||
}
|
||||
}
|
||||
idx += DB_RECORD_LEN; // +1 because we have an extra record with totals
|
||||
// for the end of the day
|
||||
|
||||
dailyData[day + 1] = dayData;
|
||||
}
|
||||
return dailyData;
|
||||
}
|
||||
|
||||
function viewMonthDataAsTable(filename, date, monthstr) {
|
||||
Util.showModal("Reading Health info...");
|
||||
Util.readStorage(
|
||||
filename, data => {
|
||||
Util.hideModal();
|
||||
|
||||
var htmlOverview = `<h1>` + monthstr + `</ h1>
|
||||
<button class="btn btn-primary" id="backtomonth" style="float: right;margin-right: 5px;">Back</button>
|
||||
<table class="table table-striped table-hover">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>Day</th>
|
||||
<th>Steps</th>
|
||||
<th>BPM</th>
|
||||
<th>Movement</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>\n`;
|
||||
|
||||
var dailyData = getDailyData(data);
|
||||
for (var i = 1; i < dailyData.length + 1; i++) {
|
||||
var dayData = dailyData[i];
|
||||
if (dayData) {
|
||||
htmlOverview += `<tr>
|
||||
<td>${i}</td>
|
||||
<td>${dayData.steps}</td>
|
||||
<td>${Math.round(dayData.bpm)}</td>
|
||||
<td>${dayData.movement}</td></tr>`
|
||||
}
|
||||
}
|
||||
htmlOverview += `</tbody></table>`;
|
||||
domContent.innerHTML = htmlOverview;
|
||||
domContent.querySelector("#backtomonth").addEventListener("click",event => {
|
||||
getMonthList();
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function viewMonthDataAsGraph(filename, date, monthstr) {
|
||||
Util.showModal("Reading Health info...");
|
||||
Util.readStorage(
|
||||
filename, data => {
|
||||
Util.hideModal();
|
||||
|
||||
var html = `<h1>` + monthstr + `</ h1>
|
||||
<button class="btn btn-primary" id="backtomonth" style="float: right;margin-right: 5px;">Back</button>
|
||||
<h2>Steps</h2>
|
||||
<canvas id="chartSteps"></canvas>
|
||||
<h2>BPM</h2>
|
||||
<canvas id="chartBPM"></canvas>
|
||||
<h2>Movement</h2>
|
||||
<canvas id="chartMovement"></canvas>`
|
||||
domContent.innerHTML = html;
|
||||
domContent.querySelector("#backtomonth").addEventListener("click",event => {
|
||||
getMonthList();
|
||||
});
|
||||
|
||||
var labels = [];
|
||||
var dataSteps = [], dataBPM = [], dataMovement = [];
|
||||
|
||||
var dailyData = getDailyData(data);
|
||||
for (var i = 1; i < dailyData.length + 1; i++) {
|
||||
var dayData = dailyData[i];
|
||||
if (dayData) {
|
||||
labels.push(i);
|
||||
dataSteps.push(dayData.steps);
|
||||
dataBPM.push(dayData.bpm);
|
||||
dataMovement.push(dayData.movement);
|
||||
}
|
||||
}
|
||||
|
||||
new Chart(document.getElementById("chartSteps"), {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: labels,
|
||||
datasets: [{
|
||||
label: '# of steps',
|
||||
data: dataSteps,
|
||||
borderWidth: 1
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
scales: {
|
||||
y: {
|
||||
beginAtZero: true
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
new Chart(document.getElementById("chartBPM"), {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: labels,
|
||||
datasets: [{
|
||||
label: 'Beats per minute',
|
||||
data: dataBPM,
|
||||
borderWidth: 1
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
scales: {
|
||||
y: {
|
||||
beginAtZero: true
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
new Chart(document.getElementById("chartMovement"), {
|
||||
type: 'bar',
|
||||
data: {
|
||||
labels: labels,
|
||||
datasets: [{
|
||||
label: 'Movement',
|
||||
data: dataMovement,
|
||||
borderWidth: 1
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
scales: {
|
||||
y: {
|
||||
beginAtZero: true
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
function onInit() {
|
||||
getMonthList();
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue