Skip to content

Wip/2025 reports #8366

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

Open
wants to merge 7 commits into
base: dev
Choose a base branch
from
Open

Wip/2025 reports #8366

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9b15b73
Updates to report pages
May 28, 2025
e27c00f
cleanups
May 28, 2025
284daf3
New timeframe presets
May 28, 2025
35b1854
fix prev presets
May 28, 2025
b71db01
extra translations
May 28, 2025
04de452
Fix TING calculation
May 28, 2025
9d36873
Merge branch 'dev' into wip/2025-reports
bewest May 28, 2025
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
19 changes: 19 additions & 0 deletions lib/report/reportclient.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@ var init = function init () {
'mg/dl': {
low: client.settings.thresholds.bgTargetBottom
, high: client.settings.thresholds.bgTargetTop
, superlow: client.settings.thresholds.bgLow
, superhigh: client.settings.thresholds.bgHigh
}
, 'mmol': {
low: client.utils.scaleMgdl(client.settings.thresholds.bgTargetBottom)
, high: client.utils.scaleMgdl(client.settings.thresholds.bgTargetTop)
, superlow: client.utils.scaleMgdl(client.settings.thresholds.bgLow)
, superhigh: client.utils.scaleMgdl(client.settings.thresholds.bgHigh)
}
};

