Merge pull request #8367 from nightscout/wip/bewest/collaborations

Wip/bewest/collaborations

Author: bewest

README.md

@@ -752,7 +752,7 @@ For remote overrides, the following extended settings must be configured:
   * `ns-info` - Plugins that generate notifications at the info level will cause this event to also be triggered.  It will be sent in addition to `ns-event`.
   * `ns-warning` - Alarms at the warning level with cause this event to also be triggered.  It will be sent in addition to `ns-event`.
   * `ns-urgent` - Alarms at the urgent level with cause this event to also be triggered.  It will be sent in addition to `ns-event`.
-  * see the [full list of events](lib/plugins/maker-setup.md#events)
+  * see the [full list of events](docs/plugins/maker-setup.md#events)
 
 
 ### Treatment Profile

docker-compose.yml

@@ -10,6 +10,7 @@ x-logging:
 services:
   mongo:
     image: mongo:4.4
+    restart: always
     volumes:
       - ${NS_MONGO_DATA_DIR:-./mongo-data}:/data/db:cached
     logging: *default-logging
@@ -65,6 +66,7 @@ services:
 
   traefik:
     image: traefik:latest
+    restart: always
     container_name: 'traefik'
     command:
       - '--providers.docker=true'

lib/constants.json

@@ -7,7 +7,7 @@
   "HTTP_BAD_REQUEST": 400,
   "ENTRIES_DEFAULT_COUNT" : 10,
   "PROFILES_DEFAULT_COUNT" : 10, 
-  "MMOL_TO_MGDL": 18.018018018,
+  "MMOL_TO_MGDL": 18.01559,
   "ONE_DAY" : 86400000,
   "TWO_DAYS" : 172800000,
   "FIFTEEN_MINUTES": 900000,

lib/report_plugins/dailystats.js

@@ -1,5 +1,7 @@
 'use strict';
 
+var consts = require('../constants');
+
 var dailystats = {
   name: 'dailystats'
   , label: 'Daily Stats'
@@ -62,6 +64,8 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
   $('<th>' + translate('25%') + '</th>').appendTo(thead);
   $('<th>' + translate('Median') + '</th>').appendTo(thead);
   $('<th>' + translate('75%') + '</th>').appendTo(thead);
+  $('<th>' + translate('A1c est* %<sub>DCCT</sub>') + '</th>').appendTo(thead);
+  $('<th>' + translate('A1c est* <sub>IFCC</sub>') + '</th>').appendTo(thead);
   thead.appendTo(table);
 
   sorteddaystoshow.forEach(function(day) {
@@ -104,6 +108,8 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
       , highs: 0
     });
     var average = sum / daysRecords.length;
+    var averageA1cDCCT = (average * consts.MMOL_TO_MGDL + 46.7) / 28.7;
+    var averageA1cIFCC = ((average * consts.MMOL_TO_MGDL + 46.7) / 28.7 - 2.15) * 10.929;
 
     var bgValues = daysRecords.map(function(r) { return r.sgv; });
     $('<td><div id="dailystat-chart-' + day.toString() + '" class="inlinepiechart"></div></td>').appendTo(tr);
@@ -120,6 +126,8 @@ dailystats.report = function report_dailystats (datastorage, sorteddaystoshow, o
     $('<td class="tdborder">' + ss.quantile(bgValues, 0.25).toFixed(1) + '</td>').appendTo(tr);
     $('<td class="tdborder">' + ss.quantile(bgValues, 0.5).toFixed(1) + '</td>').appendTo(tr);
     $('<td class="tdborder">' + ss.quantile(bgValues, 0.75).toFixed(1) + '</td>').appendTo(tr);
+    $('<td class="tdborder">' + averageA1cDCCT.toFixed(1) + '%</td>').appendTo(tr);
+    $('<td class="tdborder">' + averageA1cIFCC.toFixed(0) + '</td>').appendTo(tr);
 
     table.append(tr);
     var inrange = [

lib/storage/mongo-storage.js

@@ -42,7 +42,7 @@ function init(env, cb, forceNewConnection) {
 
           const result = await mongo.db.command({ connectionStatus: 1 });
           const roles = result.authInfo.authenticatedUserRoles;
-          if (roles.length > 0 && roles[0].role == 'readAnyDatabase') {
+          if (roles && roles.length > 0 && roles[0].role == 'readAnyDatabase') {
             console.error('Mongo user is read only');
             cb(new Error('MongoDB connection is in read only mode! Go back to MongoDB configuration and check your database user has read and write access.'), null);
           }

translations/fr_FR.json

@@ -70,10 +70,10 @@
     "Normal": "Normal",
     "Median": "Médiane",
     "Readings": "Valeurs",
-    "StDev": "Déviation St.",
+    "StDev": "Dév. std.",
     "Daily stats report": "Rapport quotidien",
-    "Glucose Percentile report": "Rapport percentiles Glycémie",
-    "Glucose distribution": "Distribution glycémies",
+    "Glucose Percentile report": "Rapport centiles glucose",
+    "Glucose distribution": "Distribution du glucose",
     "days total": "jours totaux",
     "Total per day": "Total journalier",
     "Overall": "En général",