Merge pull request nightscout#23 from nightscout/dev

Refresh dev from nightscout/dev

.nvmrc

@@ -1 +1 @@
-8.9.x
+8.11.x

.travis.yml

@@ -3,7 +3,7 @@ sudo: required
 dist: trusty
 node_js:
   - "8"
-  - "9"
+  - "10"
 before_install: if [[ `npm --version` != "5.8.0" ]]; then npm install -g npm@latest; npm --version; fi
 matrix:
   fast_finish: true

README.md

@@ -106,7 +106,7 @@ Community maintained fork of the
 
 Requirements:
 
-- [Node.js](http://nodejs.org/) 8.11.0 LTS or later or [Node.js](http://nodejs.org/) 9.10.0 or later. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or `setup.sh`)
+- [Node.js](http://nodejs.org/) 8.11.3 LTS or later or [Node.js](http://nodejs.org/) 10.5.0 or later. Use [Install instructions for Node](https://nodejs.org/en/download/package-manager/) or `setup.sh`)
 - [MongoDB](https://www.mongodb.com/download-center?jmp=nav#community) 3.x. MongoDB 2.4 is only supported for Raspberry Pi.
 
 Clone this repo then install dependencies into the root of the project:

lib/data/ddata.js

@@ -228,11 +228,18 @@ function init( ) {
           //convert to mgdl
           t.targetTop = t.targetTop * 18;
           t.targetBottom = t.targetBottom * 18;
+          t.units = 'mg/dl';
         }
       }
       //if we have a temp target thats below 20, assume its mmol and convert to mgdl for safety.
-      if ( t.targetTop < 20 ) { t.targetTop = t.targetTop * 18; }
-      if ( t.targetBottom < 20 ) { t.targetBottom = t.targetBottom * 18; }
+      if ( t.targetTop < 20 ) {
+        t.targetTop = t.targetTop * 18;
+        t.units = 'mg/dl';
+      }
+      if ( t.targetBottom < 20 ) {
+        t.targetBottom = t.targetBottom * 18;
+        t.units = 'mg/dl';
+      }
       return t.eventType && t.eventType.indexOf('Temporary Target') > -1;
     });
     if (preserveOrignalTreatments)

lib/language.js

@@ -11176,7 +11176,7 @@ function init() {
     'alexaBasalTemp': {
         bg:  '%1 temp basal of %2 units per hour will end %3'
         , cs:  '%1 temp basal of %2 units per hour will end %3'
-        , de: '%1 temporäre Basalrate von %2 Einheiten endet in %3'
+        , de: '%1 temporäre Basalrate von %2 Einheiten endet %3'
         , dk:  '%1 temp basal of %2 units per hour will end %3'
         , el:  '%1 temp basal of %2 units per hour will end %3'
         , en:  '%1 temp basal of %2 units per hour will end %3'
@@ -11362,7 +11362,7 @@ function init() {
       },
       'alexaLastLoop': {
         en: 'The last successful loop was %1'
-        , de: 'Der letzte erfolgreiche Loop war vor %1'
+        , de: 'Der letzte erfolgreiche Loop war %1'
       },
     'alexaLoopNotAvailable': {
       en: 'Loop plugin does not seem to be enabled'
@@ -11423,14 +11423,23 @@ function init() {
     }
     ,
     'Clock View': {
-      fi: 'Kellonäkymä'
+      cs: 'Hodiny'
+      ,fi: 'Kellonäkymä'
       ,nl: 'Klokweergave'
       ,es: 'Vista del reloj'
       ,fr: 'Vue Horloge'
       ,ro: 'Vedere tip ceas'
       ,ru: 'цифры крупно'
       ,it: 'Vista orologio'
     }
+    ,
+    'TDD average': {
+      cs: 'Průměrná denní dávka'
+    }
+    ,
+    'Carbs average': {
+      cs: 'Průměrné množství sacharidů'
+    }
 
   };
 

lib/report_plugins/daytoday.js

@@ -71,12 +71,21 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
   var TOOLTIP_TRANS_MS = 300;
 
   var padding = { top: 15, right: 22, bottom: 30, left: 35 };
-
+
+  var tddSum = 0;
+  var carbsSum = 0;
+
   daytoday.prepareHtml(sorteddaystoshow) ;
   sorteddaystoshow.forEach( function eachDay(day) {
     drawChart(day,datastorage[day],options);
   });
-
+
+  var tddAverage = tddSum / datastorage.alldays;
+  var carbsAverage = carbsSum / datastorage.alldays;
+
+  if (options.insulindistribution)
+    $('#daytodaycharts').append('<br><br><b>' + translate('TDD average') + ':</b> ' + tddAverage.toFixed(1) + 'U <b>' + translate('Carbs average') + ':</b> ' + carbsAverage.toFixed(0) + 'g');
+
   function timeTicks(n,i) {
     var t12 = [ 
       '12am', '', '2am', '', '4am', '', '6am', '', '8am', '', '10am', '',
@@ -879,6 +888,9 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
           });
     }
 
+    tddSum += totalDailyInsulin;
+    carbsSum += data.dailyCarbs;
+
     appendProfileSwitch(context, {
       //eventType: 'Profile Switch'
       profile: client.profilefunctions.activeProfileToTime(from)

lib/report_plugins/glucosedistribution.js

@@ -194,7 +194,7 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so
      var nextEntry = glucose_data[i+1];
 
      var timeDelta = nextEntry.displayTime.getTime() - entry.displayTime.getTime();
-     var timeDelta2 = entry.displayTime.getTime() - nextEntry.displayTime.getTime();
+     var timeDelta2 = entry.displayTime.getTime() - prevEntry.displayTime.getTime();
 
      var maxGap = (5 * 60 * 1000) + 10000;
 
@@ -468,4 +468,4 @@ glucosedistribution.report = function report_glucosedistribution(datastorage, so
         report_glucosedistribution(datastorage, sorteddaystoshow, options);
     }
 
-};
+};