diff --git a/app.coffee b/app.coffee index 59dbb8a..d1b9bc4 100644 --- a/app.coffee +++ b/app.coffee @@ -76,6 +76,8 @@ app.get '/json/between/:start/:end', json.findBetweenDateTime app.get '/json/byID/:date/:card_id', json.getCardByCardID app.get '/json/card/:id', json.singleCard app.get '/csv/:id', json.cardCSV +app.get '/json/status/:startDTime/:endDTime', json.statusBetween +app.get '/json/status/:startDTime/', json.statusBetween app.get '/json/status', json.status app.get '/json/setup', json.getSetup app.get '/json/totals', json.getCurrentTotals diff --git a/bower.json b/bower.json index e32cfc2..dc5e8f3 100644 --- a/bower.json +++ b/bower.json @@ -30,7 +30,8 @@ "font-awesome": "~4.5.0", "ngQuickDate": "^1.3.4", "angular-animate-css": "ng-animate-css#^0.0.4", - "angular-bootstrap": "^1.2.5" + "angular-bootstrap": "^1.2.5", + "angular-google-chart":"*" }, "resolutions": { diff --git a/public/js/controllers.js b/public/js/controllers.js index 6ab4e20..c260337 100644 --- a/public/js/controllers.js +++ b/public/js/controllers.js @@ -1,5 +1,13 @@ -var wellCtrls = angular.module('wellCtrls', ['n3-line-chart', 'ui.bootstrap', 'ngAnimate', 'ngJustGage']); +var wellCtrls = angular.module('wellCtrls', ['n3-line-chart', 'ui.bootstrap', 'ngAnimate', 'ngJustGage', 'googlechart']); + +wellCtrls.value('googleChartApiConfig', { + version: '1.1', + optionalSettings: { + packages: ['timeline'], + language: 'en' + } + }); var dateConversion = function(raw){ var converted = raw.slice(4, 6) + '/' + raw.slice(6, 8) + '/' + raw.slice(0, 4); diff --git a/routes/json_sqlite.coffee b/routes/json_sqlite.coffee index 87f4948..80fd567 100644 --- a/routes/json_sqlite.coffee +++ b/routes/json_sqlite.coffee @@ -1364,3 +1364,28 @@ exports.getValuesClosestTo = (req, res) -> status: "OK" vals: rows undefined + +exports.statusBetween = (req, res) -> + endDTime = Date.now() / 1000 + if req.params.endDTime + endDTime = req.params.endDTime + sqlite3 = require('sqlite3').verbose() + db = new sqlite3.Database(dbFile) + db.serialize ()-> + query = "SELECT * FROM run_status WHERE dtime => ? AND dtme <= ?" + prepQuery = db.prepare(query) + prepQuery.all req.params.startDTime, req.params.endDTime, (err, rows) -> + prepQuery.finalize() + db.close() + if err + errMsg = + status:"error" + message:err + query:query + console.log errMsg + res.json errMsg + else + res.json + status: "OK" + run_status: rows + undefined