Added StatusBetween function

This commit is contained in:
Patrick McDonagh
2016-03-31 12:06:00 -05:00
parent edf73c81fc
commit 772bf1ea8c
4 changed files with 38 additions and 2 deletions

View File

@@ -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

View File

@@ -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": {

View File

@@ -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);

View File

@@ -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