From 34bd56746918ff4bb64cdd8095cceff675d4d399 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Wed, 25 Jun 2014 15:04:52 -0700 Subject: [PATCH 01/20] Disable caching for /pebble and other dynamic elements. --- server.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/server.js b/server.js index d93493b24ab..7f88b2c2e50 100644 --- a/server.js +++ b/server.js @@ -82,6 +82,17 @@ var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); var app = express(); app.set('title', 'Nightscout'); +// serve the pebble JSON +app.get("/pebble", function(req, res) { + writePebbleJSON(req, res); +}); + +// send the HTML5 app cache file +app.use("/nightscout.appcache", function(req, res) { + res.set('Content-Type', 'text/cache-manifest'); + res.end(getAppCache(req)); +}); + // define static server var staticDir = __dirname + '/static/'; var server = express.static(staticDir); @@ -95,17 +106,6 @@ app.use(function(req, res, next) { next(); }); -// serve the pebble JSON -app.get("/pebble", function(req, res) { - writePebbleJSON(req, res); -}); - -// send the HTML5 app cache file -app.use("/nightscout.appcache", function(req, res) { - res.set('Content-Type', 'text/cache-manifest'); - res.end(getAppCache(req)); -}); - // serve the static content app.use(server); From a0a9a02d66f6da20f76bd6dd3e2940bc142ae400 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 14:43:53 -0700 Subject: [PATCH 02/20] Pebble class experiment. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This isn’t used at the current time. --- lib/pebble-v2.js | 71 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 71 insertions(+) create mode 100644 lib/pebble-v2.js diff --git a/lib/pebble-v2.js b/lib/pebble-v2.js new file mode 100644 index 00000000000..425dea14dae --- /dev/null +++ b/lib/pebble-v2.js @@ -0,0 +1,71 @@ +var DIRECTIONS = { + NONE: 0, + DoupleUp: 1, + SingleUp: 2, + FortyFiveUp: 3, + Flat: 4, + FortyFiveDown: 5, + SingleDown: 6, + DoubleDown: 7, + 'NOT COMPUTABLE': 8, + 'RATE OUT OF RANGE': 9 +}; +var FORTY_MINUTES = 2400000; + +// Constructor +function Pebble(collection) { + // always initialize all instance properties + this.enteries = []; + + console.log(collection); + + this.enteries = this.getLatest(collection); +} +// class methods +Pebble.prototype.directionToTrend = function(direction) { + var trend = 8; + if (direction in DIRECTIONS) { + trend = DIRECTIONS[direction]; + } + return trend; +}; + +Pebble.prototype.getLatest = function(collection) { + var cgmData = this.enteries; + var result = ""; + + var now = Date.now(); + var earliest_data = now - (FORTY_MINUTES*5); + + collection.find({ }).sort({"date": -1}).limit(10).toArray(function(results) { + console.log('queried', new Date(earliest_data).toISOString( ), + new Date(now).toISOString( ), 'got raw results', results.length); + results.forEach(function(element, index, array) { + var last = cgmData[cgmData.length - 1]; + if (element) { + console.log(element, index); + var obj = {}; + obj.sgv = element.sgv; + obj.bgdelta = (last ? (last.sgv - element.sgv) : 0); + if ('direction' in element) { + obj.trend = directionToTrend(element.direction); + obj.direction = element.direction; + } + // obj.y = element.sgv; + // obj.x = element.date; + obj.datetime = element.date; + // obj.date = element.date.toString( ); + cgmData.push(obj); + } + }); + // cgmData.reverse( ); + var result = { status: [ {now:now}], bgs: cgmData.slice(0, 6) }; + console.log('RESULT', result); + collection.db.close(); + }); + + return result; +}; + +// export the class +module.exports = Pebble; \ No newline at end of file From 53d9b7ea2986d548275fda3ecacae8396702e608 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 15:32:09 -0700 Subject: [PATCH 03/20] Fixed "expires:" header format error. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added “dateformat” package. Plus some code reorganization. --- package.json | 1 + server.js | 93 ++++++++++++++++++++++++++-------------------------- 2 files changed, 48 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index ed1c8658130..1dec5670981 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "dependencies": { "appcache-node": "^0.2.0", "bower": "~1.3.2", + "dateformat": "^1.0.8-1.2.3", "express": "^4.4.4", "mongodb": "1.3.20", "socket.io": "~0.9.16" diff --git a/server.js b/server.js index 7f88b2c2e50..560666bc0da 100644 --- a/server.js +++ b/server.js @@ -20,6 +20,7 @@ var patientData = []; var now = new Date().getTime(); var fs = require('fs'); +var dateformat = require('dateformat'); var express = require('express'); var appcache = require("appcache-node"); var mongoClient = require('mongodb').MongoClient; @@ -28,7 +29,46 @@ var cgmData = []; //////////////////////////////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////////////////////////////// -// define helper functions +// setup http server +//////////////////////////////////////////////////////////////////////////////////////////////////// +var PORT = process.env.PORT || 1337; +var THIRTY_DAYS = 2592000; +var now = new Date(); +var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); +expires = dateformat(expires, "GMT:ddd mmm dS yyyy HH:MM:ss Z"); +console.log(expires); + +var app = express(); +app.set('title', 'Nightscout'); + +// serve special URLs +app.get("/pebble", servePebble); // Pebble API +app.use("/nightscout.appcache", serveAppcache); // HTML5 Application Cache + +// define static server +var staticDir = __dirname + '/static/'; +var server = express.static(staticDir); +app.use(function(req, res, next) { + res.set({ + "Cache-Control": "public, max-age=" + THIRTY_DAYS, + "Expires": expires, + "Arr-Disable-Session-Affinity": "True" + }); + + next(); +}); + +// serve the static content +app.use(server); + +// handle errors +app.use(errorHandler); + +var server = app.listen(PORT); +//////////////////////////////////////////////////////////////////////////////////////////////////// + +//////////////////////////////////////////////////////////////////////////////////////////////////// +// server helper functions //////////////////////////////////////////////////////////////////////////////////////////////////// function errorHandler(err, req, res, next) { if (err) { @@ -64,57 +104,18 @@ function getAppCache(req) { ]); } -function writePebbleJSON(req, res) { +function serveAppcache(req, res) { + res.set('Content-Type', 'text/cache-manifest'); + res.end(getAppCache(req)); +} + +function servePebble(req, res) { req.with_collection = with_collection; pebble.pebble(req, res); return; } //////////////////////////////////////////////////////////////////////////////////////////////////// -//////////////////////////////////////////////////////////////////////////////////////////////////// -// setup http server -//////////////////////////////////////////////////////////////////////////////////////////////////// -var PORT = process.env.PORT || 1337; -var THIRTY_DAYS = 2592000; -var now = new Date(); -var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); - -var app = express(); -app.set('title', 'Nightscout'); - -// serve the pebble JSON -app.get("/pebble", function(req, res) { - writePebbleJSON(req, res); -}); - -// send the HTML5 app cache file -app.use("/nightscout.appcache", function(req, res) { - res.set('Content-Type', 'text/cache-manifest'); - res.end(getAppCache(req)); -}); - -// define static server -var staticDir = __dirname + '/static/'; -var server = express.static(staticDir); -app.use(function(req, res, next) { - res.set({ - "Cache-Control": "public, max-age=" + THIRTY_DAYS, - "Expires": expires, - "Arr-Disable-Session-Affinity": "True" - }); - - next(); -}); - -// serve the static content -app.use(server); - -// handle errors -app.use(errorHandler); - -var server = app.listen(PORT); -//////////////////////////////////////////////////////////////////////////////////////////////////// - //////////////////////////////////////////////////////////////////////////////////////////////////// // setup socket io for data and message transmission //////////////////////////////////////////////////////////////////////////////////////////////////// From 4f5c4e698f58ad12270e12ad6988c5a7907a3262 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 15:34:14 -0700 Subject: [PATCH 04/20] Fixed "expires:" header format error. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added “dateformat” package. Plus some code reorganization. --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 560666bc0da..e9745303cc4 100644 --- a/server.js +++ b/server.js @@ -35,7 +35,7 @@ var PORT = process.env.PORT || 1337; var THIRTY_DAYS = 2592000; var now = new Date(); var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); -expires = dateformat(expires, "GMT:ddd mmm dS yyyy HH:MM:ss Z"); +expires = dateformat(expires, "GMT:ddd, mmm dS yyyy HH:MM:ss Z"); console.log(expires); var app = express(); From 01349a8038048590fdbb91000efd30254c2a28a2 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 15:39:06 -0700 Subject: [PATCH 05/20] Fixed "expires:" header format error. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added “dateformat” package. Plus some code reorganization. --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index e9745303cc4..21789bda211 100644 --- a/server.js +++ b/server.js @@ -35,7 +35,7 @@ var PORT = process.env.PORT || 1337; var THIRTY_DAYS = 2592000; var now = new Date(); var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); -expires = dateformat(expires, "GMT:ddd, mmm dS yyyy HH:MM:ss Z"); +expires = dateformat(expires, "GMT:ddd, mmm d yyyy HH:MM:ss Z"); console.log(expires); var app = express(); From 6f298c34f30728f858de63e3c3472e459c4bdd34 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 15:40:47 -0700 Subject: [PATCH 06/20] Fixed "expires:" header format error. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Added “dateformat” package. Plus some code reorganization. --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 21789bda211..0b3d236ed1b 100644 --- a/server.js +++ b/server.js @@ -35,7 +35,7 @@ var PORT = process.env.PORT || 1337; var THIRTY_DAYS = 2592000; var now = new Date(); var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); -expires = dateformat(expires, "GMT:ddd, mmm d yyyy HH:MM:ss Z"); +expires = dateformat(expires, "GMT:ddd, d mmm yyyy HH:MM:ss Z"); console.log(expires); var app = express(); From a15f3346285b1fc7e57946929e319bc46807f422 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 16:48:06 -0700 Subject: [PATCH 07/20] Unnecessary "cache-control: public" removed. Adding socket.io.js to nightscout.appcache, plus a little cleanup. --- server.js | 4 ++-- static/index.html | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/server.js b/server.js index 0b3d236ed1b..a61c0f4876c 100644 --- a/server.js +++ b/server.js @@ -36,7 +36,6 @@ var THIRTY_DAYS = 2592000; var now = new Date(); var expires = new Date(now.getTime() + (1000 * THIRTY_DAYS)); expires = dateformat(expires, "GMT:ddd, d mmm yyyy HH:MM:ss Z"); -console.log(expires); var app = express(); app.set('title', 'Nightscout'); @@ -50,7 +49,7 @@ var staticDir = __dirname + '/static/'; var server = express.static(staticDir); app.use(function(req, res, next) { res.set({ - "Cache-Control": "public, max-age=" + THIRTY_DAYS, + "Cache-Control": "max-age=" + THIRTY_DAYS, "Expires": expires, "Arr-Disable-Session-Affinity": "True" }); @@ -96,6 +95,7 @@ function getAppCache(req) { 'http://'+hostname+'/favicon.ico', 'http://'+hostname+'/bower_components/d3/d3.min.js', 'http://'+hostname+'/bower_components/jquery/dist/jquery.min.js', + 'http://'+hostname+'/socket.io/socket.io.js', 'http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,300,400,600,700,800', 'http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic', '', diff --git a/static/index.html b/static/index.html index d9d56bc5eeb..c6cedf497a3 100644 --- a/static/index.html +++ b/static/index.html @@ -3,8 +3,8 @@ NightScout - - + +
@@ -39,7 +39,7 @@ - + From 0f8e409558d53f40824dffa570097fe0f801fad7 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 17:10:50 -0700 Subject: [PATCH 08/20] Attempting to resolve a few reddot.org issues. --- server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server.js b/server.js index a61c0f4876c..ae4947da07c 100644 --- a/server.js +++ b/server.js @@ -51,6 +51,7 @@ app.use(function(req, res, next) { res.set({ "Cache-Control": "max-age=" + THIRTY_DAYS, "Expires": expires, + "Vary": "Accept-Encoding", "Arr-Disable-Session-Affinity": "True" }); From d17670c39c5164186071a8aa9139b2d871e8d399 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 17:35:07 -0700 Subject: [PATCH 09/20] More redbot.org testing --- server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/server.js b/server.js index ae4947da07c..ec6be33c74a 100644 --- a/server.js +++ b/server.js @@ -52,6 +52,7 @@ app.use(function(req, res, next) { "Cache-Control": "max-age=" + THIRTY_DAYS, "Expires": expires, "Vary": "Accept-Encoding", + "Accept-Ranges": "none", "Arr-Disable-Session-Affinity": "True" }); From 3e9092ece1b21a0bcd95b8751f337b0e619fa74d Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 17:48:54 -0700 Subject: [PATCH 10/20] I think it is ready! --- server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server.js b/server.js index ec6be33c74a..4300ca184b4 100644 --- a/server.js +++ b/server.js @@ -42,7 +42,7 @@ app.set('title', 'Nightscout'); // serve special URLs app.get("/pebble", servePebble); // Pebble API -app.use("/nightscout.appcache", serveAppcache); // HTML5 Application Cache +app.get("/nightscout.appcache", serveAppcache); // HTML5 Application Cache // define static server var staticDir = __dirname + '/static/'; @@ -97,7 +97,6 @@ function getAppCache(req) { 'http://'+hostname+'/favicon.ico', 'http://'+hostname+'/bower_components/d3/d3.min.js', 'http://'+hostname+'/bower_components/jquery/dist/jquery.min.js', - 'http://'+hostname+'/socket.io/socket.io.js', 'http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,300,400,600,700,800', 'http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic', '', From 1821568b200abe3f322e4ba6fb37d17660855261 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Thu, 26 Jun 2014 20:33:06 -0700 Subject: [PATCH 11/20] Removing unused experiment. --- lib/pebble-v2.js | 71 ------------------------------------------------ 1 file changed, 71 deletions(-) delete mode 100644 lib/pebble-v2.js diff --git a/lib/pebble-v2.js b/lib/pebble-v2.js deleted file mode 100644 index 425dea14dae..00000000000 --- a/lib/pebble-v2.js +++ /dev/null @@ -1,71 +0,0 @@ -var DIRECTIONS = { - NONE: 0, - DoupleUp: 1, - SingleUp: 2, - FortyFiveUp: 3, - Flat: 4, - FortyFiveDown: 5, - SingleDown: 6, - DoubleDown: 7, - 'NOT COMPUTABLE': 8, - 'RATE OUT OF RANGE': 9 -}; -var FORTY_MINUTES = 2400000; - -// Constructor -function Pebble(collection) { - // always initialize all instance properties - this.enteries = []; - - console.log(collection); - - this.enteries = this.getLatest(collection); -} -// class methods -Pebble.prototype.directionToTrend = function(direction) { - var trend = 8; - if (direction in DIRECTIONS) { - trend = DIRECTIONS[direction]; - } - return trend; -}; - -Pebble.prototype.getLatest = function(collection) { - var cgmData = this.enteries; - var result = ""; - - var now = Date.now(); - var earliest_data = now - (FORTY_MINUTES*5); - - collection.find({ }).sort({"date": -1}).limit(10).toArray(function(results) { - console.log('queried', new Date(earliest_data).toISOString( ), - new Date(now).toISOString( ), 'got raw results', results.length); - results.forEach(function(element, index, array) { - var last = cgmData[cgmData.length - 1]; - if (element) { - console.log(element, index); - var obj = {}; - obj.sgv = element.sgv; - obj.bgdelta = (last ? (last.sgv - element.sgv) : 0); - if ('direction' in element) { - obj.trend = directionToTrend(element.direction); - obj.direction = element.direction; - } - // obj.y = element.sgv; - // obj.x = element.date; - obj.datetime = element.date; - // obj.date = element.date.toString( ); - cgmData.push(obj); - } - }); - // cgmData.reverse( ); - var result = { status: [ {now:now}], bgs: cgmData.slice(0, 6) }; - console.log('RESULT', result); - collection.db.close(); - }); - - return result; -}; - -// export the class -module.exports = Pebble; \ No newline at end of file From ef6e17f29658e29cc9af4d863688ed1873125428 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sat, 28 Jun 2014 01:02:42 -0700 Subject: [PATCH 12/20] Changing HTML5 app cache to only include audio, favicon, and google fonts. HTTP Header Cache caches all. --- server.js | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/server.js b/server.js index 4300ca184b4..f0c928aed62 100644 --- a/server.js +++ b/server.js @@ -88,15 +88,13 @@ function getAppCache(req) { // Define the files you want the browser to cache var hostname = req.headers.host; return appcache.newCache([ - 'http://'+hostname+'/audio/alarm.mp3', - 'http://'+hostname+'/audio/alarm2.mp3', - 'http://'+hostname+'/css/dropdown.css', - 'http://'+hostname+'/css/main.css', - 'http://'+hostname+'/js/client.js', - 'http://'+hostname+'/js/dropdown.js', - 'http://'+hostname+'/favicon.ico', - 'http://'+hostname+'/bower_components/d3/d3.min.js', - 'http://'+hostname+'/bower_components/jquery/dist/jquery.min.js', + 'audio/alarm.mp3', + 'audio/alarm2.mp3', + /* 'css/dropdown.css', + 'css/main.css', + 'js/client.js', + 'js/dropdown.js', */ + '/favicon.ico', 'http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,300,400,600,700,800', 'http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic', '', From 0ff2aafa7890c6028bf4c6a6bf5332b0519dc9c2 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sat, 28 Jun 2014 01:16:31 -0700 Subject: [PATCH 13/20] Changing HTML5 app cache to only include audio, favicon, and google fonts. HTTP Header Cache still caches all. --- server.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/server.js b/server.js index f0c928aed62..a1846898b02 100644 --- a/server.js +++ b/server.js @@ -84,9 +84,8 @@ function errorHandler(err, req, res, next) { } } -function getAppCache(req) { +function getAppCache() { // Define the files you want the browser to cache - var hostname = req.headers.host; return appcache.newCache([ 'audio/alarm.mp3', 'audio/alarm2.mp3', From b3370f13db98a6e3a98ed022fe28ec4cf3ed5613 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 00:17:08 -0700 Subject: [PATCH 14/20] Removed http: protocol from HTML5 app cache file so we can utilize SSL without breaking the appearance of the site. --- server.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server.js b/server.js index a1846898b02..40e6abdb7b8 100644 --- a/server.js +++ b/server.js @@ -94,8 +94,8 @@ function getAppCache() { 'js/client.js', 'js/dropdown.js', */ '/favicon.ico', - 'http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,300,400,600,700,800', - 'http://fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic', + '//fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,300,400,600,700,800', + '//fonts.googleapis.com/css?family=Ubuntu:300,400,500,700,300italic,400italic,500italic,700italic', '', 'NETWORK:', '*' From 7a024b7c04c5879179e0419e1e3704c422f4940d Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 14:37:36 -0700 Subject: [PATCH 15/20] change to test heroku + codeship.io integration --- static/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/index.html b/static/index.html index c6cedf497a3..b258a7b26eb 100644 --- a/static/index.html +++ b/static/index.html @@ -35,7 +35,7 @@
- + From 5d1ba85a2ff2125a1a977759f4f3e1ac61255800 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 14:52:08 -0700 Subject: [PATCH 16/20] Error handler fix. --- server.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server.js b/server.js index 40e6abdb7b8..da3120174ea 100644 --- a/server.js +++ b/server.js @@ -75,7 +75,7 @@ function errorHandler(err, req, res, next) { if (err) { // Log the error var msg = "Error serving " + request.url + " - " + err.message; - sys.error(msg); + require("sys").error(msg); console.log(msg); // Respond to the client From 49f316128ff8104214ab9e620a38d0d718fa63e9 Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 15:08:31 -0700 Subject: [PATCH 17/20] change to test heroku + codeship.io integration --- static/index.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/index.html b/static/index.html index b258a7b26eb..da7a231bdc1 100644 --- a/static/index.html +++ b/static/index.html @@ -35,7 +35,7 @@
- + From 290da9b039d6cf7b90514375c4a881211105473b Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 15:13:40 -0700 Subject: [PATCH 18/20] Cache test: testing change to client.js --- static/js/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/client.js b/static/js/client.js index 6fe4b0b0583..f527ced2f49 100644 --- a/static/js/client.js +++ b/static/js/client.js @@ -1,6 +1,6 @@ (function() { "use strict"; - + alert("test"); var retrospectivePredictor = true, latestSGV, treatments, From 82e2ad9ca086e4cb0b4aeeaddb178da0ac68051b Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 15:15:51 -0700 Subject: [PATCH 19/20] Cache test: testing change to client.js --- static/js/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/client.js b/static/js/client.js index f527ced2f49..af5ce8565b9 100644 --- a/static/js/client.js +++ b/static/js/client.js @@ -1,6 +1,6 @@ (function() { "use strict"; - alert("test"); + alert("test2"); var retrospectivePredictor = true, latestSGV, treatments, From 1088fccf1a51f62e63c719553cc2d41b593f87cf Mon Sep 17 00:00:00 2001 From: Brian Hanifin Date: Sun, 29 Jun 2014 15:21:49 -0700 Subject: [PATCH 20/20] Removing cache test code --- static/js/client.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/static/js/client.js b/static/js/client.js index af5ce8565b9..6fe4b0b0583 100644 --- a/static/js/client.js +++ b/static/js/client.js @@ -1,6 +1,6 @@ (function() { "use strict"; - alert("test2"); + var retrospectivePredictor = true, latestSGV, treatments,