stop using uniq for SGVs since we use buckets (nightscout#2370)

jasoncalabrese · web-flow · commit 192c4d053314 · 2016-12-24T10:34:34.000-08:00
* stop using uniq for SGVs since we use buckets
also enables more detailed monitoring when there is data from multiple devices with the same mills

* clean up

* bump version to 0.9.3-dev-20161224
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "nightscout",
-  "version": "0.9.3-dev-20161219",
+  "version": "0.9.3-dev-20161224",
   "dependencies": {
     "colorbrewer": "~1.0.0",
     "jQuery-Storage-API": "~1.7.2",
diff --git a/lib/data/dataloader.js b/lib/data/dataloader.js
@@ -111,8 +111,11 @@ function loadEntries (ddata, ctx, callback) {
           }
         }
       });
+
+      //stop using uniq for SGVs since we use buckets, also enables more detailed monitoring
+      ddata.sgvs = sgvs;
+
       ddata.mbgs = uniq(mbgs);
-      ddata.sgvs = uniq(sgvs);
       ddata.cals = uniq(cals);
     }
     callback();
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "Nightscout",
-  "version": "0.9.3-dev-20161219",
+  "version": "0.9.3-dev-20161224",
   "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-20161219" />
-      <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.9.3-dev-20161219" />
+      <link rel="stylesheet" type="text/css" href="/css/drawer.css?v=0.9.3-dev-20161224" />
+      <link rel="stylesheet" type="text/css" href="/css/main.css?v=0.9.3-dev-20161224" />
       <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-20161219" />
+      <link rel="stylesheet" type="text/css" href="/css/sgv.css?v=0.9.3-dev-20161224" />
       <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-20161219"></script>
+        <script src="/public/js/bundle.js?v=0.9.3-dev-20161224"></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-20161219" />
+      <link rel="stylesheet" type="text/css" href="/css/report.css?v=0.9.3-dev-20161224" />
       <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-20161219"></script>
+    <script src="/public/js/bundle.js?v=0.9.3-dev-20161224"></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-20161219"></script>
+    <script src="/report/js/report.js?v=0.9.3-dev-20161224"></script>
     <script src="/report/js/flotcandle.js"></script>
     </body>
 </html>
diff --git a/tests/openaps-storage.test.js b/tests/openaps-storage.test.js
@@ -65,8 +65,6 @@ describe('openaps storage', function () {
         should.not.exist(err);
         should.exist(results);
 
-        console.info('>>>devicestatus results', results);
-
         results.length.should.equal(1);
         results[0].openaps.enacted.eventualBG.should.equal(82);
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "nightscout",`
`3`		`- "version": "0.9.3-dev-20161219",`
	`3`	`+ "version": "0.9.3-dev-20161224",`
`4`	`4`	`"dependencies": {`
`5`	`5`	`"colorbrewer": "~1.0.0",`
`6`	`6`	`"jQuery-Storage-API": "~1.7.2",`
Original file line number	Diff line number	Diff line change
`@@ -111,8 +111,11 @@ function loadEntries (ddata, ctx, callback) {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`});`
	`114`	`+`
	`115`	`+ //stop using uniq for SGVs since we use buckets, also enables more detailed monitoring`
	`116`	`+ ddata.sgvs = sgvs;`
	`117`	`+`
`114`	`118`	`ddata.mbgs = uniq(mbgs);`
`115`		`- ddata.sgvs = uniq(sgvs);`
`116`	`119`	`ddata.cals = uniq(cals);`
`117`	`120`	`}`
`118`	`121`	`callback();`