[WEB-1985] Add Sooil Dana-i pump to Device Settings

data/pumpSettings/dana/flatrate.json

@@ -0,0 +1,68 @@
+{
+    "activeSchedule": "Profile A",
+    "basalSchedules": [
+        {
+            "name": "Profile C",
+            "value": [
+                {
+                    "rate": 0,
+                    "start": 0
+                }
+            ]
+        },
+        {
+            "name": "Profile D",
+            "value": [
+                {
+                    "rate": 0,
+                    "start": 0
+                }
+            ]
+        },
+        {
+            "name": "Profile A",
+            "value": [
+                {
+                    "rate": 0.2,
+                    "start": 0
+                }
+            ]
+        },
+        {
+            "name": "Profile B",
+            "value": [
+                {
+                    "rate": 0,
+                    "start": 0
+                }
+            ]
+        }
+    ],
+    "bgTarget": [
+        {
+            "start": 0,
+            "target": 5.5
+        }
+    ],
+    "carbRatio": [
+        {
+            "amount": 0.25,
+            "start": 0
+        }
+    ],
+    "deviceId": "Dana-I5-WLL00056FI",
+    "deviceTime": "2022-12-14T14:05:23",
+    "insulinSensitivity": [
+        {
+            "amount": 2.8,
+            "start": 0
+        }
+    ],
+    "time": "2022-12-14T14:05:45.876+00:00",
+    "timezoneOffset": 0,
+    "type": "pumpSettings",
+    "units": {
+        "bg": "mmol/L",
+        "carb": "grams"
+    }
+}

data/pumpSettings/dana/multirate.json

@@ -0,0 +1,96 @@
+{
+    "activeSchedule": "Profile B",
+    "basalSchedules": [
+        {
+            "name": "Profile C",
+            "value": [
+                {
+                    "rate": 0,
+                    "start": 0
+                }
+            ]
+        },
+        {
+            "name": "Profile D",
+            "value": [
+                {
+                    "rate": 0,
+                    "start": 0
+                }
+            ]
+        },
+        {
+            "name": "Profile A",
+            "value": [
+                {
+                    "rate": 0.2,
+                    "start": 0
+                }
+            ]
+        },
+        {
+            "name": "Profile B",
+            "value": [
+                {
+                    "rate": 0.2,
+                    "start": 0
+                },
+                {
+                    "rate": 0.3,
+                    "start": 14400000
+                },
+                {
+                    "rate": 0.4,
+                    "start": 28800000
+                },
+                {
+                    "rate": 0.3,
+                    "start": 32400000
+                },
+                {
+                    "rate": 0.5,
+                    "start": 43200000
+                },
+                {
+                    "rate": 0.2,
+                    "start": 50400000
+                },
+                {
+                    "rate": 0.1,
+                    "start": 57600000
+                }
+            ]
+        }
+    ],
+    "bgTarget": [
+        {
+            "start": 0,
+            "target": 5.1
+        }
+    ],
+    "carbRatio": [
+        {
+            "amount": 0.25,
+            "start": 0
+        }
+    ],
+    "deviceId": "Dana-I5-WLL00056FI",
+    "deviceTime": "2022-12-15T11:43:09",
+    "insulinSensitivity": [
+        {
+            "amount": 2.8,
+            "start": 0
+        }
+    ],
+    "time": "2022-12-15T11:43:32.357+00:00",
+    "timezoneOffset": 0,
+    "type": "pumpSettings",
+    "units": {
+        "bg": "mmol/L",
+        "carb": "grams"
+    },
+    "uploadId": "SampleUploadId",
+    "guid": "5886768b-012e-453d-8e3e-2c5280995c48",
+    "id": "8372053933d14de3974c8d183c2a433e",
+    "source": "Sooil"
+}

data/pumpSettings/dana/multirate.raw.json

