Start working on updating www to work with new db setup

This commit is contained in:
Patrick McDonagh
2016-04-21 09:34:11 -05:00
parent b3713541ef
commit 45d99d1465
2 changed files with 4 additions and 2 deletions

View File

@@ -28,6 +28,7 @@
<div class="row">
<pre>{{tagData}}</pre>
<div class="col-sm-4">
<div id="Status" class="gauge well" style="width:95%; text-align:center; margin:10px;"><h4>Status:</h4><h5>{{cardData.Card_Type}}</h5><h6>at {{tagData.fillage_percent.dtime * 1000 | date: "medium"}}</h6></div>
</div>

View File

@@ -1325,9 +1325,10 @@ exports.getTagValues = (req, res) ->
db = new sqlite3.Database(dbFile)
db.serialize () ->
query = "SELECT name, dtime, val FROM tag_vals GROUP BY name"
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 v2.id DESC LIMIT 1)"
prepQuery = db.prepare query
prepQuery.all req.params.id, (err, rows) ->
prepQuery.all (err, rows) ->
console.log(rows)
prepQuery.finalize()
db.close()
if err