Expand Down Expand Up @@ -150,6 +154,11 @@ var init = function init () {
$('#rp_enabledate').prop('checked', true);
return setDataRange(event, days);
});
$('.prevdates').click(function(event) {
var days = $(this).attr('days');
$('#rp_enabledate').prop('checked', true);
return setPrevDataRange(event, days);
});
$('#rp_show').click(show);
$('#rp_notes').bind('input', function(event) {
$('#rp_enablenotes').prop('checked', true);
Expand All @@ -169,6 +178,8 @@ var init = function init () {

$('#rp_targetlow').val(targetBGdefault[client.settings.units.toLowerCase()].low);
$('#rp_targethigh').val(targetBGdefault[client.settings.units.toLowerCase()].high);
$('#rp_superlow').val(targetBGdefault[client.settings.units.toLowerCase()].superlow);
$('#rp_superhigh').val(targetBGdefault[client.settings.units.toLowerCase()].superhigh);

if (client.settings.scaleY === 'linear') {
$('#rp_linear').prop('checked', true);
Expand Down Expand Up @@ -222,6 +233,8 @@ var init = function init () {
//console.log(timerange,zone);
options.targetLow = parseFloat($('#rp_targetlow').val().replace(',', '.'));
options.targetHigh = parseFloat($('#rp_targethigh').val().replace(',', '.'));
options.superLow = parseFloat($('#rp_superlow').val().replace(',', '.'));
options.superHigh = parseFloat($('#rp_superhigh').val().replace(',', '.'));
options.raw = $('#rp_optionsraw').is(':checked');
options.iob = $('#rp_optionsiob').is(':checked');
options.cob = $('#rp_optionscob').is(':checked');
Expand Down Expand Up @@ -560,6 +573,12 @@ var init = function init () {
return maybePrevent(event);
}

function setPrevDataRange (event, days) {
$('#rp_to').val(moment().add(-days, 'days').format('YYYY-MM-DD'));
$('#rp_from').val(moment().add(-2*days + 1, 'days').format('YYYY-MM-DD'));
return maybePrevent(event);
}

function switchreport_handler (event) {
var id = $(this).attr('id');

Expand Down
82 changes: 56 additions & 26 deletions lib/report_plugins/dailystats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ dailystats.css =
' text-align:center;' +
'}' +
'#dailystats-placeholder .inlinepiechart {' +
' width: 2.2in;' +
' width: 2.0in;' +
' height: 0.9in;' +
'}';

Expand All @@ -53,14 +53,20 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
var thead = $('<tr/>');
$('<th></th>').appendTo(thead);
$('<th>' + translate('Date') + '</th>').appendTo(thead);
$('<th>' + translate('Low') + '</th>').appendTo(thead);
$('<th>' + translate('Normal') + '</th>').appendTo(thead);
$('<th>' + translate('High') + '</th>').appendTo(thead);
$('<th style="background-color:#f2957d">' + translate('Low') + '<br />&nbsp;</th>').appendTo(thead);
if (options.superLow < options.targetLow) {
$('<th style="background-color:#dfffb2">' + translate('Lowish') + '<font size="-1"><br/><div style="float:left;">&nbsp;' + options.superLow + '</div></font></th>').appendTo(thead);
}
$('<th style="background-color:#54c954">' + translate('In Range') + '<font size="-1"><br/><div style="float:left;">&nbsp;' + options.targetLow + '</div><div style="float:right;">' + options.targetHigh + '&nbsp;</div></font></th>').appendTo(thead);
if (options.targetHigh < options.superHigh) {
$('<th style="background-color:#7df27d">' + translate('Highish') + '<font size="-1"><br/><div style="float:right;">' + options.superHigh + '&nbsp;</div></font></th>').appendTo(thead);
}
$('<th style="background-color:#54ffff">' + translate('High') + '<br />&nbsp;</th>').appendTo(thead);
$('<th>' + translate('Readings') + '</th>').appendTo(thead);
$('<th>' + translate('Min') + '</th>').appendTo(thead);
$('<th>' + translate('Max') + '</th>').appendTo(thead);
$('<th>' + translate('Average') + '</th>').appendTo(thead);
$('<th>' + translate('StDev') + '</th>').appendTo(thead);
$('<th>' + translate('StDev') + ' (' + translate('CV') + ')</th>').appendTo(thead);
$('<th>' + translate('25%') + '</th>').appendTo(thead);
$('<th>' + translate('Median') + '</th>').appendTo(thead);
$('<th>' + translate('75%') + '</th>').appendTo(thead);
Expand All @@ -87,10 +93,14 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o

var stats = daysRecords.reduce(function(out, record) {
record.sgv = parseFloat(record.sgv);
if (record.sgv < options.targetLow) {
if (record.sgv < options.superLow) {
out.lows++;
} else if (record.sgv < options.targetHigh) {
} else if (record.sgv < options.targetLow) {
out.lowish++;
} else if (record.sgv <= options.targetHigh) {
out.normal++;
} else if (record.sgv <= options.superHigh) {
out.highish++;
} else {
out.highs++;
}
Expand All @@ -104,7 +114,9 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
return out;
}, {
lows: 0
, lowish: 0
, normal: 0
, highish: 0
, highs: 0
});
var average = sum / daysRecords.length;
Expand All @@ -115,35 +127,53 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
$('<td><div id="dailystat-chart-' + day.toString() + '" class="inlinepiechart"></div></td>').appendTo(tr);

$('<td class="tdborder" style="width:160px">' + report_plugins.utils.localeDate(day) + '</td>').appendTo(tr);
$('<td class="tdborder">' + Math.round((100 * stats.lows) / daysRecords.length) + '%</td>').appendTo(tr);
$('<td class="tdborder">' + Math.round((100 * stats.normal) / daysRecords.length) + '%</td>').appendTo(tr);
$('<td class="tdborder">' + Math.round((100 * stats.highs) / daysRecords.length) + '%</td>').appendTo(tr);
$('<td class="tdborder">' + ((100.0 * stats.lows) / daysRecords.length).toFixed(1) + '%</td>').appendTo(tr);
if (options.superLow < options.targetLow) {
$('<td class="tdborder">' + ((100.0 * stats.lowish) / daysRecords.length).toFixed(1) + '%</td>').appendTo(tr);
}
$('<td class="tdborder">' + ((100.0 * stats.normal) / daysRecords.length).toFixed(1) + '%</td>').appendTo(tr);
if (options.targetHigh < options.superHigh) {
$('<td class="tdborder">' + ((100.0 * stats.highish) / daysRecords.length).toFixed(1) + '%</td>').appendTo(tr);
}
$('<td class="tdborder">' + ((100.0 * stats.highs) / daysRecords.length).toFixed(1) + '%</td>').appendTo(tr);
$('<td class="tdborder">' + daysRecords.length + '</td>').appendTo(tr);
$('<td class="tdborder">' + minForDay + '</td>').appendTo(tr);
$('<td class="tdborder">' + maxForDay + '</td>').appendTo(tr);
$('<td class="tdborder">' + average.toFixed(1) + '</td>').appendTo(tr);
$('<td class="tdborder">' + ss.standard_deviation(bgValues).toFixed(1) + '</td>').appendTo(tr);
$('<td class="tdborder">' + ss.standard_deviation(bgValues).toFixed(1) + '<br/>(' +
Math.round(100 * ss.standard_deviation(bgValues) / average).toFixed(0) + '%)</td>').appendTo(tr);
$('<td class="tdborder">' + ss.quantile(bgValues, 0.25).toFixed(1) + '</td>').appendTo(tr);
$('<td class="tdborder">' + ss.quantile(bgValues, 0.5).toFixed(1) + '</td>').appendTo(tr);
$('<td class="tdborder">' + ss.quantile(bgValues, 0.75).toFixed(1) + '</td>').appendTo(tr);
$('<td class="tdborder">' + averageA1cDCCT.toFixed(1) + '%</td>').appendTo(tr);
$('<td class="tdborder">' + averageA1cIFCC.toFixed(0) + '</td>').appendTo(tr);

table.append(tr);
var inrange = [
{
label: translate('Low')
, data: Math.round(stats.lows * 1000 / daysRecords.length) / 10
}
, {
label: translate('In Range')
, data: Math.round(stats.normal * 1000 / daysRecords.length) / 10
}
, {
label: translate('High')
, data: Math.round(stats.highs * 1000 / daysRecords.length) / 10
}
];
var inrange = [{
data: Math.round(stats.lows * 1000 / daysRecords.length) / 10
}];
var rangecolors = [ '#f2957d' ];
if (options.superLow < options.targetLow) {
inrange.push({
data: Math.round(stats.lowish * 1000 / daysRecords.length) / 10
});
rangecolors.push('#dfffb2');
}
inrange.push({
data: Math.round(stats.normal * 1000 / daysRecords.length) / 10
});
rangecolors.push('#54c954');
if (options.targetHigh < options.superHigh) {
inrange.push({
data: Math.round(stats.highish * 1000 / daysRecords.length) / 10
});
rangecolors.push('#7df27d');
}
inrange.push({
data: Math.round(stats.highs * 1000 / daysRecords.length) / 10
});
rangecolors.push('#54ffff');

$.plot(
'#dailystat-chart-' + day.toString()
, inrange, {
Expand All @@ -152,7 +182,7 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
show: true
}
}
, colors: ['#f88', '#8f8', '#ff8']
, colors: rangecolors
}
);
});
Expand Down
37 changes: 25 additions & 12 deletions lib/report_plugins/daytoday.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ daytoday.html = function html (client) {
'&nbsp;' + translate('Size') +
' <select id="rp_size">' +
' <option x="800" y="250">800x250px</option>' +
' <option x="1000" y="300" selected>1000x300px</option>' +
' <option x="1200" y="400">1200x400px</option>' +
' <option x="1000" y="300">1000x300px</option>' +
' <option x="1200" y="400" selected>1200x400px</option>' +
' <option x="1550" y="600">1550x600px</option>' +
' <option x="2400" y="800">2400x800px</option>' +
'</select>' +
Expand Down Expand Up @@ -228,6 +228,15 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
yCarbsScale.range([chartHeight, 0]);
yScaleBasals.range([yScale2(client.utils.scaleMgdl(72)), chartHeight]);

// add outer BG rect
context.append('rect')
.attr('x', xScale2(dataRange[0]) + padding.left)
.attr('y', yScale2(options.superHigh) + padding.top)
.attr('width', xScale2(dataRange[1] - xScale2(dataRange[0])))
.attr('height', yScale2(options.superLow) - yScale2(options.superHigh))
.style('fill', 'WhiteSmoke')
.attr('stroke', 'grey');

// add target BG rect
context.append('rect')
.attr('x', xScale2(dataRange[0]) + padding.left)
Expand Down Expand Up @@ -767,7 +776,11 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
}

if (treatment.insulin && options.insulin) {
var dataLabel = client.utils.toRoundedStr(treatment.insulin, 2)+ 'U';
var dataLabel = client.utils.toRoundedStr(treatment.insulin, 3)+ 'U';
var displayval = treatment.insulin * 100;
if (Math.round(displayval) == displayval) {
dataLabel = client.utils.toRoundedStr(treatment.insulin, 2)+ 'U';
}
context.append('rect')
.attr('y', yInsulinScale(treatment.insulin))
.attr('height', chartHeight - yInsulinScale(treatment.insulin))
Expand Down Expand Up @@ -934,18 +947,18 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio

console.log('Insulin for day: ' + day + ' bolus: ' + bolusInsulin + ' basebasal: ' + baseBasalInsulin + ' positiveTemps: ' + positiveTemps + ' negativeTemps: ' + negativeTemps);
var table = $('<table>');
$('<tr><td><b>' + translate('Bolus insulin:') + '</b></td><td align="right">' + bolusInsulin.toFixed(1) + 'U</td></tr>').appendTo(table);
$('<tr><td>' + translate('Bolus insulin:') + '</td><td align="right">' + bolusInsulin.toFixed(3) + 'U</td></tr>').appendTo(table);
if (positiveTemps > 0 || negativeTemps > 0) {
$('<tr><td>' + translate('Base basal insulin:') + '</td><td align="right">' + baseBasalInsulin.toFixed(1) + 'U</td></tr>').appendTo(table);
$('<tr><td><b>' + translate('Base basal insulin:') + '</b></td><td align="right">' + baseBasalInsulin.toFixed(3) + 'U</td></tr>').appendTo(table);
}
if (positiveTemps > 0) {
$('<tr><td>' + translate('Positive temp basal insulin:') + '</td><td align="right">' + positiveTemps.toFixed(1) + 'U</td></tr>').appendTo(table);
$('<tr><td>' + translate('Positive temp basal insulin:') + '</td><td align="right">' + positiveTemps.toFixed(3) + 'U</td></tr>').appendTo(table);
}
if (negativeTemps < 0) {
$('<tr><td>' + translate('Negative temp basal insulin:') + '</td><td align="right">' + negativeTemps.toFixed(1) + 'U</td></tr>').appendTo(table);
$('<tr><td>' + translate('Negative temp basal insulin:') + '</td><td align="right">' + negativeTemps.toFixed(3) + 'U</td></tr>').appendTo(table);
}
var totalBasalInsulin = baseBasalInsulin + positiveTemps + negativeTemps;
$('<tr><td><b>' + translate('Total basal insulin:') + '</b></td><td align="right">' + totalBasalInsulin.toFixed(1) + 'U</td></tr>').appendTo(table);
$('<tr><td>' + translate('Total basal insulin:') + '</td><td align="right">' + totalBasalInsulin.toFixed(3) + 'U</td></tr>').appendTo(table);
var totalDailyInsulin = bolusInsulin + baseBasalInsulin + positiveTemps + negativeTemps;
$('<tr><td><b>' + translate('Total daily insulin:') + '</b></td><td align="right">' + totalDailyInsulin.toFixed(1) + 'U</td></tr>').appendTo(table);

Expand All @@ -958,11 +971,11 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio

var chartData = [
{
label: translate('Basal')
, count: totalBasalInsulin
, pct: (totalBasalInsulin / totalDailyInsulin * 100).toFixed(0)
label: translate('Base basal')
, count: baseBasalInsulin
, pct: (baseBasalInsulin / totalDailyInsulin * 100).toFixed(0)
}
, { label: translate('Bolus'), count: bolusInsulin, pct: (bolusInsulin / totalDailyInsulin * 100).toFixed(0) }
, { label: translate('non-base'), count: (totalDailyInsulin-baseBasalInsulin), pct: ((totalDailyInsulin-baseBasalInsulin) / totalDailyInsulin * 100).toFixed(0) }
];

// Insulin distribution chart
Expand Down
Loading
Loading