Merge fd615fd into 3eef278

nightscout · Jul 26, 2018 · 52d7e8e · 52d7e8e
2 parents 3eef278 + fd615fd
commit 52d7e8e
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 10 deletions.
diff --git a/lib/client/browser-settings.js b/lib/client/browser-settings.js
@@ -36,6 +36,7 @@ function init (client, serverSettings, $) {
     $('#alarm-timeagowarnmins-browser').val(settings.alarmTimeagoWarnMins);
     $('#alarm-timeagourgent-browser').prop('checked', settings.alarmTimeagoUrgent);
     $('#alarm-timeagourgentmins-browser').val(settings.alarmTimeagoUrgentMins);
+    $('#alarm-pumpbatterylow-browser').prop('checked', settings.alarmPumpBatteryLow);
 
     $('#nightmode-browser').prop('checked', settings.nightMode);
     $('#editmode-browser').prop('checked', settings.editMode);

diff --git a/lib/client/index.js b/lib/client/index.js
@@ -596,13 +596,16 @@ client.load = function load(serverSettings, callback) {
         playAlarm(audio);
         $(this).addClass('playing');
       });
-
-      var speechPlugin = client.plugins.enabledPlugins['speech'];
-
-      if (speechPlugin) {
-         speechPlugin.say(alarmMessage);
-      }
-
+
+      //TODO: temporary disabled becaused it throws Uncaught TypeError: Cannot read property 'speech' of undefined if speech is not in ENABLE, https://github.com/nightscout/cgm-remote-monitor/pull/3709
+      //var speechEnabled = client.plugins.isEnabled('speech') ;
+      //if (speechEnabled) {
+      //  var speechPlugin = client.plugins.enabledPlugins['speech'];
+      //  if (speechPlugin) {
+      //     speechPlugin.say(alarmMessage);
+      //  }
+      //}
+
     }
 
     container.addClass('alarming').addClass(file === urgentAlarmSound ? 'urgent' : 'warning');

diff --git a/lib/language.js b/lib/language.js
@@ -1309,13 +1309,13 @@ function init() {
     ,'netIOB stats': { // hourlystats.js
       nl: 'netIOB stats'
       ,sv: 'netIOB statistik'
-	  ,de: 'netIOB Statistiken'
+	    ,de: 'netIOB Statistiken'
     }
     ,'temp basals must be rendered to display this report': { //hourlystats.js
       nl: 'tijdelijk basaal moet zichtbaar zijn voor dit rapport'
       ,sv: 'temp basal måste vara synlig för denna rapport'
       ,de: 'temporäre Basalraten müssen für diesen Report sichtbar sein'
-    } 
+    }
     ,'Weekly success' : {
       cs: 'Statistika po týdnech'
       ,de: 'Wöchentlicher Erfolg'
@@ -11667,4 +11667,4 @@ function init() {
   return language();
 }
 
-module.exports = init;
+module.exports = init;
diff --git a/lib/settings.js b/lib/settings.js
@@ -27,6 +27,7 @@ function init ( ) {
     , alarmTimeagoWarnMins: 15
     , alarmTimeagoUrgent: true
     , alarmTimeagoUrgentMins: 30
+    , alarmPumpBatteryLow: false
     , language: 'en'
     , scaleY: 'log'
     , showPlugins: ''

diff --git a/views/index.html b/views/index.html
@@ -232,6 +232,7 @@
                           <input type="text" id="alarm-timeagourgentmins-browser" class="timeago-mins" value="30"/>
                           <span class="translate">mins</span>
                         </dd>
+                        <dd><input type="checkbox" id="alarm-pumpbatterylow-browser" /><label for="alarm-pumpbatterylow-browser" class="translate">Pump Battery Low Alarm</label></dd>
                     </dl>
                     <dl class="toggle">
                         <dt><span class="translate">Night Mode</span> <a class="tip" original-title="When enabled the page will be dimmed from 10pm - 6am."><i class="icon-help-circled"></i></a></dt>