Merge pull request #3 from nightscout/dev

Dev
jasoncalabrese · Nov 16, 2018 · 93be1a6 · 93be1a6
2 parents e930b1d + 1410c68
commit 93be1a6
Show file tree

Hide file tree

Showing 4 changed files with 71 additions and 22 deletions.
diff --git a/lib/language.js b/lib/language.js
@@ -4942,6 +4942,29 @@ function init() {
       ,ko: 'CGM 센서 시작'
       ,zh_cn: '启动CGM（连续血糖监测）探头'
       }
+    ,'CGM Sensor Stop' : {
+      cs: 'CGM Sensor Stop'
+      ,de: 'CGM Sensor Stop'
+      ,es: 'CGM Sensor Stop'
+      ,fr: 'CGM Sensor Stop'
+      ,el: 'CGM Sensor Stop'
+      ,pt: 'CGM Sensor Stop'
+      ,sv: 'CGM Sensor Stop'
+      ,ro: 'CGM Sensor Stop'
+      ,bg: 'CGM Sensor Stop'
+      ,hr: 'CGM Sensor Stop'
+      ,it: 'CGM Sensor Stop'
+      ,dk: 'CGM Sensor Stop'
+      ,fi: 'CGM Sensor Stop'
+      ,nb: 'CGM Sensor Stop'
+      ,he: 'CGM Sensor Stop'
+      ,pl: 'CGM Sensor Stop'
+      ,ru: 'CGM Sensor Stop'
+      ,sk: 'CGM Sensor Stop'
+      ,nl: 'CGM Sensor Stop'
+      ,ko: 'CGM Sensor Stop'
+      ,zh_cn: 'CGM Sensor Stop'
+      }
     ,'CGM Sensor Insert' : {
       cs: 'Výměna sensoru'
       ,de: 'CGM Sensor Wechsel'
@@ -11748,22 +11771,39 @@ function init() {
       ,bg: 'Средната промяна за час е сумата на всички промени в стойностите на КЗ за разгледания период, разделена на броя часове в периода. По-ниската стойност е по-добра'
       ,pl: 'Sednia całkowita godzinnych zmian jest sumą wszystkich zmian glikemii w badanym okresie, podzielonym przez liczbę godzin. Mniejsze są lepsze'
     }
-    , 'GVI and PGS are measures developed by Dexcom, detailed <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.' : {
-      cs: 'GVI a PGS jsou měření vyvinutá společností Dexcom, podrobněji <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">zde</a>.'
-     ,he: 'GVI and PGS are measures developed by Dexcom, detailed <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>. '
-     ,fi: 'GVI ja PGS ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">täällä</a>..'
-     ,it: 'GVI e PGS sono misure sviluppate da Dexcom, dettagliate <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">qui</a>.'
-     ,es: 'Variabilidad de la glucosa en sangre y el estado glucémico del paciente es un valor diseñado por Dexcom, más detalles en <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
-     ,fr: 'GVI et PGS sont des mesures développées par la firme Dexcom, présentées en détail <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">ici</a>.'
-     ,ro: 'GVI și PGS sunt caracteristici de măsurare inventate de Dexcom, ale căror detalii le găsiți <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">aici</a>.'
-     ,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
-     ,nl: 'GVI en PGS zijn maten ontworpen door Dexcom, gedetaillieerde info <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
-     ,zh_cn: 'GVI和PGS是由Dexcom开发的措施，详细说明 <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.'
-     ,sv: 'GVI och PGS är värden utvecklade av Dexcom, detaljer <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">här</a>.'
-     ,de: 'GVI und PGS sind von Dexcom entwickelte Werte. Details <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">hier</a>.'
-     ,dk: 'GVI og PGS er værdier udviklet af Dexcom, detaljer <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">her</a>.'
-     ,bg: 'GVI и PGS са параметри разработени от Декском, повече детайли <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">тук</a>.'
-     ,pl: 'GVI i PGS są pomiarami opracowanymi przez Dexcom, szczegóły <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">tutaj</a>.'
+    , 'GVI (Glycemic Variability Index) and PGS (Patient Glycemic Status) are measures developed by Dexcom, detailed <a href="' : { 
+     cs: 'GVI (Glycemic Variability Index) a PGS (Patient Glycemic Status) jsou měření vyvinutá společností Dexcom, podrobněji <a href="'
+     ,he: 'GVI (Glycemic Variability Index) and PGS (Patient Glycemic Status) are measures developed by Dexcom, detailed <a href="'
+     ,fi: 'GVI (Glycemic Variability Index) ja PGS (Patient Glycemic Status) ovat Dexcom-yrityksen kehittämiä mittaustapoja, joista voit lukea lisää <a href="'
+     ,it: 'GVI (Glycemic Variability Index) e PGS (Patient Glycemic Status) sono misure sviluppate da Dexcom, dettagliate <a href="'
+     ,es: 'Variabilidad de la glucosa en sangre y el estado glucémico del paciente es un valor diseñado por Dexcom, más detalles en <a href="'
+     ,fr: 'GVI (Glycemic Variability Index) et PGS (Patient Glycemic Status) sont des mesures développées par la firme Dexcom, présentées en détail <a href="'
+     ,ro: 'GVI (Glycemic Variability Index) și PGS (Patient Glycemic Status) sunt caracteristici de măsurare inventate de Dexcom, ale căror detalii le găsiți <a href="'
+     ,ru: 'вариабельность гликемии и статус гликемии больного это величины, разработанные декскомом, подробнее <a href="'
+     ,nl: 'GVI (Glycemic Variability Index) en PGS (Patient Glycemic Status) zijn indicatoren (measures) ontworpen door Dexcom, gedetaillieerde info <a href="'
+     ,zh_cn: 'GVI (Glycemic Variability Index)和PGS (Patient Glycemic Status)是由Dexcom开发的措施，详细说明 <a href="'
+     ,sv: 'GVI (Glycemic Variability Index) och PGS (Patient Glycemic Status) är värden utvecklade av Dexcom, detaljer <a href="'
+     ,de: 'GVI (Glycemic Variability Index) und PGS (Patient Glycemic Status) sind von Dexcom entwickelte Werte. Details <a href="'
+     ,dk: 'GVI (Glycemic Variability Index) og PGS (Patient Glycemic Status) er værdier udviklet af Dexcom, detaljer <a href="'
+     ,bg: 'GVI (Glycemic Variability Index) и PGS (Patient Glycemic Status) са параметри разработени от Декском, повече детайли <a href="'
+     ,pl: 'GVI (Glycemic Variability Index) i PGS (Patient Glycemic Status) są pomiarami opracowanymi przez Dexcom, szczegóły <a href="'
+    }
+    , '">can be found here</a>.' : { 
+     cs: '">zde</a>.'
+     ,he: '">here</a>.'
+     ,fi: '">here</a>.'
+     ,it: '">qui</a>.'
+     ,es: '">here</a>.'
+     ,fr: '">ici</a>.'
+     ,ro: '">aici</a>.'
+     ,ru: '">here</a>.'
+     ,nl: '">is hier te vinden</a>.'
+     ,zh_cn: '">here</a>.'
+     ,sv: '">här</a>.'
+     ,de: '">hier</a>.'
+     ,dk: '">her</a>.'
+     ,bg: '">тук</a>.'
+     ,pl: '">tutaj</a>.'
     }
     , 'Mean Total Daily Change' : {
       cs: 'Průměrná celková denní změna'
@@ -12350,7 +12390,7 @@ function init() {
         ,nl: 'Vet [g]'
         ,zh_cn: '脂肪[g]'
         ,ro: 'Grăsimi [g]'
-        ,ru: 'жиры'
+        ,ru: 'жиры [g]'
         ,it: 'Grassi [g]'
         ,sv: 'Fett [g]'
         ,bg: 'Мазнини [гр]'
@@ -12366,7 +12406,7 @@ function init() {
         ,nl: 'Proteine [g]'
         ,zh_cn: '蛋白质[g]'
         ,ro: 'Proteine [g]'
-        ,ru: 'белки'
+        ,ru: 'белки [g]'
         ,it: 'Proteine [g]'
         ,sv: 'Protein [g]'
         ,bg: 'Протеини [гр]'
@@ -12380,7 +12420,7 @@ function init() {
        ,es: 'Energía [Kj]'
        ,fr: 'Énergie [kJ]'
        ,ro: 'Energie [g]'
-       ,ru: 'энергетика'
+       ,ru: 'энергия [kJ'
        ,it: 'Energia [kJ]'
        ,zh_cn: '能量 [kJ]' 
        ,nl: 'Energie [kJ]'
@@ -12461,7 +12501,7 @@ function init() {
       , it: 'Totale Dose Giornaliera media (TDD)'
       , bg: 'Обща дневна доза средно'
       , pl: 'Średnia dawka dzienna'
-      , ru: 'средняя суточная доза инсулина '
+      , ru: 'средняя суточная доза инсулина'
     },
     'Carbs average': {
       cs: 'Průměrné množství sacharidů'

diff --git a/lib/plugins/careportal.js b/lib/plugins/careportal.js
@@ -69,6 +69,10 @@ function init() {
         , name: 'CGM Sensor Insert'
         , bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
       }
+      , { val: 'Sensor Stop'
+        , name: 'CGM Sensor Stop'
+        , bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false
+      }
       , { val: 'Pump Battery Change'
         , name: 'Pump Battery Change'
         , bg: true,  insulin: false, carbs: false, prebolus: false, duration: false, percent: false, absolute: false, profile: false, split: false

diff --git a/lib/report_plugins/daytoday.js b/lib/report_plugins/daytoday.js
@@ -899,6 +899,9 @@ daytoday.report = function report_daytoday(datastorage,sorteddaystoshow,options)
     });
 
     function appendProfileSwitch(context, treatment) {
+
+      if (!treatment.cutting && !treatment.profile) { return; }
+
       var sign = treatment.first ? '▲▲▲' : '▬▬▬';
       var text;
       if (treatment.cutting) {

diff --git a/lib/report_plugins/glucosedistribution.js b/lib/report_plugins/glucosedistribution.js
@@ -32,11 +32,13 @@ glucosedistribution.html = function html(client) {
         '<br/><div id="explanation">' +
         '* ' + translate('This is only a rough estimation that can be very inaccurate and does not replace actual blood testing. The formula used is taken from:') +
         'Nathan, David M., et al. "Translating the A1C assay into estimated average glucose values." <i>Diabetes care</i> 31.8 (2008): 1473-1478.' + '<br/><br/>' +
-		translate('Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.') + '<br/><br/>' +
+        translate('Time in fluctuation and Time in rapid fluctuation measure the % of time during the examined period, during which the blood glucose has been changing relatively fast or rapidly. Lower values are better.') + '<br/><br/>' +
         translate('Mean Total Daily Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of days. Lower is better.')+ '<br/><br/>' +
         translate('Mean Hourly Change is a sum of the absolute value of all glucose excursions for the examined period, divided by the number of hours in the period. Lower is better.')+ '<br/><br/>' +
         translate('Out of Range RMS is calculated by squaring the distance out of range for all glucose readings for the examined period, summing them, dividing by the count and taking the square root. This metric is similar to in-range percentage but weights readings far out of range higher. Lower values are better.')+ '<br/><br/>' +
-        translate('GVI and PGS are measures developed by Dexcom, detailed <a href="http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line#2">here</a>.')+
+        translate('GVI (Glycemic Variability Index) and PGS (Patient Glycemic Status) are measures developed by Dexcom, detailed <a href="')+
+        'https://web.archive.org/web/20160523152519/http://www.healthline.com/diabetesmine/a-new-view-of-glycemic-variability-how-long-is-your-line'+
+        translate('">can be found here</a>.')+
         '</div><br/><br/>' +
         translate('Filter by hours') + ':' +
         '<br/>' +