tideline 1.37.0 → 1.38.0-local-data-source.1

package/css/tideline.less

@@ -256,6 +256,11 @@ svg {
     .d3-bolus-automated;
     stroke-width: 1.5;
   }
+  &.d3-rect-bolus-insulin-legend {
+    fill: url(#diagonalStripes);
+    stroke: url(#diagonalStripes);
+    stroke-width: 1.5;
+  }
   &.d3-path-bolus {
     stroke: @bolus;
     fill: none;
@@ -862,3 +867,8 @@ text.d3-tabular-ui {
     }
   }
 }
+
+.d3-image-event {
+  outline: 1px solid #E9EFF1;
+  border-radius: 12px;
+}

package/img/event/event-health.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" rx="12" fill="#8C8C8C"/>
+<path d="M12.0001 19C11.9041 19 11.7875 18.9657 11.6504 18.8972C11.5133 18.8332 11.383 18.76 11.2596 18.6777C9.98883 17.855 8.88264 16.991 7.94101 16.086C7.00395 15.1763 6.27716 14.2416 5.76063 13.2816C5.2441 12.3172 4.98584 11.3458 4.98584 10.3676C4.98584 9.71853 5.08869 9.12658 5.29438 8.59177C5.50465 8.05696 5.79263 7.59529 6.15831 7.20675C6.52856 6.81821 6.95367 6.5211 7.43362 6.3154C7.91815 6.10513 8.43925 6 8.99692 6C9.68714 6 10.2837 6.1737 10.7865 6.5211C11.2939 6.8685 11.6984 7.32103 12.0001 7.87869C12.3063 7.31646 12.7109 6.86392 13.2137 6.5211C13.7211 6.1737 14.3199 6 15.0101 6C15.5586 6 16.0752 6.10513 16.5597 6.3154C17.0488 6.5211 17.4762 6.81821 17.8419 7.20675C18.2075 7.59529 18.4932 8.05696 18.6989 8.59177C18.9092 9.12658 19.0143 9.71853 19.0143 10.3676C19.0143 11.3458 18.7561 12.3172 18.2395 13.2816C17.723 14.2416 16.9939 15.1763 16.0523 16.086C15.1152 16.991 14.0136 17.855 12.7474 18.6777C12.6195 18.76 12.4869 18.8332 12.3498 18.8972C12.2172 18.9657 12.1006 19 12.0001 19Z" fill="white"/>
+</svg>

package/img/event/event-notes.svg

@@ -0,0 +1,16 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" rx="12" fill="#8C8C8C"/>
+<g clip-path="url(#clip0_4901_15742)">
+<path d="M5.52629 18.0027C5.48821 18.1348 5.52629 18.2795 5.6227 18.376C5.69381 18.447 5.79289 18.4877 5.89188 18.4877C5.92739 18.4877 5.96299 18.4826 5.99602 18.4724L9.54555 17.4593L6.53934 14.4531L5.52629 18.0027Z" fill="white"/>
+<path d="M5.89176 18.4998C5.78762 18.4998 5.68864 18.4592 5.61505 18.3856C5.51348 18.284 5.4754 18.1367 5.51596 17.9996L6.53665 14.4297L9.5734 17.4664L5.99838 18.4846C5.96288 18.4948 5.92727 18.4998 5.89176 18.4998ZM6.54686 14.4754L5.53887 18.0047C5.50327 18.1342 5.53887 18.2713 5.6328 18.3652C5.70133 18.4338 5.79526 18.4719 5.89176 18.4719C5.92479 18.4719 5.9603 18.4668 5.99333 18.4567L9.52262 17.4487L6.54686 14.4754Z" fill="white"/>
+<path d="M18.1531 7.46014L16.5408 5.84783C16.3225 5.63201 16.0381 5.5127 15.7309 5.5127C15.4262 5.5127 15.1392 5.63201 14.9234 5.84535L14.116 6.65269L17.3432 9.87988L18.1506 9.07244C18.3664 8.85662 18.4832 8.56969 18.4832 8.265C18.4857 7.96031 18.3664 7.67596 18.1531 7.46014Z" fill="white"/>
+<path d="M17.3455 9.89764L14.1006 6.65269L14.9156 5.83772C15.134 5.61932 15.4234 5.5 15.7306 5.5C16.0404 5.5 16.3299 5.61932 16.5457 5.83772L18.158 7.45002C18.3763 7.66832 18.4956 7.95783 18.4956 8.265C18.4956 8.57484 18.3763 8.86426 18.158 9.08008L17.3455 9.89764ZM14.1361 6.65269L17.3455 9.86213L18.1428 9.0648C18.356 8.85156 18.4728 8.56969 18.4728 8.26758C18.4728 7.96547 18.356 7.68359 18.1428 7.47035L16.5304 5.85547C16.3172 5.64223 16.0328 5.52539 15.7306 5.52539C15.4285 5.52539 15.1467 5.64223 14.9334 5.85547L14.1361 6.65269Z" fill="white"/>
+<path d="M6.96777 13.8028L13.58 7.19043L16.8081 10.4185L10.1959 17.0309L6.96777 13.8028Z" fill="white"/>
+<path d="M10.1957 17.0498L6.94824 13.8024L13.5803 7.17285L16.8252 10.4178L10.1957 17.0498ZM6.98633 13.8024L10.1957 17.0117L16.7896 10.4178L13.5803 7.20846L6.98633 13.8024Z" fill="white"/>
+</g>
+<defs>
+<clipPath id="clip0_4901_15742">
+<rect width="13" height="13" fill="white" transform="translate(5.5 5.5)"/>
+</clipPath>
+</defs>
+</svg>

package/img/event/event-physical_activity.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<rect width="24" height="24" rx="12" fill="#8C8C8C"/>
+<path d="M13.9381 7.19841C13.6371 7.19841 13.3668 7.12699 13.127 6.98416C12.8873 6.83623 12.6934 6.64238 12.5455 6.40263C12.4027 6.16288 12.3313 5.89507 12.3313 5.5992C12.3313 5.30334 12.4027 5.03553 12.5455 4.79578C12.6934 4.55092 12.8873 4.35708 13.127 4.21425C13.3668 4.07142 13.6371 4 13.9381 4C14.234 4 14.5018 4.07142 14.7415 4.21425C14.9813 4.35708 15.1726 4.55092 15.3154 4.79578C15.4634 5.03553 15.5373 5.30334 15.5373 5.5992C15.5373 5.89507 15.4634 6.16288 15.3154 6.40263C15.1726 6.64238 14.9813 6.83623 14.7415 6.98416C14.5018 7.12699 14.234 7.19841 13.9381 7.19841ZM11.436 13.5417C11.2269 13.4243 11.0152 13.2968 10.8009 13.1591C10.5867 13.0162 10.4285 12.8275 10.3265 12.5928C10.2245 12.3531 10.2347 12.0266 10.3571 11.6134L10.9387 9.51687C10.9795 9.38424 10.9591 9.28222 10.8774 9.2108C10.7958 9.13938 10.6989 9.10878 10.5867 9.11898L9.569 9.18784L9.26293 11.2997C9.19662 11.7741 8.94921 11.9935 8.52072 11.9578C8.31667 11.9374 8.16109 11.8532 8.05397 11.7053C7.94684 11.5522 7.90858 11.3609 7.93919 11.1314L8.29117 8.53745C8.31667 8.3232 8.39574 8.15232 8.52837 8.02479C8.661 7.89726 8.83189 7.82584 9.04103 7.81054L11.5967 7.63455C12.27 7.58354 12.8261 7.65496 13.2648 7.8488C13.7035 8.03754 14.0886 8.35891 14.4202 8.81291L15.675 10.5498L17.4961 9.73877C17.7002 9.64695 17.8864 9.62654 18.0547 9.67755C18.2282 9.72856 18.3582 9.84844 18.445 10.0372C18.5368 10.2259 18.547 10.4045 18.4756 10.5728C18.4042 10.7411 18.2639 10.8712 18.0547 10.963L15.7439 11.996C15.5909 12.0674 15.4327 12.0802 15.2695 12.0343C15.1114 11.9884 14.9864 11.894 14.8946 11.7512L14.0835 10.5805C14.007 10.4682 13.9101 10.4198 13.7927 10.4351C13.6754 10.4504 13.5989 10.5243 13.5632 10.657L13.0199 12.524L15.7516 14.3145C15.9607 14.4522 16.078 14.6512 16.1035 14.9113C16.129 15.1715 16.0525 15.3755 15.874 15.5234L13.3642 17.6583C13.1602 17.8317 12.9561 17.9108 12.7521 17.8955C12.5532 17.8853 12.3925 17.8113 12.27 17.6736C12.1527 17.5358 12.0992 17.3701 12.1094 17.1762C12.1196 16.9773 12.2241 16.7962 12.4231 16.6329L14.1983 15.0949L11.436 13.5417ZM6.55423 19.8313C6.4063 19.6987 6.32213 19.5253 6.30173 19.311C6.28643 19.0968 6.37569 18.8953 6.56954 18.7065L9.01808 16.2733L9.87507 13.2279C10.0077 13.4014 10.1735 13.5646 10.3724 13.7176C10.5714 13.8656 10.8086 14.0161 11.084 14.1691L11.3365 14.3145L10.3571 16.8395C10.2959 16.9926 10.2449 17.0997 10.2041 17.1609C10.1633 17.217 10.0919 17.2961 9.98984 17.3981L7.62547 19.7319C7.44183 19.9104 7.25309 19.9997 7.05925 19.9997C6.8654 20.0048 6.69707 19.9487 6.55423 19.8313Z" fill="white"/>
+</svg>

package/js/data/util/device.js

@@ -29,4 +29,17 @@ module.exports = {
   isAutomatedBasalDevice: (pumpUpload = {}) => {
     return _.includes(_.get(AUTOMATED_BASAL_DEVICE_MODELS, pumpUpload.source, []), pumpUpload.deviceModel);
   },
+
+  getUppercasedManufacturer: (manufacturer = '') => {
+    return _.map(manufacturer.split(' '), part => {
+      switch (part) {
+        case 'diy':
+          return _.upperCase(part);
+        case 'twiist':
+          return part;
+        default:
+          return _.upperFirst(part);
+      }
+    }).join(' ');
+  },
 };

package/js/index.js

@@ -41,6 +41,7 @@ module.exports = {
   plot: {
     basal: require('./plot/basal'),
     quickbolus: require('./plot/quickbolus'),
+    insulin: require('./plot/insulin'),
     cbg: require('./plot/cbg'),
     message: require('./plot/message'),
     timechange: require('./plot/timechange'),

package/js/plot/event.js

@@ -2,6 +2,28 @@ var d3 = require('d3');
 var _ = require('lodash');
 
 var eventImage = require('../../img/event/event.svg');
+var eventHealthImage = require('../../img/event/event-health.svg');
+var eventPhysicalActivityImage = require('../../img/event/event-physical_activity.svg');
+var eventNotesImage = require('../../img/event/event-notes.svg');
+
+const EVENT_HEALTH = 'health';
+const EVENT_NOTES = 'notes';
+const EVENT_PHYSICAL_ACTIVITY = 'physical_activity';
+
+function getEventImageByType(d) {
+  const eventType = d.tags?.event;
+
+  switch (eventType) {
+    case EVENT_HEALTH:
+      return eventHealthImage;
+    case EVENT_PHYSICAL_ACTIVITY:
+      return eventPhysicalActivityImage;
+    case EVENT_NOTES:
+      return eventNotesImage;
+    default:
+      return eventImage;
+  }
+}
 
 /**
  * Module for adding event markers to a chart pool
@@ -72,13 +94,13 @@ module.exports = function(pool, opts = {}) {
     opts.xScale = pool.xScale().copy();
     selection.append('image')
       .attr({
-        'xlink:href': eventImage,
+        'xlink:href': getEventImageByType,
         x: event.xPositionCorner,
         y: event.yPositionCorner,
         width: opts.size,
-        height: opts.size
+        height: opts.size,
       })
-      .classed({'d3-image': true, 'd3-event': true});
+      .classed({'d3-image': true, 'd3-event': true, 'd3-image-event': true });
   };
 
   event.xPositionCorner = function(d) {

package/js/plot/insulin.js

@@ -0,0 +1,110 @@
+var d3 = require('d3');
+var _ = require('lodash');
+
+var commonbolus = require('./util/commonbolus');
+var drawbolus = require('./util/drawbolus');
+
+module.exports = function(pool, opts) {
+  opts = opts || {};
+
+  var defaults = {
+    width: 12
+  };
+
+  _.defaults(opts, defaults);
+
+  var drawBolus = drawbolus(pool, opts);
+
+  function insulin(selection) {
+    opts.xScale = pool.xScale().copy();
+    selection.each(function(currentData) {
+      drawBolus.annotations(_.filter(currentData, function(d) { return d.annotations; }));
+
+      var insulinData = d3.select(this)
+        .selectAll('g.d3-insulin-group')
+        .data(currentData, function(d) {
+          return d.id;
+        });
+
+      var insulinGroups = insulinData.enter()
+        .append('g')
+        .attr({
+          'class': 'd3-insulin-group',
+          id: function(d) { return 'insulin_group_' + d.id; }
+        });
+
+      // Add shared pattern definition to the top-level SVG if not already present
+      var svg = d3.select(this).node().ownerSVGElement
+        ? d3.select(this).node().ownerSVGElement
+        : d3.select(this).node();
+
+      var svgSelection = d3.select(svg);
+
+      // Check if pattern already exists
+      if (svgSelection.select('defs #diagonalStripes').empty()) {
+        var defs = svgSelection.select('defs');
+
+        if (defs.empty()) {
+          defs = svgSelection.append('defs');
+        }
+
+        var pattern = defs.append('pattern')
+          .attr('id', 'diagonalStripes')
+          .attr('patternUnits', 'userSpaceOnUse')
+          .attr('width', 5)
+          .attr('height', 5)
+          .attr('patternTransform', 'rotate(45)');
+
+        pattern.append('rect')
+          .attr('width', 5)
+          .attr('height', 5)
+          .attr('fill', '#7CD0F0');
+
+        pattern.append('rect')
+          .attr('x', 0)
+          .attr('y', 0)
+          .attr('width', 2)
+          .attr('height', 5)
+          .attr('fill', 'rgba(0, 0, 0, 0.15)');
+      }
+
+      // sort by size so smaller insulin doses are drawn last
+      insulinGroups = insulinGroups.sort(function(a,b){
+        const aDose = commonbolus.getDelivered(a);
+        const bDose = commonbolus.getDelivered(b);
+
+        // in cases where the dose value is the same, tiebreak the sort by counting extended boluses
+        // as 1 unit higher so that a non-extended bolus is drawn on top, enabling both to be hovered over
+        if (aDose === bDose) {
+          return d3.descending(a.tags?.extended ? 1 : 0, b.tags?.extended ? 1 : 0);
+        }
+
+        return d3.descending(aDose, bDose);
+      });
+
+      drawBolus.bolus(insulinGroups.filter(function(d) {
+        return commonbolus.getDelivered(d);
+      }));
+
+      insulinData.exit().remove();
+
+      var highlight = pool.highlight('.d3-wizard-group, .d3-bolus-group, .d3-insulin-group', opts);
+
+      // tooltips
+      selection.selectAll('.d3-insulin-group').on('mouseover', function(d) {
+        highlight.on(d3.select(this));
+        var parentContainer = document.getElementsByClassName('patient-data')[0].getBoundingClientRect();
+        var container = this.getBoundingClientRect();
+        container.y = container.top - parentContainer.top;
+
+        drawBolus.tooltip.add(d, container);
+      });
+      selection.selectAll('.d3-insulin-group').on('mouseout', function(d) {
+        highlight.off();
+        drawBolus.tooltip.remove(d);
+      });
+    });
+  }
+
+  return insulin;
+};

package/js/plot/quickbolus.js

@@ -113,7 +113,7 @@ module.exports = function(pool, opts) {
 
       boluses.exit().remove();
 
-      var highlight = pool.highlight('.d3-wizard-group, .d3-bolus-group', opts);
+      var highlight = pool.highlight('.d3-wizard-group, .d3-bolus-group, .d3-insulin-group', opts);
 
       // tooltips
       selection.selectAll('.d3-bolus-group').on('mouseover', function(d) {

package/js/plot/util/annotations/annotation.js

@@ -49,7 +49,7 @@ module.exports = function(container, annotationsGroup) {
     var hoverTarget;
 
     if (opts && opts.d && !_.isEmpty(opts.d.annotations)) {
-      if (opts.d.annotations[0].code.slice(0, 6) === 'stats-') {
+      if (opts.d.annotations[0].code?.slice(0, 6) === 'stats-') {
         // NB: this (temporarily) disables the new explainer tooltips
         // for all stats widget components when stats are active
         if (opts.d.annotations[0].code !== 'stats-insufficient-data') {
@@ -97,7 +97,7 @@ module.exports = function(container, annotationsGroup) {
   annotation.tooltip = function(opts, selection, hoverTarget) {
     opts = opts || {};
 
-    if (opts.d.annotations[0].code.slice(0, 6) === 'stats-') {
+    if (opts.d.annotations[0].code?.slice(0, 6) === 'stats-') {
       if (container.type === 'daily') {
         opts.x = opts.x - (container.currentTranslation() - container.axisGutter());
       }

package/js/plot/util/commonbolus.js

@@ -47,6 +47,9 @@ module.exports = {
   },
   getMaxValue: function(d) {
     var wiz;
+    if (d.type === 'insulin') {
+      return this.getDelivered(d);
+    }
     if (d.type === 'wizard') {
       if (d.bolus) {
         wiz = _.clone(d);
@@ -64,6 +67,9 @@ module.exports = {
     return rec > programmedTotal ? rec : programmedTotal;
   },
   getDelivered: function(d) {
+    if (d.type === 'insulin') {
+      return d?.dose?.total || NaN;
+    }
     if (d.type === 'wizard') {
       if (d.bolus) {
         d = d.bolus;

package/js/plot/util/drawbolus.js

@@ -145,8 +145,12 @@ module.exports = function(pool, opts) {
           },
           'class': function(d) {
             d = pluckBolus(d);
+            if (d.type === 'insulin') return 'd3-rect-insulin d3-bolus';
             return d.subType === 'automated' ? 'd3-bolus-automated d3-bolus' : 'd3-rect-bolus d3-bolus';
           },
+          'fill': function(d) {
+            return (d.type === 'insulin') ? 'url(#diagonalStripes)' : null;
+          },
           id: function(d) {
             d = pluckBolus(d);
             return 'bolus_' + d.id;

package/js/plot/util/legend.js

@@ -257,6 +257,32 @@ var legend = {
       type: 'text'
     },
   ],
+  bolusInsulin: [
+    {
+      create: function(opts) {
+        opts.widths.push(opts.SHAPE_WIDTH);
+        return opts.selection.append('rect')
+          .attr({
+            'class': 'd3-bolus d3-rect-bolus-insulin-legend'
+          });
+      },
+      type: 'rect'
+    },
+    {
+      create: function(opts) {
+        return opts.selection.append('text')
+          .attr({
+            'class': 'd3-pool-legend'
+          })
+          .text(EMPTY_SPACE + t('other'))
+          .each(function() {
+            opts.widths.push(this.getBoundingClientRect().width);
+            opts.textHeight = this.getBoundingClientRect().height;
+          });
+      },
+      type: 'text'
+    },
+  ],
   carbs: [
     {
       create: function(opts) {

package/js/plot/wizard.js

@@ -124,7 +124,7 @@ module.exports = function(pool, opts) {
 
       wizards.exit().remove();
 
-      var highlight = pool.highlight('.d3-wizard-group, .d3-bolus-group', opts);
+      var highlight = pool.highlight('.d3-wizard-group, .d3-bolus-group, .d3-insulin-group', opts);
 
       // tooltips
       selection.selectAll('.d3-wizard-group').on('mouseover', function(d) {

package/package.json

@@ -4,7 +4,7 @@
     "node": "20.8.0"
   },
   "packageManager": "yarn@3.6.4",
-  "version": "1.37.0",
+  "version": "1.38.0-local-data-source.1",
   "description": "Tidepool's timeline data visualization",
   "repository": {
     "type": "git",

package/plugins/blip/basics/chartbasicsfactory.js

@@ -199,6 +199,11 @@ class BasicsChart extends React.Component {
           if (hasAutomatedSuspends && hasAutomatedStops) section.perRow = 2;
         }
 
+        if (section.type === 'boluses' && section.perRow === 3) {
+          const hasManualBoluses = _.get(props, 'data.data.aggregationsByDate.boluses.summary.subtotals.manual.count', 0) > 0;
+          if (hasManualBoluses) section.perRow = 4;
+        }
+
         if (_.isArray(selectorOptions.rows)) selectorOptions.rows = _.chunk(_.orderBy(selectorOptions.rows, 'selectorIndex'), section.perRow || 3);
       }
 

package/plugins/blip/basics/components/sitechange/Selector.js

@@ -25,6 +25,7 @@ var cx = require('classnames');
 
 var basicsActions = require('../../logic/actions');
 var BasicsUtils = require('../BasicsUtils');
+var { getUppercasedManufacturer } = require('../../../../../js/data/util/device');
 
 var constants = require('../../logic/constants');
 
@@ -137,7 +138,7 @@ var Selector = createReactClass({
       }
     };
 
-    const manufacturer = _.capitalize(_.get(pump, 'manufacturer', ''));
+    const manufacturer = getUppercasedManufacturer(_.get(pump, 'manufacturer', ''));
 
     if (pumpVocabulary.hasOwnProperty(manufacturer)) {
       return (

package/plugins/blip/chartdailyfactory.js

@@ -90,6 +90,7 @@ function chartDailyFactory(el, options) {
   const bolusCarbsLegend = ['bolus', 'carbs'];
   if (showingCarbExchanges) bolusCarbsLegend.splice(1, 0, 'carbExchanges');
   if (options.automatedBolus) bolusCarbsLegend.unshift('bolusAutomated');
+  if (options.insulinBolus) bolusCarbsLegend.unshift('bolusInsulin');
 
   const basalLegend = ['basal'];
   if (options.automatedBasal) basalLegend.unshift('basalAutomated');
@@ -161,7 +162,7 @@ function chartDailyFactory(el, options) {
     if (!options.pool.bolus.hidden) poolBolus = chart.newPool(options.pool.bolus)
       .id('poolBolus', chart.poolGroup())
       .label([{
-        'main': t('Bolus'),
+        'main': t('Insulin'),
         'light': ' U'
       },
       {
@@ -221,6 +222,10 @@ function chartDailyFactory(el, options) {
       type: 'bolus',
       shape: 'generic'
     });
+    if (poolBolus) chart.tooltips().addGroup(poolBolus, {
+      type: 'insulin',
+      shape: 'generic'
+    });
     if (poolBasal) chart.tooltips().addGroup(poolBasal, {
       type: 'basal'
     });
@@ -235,6 +240,7 @@ function chartDailyFactory(el, options) {
       'cbg',
       'deviceEvent',
       'food',
+      'insulin',
       'message',
       'smbg',
       'wizard',
@@ -256,14 +262,19 @@ function chartDailyFactory(el, options) {
     }
 
     const groupedData = _.groupBy(processedData, 'type');
-    const groupedEventData = _.groupBy(_.filter(processedData, d => _.isString(d.tags?.event)), 'type');
+
+    // Set all event data to type 'event' to allow rendering them in all sequential order regardless of actual type
+    const groupedEventData = { event: _.map(
+      _.filter(processedData, d => _.isString(d.tags?.event)),
+      d => ({ ...d, type: 'event', originalType: d.type })
+    ) };
 
     _.each(renderedDataTypes, type => {
       if (!groupedData[type]) groupedData[type] = [];
     });
 
     // initialize chart with data
-    chart.data(processedData).setAxes();
+    chart.data([...processedData, ...(groupedEventData.event || [])]).setAxes();
     if (!options.endpoints) chart.setNav().setScrollNav();
 
     // x-axis pools
@@ -336,7 +347,7 @@ function chartDailyFactory(el, options) {
 
     if (poolBolus) {
       // bolus & carbs pool
-      var scaleBolus = scales.bolus(groupedData.bolus.concat(groupedData.wizard), poolBolus);
+      var scaleBolus = scales.bolus(groupedData.bolus.concat(groupedData.wizard).concat(groupedData.insulin), poolBolus);
       var scaleCarbs = options.dynamicCarbs ? scales.carbs(groupedData.wizard, poolBolus) : null;
       // set up y-axis for bolus
       poolBolus.yAxis(d3.svg.axis()
@@ -356,7 +367,17 @@ function chartDailyFactory(el, options) {
         yScale: scaleHeight
       }), true, true);
 
-      // add wizard data to wizard pool
+      // add insulin data to bolus pool
+      poolBolus.addPlotType('insulin', tideline.plot.insulin(poolBolus, {
+        yScale: scaleBolus,
+        emitter: emitter,
+        subdueOpacity: 0.4,
+        timezoneAware: chart.options.timePrefs.timezoneAware,
+        onBolusHover: options.onBolusHover,
+        onBolusOut: options.onBolusOut,
+      }), true, true);
+
+      // add wizard data to bolus pool
       poolBolus.addPlotType('wizard', tideline.plot.wizard(poolBolus, {
         yScale: scaleBolus,
         yScaleCarbs: scaleCarbs,
@@ -374,7 +395,7 @@ function chartDailyFactory(el, options) {
         onCarbOut: options.onCarbOut,
       }), true, true);
 
-      // quick bolus data to wizard pool
+      // quick bolus data to bolus pool
       poolBolus.addPlotType('bolus', tideline.plot.quickbolus(poolBolus, {
         yScale: scaleBolus,
         emitter: emitter,
@@ -462,7 +483,7 @@ function chartDailyFactory(el, options) {
       // add pump events data to events pool
       _.each(groupedEventData, function(data, type) {
         poolEvents.addPlotType(type, tideline.plot.event(poolEvents, {
-          size: 18,
+          size: 24,
           emitter: emitter,
           data: data,
           timezoneAware: chart.options.timePrefs.timezoneAware,

package/.vscode/settings.json

@@ -1,5 +0,0 @@
-{
-  "githubPullRequests.ignoredPullRequestBranches": [
-    "develop"
-  ]
-}