diff --git a/static/js/client.js b/static/js/client.js
index 10ad7b37..94072b49 100644
--- a/static/js/client.js
+++ b/static/js/client.js
@@ -1,8 +1,8 @@
(function () {
"use strict";
- var retrospectivePredictor = true,
- latestSGV,
+ var latestSGV,
+ errorCode,
treatments,
padding = { top: 20, right: 10, bottom: 30, left: 10 },
opacity = {current: 1, DAY: 1, NIGHT: 0.5},
@@ -23,7 +23,9 @@
clip,
TWENTY_FIVE_MINS_IN_MS = 1500000,
THIRTY_MINS_IN_MS = 1800000,
+ FORTY_MINS_IN_MS = 2400000,
FORTY_TWO_MINS_IN_MS = 2520000,
+ SIXTY_MINS_IN_MS = 3600000,
FOCUS_DATA_RANGE_MS = 12600000, // 3.5 hours of actual data
FORMAT_TIME = '%I:%M%', //alternate format '%H:%M'
audio = document.getElementById('audio'),
@@ -41,6 +43,14 @@
var tickValues = [2.0, 3.0, 4.0, 6.0, 10.0, 15.0, 22.0];
}
+ //TODO: get these from the config
+ var targetTop = 180,
+ targetBottom = 80;
+
+ var futureOpacity = d3.scale.linear( )
+ .domain([TWENTY_FIVE_MINS_IN_MS, SIXTY_MINS_IN_MS])
+ .range([0.8, 0.1]);
+
// create svg and g to contain the chart contents
var charts = d3.select('#chartContainer').append('svg')
.append('g')
@@ -135,7 +145,7 @@
// get the desired opacity for context chart based on the brush extent
function highlightBrushPoints(data) {
if (data.date.getTime() >= brush.extent()[0].getTime() && data.date.getTime() <= brush.extent()[1].getTime()) {
- return 1;
+ return futureOpacity(data.date - latestSGV.x);
} else {
return 0.5;
}
@@ -211,15 +221,15 @@
}
var element = document.getElementById('bgButton').hidden == '';
-
var nowDate = new Date(brushExtent[1] - THIRTY_MINS_IN_MS);
// predict for retrospective data
- if (retrospectivePredictor && brushExtent[1].getTime() - THIRTY_MINS_IN_MS < now && element != true) {
+ if (brushExtent[1].getTime() - THIRTY_MINS_IN_MS < now && element != true) {
// filter data for -12 and +5 minutes from reference time for retrospective focus data prediction
var nowData = data.filter(function(d) {
return d.date.getTime() >= brushExtent[1].getTime() - FORTY_TWO_MINS_IN_MS &&
- d.date.getTime() <= brushExtent[1].getTime() - TWENTY_FIVE_MINS_IN_MS
+ d.date.getTime() <= brushExtent[1].getTime() - TWENTY_FIVE_MINS_IN_MS &&
+ d.color != 'none';
});
if (nowData.length > 1) {
var prediction = predictAR(nowData);
@@ -238,18 +248,69 @@
$('#currentTime')
.text(formatTime(new Date(brushExtent[1] - THIRTY_MINS_IN_MS)))
.css('text-decoration','line-through');
- } else if (retrospectivePredictor) {
+
+ $('#lastEntry').text("RETRO").removeClass('current');
+
+ $('.container #noButton .currentBG').css({color: 'grey'});
+ $('.container #noButton .currentDirection').css({color: 'grey'});
+
+ } else {
// if the brush comes back into the current time range then it should reset to the current time and sg
+ var nowData = data.filter(function(d) {
+ return d.color != 'none';
+ });
+ nowData = [nowData[nowData.length - 2], nowData[nowData.length - 1]];
+ var prediction = predictAR(nowData);
+ focusData = focusData.concat(prediction);
var dateTime = new Date(now);
nowDate = dateTime;
$('#currentTime')
.text(formatTime(dateTime))
- .css('text-decoration','');
- $('.container .currentBG')
- .text(scaleBg(latestSGV.y))
- .css('text-decoration','');
- $('.container .currentDirection')
- .html(latestSGV.direction);
+ .css('text-decoration', '');
+
+ if (errorCode) {
+ var errorDisplay;
+
+ switch (parseInt(errorCode)) {
+ case 0: errorDisplay = '??0'; break; //None
+ case 1: errorDisplay = '?SN'; break; //SENSOR_NOT_ACTIVE
+ case 2: errorDisplay = '??2'; break; //MINIMAL_DEVIATION
+ case 3: errorDisplay = '?NA'; break; //NO_ANTENNA
+ case 5: errorDisplay = '?NC'; break; //SENSOR_NOT_CALIBRATED
+ case 6: errorDisplay = '?CD'; break; //COUNTS_DEVIATION
+ case 7: errorDisplay = '??7'; break; //?
+ case 8: errorDisplay = '??8'; break; //?
+ case 9: errorDisplay = '⌛'; break; //ABSOLUTE_DEVIATION
+ case 10: errorDisplay = '???'; break; //POWER_DEVIATION
+ case 12: errorDisplay = '?RF'; break; //BAD_RF
+ default: errorDisplay = '?' + parseInt(errorCode) + '?'; break;
+ }
+
+ $('#lastEntry').text("CGM ERROR").removeClass('current').addClass("urgent");
+
+ $('.container .currentBG').html(errorDisplay)
+ .css('text-decoration', '');
+ $('.container .currentDirection').html('✖');
+
+ var color = sgvToColor(errorCode);
+ $('.container #noButton .currentBG').css({color: color});
+ $('.container #noButton .currentDirection').css({color: color});
+
+ } else {
+
+ var secsSinceLast = (Date.now() - new Date(latestSGV.x).getTime()) / 1000;
+ $('#lastEntry').text(timeAgo(secsSinceLast)).toggleClass('current', secsSinceLast < 10 * 60);
+
+ $('.container .currentBG')
+ .text(scaleBg(latestSGV.y))
+ .css('text-decoration', '');
+ $('.container .currentDirection')
+ .html(latestSGV.direction);
+
+ var color = sgvToColor(latestSGV.y);
+ $('.container #noButton .currentBG').css({color: color});
+ $('.container #noButton .currentDirection').css({color: color});
+ }
}
xScale.domain(brush.extent());
@@ -271,6 +332,7 @@
.attr('cx', function (d) { return xScale(d.date); })
.attr('cy', function (d) { return yScale(d.sgv); })
.attr('fill', function (d) { return d.color; })
+ .attr('opacity', function (d) { return futureOpacity(d.date - latestSGV.x); })
.attr('r', 3);
focusCircles.exit()
@@ -556,18 +618,18 @@
.transition()
.duration(UPDATE_TRANS_MS)
.attr('x1', xScale2(dataRange[0]))
- .attr('y1', yScale2(scaleBg(180)))
+ .attr('y1', yScale2(scaleBg(targetTop)))
.attr('x2', xScale2(dataRange[1]))
- .attr('y2', yScale2(scaleBg(180)));
+ .attr('y2', yScale2(scaleBg(targetTop)));
// transition low line to correct location
context.select('.low-line')
.transition()
.duration(UPDATE_TRANS_MS)
.attr('x1', xScale2(dataRange[0]))
- .attr('y1', yScale2(scaleBg(80)))
+ .attr('y1', yScale2(scaleBg(targetBottom)))
.attr('x2', xScale2(dataRange[1]))
- .attr('y2', yScale2(scaleBg(80)));
+ .attr('y2', yScale2(scaleBg(targetBottom)));
}
}
@@ -653,7 +715,6 @@
socket.on('now', function (d) {
now = d;
var dateTime = new Date(now);
- // lixgbg old: $('#currentTime').text(d3.time.format('%I:%M%p')(dateTime));
$('#currentTime').text(formatTime(dateTime));
// Dim the screen by reducing the opacity when at nighttime
@@ -668,40 +729,35 @@
socket.on('sgv', function (d) {
if (d.length > 1) {
+ errorCode = d.length >= 5 ? d[4] : undefined;
+
// change the next line so that it uses the prediction if the signal gets lost (max 1/2 hr)
if (d[0].length) {
- var current = d[0][d[0].length - 1];
- latestSGV = current;
- var secsSinceLast = (Date.now() - new Date(current.x).getTime()) / 1000;
- var currentBG = current.y;
+ latestSGV = d[0][d[0].length - 1];
- //TODO: currently these are filtered on the server
- //TODO: use icons for these magic values
- switch (current.y) {
- case 0: currentBG = '??0'; break; //None
- case 1: currentBG = '?SN'; break; //SENSOR_NOT_ACTIVE
- case 2: currentBG = '??2'; break; //MINIMAL_DEVIATION
- case 3: currentBG = '?NA'; break; //NO_ANTENNA
- case 5: currentBG = '?NC'; break; //SENSOR_NOT_CALIBRATED
- case 6: currentBG = '?CD'; break; //COUNTS_DEVIATION
- case 7: currentBG = '??7'; break; //?
- case 8: currentBG = '??8'; break; //?
- case 9: currentBG = '?AD'; break; //ABSOLUTE_DEVIATION
- case 10: currentBG = '?PD'; break; //POWER_DEVIATION
- case 12: currentBG = '?RF'; break; //BAD_RF
- default:
- currentBG = scaleBg(currentBG);
- break;
+ //TODO: alarmHigh/alarmLow probably shouldn't be here
+ if (browserSettings.alarmHigh) {
+ $('.container .current').toggleClass('high', latestSGV.y > 180);
+ }
+ if (browserSettings.alarmLow) {
+ $('.container .current').toggleClass('low', latestSGV.y < 70);
}
-
- $('#lastEntry').text(timeAgo(secsSinceLast)).toggleClass('current', secsSinceLast < 10 * 60);
- $('.container .currentBG').text(currentBG);
- $('.container .currentDirection').html(current.direction);
- $('.container .current').toggleClass('high', current.y > 180).toggleClass('low', current.y < 70)
}
- data = d[0].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), direction: obj.direction, color: 'grey'} });
- data = data.concat(d[1].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), color: 'blue'} }));
+ data = d[0].map(function (obj) {
+ return { date: new Date(obj.x), sgv: scaleBg(obj.y), direction: obj.direction, color: sgvToColor(obj.y)}
+ });
+ // TODO: This is a kludge to advance the time as data becomes stale by making old predictor clear (using color = 'none')
+ // This shouldn't have to be sent and can be fixed by using xScale.domain([x0,x1]) function with
+ // 2 days before now as x0 and 30 minutes from now for x1 for context plot, but this will be
+ // required to happen when "now" event is sent from websocket.js every minute. When fixed,
+ // remove all "color != 'none'" code
+ data = data.concat(d[1].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), color: 'none'} }));
data = data.concat(d[2].map(function (obj) { return { date: new Date(obj.x), sgv: scaleBg(obj.y), color: 'red'} }));
+
+ data.forEach(function (d) {
+ if (d.sgv < 39)
+ d.color = "transparent";
+ })
treatments = d[3];
if (!isInitialData) {
@@ -713,6 +769,22 @@
}
}
});
+
+ function sgvToColor(sgv) {
+ var color = 'grey';
+
+ if (browserSettings.theme == "colors") {
+ if (sgv > targetTop) {
+ color = 'yellow';
+ } else if (sgv >= targetBottom && sgv <= targetTop) {
+ color = '#4cff00';
+ } else if (sgv < targetBottom) {
+ color = 'red';
+ }
+ }
+
+ return color;
+ }
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -722,16 +794,20 @@
console.log('Client connected to server.')
});
socket.on('alarm', function () {
- console.log("Alarm raised!");
- currentAlarmType = 'alarm';
- generateAlarm(alarmSound);
+ if (browserSettings.alarmHigh) {
+ console.log("Alarm raised!");
+ currentAlarmType = 'alarm';
+ generateAlarm(alarmSound);
+ }
brushInProgress = false;
updateChart(false);
});
socket.on('urgent_alarm', function () {
- console.log("Urgent alarm raised!");
- currentAlarmType = 'urgent_alarm';
- generateAlarm(urgentAlarmSound);
+ if (browserSettings.alarmLow) {
+ console.log("Urgent alarm raised!");
+ currentAlarmType = 'urgent_alarm';
+ generateAlarm(urgentAlarmSound);
+ }
brushInProgress = false;
updateChart(false);
});
@@ -745,11 +821,11 @@
$('#testAlarms').click(function(event) {
d3.select('.audio.alarms audio').each(function (data, i) {
- var audio = this;
- playAlarm(audio);
- setTimeout(function() {
- audio.pause();
- }, 4000);
+ var audio = this;
+ playAlarm(audio);
+ setTimeout(function() {
+ audio.pause();
+ }, 4000);
});
event.preventDefault();
});
@@ -758,9 +834,9 @@
alarmInProgress = true;
var selector = '.audio.alarms audio.' + file;
d3.select(selector).each(function (d, i) {
- var audio = this;
- playAlarm(audio);
- $(this).addClass('playing');
+ var audio = this;
+ playAlarm(audio);
+ $(this).addClass('playing');
});
var element = document.getElementById('bgButton');
element.hidden = '';
@@ -789,9 +865,9 @@
element = document.getElementById('noButton');
element.hidden = '';
d3.select('audio.playing').each(function (d, i) {
- var audio = this;
- audio.pause();
- $(this).removeClass('playing');
+ var audio = this;
+ audio.pause();
+ $(this).removeClass('playing');
});
$(".time").show();
@@ -839,9 +915,9 @@
}
if (parts.value)
- return parts.value + ' ' + parts.label + ' ago';
+ return parts.value + ' ' + parts.label + ' ago';
else
- return parts.label;
+ return parts.label;
}
@@ -851,64 +927,91 @@
//draw a compact visualization of a treatment (carbs, insulin)
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
function drawTreatment(treatment, scale, showValues) {
- var carbs = treatment.carbs;
- var insulin = treatment.insulin;
- var CR = treatment.CR;
- var R1 = Math.sqrt(Math.min(carbs, insulin * CR)) / scale,
- R2 = Math.sqrt(Math.max(carbs, insulin * CR)) / scale,
- R3 = R2 + 8 / scale;
+ if (!treatment.CR) {
+ //plot a simple treatment point
+ console.info("plotting treatment", treatment);
+ var treatmentDots = focus.selectAll('treatment-dot')
+ .data(treatment)
+ .enter()
+ .append('g')
+ .attr('transform', 'translate(' + xScale(treatment.x) + ', ' + yScale(scaleBg(300)) + ')');
- var arc_data = [
- { 'element': '', 'color': '#9c4333', 'start': -1.5708, 'end': 1.5708, 'inner': 0, 'outer': R1 },
- { 'element': '', 'color': '#d4897b', 'start': -1.5708, 'end': 1.5708, 'inner': R1, 'outer': R2 },
- { 'element': '', 'color': 'transparent', 'start': -1.5708, 'end': 1.5708, 'inner': R2, 'outer': R3 },
- { 'element': '', 'color': '#3d53b7', 'start': 1.5708, 'end': 4.7124, 'inner': 0, 'outer': R1 },
- { 'element': '', 'color': '#5d72c9', 'start': 1.5708, 'end': 4.7124, 'inner': R1, 'outer': R2 },
- { 'element': '', 'color': 'transparent', 'start': 1.5708, 'end': 4.7124, 'inner': R2, 'outer': R3 }
- ];
+ //TODO: some d3 magic to get the treatments to display and show a tooltip
+ } else {
+ var carbs = treatment.carbs;
+ var insulin = treatment.insulin;
+ var CR = treatment.CR;
- if (carbs < insulin * CR) arc_data[1].color = 'transparent';
- if (carbs > insulin * CR) arc_data[4].color = 'transparent';
- if (carbs > 0) arc_data[2].element = Math.round(carbs) + ' g';
- if (insulin > 0) arc_data[5].element = Math.round(insulin * 10) / 10 + ' U';
+ var R1 = Math.sqrt(Math.min(carbs, insulin * CR)) / scale,
+ R2 = Math.sqrt(Math.max(carbs, insulin * CR)) / scale,
+ R3 = R2 + 8 / scale;
- var arc = d3.svg.arc()
- .innerRadius(function (d) { return 5 * d.inner; })
- .outerRadius(function (d) { return 5 * d.outer; })
- .endAngle(function (d) { return d.start; })
- .startAngle(function (d) { return d.end; });
+ var arc_data = [
+ { 'element': '', 'color': '#9c4333', 'start': -1.5708, 'end': 1.5708, 'inner': 0, 'outer': R1 },
+ { 'element': '', 'color': '#d4897b', 'start': -1.5708, 'end': 1.5708, 'inner': R1, 'outer': R2 },
+ { 'element': '', 'color': 'transparent', 'start': -1.5708, 'end': 1.5708, 'inner': R2, 'outer': R3 },
+ { 'element': '', 'color': '#3d53b7', 'start': 1.5708, 'end': 4.7124, 'inner': 0, 'outer': R1 },
+ { 'element': '', 'color': '#5d72c9', 'start': 1.5708, 'end': 4.7124, 'inner': R1, 'outer': R2 },
+ { 'element': '', 'color': 'transparent', 'start': 1.5708, 'end': 4.7124, 'inner': R2, 'outer': R3 }
+ ];
- var treatmentDots = focus.selectAll('treatment-dot')
- .data(arc_data)
- .enter()
- .append('g')
- .attr('transform', 'translate(' + xScale(treatment.x) + ', ' + yScale(scaleBg(treatment.y)) + ')');
+ if (carbs < insulin * CR) arc_data[1].color = 'transparent';
+ if (carbs > insulin * CR) arc_data[4].color = 'transparent';
+ if (carbs > 0) arc_data[2].element = Math.round(carbs) + ' g';
+ if (insulin > 0) arc_data[5].element = Math.round(insulin * 10) / 10 + ' U';
- var arcs = treatmentDots.append('path')
- .attr('class', 'path')
- .attr('fill', function (d, i) { return d.color; })
- .attr('id', function (d, i) { return 's' + i; })
- .attr('d', arc);
-
-
- // labels for carbs and insulin
- if (showValues) {
- var label = treatmentDots.append('g')
- .attr('class', 'path')
- .attr('id', 'label')
- .style('fill', 'white');
- label.append('text')
- .style('font-size', 30 / scale)
- .style('font-family', 'Arial')
- .attr('text-anchor', 'middle')
- .attr('dy', '.35em')
- .attr('transform', function (d) {
- d.outerRadius = d.outerRadius * 2.1;
- d.innerRadius = d.outerRadius * 2.1;
- return 'translate(' + arc.centroid(d) + ')';
+ var arc = d3.svg.arc()
+ .innerRadius(function (d) {
+ return 5 * d.inner;
})
- .text(function (d) { return d.element; })
+ .outerRadius(function (d) {
+ return 5 * d.outer;
+ })
+ .endAngle(function (d) {
+ return d.start;
+ })
+ .startAngle(function (d) {
+ return d.end;
+ });
+
+ var treatmentDots = focus.selectAll('treatment-dot')
+ .data(arc_data)
+ .enter()
+ .append('g')
+ .attr('transform', 'translate(' + xScale(treatment.x) + ', ' + yScale(scaleBg(treatment.y)) + ')');
+
+ var arcs = treatmentDots.append('path')
+ .attr('class', 'path')
+ .attr('fill', function (d, i) {
+ return d.color;
+ })
+ .attr('id', function (d, i) {
+ return 's' + i;
+ })
+ .attr('d', arc);
+
+
+ // labels for carbs and insulin
+ if (showValues) {
+ var label = treatmentDots.append('g')
+ .attr('class', 'path')
+ .attr('id', 'label')
+ .style('fill', 'white');
+ label.append('text')
+ .style('font-size', 30 / scale)
+ .style('font-family', 'Arial')
+ .attr('text-anchor', 'middle')
+ .attr('dy', '.35em')
+ .attr('transform', function (d) {
+ d.outerRadius = d.outerRadius * 2.1;
+ d.innerRadius = d.outerRadius * 2.1;
+ return 'translate(' + arc.centroid(d) + ')';
+ })
+ .text(function (d) {
+ return d.element;
+ })
+ }
}
}
@@ -922,6 +1025,8 @@
var BG_REF = 140;
var BG_MIN = 36;
var BG_MAX = 400;
+ // these are the one sigma limits for the first 13 prediction interval uncertainties (65 minutes)
+ var CONE = [0.020, 0.041, 0.061, 0.081, 0.099, 0.116, 0.132, 0.146, 0.159, 0.171, 0.182, 0.192, 0.201];
if (actual.length < 2) {
var y = [Math.log(actual[0].sgv / BG_REF), Math.log(actual[0].sgv / BG_REF)];
} else {
@@ -932,17 +1037,31 @@
y = [Math.log(actual[0].sgv / BG_REF), Math.log(actual[0].sgv / BG_REF)];
}
}
- var n = 20;
var AR = [-0.723, 1.716];
var dt = actual[1].date.getTime();
- for (var i = 0; i <= n; i++) {
+ var predictedColor = 'blue';
+ if (browserSettings.theme == "colors") {
+ predictedColor = 'cyan';
+ }
+ for (var i = 0; i < CONE.length; i++) {
y = [y[1], AR[0] * y[0] + AR[1] * y[1]];
dt = dt + FIVE_MINUTES;
- predicted[i] = {
- date: new Date(dt+3000),
- sgv: Math.max(BG_MIN, Math.min(BG_MAX, Math.round(BG_REF * Math.exp(y[1])))),
- color: 'blue'
+ // Add 2000 ms so not same point as SG
+ predicted[i * 2] = {
+ date: new Date(dt + 2000),
+ sgv: Math.max(BG_MIN, Math.min(BG_MAX, Math.round(BG_REF * Math.exp((y[1] - 2 * CONE[i]))))),
+ color: predictedColor
};
+ // Add 4000 ms so not same point as SG
+ predicted[i * 2 + 1] = {
+ date: new Date(dt + 4000),
+ sgv: Math.max(BG_MIN, Math.min(BG_MAX, Math.round(BG_REF * Math.exp((y[1] + 2 * CONE[i]))))),
+ color: predictedColor
+ };
+ predicted.forEach(function (d) {
+ if (d.sgv < BG_MIN)
+ d.color = "transparent";
+ })
}
return predicted;
}
diff --git a/static/js/ui-utils.js b/static/js/ui-utils.js
index eedfd9eb..ccee0b3b 100644
--- a/static/js/ui-utils.js
+++ b/static/js/ui-utils.js
@@ -1,9 +1,13 @@
var drawerIsOpen = false;
+var treatmentDrawerIsOpen = false;
var browserStorage = $.localStorage;
var defaultSettings = {
"units": "mg/dl",
- "nightMode": false
-}
+ "alarmHigh": true,
+ "alarmLow": true,
+ "nightMode": false,
+ "theme": "default"
+};
var app = {};
$.ajax("/api/v1/status.json", {
@@ -26,29 +30,42 @@ $.ajax("/api/v1/status.json", {
function getBrowserSettings(storage) {
var json = {};
try {
- json = {
+ var json = {
"units": storage.get("units"),
+ "alarmHigh": storage.get("alarmHigh"),
+ "alarmLow": storage.get("alarmLow"),
"nightMode": storage.get("nightMode"),
- "customTitle": storage.get("customTitle")
+ "customTitle": storage.get("customTitle"),
+ "theme": storage.get("theme")
};
// Default browser units to server units if undefined.
json.units = setDefault(json.units, serverSettings.units);
- //console.log("browserSettings.units: " + json.units);
if (json.units == "mmol") {
$("#mmol-browser").prop("checked", true);
} else {
$("#mgdl-browser").prop("checked", true);
}
+ json.alarmHigh = setDefault(json.alarmHigh, defaultSettings.alarmHigh);
+ $("#alarmhigh-browser").prop("checked", json.alarmHigh);
+ json.alarmLow = setDefault(json.alarmLow, defaultSettings.alarmLow);
+ $("#alarmlow-browser").prop("checked", json.alarmLow);
+
json.nightMode = setDefault(json.nightMode, defaultSettings.nightMode);
$("#nightmode-browser").prop("checked", json.nightMode);
if (json.customTitle) {
- $("h1.customTitle").html(json.customTitle);
+ $("h1.customTitle").text(json.customTitle);
$("input#customTitle").prop("value", json.customTitle);
document.title = "Nightscout: " + json.customTitle;
}
+
+ if (json.theme == "colors") {
+ $("#theme-colors-browser").prop("checked", true);
+ } else {
+ $("#theme-default-browser").prop("checked", true);
+ }
}
catch(err) {
showLocalstorageError();
@@ -84,13 +101,24 @@ function jsonIsNotEmpty(json) {
}
function storeInBrowser(json, storage) {
if (json.units) storage.set("units", json.units);
+ if (json.alarmHigh == true) {
+ storage.set("alarmHigh", true)
+ } else {
+ storage.set("alarmHigh", false)
+ }
+ if (json.alarmLow == true) {
+ storage.set("alarmLow", true)
+ } else {
+ storage.set("alarmLow", false)
+ }
if (json.nightMode == true) {
storage.set("nightMode", true)
} else {
storage.set("nightMode", false)
}
if (json.customTitle) storage.set("customTitle", json.customTitle);
- event.preventDefault();
+ if (json.theme) storage.set("theme", json.theme);
+ event.preventDefault();
}
function storeOnServer(json) {
if (jsonIsNotEmpty(json)) {
@@ -132,6 +160,7 @@ function closeDrawer(callback) {
});
drawerIsOpen = false;
}
+
function openDrawer() {
drawerIsOpen = true;
$("#container").animate({marginLeft: "-200px"}, 300);
@@ -140,6 +169,30 @@ function openDrawer() {
$("#drawer").animate({right: "0"}, 300);
}
+function closeTreatmentDrawer(callback) {
+ $("#container").animate({marginLeft: "0px"}, 400, callback);
+ $("#chartContainer").animate({marginLeft: "0px"}, 400);
+ $("#treatmentDrawer").animate({right: "-300px"}, 400, function() {
+ $("#treatmentDrawer").css("display", "none");
+ });
+ treatmentDrawerIsOpen = false;
+}
+function openTreatmentDrawer() {
+ treatmentDrawerIsOpen = true;
+ $("#container").animate({marginLeft: "-300px"}, 400);
+ $("#chartContainer").animate({marginLeft: "-300px"}, 400);
+ $("#treatmentDrawer").css("display", "block");
+ $("#treatmentDrawer").animate({right: "0"}, 400);
+
+ $('#enteredBy').val(browserStorage.get("enteredBy") || '');
+ $('#eventType').val('BG Check');
+ $('#glucoseValue').val('');
+ $('#meter').prop('checked', true)
+ $('#carbsGiven').val('');
+ $('#insulinGiven').val('');
+ $('#notes').val('');
+}
+
function closeNotification() {
var notify = $("#notification");
@@ -195,6 +248,33 @@ function stretchStatusForToolbar(toolbarState){
}
}
+function treatmentSubmit(event) {
+
+ var data = new Object();
+ data.enteredBy = document.getElementById("enteredBy").value;
+ data.eventType = document.getElementById("eventType").value;
+ data.glucose = document.getElementById("glucoseValue").value;
+ data.glucoseType = $('#treatment-form input[name=glucoseType]:checked').val();
+ data.carbs = document.getElementById("carbsGiven").value;
+ data.insulin = document.getElementById("insulinGiven").value;
+ data.notes = document.getElementById("notes").value;
+
+ var dataJson = JSON.stringify(data, null, " ");
+
+ var xhr = new XMLHttpRequest();
+ xhr.open("POST", "/api/v1/treatments/", true);
+ xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
+ xhr.send(dataJson);
+
+ browserStorage.set("enteredBy", data.enteredBy);
+
+ closeTreatmentDrawer();
+
+ if (event) {
+ event.preventDefault();
+ }
+}
+
var querystring = getQueryParms();
// var serverSettings = getServerSettings();
@@ -222,6 +302,12 @@ Dropdown.prototype.open = function (e) {
$("#drawerToggle").click(function(event) {
+ //close other drawers
+ if(treatmentDrawerIsOpen) {
+ closeTreatmentDrawer();
+ treatmentDrawerIsOpen = false;
+ }
+
if(drawerIsOpen) {
closeDrawer();
drawerIsOpen = false;
@@ -232,6 +318,25 @@ $("#drawerToggle").click(function(event) {
event.preventDefault();
});
+$("#treatmentDrawerToggle").click(function(event) {
+ //close other drawers
+ if(drawerIsOpen) {
+ closeDrawer();
+ drawerIsOpen = false;
+ }
+
+ if(treatmentDrawerIsOpen) {
+ closeTreatmentDrawer();
+ treatmentDrawerIsOpen = false;
+ } else {
+ openTreatmentDrawer();
+ treatmentDrawerIsOpen = true;
+ }
+ event.preventDefault();
+});
+
+$("#treatmentDrawer button").click(treatmentSubmit);
+
$("#notification").click(function(event) {
closeNotification();
event.preventDefault();
@@ -255,8 +360,11 @@ $("#showToolbar").find("a").click(function(event) {
$("input#save").click(function() {
storeInBrowser({
"units": $("input:radio[name=units-browser]:checked").val(),
+ "alarmHigh": $("#alarmhigh-browser").prop("checked"),
+ "alarmLow": $("#alarmlow-browser").prop("checked"),
"nightMode": $("#nightmode-browser").prop("checked"),
- "customTitle": $("input#customTitle").prop("value")
+ "customTitle": $("input#customTitle").prop("value"),
+ "theme": $("input:radio[name=theme-browser]:checked").val()
}, browserStorage);
storeOnServer({
diff --git a/static/treatments.html b/static/treatments.html
new file mode 100644
index 00000000..24761c4d
--- /dev/null
+++ b/static/treatments.html
@@ -0,0 +1,98 @@
+
+
+
+
+
Nightscout: Treatments
+
+
+
+
+
+
+
+
+
+
Nightscout: Treatments
+
+
+
+ | Time |
+ Event Type |
+ BG |
+ Insulin |
+ Carbs |
+ Entered By |
+ Notes |
+
+
+
+
+ | {{treatment.created_at | date:'short'}} |
+ {{treatment.eventType}} |
+ {{glucoseDisplay(treatment)}} |
+ {{treatment.insulin | number: 2}} |
+ {{treatment.carbs}} |
+ {{treatment.enteredBy}} |
+ {{treatment.notes}} |
+
+
+
+
+
+
+
diff --git a/testing/convert-treatments.js b/testing/convert-treatments.js
new file mode 100644
index 00000000..1ef65786
--- /dev/null
+++ b/testing/convert-treatments.js
@@ -0,0 +1,16 @@
+db.treatments.find().forEach(
+ function (elem) {
+ db.treatments.update(
+ {
+ _id: elem._id
+ },
+ {
+ $set: {
+ glucose: elem.glucoseValue,
+ insulin: elem.insulinGiven,
+ carbs: elem.carbsGiven
+ }
+ }
+ );
+ }
+);
diff --git a/testing/populate.js b/testing/populate.js
new file mode 100644
index 00000000..f4fff19a
--- /dev/null
+++ b/testing/populate.js
@@ -0,0 +1,125 @@
+'use strict';
+///////////////////////////////////////////////////
+// This script is intended to be run as a cron job
+// every n-minutes or whatever the equiv is on windows
+//
+// Author: John A. [euclidjda](https://github.com/euclidjda)
+// Source: https://gist.github.com/euclidjda/4ae207a89921f21382a9
+///////////////////////////////////////////////////
+
+///////////////////////////////////////////////////
+// DB Connection setup and utils
+///////////////////////////////////////////////////
+
+var mongodb = require('mongodb');
+var software = require('./package.json');
+var env = require('./env')( );
+
+main();
+
+function main( ) {
+
+ var MongoClient = mongodb.MongoClient;
+
+ MongoClient.connect(env.mongo, function connected (err, db) {
+
+ console.log("Connected to mongo, ERROR: %j", err);
+ if (err) { throw err; }
+ populate_collection( db );
+
+ });
+
+}
+
+function populate_collection( db ) {
+
+ //console.log( 'mongo = ' + env.mongo );
+ //console.log( 'collection = ' + env.mongo_collection );
+
+ var cgm_collection = db.collection( env.mongo_collection );
+
+ var new_cgm_record = get_cgm_record();
+
+ cgm_collection.insert( new_cgm_record, function(err,created) {
+
+ // TODO: Error checking
+ process.exit( 0 );
+
+ } );
+
+
+}
+
+function get_cgm_record( ) {
+
+ var dateobj = new Date();
+ var datemil = dateobj.getTime();
+ var datesec = datemil / 1000;
+ var datestr = getDateString( dateobj );
+
+ // We put the time in a range from -1 to +1 for every thiry minute period
+ var range = (datesec % 1800)/900 - 1.0;
+
+ // The we push through a COS function and scale between 40 and 400 (so it is like a bg level)
+ var sgv = Math.floor(360*(Math.cos( 10.0 * range / 3.14 ) / 2 + 0.5)) + 40;
+ var dir = range > 0.0 ? "FortyFiveDown" : "FortyFiveUp";
+
+ console.log( 'Writing Record: ');
+ console.log( 'sgv = ' + sgv );
+ console.log( 'date = ' + datemil );
+ console.log( 'dir = ' + dir );
+ console.log( 'str = ' + datestr );
+
+ var mondo_db = null;
+ var doc = { 'device' :'dexcom' ,
+ 'date' : datemil ,
+ 'sgv' : sgv ,
+ 'direction' : dir ,
+ 'dateString' : datestr };
+
+
+ return doc;
+}
+
+function getDateString( d ) {
+
+ // How I wish js had strftime. This would be one line of code!
+
+ var month = d.getMonth();
+ var day = d.getDay();
+ var year = d.getFullYear();
+
+ if (month < 10 ) month = '0'+month;
+ if (day < 10 ) day = '0'+day;
+
+ var hour = d.getHours();
+ var min = d.getMinutes();
+ var sec = d.getSeconds();
+
+ var ampm = 'PM';
+
+ if (hour < 12)
+ {
+ ampm = "AM";
+ }
+ else
+ {
+ ampm = "PM";
+ }
+
+ if (hour == 0)
+ {
+ hour = 12;
+ }
+ if (hour > 12)
+ {
+ hour = hour - 12;
+ }
+
+ if (hour < 10) hour = '0' + hour;
+ if (min < 10) min = '0' + min;
+ if (sec < 10) sec = '0' + sec;
+
+ return month + '/' + day + '/' + year + ' ' + hour + ':' + min + ':' + sec + ' ' + ampm;
+
+}