From 1ca2291f31ca8f61423a108d32d514653a3faa98 Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Thu, 21 Apr 2016 15:13:12 -0500 Subject: [PATCH] Fixed SQL query to get tag values at time --- public/partials/cardOverview.html | 11 +++++------ routes/json_sqlite.coffee | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/public/partials/cardOverview.html b/public/partials/cardOverview.html index 643b29e..e06fdb3 100644 --- a/public/partials/cardOverview.html +++ b/public/partials/cardOverview.html @@ -28,9 +28,8 @@
- 
{{tagData}}
-

Status:

{{cardData.Card_Type}}
at {{tagData.fillage_percent.dtime * 1000 | date: "medium"}}
+

Status:

{{cardData.Card_Type}}
at {{cardData.Stroke_Time | date: "medium"}}

Pump Fillage:

{{tagData.fillage_percent.val | number:3}} %
at {{tagData.fillage_percent.dtime * 1000 | date: "medium"}}
@@ -39,16 +38,16 @@

Fluid Above Pump:

{{tagData.fluid_level.val | number:3}} ft.
at {{tagData.fluid_level.dtime * 1000 | date: "medium"}}
-

Polished Rod HP:

{{tagData.polished_rod_hp.val | number:3}} HP
+

Polished Rod HP:

{{tagData.polished_rod_hp.val | number:3}} HP
at {{tagData.polished_rod_hp.dtime * 1000 | date: "medium"}}
-

Pump HP:

{{tagData.pump_hp.val | number:3}} HP
+

Pump HP:

{{tagData.pump_hp.val | number:3}} HP
at {{tagData.pump_hp.dtime * 1000 | date: "medium"}}
-

Speed:

{{tagData.spm.val | number:3}} SPM
+

Speed:

{{tagData.spm.val | number:3}} SPM
at {{tagData.spm.dtime * 1000 | date: "medium"}}
-

Fluid Load:

{{tagData.downhole_fluid_load.val | number:3}} lbs.
+

Fluid Load:

{{tagData.downhole_fluid_load.val | number:3}} lbs.
at {{tagData.downhole_fluid_load.dtime * 1000 | date: "medium"}}

Current Stroke:

{{cardData.Stroke_Time | date: "medium"}}
diff --git a/routes/json_sqlite.coffee b/routes/json_sqlite.coffee index cb9929b..349be9e 100644 --- a/routes/json_sqlite.coffee +++ b/routes/json_sqlite.coffee @@ -1349,7 +1349,7 @@ exports.getValuesClosestTo = (req, res) -> sqlite3 = require('sqlite3').verbose() db = new sqlite3.Database(dbFile) db.serialize ()-> - query = 'SELECT v1.id, v1.tagID, v1.dtime, v1.val, t.name, t.class, t.units FROM tag_vals v1 LEFT JOIN tags t ON t.id = v1.tagID WHERE v1.id = (SELECT v2.id FROM tag_vals v2 WHERE v2.tagID = v1.tagID ORDER BY ABS(v2.dtime - ?) ASC LIMIT 1);' + query = 'SELECT v.id, v.val, v.dtime, t.name, t.maxExpected, t.minExpected, t.units FROM (SELECT tagID, MAX(dtime) dtime FROM tag_vals WHERE dtime <= ? GROUP BY tagID) v0 JOIN tag_vals v ON v0.tagID = v.tagID AND v0.dtime = v.dtime JOIN tags t ON t.id = v.tagID' prepQuery = db.prepare query prepQuery.all req.params.unixTS, (err, rows)-> prepQuery.finalize()