From b98c131a34bc4fba513cc18f22f611c2dd5c637a Mon Sep 17 00:00:00 2001
From: Michael Kroes <michael@kroes.email>
Date: Tue, 17 Nov 2020 09:50:48 +0100
Subject: [PATCH] Added a specific rendering for BG Check events on the Day to
 Day report.

Added an option to hide BG Check and other events on the Day to Day report.
---
 lib/report/reportclient.js     |  4 +++-
 lib/report/reportstorage.js    |  4 +++-
 lib/report_plugins/daytoday.js | 15 +++++++++++++--
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/lib/report/reportclient.js b/lib/report/reportclient.js
index aed324d84a7..b62a5467b64 100644
--- a/lib/report/reportclient.js
+++ b/lib/report/reportclient.js
@@ -246,7 +246,9 @@ var init = function init () {
         options.cob = true;
         options.openAps = true;
       }
-
+      options.bgcheck = $('#rp_optionsbgcheck').is(':checked');
+      options.othertreatments = $('#rp_optionsothertreatments').is(':checked');
+      
       const reportStorage = require('./reportstorage');
       reportStorage.saveProps(options);
       var matchesneeded = 0;
diff --git a/lib/report/reportstorage.js b/lib/report/reportstorage.js
index e0a8d8b9d17..5997261d7eb 100644
--- a/lib/report/reportstorage.js
+++ b/lib/report/reportstorage.js
@@ -12,7 +12,9 @@ const defaultValues = {
     predicted: false,
     openAps: false,
     insulindistribution: true,
-    predictedTruncate: true
+    predictedTruncate: true,
+    bgcheck: true,
+    othertreatments: false
 };
 let cachedProps;
 
diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js
index 928c6b8579f..49aad99ed16 100644
--- a/lib/report_plugins/daytoday.js
+++ b/lib/report_plugins/daytoday.js
@@ -35,6 +35,8 @@ daytoday.html = function html (client) {
     `<label><input type="checkbox" id="rp_optionspredicted" ${reportStorage.getValue('predicted') ? "checked" : ""}><span style="color:sienna;opacity:0.5">${translate('Predictions')}</span></label>` +
     `<label><input type="checkbox" id="rp_optionsopenaps" ${reportStorage.getValue('openAps') ? "checked" : ""}><span style="color:sienna;opacity:0.5">${translate('OpenAPS')}</span></label>` +
     `<label><input type="checkbox" id="rp_optionsdistribution" ${reportStorage.getValue('insulindistribution') ? "checked" : ""}><span style="color:blue;opacity:0.5">${translate('Insulin distribution')}</span></label>` +
+    `<label><input type="checkbox" id="rp_optionsbgcheck" ${reportStorage.getValue('bgcheck') ? "checked" : ""}><span style="color:#ff0000;opacity:0.5">${translate('BG Check')}</span></label>` +
+    `<label><input type="checkbox" id="rp_optionsothertreatments" ${reportStorage.getValue('othertreatments') ? "checked" : ""}>${translate('View all treatments')}</span></label>` +
     '&nbsp;' + translate('Size') +
     ' <select id="rp_size">' +
     '  <option x="800" y="250">800x250px</option>' +
@@ -873,7 +875,16 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
            .attr('y', yScale2(client.utils.scaleMgdl(414)) + padding.top)
            .attr('x', xScale2(treatment.mills + times.mins(treatment.duration).msecs / 2) + padding.left)
            .text(treatment.reason);
-      } else if (!treatment.duration) {
+      } else if (treatment.eventType === 'BG Check' && !treatment.duration && options.bgcheck) {
+        context.append('circle')
+           .attr('cx', xScale2(treatment.mills) + padding.left)
+           .attr('cy', yScale2(scaledTreatmentBG(treatment, data.sgv)) + padding.top)
+           .attr('fill', 'red')
+           .style('opacity', 1)
+           .attr('stroke-width', 1)
+           .attr('stroke', 'darkred')
+           .attr('r', 4);
+      } else if (!treatment.duration && options.othertreatments) {
         // other treatments without duration
         context.append('circle')
           .attr('cx', xScale2(treatment.mills) + padding.left)
@@ -890,7 +901,7 @@ daytoday.report = function report_daytoday (datastorage, sorteddaystoshow, optio
           .attr('y', yScale2(scaledTreatmentBG(treatment, data.sgv)) + padding.top - 10)
           .attr('x', xScale2(treatment.mills) + padding.left + 10)
           .text(translate(client.careportal.resolveEventName(treatment.eventType)));
-      } else if (treatment.duration) {
+      } else if (treatment.duration && options.othertreatments) {
         // other treatments with duration
         context.append('rect')
           .attr('x', xScale2(treatment.mills) + padding.left)