From b114fcf23534b8564009f1fa0ce2402d10e54429 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     |  3 +++
 lib/report_plugins/daytoday.js | 15 +++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/lib/report/reportclient.js b/lib/report/reportclient.js
index c9061553e05e..039e32b79c1d 100644
--- a/lib/report/reportclient.js
+++ b/lib/report/reportclient.js
@@ -250,6 +250,9 @@ var init = function init () {
         options.openAps = true;
       }
 
+      options.bgcheck = $('#rp_optionsbgcheck').is(':checked');
+      options.othertreatments = $('#rp_optionsothertreatments').is(':checked');
+      
       var matchesneeded = 0;
 
       // date range
diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js
index 47c16cf71a81..2a6b0955824a 100644
--- a/lib/report_plugins/daytoday.js
+++ b/lib/report_plugins/daytoday.js
@@ -34,6 +34,8 @@ daytoday.html = function html (client) {
     '<label><input type="checkbox" id="rp_optionspredicted"><span style="color:sienna;opacity:0.5">' + translate('Predictions') + '</span></label>' +
     '<label><input type="checkbox" id="rp_optionsopenaps"><span style="color:sienna;opacity:0.5">' + translate('OpenAPS') + '</span></label>' +
     '<label><input type="checkbox" id="rp_optionsdistribution" checked><span style="color:blue;opacity:0.5">' + translate('Insulin distribution') + '</span></label>' +
+    '<label><input type="checkbox" id="rp_optionsbgcheck" checked><span style="color:red;opacity:0.5">' + translate('BG Check') + '</span></label>' +
+    '<label><input type="checkbox" id="rp_optionsothertreatments">' + translate('View all treatments') + '</span></label>' +
     '&nbsp;' + translate('Size') +
     ' <select id="rp_size">' +
     '  <option x="800" y="250">800x250px</option>' +
@@ -872,7 +874,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)
@@ -889,7 +900,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)