Merge pull request #2342 from nightscout/wip/nan-bg-fix

go back to using scaleEntry instead of scaleMgdl
nightscout · Dec 13, 2016 · 218b00a · 218b00a
2 parents 0694221 + 25e5af5
commit 218b00a
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "0.9.3-dev-20161212",
+  "version": "0.9.3-dev-20161212b",
   "dependencies": {
     "colorbrewer": "~1.0.0",
     "jQuery-Storage-API": "~1.7.2",

diff --git a/lib/client/renderer.js b/lib/client/renderer.js
@@ -146,7 +146,7 @@ function init (client, d3) {
       var rawbgInfo = getRawbgInfo();
 
       client.tooltip.transition().duration(TOOLTIP_TRANS_MS).style('opacity', .9);
-      client.tooltip.html('<strong>' + translate('BG')+ ':</strong> ' + client.sbx.scaleMgdl( d ) +
+      client.tooltip.html('<strong>' + translate('BG')+ ':</strong> ' + client.sbx.scaleEntry( d ) +
         (d.type === 'mbg' ? '<br/><strong>' + translate('Device') + ': </strong>' + d.device : '') +
         (rawbgInfo.value ? '<br/><strong>' + translate('Raw BG') + ':</strong> ' + rawbgInfo.value : '') +
         (rawbgInfo.noise ? '<br/><strong>' + translate('Noise') + ':</strong> ' + rawbgInfo.noise : '') +

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.9.3-dev-20161212",
+  "version": "0.9.3-dev-20161212b",
   "description": "Nightscout acts as a web-based CGM (Continuous Glucose Montinor) to allow multiple caregivers to remotely view a patients glucose data in realtime.",
   "license": "AGPL-3.0",
   "author": "Nightscout Team",

diff --git a/static/index.html b/static/index.html
@@ -25,10 +25,10 @@
       <meta name="msapplication-config" content="/browserconfig.xml">
       <meta name="theme-color" content="#333333">
 
-      <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.9.3-dev-20161212" />
-      <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.9.3-dev-20161212" />
+      <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.9.3-dev-20161212b" />
+      <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.9.3-dev-20161212b" />
       <link rel="stylesheet" type="text/css" href="/css/dropdown.css" />
-      <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.9.3-dev-20161212" />
+      <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.9.3-dev-20161212b" />
       <link rel="stylesheet" type="text/css" href="/bower_components/tipsy-jmalonzo/src/stylesheets/tipsy.css" />
       <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-darkness/jquery-ui.min.css">
     </head>
@@ -590,7 +590,7 @@
             <audio src="/audio/alarm2.mp3" preload="auto" loop="true" class="urgent alarm2 mp3" type="audio/mp3"></audio>
         </div>
 
-        <script src="/public/js/bundle.js?v=0.9.3-dev-20161212"></script>
+        <script src="/public/js/bundle.js?v=0.9.3-dev-20161212b"></script>
         <script src="/socket.io/socket.io.js"></script>
         <script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
         <script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>

diff --git a/static/report/index.html b/static/report/index.html
@@ -23,7 +23,7 @@
       <meta name="msapplication-config" content="/browserconfig.xml">
       <meta name="theme-color" content="#333333">
 
-      <link rel="stylesheet" type="text/css" href="/css/report.css?v=0.9.3-dev-20161212" />
+      <link rel="stylesheet" type="text/css" href="/css/report.css?v=0.9.3-dev-20161212b" />
       <link rel="stylesheet" type="text/css" href="/bower_components/jquery-ui/themes/ui-lightness/jquery-ui.min.css">    
     </head>
     <body>
@@ -116,7 +116,7 @@ <h1><img src="/images/logo1.png"><span class="translate">Nightscout reporting</s
     <hr>
     <b><span class="translate">Authentication status</span>: </b><span id="authentication_placeholder"></span>
 
-    <script src="/public/js/bundle.js?v=0.9.3-dev-20161212"></script>
+    <script src="/public/js/bundle.js?v=0.9.3-dev-20161212b"></script>
     <script src="/socket.io/socket.io.js"></script>
     <script src="/bower_components/jQuery-Storage-API/jquery.storageapi.min.js"></script>
     <script src="/bower_components/tipsy-jmalonzo/src/javascripts/jquery.tipsy.js"></script>
@@ -125,7 +125,7 @@ <h1><img src="/images/logo1.png"><span class="translate">Nightscout reporting</s
     <script src="/bower_components/jquery-flot/jquery.flot.time.js"></script>
     <script src="/bower_components/jquery-flot/jquery.flot.fillbetween.js"></script>
     <script src="/bower_components/jquery-ui/jquery-ui.min.js"></script>
-    <script src="/report/js/report.js?v=0.9.3-dev-20161212"></script>
+    <script src="/report/js/report.js?v=0.9.3-dev-20161212b"></script>
     <script src="/report/js/flotcandle.js"></script>
     </body>
 </html>