'
+ 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/weektoweek.js b/lib/report_plugins/weektoweek.js
new file mode 100644
index 00000000000..3ff84a78639
--- /dev/null
+++ b/lib/report_plugins/weektoweek.js
@@ -0,0 +1,333 @@
+'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 TOOLTIP_TRANS_MS = 300;
+
+ 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])+
+ '