Adding additional output options (nightscout#5514)

andrew-dixon · Feb 12, 2020 · 03baee0 · 03baee0
1 parent ee97994
commit 03baee0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/lib/client/renderer.js b/lib/client/renderer.js
@@ -531,7 +531,7 @@ function init (client, d3) {
     };
   }
 
-  function prepareArc (treatment, radius) {
+  function prepareArc (treatment, radius, renderBasal) {
     var arc_data = [
       // white carb half-circle on top
       { 'element': '', 'color': 'white', 'start': -1.5708, 'end': 1.5708, 'inner': 0, 'outer': radius.R1 }
@@ -568,10 +568,13 @@ function init (client, d3) {
 
     if (treatment.insulin > 0) {
       var dosage_units = '' + Math.round(treatment.insulin * 100) / 100;
+
+      if (renderBasal === 'all-remove-zero') {
+        dosage_units = (dosage_units + "").replace(/^0/, "");
+      }
 
-      var unit_of_measurement = ' U'; // One international unit of insulin (1 IU) is shown as '1 U'
-      var enteredBy = '' + treatment.enteredBy;
-
+      var unit_of_measurement = (renderBasal === 'all-number' ? '' : ' U'); // One international unit of insulin (1 IU) is shown as '1 U'
+
       arc_data[3].element = dosage_units + unit_of_measurement;
     }
 
@@ -1001,11 +1004,12 @@ function init (client, d3) {
         scale: renderer.bubbleScale()
         , showLabels: showLabels
         , treatments: treatmentCount
-      }, client.sbx.data.profile.getCarbRatio(new Date()));
+      }, client.sbx.data.profile.getCarbRatio(new Date()),
+      renderBasal);
     });
   };
 
-  renderer.drawTreatment = function drawTreatment (treatment, opts, carbratio) {
+  renderer.drawTreatment = function drawTreatment (treatment, opts, carbratio, renderBasal) {
     if (!treatment.carbs && !treatment.protein && !treatment.fat && !treatment.insulin) {
       return;
     }
@@ -1023,7 +1027,7 @@ function init (client, d3) {
       return;
     }
 
-    var arc = prepareArc(treatment, radius);
+    var arc = prepareArc(treatment, radius, renderBasal);
     var treatmentDots = appendTreatments(treatment, arc);
     appendLabels(treatmentDots, arc, opts);
   };

diff --git a/views/index.html b/views/index.html
@@ -220,8 +220,10 @@
           <dd>
             <select id="bolusrender">
               <option class="translate" value="all">All</option>
-              <option class="translate" value="none">None</option>
+              <option class="translate" value="all-remove-zero">All (without leading zero)</option>
+              <option class="translate" value="all-number">All (just the number)</option>
               <option class="translate" value="1u">1 U and Over</option>
+              <option class="translate" value="none">None</option>
             </select>
           </dd>
         </dl>