From ffbdbebcf29356e47c0dc0d51b7130e4cb146f70 Mon Sep 17 00:00:00 2001 From: Conrad Date: Fri, 30 Mar 2018 15:07:07 -0400 Subject: [PATCH 1/2] Add temperature probe cid to model --- app/forms/senseware_node.py | 12 ++++++++++++ app/models/senseware_node.py | 4 ++++ 2 files changed, 16 insertions(+) diff --git a/app/forms/senseware_node.py b/app/forms/senseware_node.py index 98b278e..b015258 100644 --- a/app/forms/senseware_node.py +++ b/app/forms/senseware_node.py @@ -54,3 +54,15 @@ class SensewareNodeForm(Form, UserForm): notes = wtf.StringField( validators=[wtf.validators.Optional()] ) + temperature_probe_1_cid = NullableIntegerField( + validators=[wtf.validators.Optional()] + ) + temperature_probe_2_cid = NullableIntegerField( + validators=[wtf.validators.Optional()] + ) + temperature_probe_3_cid = NullableIntegerField( + validators=[wtf.validators.Optional()] + ) + temperature_probe_4_cid = NullableIntegerField( + validators=[wtf.validators.Optional()] + ) diff --git a/app/models/senseware_node.py b/app/models/senseware_node.py index 95e7f48..d1c946c 100644 --- a/app/models/senseware_node.py +++ b/app/models/senseware_node.py @@ -21,3 +21,7 @@ class SensewareNode(Model, User, Tracked, db.Model): temperature_probe_3 = db.Column(db.Integer) temperature_probe_4 = db.Column(db.Integer) notes = db.Column(db.Unicode(500)) + temperature_probe_1_cid = db.Column(db.Integer) + temperature_probe_2_cid = db.Column(db.Integer) + temperature_probe_3_cid = db.Column(db.Integer) + temperature_probe_4_cid = db.Column(db.Integer) -- GitLab From 5c4449577b622339996bc1d7d6ac5d27d3c594de Mon Sep 17 00:00:00 2001 From: Conrad Date: Tue, 3 Apr 2018 12:26:17 -0400 Subject: [PATCH 2/2] Also select channel id from table --- app/controllers/data.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/data.py b/app/controllers/data.py index 22f695b..92eb723 100644 --- a/app/controllers/data.py +++ b/app/controllers/data.py @@ -37,7 +37,7 @@ class DataController(RestController): where_statement += 'AND unit_id=%s' where_tuple = where_tuple + (filter_data['unit_id'],) - sql = "SELECT ts, value, unit, unit_id, name, sn, mod FROM data {} ORDER BY ts".format(where_statement) + sql = "SELECT ts, value, unit, unit_id, name, sn, mod, channel_id FROM data {} ORDER BY ts".format(where_statement) db = get_redshift_db(current_app) cur = db.cursor(cursor_factory=psycopg2.extras.DictCursor) cur.execute(sql, where_tuple) -- GitLab