Fix #5146 - display of treatment with only Fat and Protein set (#5381)

nightscout · Jan 1, 2020 · 8139cb9 · 8139cb9
1 parent a4ce06f
commit 8139cb9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/lib/client/renderer.js b/lib/client/renderer.js
@@ -542,23 +542,26 @@ function init (client, d3) {
       // these used to be semicircles from 1.5708 to 4.7124, but that made the tooltip target too big
       { 'element': '', 'color': 'transparent', 'start': 3.1400, 'end': 3.1432, 'inner': radius.R2, 'outer': radius.R3 }
       , { 'element': '', 'color': 'transparent', 'start': 3.1400, 'end': 3.1432, 'inner': radius.R2, 'outer': radius.R4 }
-    ];
+    ]
+      , arc_data_1_elements = [];
 
     arc_data[0].outlineOnly = !treatment.carbs;
     arc_data[2].outlineOnly = !treatment.insulin;
 
     if (treatment.carbs > 0) {
-      arc_data[1].element = Math.round(treatment.carbs) + ' g';
+      arc_data_1_elements.push(Math.round(treatment.carbs) + ' g');
     }
 
     if (treatment.protein > 0) {
-      arc_data[1].element = arc_data[1].element + " / " + Math.round(treatment.protein) + ' g';
+      arc_data_1_elements.push(Math.round(treatment.protein) + ' g');
     }
 
     if (treatment.fat > 0) {
-      arc_data[1].element = arc_data[1].element + " / " + Math.round(treatment.fat) + ' g';
+      arc_data_1_elements.push(Math.round(treatment.fat) + ' g');
     }
 
+    arc_data[1].element = arc_data_1_elements.join(' / ');
+
     if (treatment.foodType) {
       arc_data[1].element = arc_data[1].element + " " + treatment.foodType;
     }
@@ -1007,7 +1010,7 @@ function init (client, d3) {
   };
 
   renderer.drawTreatment = function drawTreatment (treatment, opts, carbratio) {
-    if (!treatment.carbs && !treatment.insulin) {
+    if (!treatment.carbs && !treatment.protein && !treatment.fat && !treatment.insulin) {
       return;
     }
 

diff --git a/lib/profilefunctions.js b/lib/profilefunctions.js
@@ -163,7 +163,7 @@ function init (profileData) {
   profile.getUnits = function getUnits (spec_profile) {
     var pu = profile.getCurrentProfile(null, spec_profile)['units'] + ' ';
     if (pu.toLowerCase().includes('mmol')) return 'mmol';
-    return 'mgdl';
+    return 'mg/dl';
   };
 
   profile.getTimezone = function getTimezone (spec_profile) {