nmelone/www-POC
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added tag value function

Browse Source
This commit is contained in:
Patrick McDonagh
2016-03-23 17:29:25 -05:00
parent 7d6631d2de
commit a6d8b61e3c
2 changed files with 45 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app.js
View File

@@ -152,6 +152,9 @@ app.get('/json/:folder/:file/taper', json.taper);
app.post('/json/cards', json.multipleCards);
app.post('/setup', json.updateSetup);
//-- Tag Values -- //
app.get('/json/tagvalues', json.getTagValues);
app.get('*', angular);
/**

63
routes/json_sqlite.js
View File

@@ -1,7 +1,7 @@
/*jshint multistr: true */
var fileLocation = "/mnt/usb";
var dbFile = "/mnt/usb/welldata.db"
var dbFile = "/mnt/usb/testdata.db";
//HELPER FUNCTIONS
var pad = function(num){
@@ -11,7 +11,7 @@ var pocDateFormat = function(dtime){
//returns the date in the format YYYYMMDD from a date Object
var regexString = /(\d{4})-(\d{2})-(\d{2}) (\d{2}):(\d{2}):(\d{2}).(\d*)/;
var dateParts = regexString.exec(dtime);
return dateParts[1] + dateParts[2] + dateParts[3]
return dateParts[1] + dateParts[2] + dateParts[3];
// return dtime.getFullYear().toString() + pad(dtime.getMonth()+1) + pad(dtime.getDate());
};
var pocDateTimeFormat = function(dtime){
@@ -52,7 +52,7 @@ var splitDateIntoObj = function(dString){
day: dList[3]
};
return d;
}
};
//DATA FUNCTIONS
@@ -219,10 +219,11 @@ exports.allCards = function(req, res){
console.log(lerr);
res.json({status:'error', message:lerr});
} else {
var cardQuery;
if (lrows.length > 0) {
// We are not being asked for the current day
var last_id = lrows[0].first_id;
var cardQuery = db.prepare("SELECT id, Card_ID, Stroke_Time, Fillage_Percent, Card_Type FROM card_history WHERE id > ? AND id <= ? ORDER BY id DESC");
cardQuery = db.prepare("SELECT id, Card_ID, Stroke_Time, Fillage_Percent, Card_Type FROM card_history WHERE id > ? AND id <= ? ORDER BY id DESC");
cardQuery.all(first_id, last_id, function(cerr, crows){
cardQuery.finalize();
db.close();
@@ -232,10 +233,10 @@ exports.allCards = function(req, res){
} else {
res.json({status:"OK", date:fdate, cards:crows});
}
})
});
} else {
// We are being asked for the current day
var cardQuery = db.prepare("SELECT id, Card_ID, Stroke_Time, Fillage_Percent, Card_Type FROM card_history WHERE id > ? ORDER BY id DESC");
cardQuery = db.prepare("SELECT id, Card_ID, Stroke_Time, Fillage_Percent, Card_Type FROM card_history WHERE id > ? ORDER BY id DESC");
cardQuery.all(first_id, function(cerr, crows){
cardQuery.finalize();
db.close();
@@ -245,7 +246,7 @@ exports.allCards = function(req, res){
} else {
res.json({status:"OK", date:fdate, cards:crows});
}
})
});
}
}
});
@@ -337,7 +338,7 @@ exports.latestCardData = function(req, res){
db.close();
if (err){
console.log(err);
res.json({status:'error', message:err, query:query})
res.json({status:'error', message:err, query:query});
} else {
rows[0].Surface_Position = rows[0].Surface_Position.toString().split(',').map(function(x){return parseFloat(x);});
rows[0].Surface_Load = rows[0].Surface_Load.toString().split(',').map(function(x){return parseFloat(x);});
@@ -363,7 +364,7 @@ exports.findBetweenDateTime = function(req, res){
db.close();
if (err){
console.log(err);
res.json({error:err, query:query})
res.json({error:err, query:query});
} else {
res.json({status:"OK", files:rows.map(createFilenameFromCardObject)});
}
@@ -384,7 +385,7 @@ exports.singleCard = function( req, res ) {
db.close();
if (err){
console.log(err);
res.json({status:'error', message:err, query:query})
res.json({status:'error', message:err, query:query});
} else {
if (rows.length > 0){
rows[0].Surface_Position = rows[0].Surface_Position.toString().split(',').map(function(x){return parseFloat(x);});
@@ -415,7 +416,7 @@ exports.singleCardOldway = function( req, res ) {
db.close();
if (err){
console.log(err);
res.json({status:"error", message:err, query:query})
res.json({status:"error", message:err, query:query});
} else {
rows[0].Surface_Position = rows[0].Surface_Position.toString().split(',').map(function(x){return parseFloat(x);});
rows[0].Surface_Load = rows[0].Surface_Load.toString().split(',').map(function(x){return parseFloat(x);});
@@ -435,7 +436,7 @@ exports.getCardByCardID = function(req, res){
var cardID = req.params.card_id;
var fdate = req.params.date;
db.serialize(function(){
var query = db.prepare("SELECT * FROM card_history WHERE DATE(Stroke_Time) = ? AND Card_ID = ? ORDER BY Stroke_Time DESC");
query.all(mysqlDateFormat(fdate), cardID, function(err, rows){
@@ -443,7 +444,7 @@ exports.getCardByCardID = function(req, res){
db.close();
if (err){
console.log(err);
res.json({status:"error", message:err, query:query})
res.json({status:"error", message:err, query:query});
} else {
if (rows.length > 0){
rows[0].Surface_Position = rows[0].Surface_Position.toString().split(',').map(function(x){return parseFloat(x);});
@@ -478,7 +479,7 @@ exports.multipleCards = function( req, res ) {
res.json({status:'error', message:err});
} else {
if (rows.length > 0){
res.json({status:"OK",
res.json({status:"OK",
cards: rows.map(function(r){
r.Surface_Position = r.Surface_Position.toString().split(',').map(function(x){return parseFloat(x);});
r.Surface_Load = r.Surface_Load.toString().split(',').map(function(x){return parseFloat(x);});
@@ -685,12 +686,12 @@ exports.eventList = function(req,res){
if (req.params.numEvents){
numEvents = req.params.numEvents;
}
db.serialize(function(){
var query = db.prepare('SELECT * FROM Event_List ORDER BY id DESC LIMIT ?');
query.all(numEvents, function(err, rows) {
query.finalize();
db.close()
db.close();
if (err) {
console.log({status:"error", message:err, query:query});
res.json({status:"error", message:err, query:query});
@@ -761,7 +762,7 @@ exports.getSetup = function(req,res){
var sqlite3 = require('sqlite3').verbose();
var db = new sqlite3.Database(dbFile);
var query = 'SELECT * FROM config ORDER BY dateChanged DESC LIMIT 1;'
var query = 'SELECT * FROM config ORDER BY dateChanged DESC LIMIT 1;';
db.serialize(function(){
db.all(query, function(err, rows) {
db.close();
@@ -1062,7 +1063,7 @@ exports.updateFiles = function(req, res){
if (readReturned.status === "error"){
res.json({status:'error', message:readReturned.message});
} else if (readReturned.status === "success") {
readReturned.status ="OK";
readReturned.status ="OK";
res.json(readReturned);
}
}
@@ -1153,7 +1154,7 @@ exports.updateNote = function(req, res){
var db = new sqlite3.Database(dbFile);
var id = parseInt(req.body.id);
db.serialize(function(){
var query = db.prepare("UPDATE Notes SET note = ?, author= ?, type = ? , associated_stroke = ? WHERE id = ?");
query.run(req.body.note, req.body.author, req.body.type, req.body.stroke_associated, id, function(err) {
@@ -1222,7 +1223,7 @@ exports.getDeletedNotes = function(req,res){
res.json({status:'error', message:err, query:query});
} else {
res.json({status:"OK", notes:rows.reverse()});
}
}
});
});
};
@@ -1361,7 +1362,7 @@ exports.getDeletedFluidShots = function(req,res){
} else {
res.json({status:"OK", fluid_shots:rows.reverse()});
}
});
});
};
@@ -1509,3 +1510,23 @@ exports.getDeletedWellTests = function(req,res){
});
});
};
exports.getTagValues = function(req, res){
var sqlite3 = require('sqlite3').verbose();
var db = new sqlite3.Database(dbFile);
db.serialize(function(){
var query = "SELECT name, dtime, val FROM tag_vals GROUP BY name";
var prepQuery = db.prepare(query);
prepQuery.all(req.params.id, function(err, rows) {
prepQuery.finalize();
db.close();
if (err) {
res.json({status:"error", message:err});
console.log(err);
} else {
res.json({status:"OK", vals:rows});
}
});
});
};