@@ -0,0 +1,84 @@
+{
+    "activeSchedule": "Profile B",
+    "basalSchedules": {
+        "Profile C": [
+            {
+                "rate": 0,
+                "start": 0
+            }
+        ],
+        "Profile D": [
+            {
+                "rate": 0,
+                "start": 0
+            }
+        ],
+        "Profile A": [
+            {
+                "rate": 0.2,
+                "start": 0
+            }
+        ],
+        "Profile B": [
+            {
+                "rate": 0.2,
+                "start": 0
+            },
+            {
+                "rate": 0.3,
+                "start": 14400000
+            },
+            {
+                "rate": 0.4,
+                "start": 28800000
+            },
+            {
+                "rate": 0.3,
+                "start": 32400000
+            },
+            {
+                "rate": 0.5,
+                "start": 43200000
+            },
+            {
+                "rate": 0.2,
+                "start": 50400000
+            },
+            {
+                "rate": 0.1,
+                "start": 57600000
+            }
+        ]
+    },
+    "bgTarget": [
+        {
+            "start": 0,
+            "target": 5.1
+        }
+    ],
+    "carbRatio": [
+        {
+            "amount": 0.25,
+            "start": 0
+        }
+    ],
+    "deviceId": "Dana-I5-WLL00056FI",
+    "deviceTime": "2022-12-15T11:43:09",
+    "insulinSensitivity": [
+        {
+            "amount": 2.8,
+            "start": 0
+        }
+    ],
+    "time": "2022-12-15T11:43:32.357+00:00",
+    "timezoneOffset": 0,
+    "type": "pumpSettings",
+    "units": {
+        "bg": "mmol/L",
+        "carb": "grams"
+    },
+    "uploadId": "SampleUploadId",
+    "guid": "5886768b-012e-453d-8e3e-2c5280995c48",
+    "id": "8372053933d14de3974c8d183c2a433e",
+    "source": "Sooil"
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tidepool/viz",
-  "version": "1.33.0-web-2051-agp-print-view.1",
+  "version": "1.33.2-sooil-dana.2",
   "description": "Tidepool data visualization for diabetes device data.",
   "keywords": [
     "data visualization"
@@ -58,7 +58,7 @@
     "moment": "2.29.4",
     "moment-timezone": "0.5.21",
     "parse-svg-path": "0.1.2",
-    "plotly.js": "2.17.1",
+    "plotly.js-basic-dist-min": "2.20.0",
     "prop-types": "15.6.2",
     "react": "16.12.0",
     "react-clipboard.js": "2.0.16",
@@ -114,7 +114,6 @@
     "eslint-plugin-moment-utc": "1.0.0",
     "eslint-plugin-react": "7.11.1",
     "gitbook-cli": "2.3.2",
-    "ify-loader": "1.1.0",
     "jsdoc-to-markdown": "4.0.1",
     "json-loader": "0.5.7",
     "jsx-ast-utils": "2.0.1",
@@ -141,7 +140,6 @@
     "sinon": "6.3.3",
     "style-loader": "0.23.0",
     "tidepool-standard-action": "0.1.1",
-    "transform-loader": "0.2.4",
     "url-loader": "1.1.1",
     "webpack": "4.18.0",
     "webpack-cli": "3.1.0"

src/components/settings/NonTandem.js

@@ -221,7 +221,7 @@ const NonTandem = (props) => {
           getText={nonTandemText.bind(this, user, pumpSettings, bgUnits, lookupKey)}
         />
       </div>
-      {!_.includes(['animas', 'microtech'], lookupKey) && (
+      {!_.includes(['animas', 'microtech', 'sooil'], lookupKey) && (
         <div className={styles.settingsContainer}>
           <div className={styles.insulinSettingsContainer}>
             <div className={styles.categoryTitle}>{t('Pump Settings')}</div>
@@ -250,7 +250,7 @@ const NonTandem = (props) => {
 NonTandem.propTypes = {
   bgUnits: PropTypes.oneOf([MMOLL_UNITS, MGDL_UNITS]).isRequired,
   copySettingsClicked: PropTypes.func.isRequired,
-  deviceKey: PropTypes.oneOf(['animas', 'carelink', 'insulet', 'medtronic', 'microtech']).isRequired,
+  deviceKey: PropTypes.oneOf(['animas', 'carelink', 'insulet', 'medtronic', 'microtech', 'sooil']).isRequired,
   openedSections: PropTypes.object.isRequired,
   pumpSettings: PropTypes.shape({
     activeSchedule: PropTypes.string.isRequired,

src/components/settings/common/PumpSettingsContainer.js

@@ -12,7 +12,7 @@ export class PumpSettingsContainer extends PureComponent {
     bgUnits: PropTypes.oneOf([MGDL_UNITS, MMOLL_UNITS]).isRequired,
     copySettingsClicked: PropTypes.func.isRequired,
     manufacturerKey: PropTypes.oneOf(
-      ['animas', 'carelink', 'insulet', 'medtronic', 'tandem', 'microtech']
+      ['animas', 'carelink', 'insulet', 'medtronic', 'tandem', 'microtech', 'sooil']
     ).isRequired,
     // see more specific schema in NonTandem and Tandem components!
     pumpSettings: PropTypes.shape({
@@ -52,7 +52,7 @@ export class PumpSettingsContainer extends PureComponent {
       timePrefs,
       toggleSettingsSection,
     } = this.props;
-    const supportedNonTandemPumps = ['animas', 'carelink', 'insulet', 'medtronic', 'microtech'];
+    const supportedNonTandemPumps = ['animas', 'carelink', 'insulet', 'medtronic', 'microtech', 'sooil'];
     const toggleFn = _.partial(toggleSettingsSection, manufacturerKey);
 
     if (manufacturerKey === 'tandem') {

src/modules/print/DailyPrintView.js

@@ -407,7 +407,7 @@ class DailyPrintView extends PrintView {
       stats[statType] = stat;
     });
 
-    const { target, veryLow } = _.get(stats, 'timeInRange.data.raw', {});
+    const { target, veryLow } = _.get(stats, 'timeInRange.data.raw.durations', {});
     const totalCbgDuration = _.get(stats, 'timeInRange.data.total.value', {});
     const { averageGlucose } = _.get(stats, 'averageGlucose.data.raw', {});
     const { carbs } = _.get(stats, 'carbs.data.raw', {});

src/utils/StatUtil.js

@@ -273,7 +273,7 @@ export class StatUtil {
       cgmDaysWorn = rawCbgData.length;
       cgmMinutesWorn = rawCbgData.length === 1 ? sampleFrequency : 0;
     } else {
-      cgmDaysWorn = Math.ceil(moment.utc(newestDatum?.time).diff(moment.utc(oldestDatum?.time), 'days', true));
+      cgmDaysWorn = moment.utc(newestDatum?.localDate).diff(moment.utc(oldestDatum?.localDate), 'days', true) + 1;
       cgmMinutesWorn = Math.ceil(moment.utc(newestDatum?.time).diff(moment.utc(oldestDatum?.time), 'minutes', true));
     }
 

src/utils/basics/data.js

@@ -37,6 +37,7 @@ import {
   ANIMAS,
   MEDTRONIC,
   MICROTECH,
+  SOOIL,
   pumpVocabulary,
 } from '../constants';
 
@@ -192,7 +193,7 @@ export function getSiteChangeSource(patient = {}, manufacturer) {
 
   let siteChangeSource = SITE_CHANGE_TYPE_UNDECLARED;
 
-  if (_.includes(_.map([ANIMAS, MEDTRONIC, TANDEM], _.lowerCase), manufacturer)) {
+  if (_.includes(_.map([ANIMAS, MEDTRONIC, TANDEM, SOOIL], _.lowerCase), manufacturer)) {
     siteChangeSource = _.get(settings, 'siteChangeSource');
     const allowedSources = [SITE_CHANGE_CANNULA, SITE_CHANGE_TUBING];
 

src/utils/bloodglucose.js

@@ -221,7 +221,15 @@ export function weightedCGMCount(data) {
  */
 export function cgmSampleFrequency(datum) {
   const deviceId = _.get(datum, 'deviceId', '');
-  return deviceId.indexOf('AbbottFreeStyleLibre') === 0 ? 15 * MS_IN_MIN : 5 * MS_IN_MIN;
+  if (deviceId.indexOf('AbbottFreeStyleLibre3') === 0) {
+    return 5 * MS_IN_MIN;
+  }
+
+  if (deviceId.indexOf('AbbottFreeStyleLibre') === 0) {
+    return 15 * MS_IN_MIN;
+  }
+
+  return 5 * MS_IN_MIN;
 }
 
 /**

src/utils/constants.js

@@ -96,6 +96,7 @@ export const TANDEM = 'Tandem';
 export const ANIMAS = 'Animas';
 export const MEDTRONIC = 'Medtronic';
 export const MICROTECH = 'Microtech';
+export const SOOIL = 'Sooil';
 
 export const pumpVocabulary = {
   [ANIMAS]: {
@@ -126,6 +127,11 @@ export const pumpVocabulary = {
     [SITE_CHANGE_TUBING]: t('Prime Reservoir'),
     [SITE_CHANGE_CANNULA]: t('Prime Cannula'),
   },
+  [SOOIL]: {
+    [SITE_CHANGE_RESERVOIR]: t('Refill'),
+    [SITE_CHANGE_TUBING]: t('Prime'),
+    [SITE_CHANGE_CANNULA]: t('Prime Cannula'),
+  },
   [TANDEM]: {
     [SITE_CHANGE_RESERVOIR]: t('Change Cartridge'),
     [SITE_CHANGE_TUBING]: t('Fill Tubing'),