');
$('#profiles-default').val(currentrecord.defaultProfile);
- for (var key in currentrecord.store) {
- if (currentrecord.store.hasOwnProperty(key)) {
- tr.append(displayRecord(currentrecord.store[key], key))
- }
- }
+
+ Object.keys(currentrecord.store).forEach(key => {
+ tr.append(displayRecord(currentrecord.store[key], key));
+ });
table.append(tr);
@@ -73,7 +71,7 @@ profiles.report = function report_profiles(datastorage, sorteddaystoshow, option
}
}
- function displayRecord(record, name) {
+ function displayRecord (record, name) {
var td = $('');
var table = $('');
@@ -91,7 +89,7 @@ profiles.report = function report_profiles(datastorage, sorteddaystoshow, option
return td;
}
- function displayRanges(array, array2) {
+ function displayRanges (array, array2) {
var text = '';
for (var i = 0; i < array.length; i++) {
text += array[i].time + ' : ' + array[i].value + (array2 ? ' - ' + array2[i].value : '') + '' + translate('Weekly Success') + ' '
- + '
'
- ;
+ '' + translate('Weekly Success') + ' ' +
+ '
';
return ret;
};
-success.css =
- '#success-placeholder td {'+
- ' border: 1px #ccc solid;'+
- ' margin: 0;'+
- ' padding: 1px;'+
- ' text-align:center;'+
- '}'+
- '#success-placeholder .bad {'+
- ' background-color: #fcc;'+
- '}'+
-
- '#success-placeholder .good {'+
- ' background-color: #cfc;'+
- '}'+
-
- '#success-placeholder th:first-child {'+
- ' width: 30%;'+
- '}'+
- '#success-placeholder th {'+
- ' width: 10%;'+
- '}'+
- '#success-placeholder table {'+
- ' width: 100%;'+
- '}'
- ;
-
-
-
-success.report = function report_success(datastorage, sorteddaystoshow, options) {
+success.css =
+ `#success-placeholder td {
+ border: 1px #ccc solid;
+ margin: 0;
+ padding: 1px;
+ text-align:center;
+ }
+ #success-placeholder .bad {
+ background-color: #fcc;
+ }
+ #success-placeholder .good {
+ background-color: #cfc;
+ }
+ #success-placeholder th:first-child {
+ width: 30%;
+ }
+ #success-placeholder th {
+ width: 10%;
+ }
+ #success-placeholder table {
+ width: 100%;
+ }`;
+
+success.report = function report_success (datastorage, sorteddaystoshow, options) {
var Nightscout = window.Nightscout;
var client = Nightscout.client;
var translate = client.translate;
var ss = require('simple-statistics');
- var low = options.targetLow,
- high = options.targetHigh;
+ var low = options.targetLow
+ , high = options.targetHigh;
var data = datastorage.allstatsrecords;
-
+
var now = Date.now();
var period = 7 * times.hours(24).msecs;
var firstDataPoint = data.reduce(function(min, record) {
- return Math.min(min, record.displayTime);
- }, Number.MAX_VALUE);
+ return Math.min(min, record.displayTime);
+ }, Number.MAX_VALUE);
if (firstDataPoint < 1390000000000) {
firstDataPoint = 1390000000000;
}
@@ -79,39 +73,39 @@ success.report = function report_success(datastorage, sorteddaystoshow, options)
if (quarters === 0) {
// insufficent data
- grid.append(''+translate('There is not sufficient data to run this report. Select more days.')+'
');
+ grid.append('' + translate('There is not sufficient data to run this report. Select more days.') + '
');
return;
}
var dim = function(n) {
var a = [];
for (var i = 0; i < n; i++) {
- a[i]=0;
+ a[i] = 0;
}
return a;
};
var sum = function(a) {
- return a.reduce(function(sum,v) {
- return sum+v;
+ return a.reduce(function(sum, v) {
+ return sum + v;
}, 0);
};
var averages = {
- percentLow: 0,
- percentInRange: 0,
- percentHigh: 0,
- standardDeviation: 0,
- lowerQuartile: 0,
- upperQuartile: 0,
- average: 0
+ percentLow: 0
+ , percentInRange: 0
+ , percentHigh: 0
+ , standardDeviation: 0
+ , lowerQuartile: 0
+ , upperQuartile: 0
+ , average: 0
};
quarters = dim(quarters).map(function(blank, n) {
- var starting = new Date(now - (n+1) * period),
- ending = new Date(now - n * period);
+ var starting = new Date(now - (n + 1) * period)
+ , ending = new Date(now - n * period);
return {
- starting: starting,
- ending: ending,
- records: data.filter(function(record) {
- return record.displayTime > starting && record.displayTime <= ending;
+ starting: starting
+ , ending: ending
+ , records: data.filter(function(record) {
+ return record.displayTime > starting && record.displayTime <= ending;
})
};
}).filter(function(quarter) {
@@ -121,8 +115,8 @@ success.report = function report_success(datastorage, sorteddaystoshow, options)
return record.sgv;
});
quarter.standardDeviation = ss.standard_deviation(bgValues);
- quarter.average = bgValues.length > 0? (sum(bgValues) / bgValues.length): 'N/A';
- quarter.lowerQuartile = ss.quantile(bgValues, 0.25);
+ quarter.average = bgValues.length > 0 ? (sum(bgValues) / bgValues.length) : 'N/A';
+ quarter.lowerQuartile = ss.quantile(bgValues, 0.25);
quarter.upperQuartile = ss.quantile(bgValues, 0.75);
quarter.numberLow = bgValues.filter(function(bg) {
return bg < low;
@@ -148,9 +142,9 @@ success.report = function report_success(datastorage, sorteddaystoshow, options)
var lowComparison = function(quarter, averages, field, invert) {
if (quarter[field] < averages[field] * 0.8) {
- return (invert? 'bad': 'good');
+ return (invert ? 'bad' : 'good');
} else if (quarter[field] > averages[field] * 1.2) {
- return (invert? 'good': 'bad');
+ return (invert ? 'good' : 'bad');
} else {
return '';
}
@@ -172,44 +166,44 @@ success.report = function report_success(datastorage, sorteddaystoshow, options)
}
};
- table.append(''+translate('Period')+' '+translate('Low')+' '+translate('In Range')+' '+translate('High')+' '+translate('Standard Deviation')+' '+translate('Low Quartile')+' '+translate('Average')+' '+translate('Upper Quartile')+' ' + translate('Period') + ' ' + translate('Low') + ' ' + translate('In Range') + ' ' + translate('High') + ' ' + translate('Standard Deviation') + ' ' + translate('Low Quartile') + ' ' + translate('Average') + ' ' + translate('Upper Quartile') + ' ' + quarters.filter(function(quarter) {
return quarter.records.length > 0;
}).map(function(quarter) {
var INVERT = true;
return '' + [
- quarter.starting.toLocaleDateString() + ' - ' + quarter.ending.toLocaleDateString(),
- {
- klass: lowComparison(quarter, averages, 'percentLow'),
- text: Math.round(quarter.percentLow) + '%'
- },
- {
- klass: lowComparison(quarter, averages, 'percentInRange', INVERT),
- text: Math.round(quarter.percentInRange) + '%'
- },
- {
- klass: lowComparison(quarter, averages, 'percentHigh'),
- text: Math.round(quarter.percentHigh) + '%'
- },
- {
- klass: lowComparison(quarter, averages, 'standardDeviation'),
- text: (quarter.standardDeviation > 10? Math.round(quarter.standardDeviation): quarter.standardDeviation.toFixed(1))
- },
- {
- klass: lowQuartileEvaluation(quarter, averages),
- text: quarter.lowerQuartile
- },
- {
- klass: lowComparison(quarter, averages, 'average'),
- text: quarter.average.toFixed(1)
- },
- {
- klass: upperQuartileEvaluation(quarter, averages),
- text: quarter.upperQuartile
+ quarter.starting.toLocaleDateString() + ' - ' + quarter.ending.toLocaleDateString()
+ , {
+ klass: lowComparison(quarter, averages, 'percentLow')
+ , text: Math.round(quarter.percentLow) + '%'
+ }
+ , {
+ klass: lowComparison(quarter, averages, 'percentInRange', INVERT)
+ , text: Math.round(quarter.percentInRange) + '%'
+ }
+ , {
+ klass: lowComparison(quarter, averages, 'percentHigh')
+ , text: Math.round(quarter.percentHigh) + '%'
+ }
+ , {
+ klass: lowComparison(quarter, averages, 'standardDeviation')
+ , text: (quarter.standardDeviation > 10 ? Math.round(quarter.standardDeviation) : quarter.standardDeviation.toFixed(1))
+ }
+ , {
+ klass: lowQuartileEvaluation(quarter, averages)
+ , text: quarter.lowerQuartile
+ }
+ , {
+ klass: lowComparison(quarter, averages, 'average')
+ , text: quarter.average.toFixed(1)
+ }
+ , {
+ klass: upperQuartileEvaluation(quarter, averages)
+ , text: quarter.upperQuartile
}
].map(function(v) {
if (typeof v === 'object') {
- return '' + v.text + ' ';
+ return '' + v.text + ' ';
} else {
return '' + v + ' ';
}
diff --git a/lib/report_plugins/treatments.js b/lib/report_plugins/treatments.js
index e6221c8b656..c0215b59b4a 100644
--- a/lib/report_plugins/treatments.js
+++ b/lib/report_plugins/treatments.js
@@ -44,6 +44,16 @@ treatments.html = function html(client) {
+ ' '
+ + translate('Protein')
+ + ' '
+ + ' '
+ + translate('Fat')
+ + ' '
+ + ' '
+ translate('Insulin Given')
+ ' ').css('width','150px').attr('align','left').append(translate('Blood Glucose')))
.append($(' ').css('width','50px').attr('align','left').append(translate('Insulin')))
.append($(' ').css('width','50px').attr('align','left').append(translate('Carbs')))
+ .append($(' ').css('width','50px').attr('align','left').append(translate('Protein')))
+ .append($(' ').css('width','50px').attr('align','left').append(translate('Fat')))
.append($(' ').css('width','50px').attr('align','left').append(translate('Duration')))
.append($(' ').css('width','50px').attr('align','left').append(translate('Percent')))
.append($(' ').css('width','50px').attr('align','left').append(translate('Basal value')))
@@ -309,6 +327,8 @@ treatments.report = function report_treatments(datastorage, sorteddaystoshow, op
.append($(' ').attr('align','center').append(tr.glucose ? tr.glucose + ' ('+translate(tr.glucoseType)+')' : ''))
.append($(' ').attr('align','center').append(tr.insulin ? tr.insulin.toFixed(2) : ''))
.append($(' ').attr('align','center').append(tr.carbs ? tr.carbs : ''))
+ .append($(' ').attr('align','center').append(tr.protein ? tr.protein : ''))
+ .append($(' ').attr('align','center').append(tr.fat ? tr.fat : ''))
.append($(' ').attr('align','center').append(tr.duration ? tr.duration.toFixed(0) : ''))
.append($(' ').attr('align','center').append(tr.percent ? tr.percent : ''))
.append($(' ').attr('align','center').append('absolute' in tr ? tr.absolute.toFixed(2) : ''))
diff --git a/lib/report_plugins/utils.js b/lib/report_plugins/utils.js
index 10daec32304..be6ba940003 100644
--- a/lib/report_plugins/utils.js
+++ b/lib/report_plugins/utils.js
@@ -1,5 +1,7 @@
'use strict';
+var consts = require('../constants');
+
var moment = window.moment;
var utils = { };
@@ -69,7 +71,7 @@ utils.scaledTreatmentBG = function scaledTreatmentBG(treatment,data) {
console.info('found mismatched glucose units, converting ' + treatment.units + ' into ' + client.settings.units, treatment);
if (treatment.units === 'mmol') {
//BG is in mmol and display in mg/dl
- treatmentGlucose = Math.round(treatment.glucose * 18);
+ treatmentGlucose = Math.round(treatment.glucose * consts.MMOL_TO_MGDL);
} else {
//BG is in mg/dl and display in mmol
treatmentGlucose = client.utils.scaleMgdl(treatment.glucose);
diff --git a/lib/report_plugins/weektoweek.js b/lib/report_plugins/weektoweek.js
new file mode 100644
index 00000000000..8719af81542
--- /dev/null
+++ b/lib/report_plugins/weektoweek.js
@@ -0,0 +1,325 @@
+'use strict';
+
+var _ = require('lodash');
+var moment = window.moment;
+var d3 = (global && global.d3) || require('d3');
+
+var dayColors = [
+ 'rgb(73, 22, 153)'
+ , 'rgb(34, 201, 228)'
+ , 'rgb(0, 153, 123)'
+ , 'rgb(135, 135, 228)'
+ , 'rgb(135, 49, 204)'
+ , 'rgb(36, 36, 228)'
+ , 'rgb(0, 234, 188)'
+];
+
+var weektoweek = {
+ name: 'weektoweek'
+ , label: 'Week to week'
+ , pluginType: 'report'
+};
+
+function init() {
+ return weektoweek;
+}
+
+module.exports = init;
+
+weektoweek.html = function html(client) {
+ var translate = client.translate;
+ var ret =
+ '' + translate('Week to week') + ' '
+ + '' + translate('To see this report, press SHOW while in this view') + ' '
+ + ' 800x250px '
+ + ' 1000x300px '
+ + ' 1200x400px '
+ + ' 1550x600px '
+ + ' '
+ + ''
+ + '
'
+ ;
+ return ret;
+};
+
+weektoweek.prepareHtml = function weektoweekPrepareHtml(weekstoshow) {
+ $('#weektoweekcharts').html('');
+
+ var colorIdx = 0;
+
+ var legend = '';
+
+ legend += 'Sunday ';
+ legend += 'Monday ';
+ legend += 'Tuesday ';
+ legend += 'Wednesday Thursday ';
+ legend += 'Friday ';
+ legend += 'Saturday
';
+
+ $('#weektoweekcharts').append($(legend));
+
+ weekstoshow.forEach(function eachWeek(d) {
+ $('#weektoweekcharts').append($(''));
+ });
+};
+
+weektoweek.report = function report_weektoweek(datastorage, sorteddaystoshow, options) {
+ var Nightscout = window.Nightscout;
+ var client = Nightscout.client;
+ var report_plugins = Nightscout.report_plugins;
+
+ var padding = { top: 15, right: 22, bottom: 30, left: 35 };
+
+ var weekstoshow = [ ];
+
+ var startDay = moment(sorteddaystoshow[0] + ' 00:00:00');
+
+ sorteddaystoshow.forEach( function eachDay(day) {
+ var weekNum = Math.abs(moment(day + ' 00:00:00').diff(startDay, 'weeks'));
+
+ if (typeof weekstoshow[weekNum] === 'undefined') {
+ weekstoshow[weekNum] = [ ];
+ }
+
+ weekstoshow[weekNum].push(day);
+ });
+
+ weekstoshow = weekstoshow.map(function orderWeek(week) {
+ return _.sortBy(week);
+ });
+
+ weektoweek.prepareHtml(weekstoshow);
+
+ weekstoshow.forEach( function eachWeek(week) {
+ var sgvData = [ ];
+ var weekStart = moment(week[0] + ' 00:00:00');
+
+ week.forEach( function eachDay(day) {
+ var dayNum = Math.abs(moment(day + ' 00:00:00').diff(weekStart, 'days'));
+
+ datastorage[day].sgv.forEach ( function eachSgv(sgv) {
+ var sgvWeekday = moment(sgv.date).day();
+ var sgvColor = dayColors[sgvWeekday];
+
+ if (sgv.color === 'gray') {
+ sgvColor = sgv.color;
+ }
+
+ sgvData.push( {
+ 'color': sgvColor
+ , 'date': moment(sgv.date).subtract(dayNum, 'days').toDate()
+ , 'filtered': sgv.filtered
+ , 'mills': sgv.mills - dayNum * 24*60*60000
+ , 'noise': sgv.noise
+ , 'sgv': sgv.sgv
+ , 'type': sgv.type
+ , 'unfiltered': sgv.unfiltered
+ , 'y': sgv.y
+ });
+ });
+ });
+
+ drawChart(week, sgvData, options);
+ });
+
+ function timeTicks(n, i) {
+ var t12 = [
+ '12am', '', '2am', '', '4am', '', '6am', '', '8am', '', '10am', '',
+ '12pm', '', '2pm', '', '4pm', '', '6pm', '', '8pm', '', '10pm', '', '12am'
+ ];
+ if (Nightscout.client.settings.timeFormat === 24) {
+ return ('00' + i).slice(-2);
+ } else {
+ return t12[i];
+ }
+ }
+
+ function drawChart(week, sgvData, options) {
+ var tickValues
+ , charts
+ , context
+ , xScale2, yScale2
+ , xAxis2, yAxis2
+ , dateFn = function (d) { return new Date(d.date); };
+
+ tickValues = client.ticks(client, {
+ scaleY: options.weekscale === report_plugins.consts.SCALE_LOG ? 'log' : 'linear'
+ , targetTop: options.targetHigh
+ , targetBottom: options.targetLow
+ });
+
+ // add defs for combo boluses
+ var dashWidth = 5;
+ d3.select('body').append('svg')
+ .append('defs')
+ .append('pattern')
+ .attr('id', 'hash')
+ .attr('patternUnits', 'userSpaceOnUse')
+ .attr('width', 6)
+ .attr('height', 6)
+ .attr('x', 0)
+ .attr('y', 0)
+ .append('g')
+ .style('fill', 'none')
+ .style('stroke', '#0099ff')
+ .style('stroke-width', 2)
+ .append('path').attr('d', 'M0,0 l' + dashWidth + ',' + dashWidth)
+ .append('path').attr('d', 'M' + dashWidth + ',0 l-' + dashWidth + ',' + dashWidth);
+
+ // create svg and g to contain the chart contents
+ charts = d3.select('#weektoweekchart-' + week[0] + '-' + week[week.length-1]).html(
+ ''+
+ report_plugins.utils.localeDate(week[0])+
+ '-' +
+ report_plugins.utils.localeDate(week[week.length-1])+
+ '