Release 1.54.0 to develop

package.json

@@ -4,7 +4,7 @@
     "node": "20.8.0"
   },
   "packageManager": "yarn@3.6.4",
-  "version": "1.55.0-web-4330-missing-settings.2",
+  "version": "1.55.0-develop.1",
   "description": "Tidepool data visualization for diabetes device data.",
   "keywords": [
     "data visualization"

src/modules/print/DailyPrintView.js

@@ -1106,12 +1106,12 @@ class DailyPrintView extends PrintView {
     bolusDetailPositions,
     bolusDetailWidths,
     bolusScale,
-    data: { bolus: insulinEvents },
+    data: { bolus: bolusData, insulin: insulinData },
   }) {
     this.doc.font(this.font)
       .fontSize(this.smallFontSize)
       .fillColor('black');
-
+    const insulinEvents = [...(bolusData || []), ...(insulinData || [])];
     const topOfBolusDetails = bolusScale.range()[0] + 2;
 
     const grouped = _.groupBy(

src/utils/basics/data.js

@@ -119,7 +119,7 @@ export function defineBasicsAggregations(bgPrefs, manufacturer, pumpUpload = {})
 
       case 'boluses':
         title = t('Insulin');
-        summaryTitle = t('Avg boluses / day');
+        summaryTitle = t('Avg insulin injections / day');
         dimensions = [
           { path: 'summary', key: 'total', label: t('Avg per day'), average: true, primary: true },
           { path: 'summary.subtotals', key: 'wizard', label: t('Calculator'), percentage: true, selectorIndex: 0 },

src/utils/print/data.js

@@ -45,13 +45,15 @@ export function processBgRange(dataByDate) {
  */
 export function processBolusRange(dataByDate, timezoneName) {
   const boluses = _.reduce(
-    dataByDate, (all, date) => (all.concat(_.get(date, 'bolus', []))), []
+    dataByDate,
+    (all, date) => (all.concat(_.get(date, 'bolus', [])).concat(_.get(date, 'insulin', []))),
+    []
   );
   _.each(boluses, (bolus) => {
     // eslint-disable-next-line no-param-reassign
     bolus.threeHrBin = Math.floor(moment.utc(bolus.normalTime).tz(timezoneName).hours() / 3) * 3;
   });
-  return extent(boluses, (d) => ((d.normal || 0) + (d.extended || 0)));
+  return extent(boluses, (d) => (_.get(d, 'dose.total') || (d.normal || 0) + (d.extended || 0)));
 }
 
 /**

src/utils/stat.js

@@ -300,6 +300,7 @@ export const formatDatum = (datum = {}, format, opts = {}) => {
  *
  * @returns {Object} an object with values corrected to sum up to 100%
  * - if the values do not sum up to 100%, the 'high' range is adjusted to compensate
+ * - in specific edge cases, the values may still sum up to 101%
  */
 export const reconcileTIRPercentages = (timeInRanges) => {
   const DECIMAL_PRECISION = 2;
@@ -325,8 +326,13 @@ export const reconcileTIRPercentages = (timeInRanges) => {
   // e.g. if sum === 0.99 and high === 0.21, we increase high to 0.22 so that all TIR
   // values add up to 1 (or 100%).
   const diff = 1 - sum;
-  const newHigh = bankersRound((modifiedTimeInRanges.high || 0) + diff, DECIMAL_PRECISION);
-  modifiedTimeInRanges.high = newHigh;
+
+  let newHigh = (modifiedTimeInRanges.high || 0) + diff;
+
+  if (newHigh < 0) newHigh = 0;
+  if (newHigh > 1) newHigh = 1;
+
+  modifiedTimeInRanges.high = bankersRound(newHigh, DECIMAL_PRECISION);
 
   return modifiedTimeInRanges;
 };

test/utils/stat.test.js

@@ -855,6 +855,28 @@ describe('stat', () => {
         });
       });
     });
+
+    describe('does not adjust high below 0% (edge case)', () => {
+      it('when using standard range', () => {
+        const timeInRanges = {
+          veryLow: 0.069767,
+          low: 0.465116,
+          target: 0.465116,
+          high: 0,
+          veryHigh: 0,
+        };
+
+        // The algorithm would be expected to subtract 1% from High to keep the Total at 100%,
+        // but we can't go below 0%, so the Total in this case will be 101%
+        expect(stat.reconcileTIRPercentages(timeInRanges)).to.deep.equal({
+          veryLow: 0.07,
+          low: 0.47,
+          target: 0.47,
+          high: 0,
+          veryHigh: 0,
+        });
+      });
+    });
   });
 
   describe('reconcileTIRDatumValues', () => {