tideline 1.36.0-develop.2 → 1.36.0-rc.2

package/js/plot/message.js

@@ -176,7 +176,7 @@ module.exports = function(pool, opts) {
     });
 
     opts.emitter.on('messageCreated', function(obj) {
-      var messageGroup = mainGroup.select('#poolMessages_message')
+      var messageGroup = mainGroup.select('#poolEvents_message')
         .append('g')
         .attr('class', 'd3-message-group d3-new')
         .attr('id', 'message_' + obj.id)

package/js/plot/util/axes/dailyx.js

@@ -30,7 +30,7 @@ module.exports = function(pool, opts) {
     textShiftX: 5,
     textShiftY: 5,
     tickLength: 15,
-    longTickMultiplier: 2.5,
+    longTickMultiplier: 3.75,
     timePrefs: {
       timezoneAware: false,
       timezoneName: dt.getBrowserTimezone(),
@@ -47,7 +47,7 @@ module.exports = function(pool, opts) {
     .append('text')
     .attr({
       'class': 'd3-day-label',
-      x: opts.leftEdge,
+      x: opts.leftEdge + 4,
       // this is the same as dailyx.dayYPosition
       // we just don't have a datum to pass here
       y: pool.height() - opts.tickLength * opts.longTickMultiplier
@@ -97,8 +97,8 @@ module.exports = function(pool, opts) {
 
       tickGroups.append('line')
         .attr({
-          x1: dailyx.xPosition,
-          x2: dailyx.xPosition,
+          x1: dailyx.tickXPosition,
+          x2: dailyx.tickXPosition,
           y1: pool.height(),
           y2: dailyx.tickLength
         });
@@ -141,6 +141,10 @@ module.exports = function(pool, opts) {
     return dailyx.xPosition(d) + opts.textShiftX;
   };
 
+  dailyx.tickXPosition = function(d) {
+    return dailyx.xPosition(d) + 1;
+  };
+
   dailyx.dayYPosition = function(d) {
     return dailyx.tickLength(d);
   };

package/package.json

@@ -4,7 +4,7 @@
     "node": "20.8.0"
   },
   "packageManager": "yarn@3.6.4",
-  "version": "1.36.0-develop.2",
+  "version": "1.36.0-rc.2",
   "description": "Tidepool's timeline data visualization",
   "repository": {
     "type": "git",

package/plugins/blip/chartdailyfactory.js

@@ -68,7 +68,7 @@ function chartDailyFactory(el, options) {
   chart.emitter = emitter;
   chart.options = options;
 
-  var poolXAxis, poolMessages, poolBG, poolBolus, poolBasal;
+  var poolXAxis, poolEvents, poolBG, poolBolus, poolBasal;
 
   var SMBG_SIZE = 16;
 
@@ -100,15 +100,15 @@ function chartDailyFactory(el, options) {
       .label('')
       .labelBaseline(options.labelBaseline)
       .index(chart.pools().indexOf(poolXAxis))
-      .heightRatio(0.65)
+      .heightRatio(0.75)
       .gutterWeight(0.0);
 
-    // messages pool
-    poolMessages = chart.newPool()
-      .id('poolMessages', chart.poolGroup())
+    // events pool
+    poolEvents = chart.newPool()
+      .id('poolEvents', chart.poolGroup())
       .label('')
       .labelBaseline(options.labelBaseline)
-      .index(chart.pools().indexOf(poolMessages))
+      .index(chart.pools().indexOf(poolEvents))
       .heightRatio(0.5)
       .gutterWeight(0.0);
 
@@ -166,11 +166,11 @@ function chartDailyFactory(el, options) {
     chart.annotations().addGroup(chart.svg().select('#' + poolBasal.id()), 'basal');
 
     // add tooltips
-    chart.tooltips().addGroup(poolMessages, {
+    chart.tooltips().addGroup(poolEvents, {
       type: 'deviceEvent',
       shape: 'generic'
     });
-    chart.tooltips().addGroup(poolMessages, {
+    chart.tooltips().addGroup(poolEvents, {
       type: 'message',
       shape: 'generic'
     });
@@ -374,30 +374,30 @@ function chartDailyFactory(el, options) {
       onPumpSettingsOverrideOut: options.onPumpSettingsOverrideOut,
     }), true, true);
 
-    // messages pool
-    // add background fill rectangles to messages pool
-    poolMessages.addPlotType('fill', fill(poolMessages, {
+    // events pool
+    // add background fill rectangles to events pool
+    poolEvents.addPlotType('fill', fill(poolEvents, {
       emitter: emitter,
       isDaily: true,
       cursor: 'cell'
     }), true, true);
 
-    // add message images to messages pool
-    poolMessages.addPlotType('message', tideline.plot.message(poolMessages, {
+    // add message images to events pool
+    poolEvents.addPlotType('message', tideline.plot.message(poolEvents, {
       size: 30,
       emitter: emitter,
       timezoneAware: chart.options.timePrefs.timezoneAware
     }), true, true);
 
-    // add timechange images to messages pool
-    poolMessages.addPlotType('deviceEvent', tideline.plot.timechange(poolMessages, {
+    // add timechange images to events pool
+    poolEvents.addPlotType('deviceEvent', tideline.plot.timechange(poolEvents, {
       size: 30,
       emitter: emitter,
       timezone: chart.options.timePrefs.timezoneName
     }), true, true);
 
-    // add pump alarm data to messages pool
-    poolMessages.addPlotType('deviceEvent', tideline.plot.alarm(poolMessages, {
+    // add pump alarm data to events pool
+    poolEvents.addPlotType('deviceEvent', tideline.plot.alarm(poolEvents, {
       size: 23,
       emitter: emitter,
       data: groupedData.deviceEvent,