commit 345c7d6adcb4ef7d07431c8b368b5f5a990300a4 Author: dsorber Date: Sun Apr 28 21:24:21 2013 -0400 Adding javascript (using Google Charts) graph of the last 60 data points to the per day display page. diff --git a/525.743/code/web/app.wsgi b/525.743/code/web/app.wsgi index f9a80ed..694de44 100644 --- a/525.743/code/web/app.wsgi +++ b/525.743/code/web/app.wsgi @@ -51,10 +51,10 @@ def application(environ, start_response): # Load the day template template = loader.load('day.html') + # Parse the date out of the URL (TODO: validate all this) day = environ['PATH_INFO'][5:7] month = environ['PATH_INFO'][7:9] year = environ['PATH_INFO'][9:13] - date = '%s/%s/%s' % (month, day, year) # Create the response args @@ -64,12 +64,27 @@ def application(environ, start_response): # grab the results, then close the DB connection. db_conn = sqlite3.connect(DB_PATH) db = db_conn.cursor() - db.execute("select strftime('%H:%M:%S', ts, 'unixepoch'), " + db.execute("select strftime('%%H:%%M:%%S', ts, 'unixepoch'), " " temp1, temp2, temp3, temp4, relay_status " "from temp_data " - "where date(ts, 'unixepoch') is date('2013-04-22')" - "order by ts desc") + "where date(ts, 'unixepoch') is date('%s-%s-%s')" + "order by ts desc" % (year, month, day)) response_args['results'] = db.fetchall() + + # Chart query + db.execute("select strftime('%%H:%%M:%%S', ts, 'unixepoch'), temp1, " + " temp2, temp3, temp4 from ( " + "select ts, temp1, temp2, temp3, temp4 " + "from temp_data " + "where date(ts, 'unixepoch') is date('%s-%s-%s')" + "order by ts desc limit 60) order by ts" + % (year, month, day)) + chart_results = db.fetchall() + # This is a bit of hack to get around a javascript issue in + # the template + response_args['chart_results'] = chart_results[:-1] + response_args['chart_last_row'] = chart_results[-1] + db_conn.close() # Generate the stream and then render it to HTML diff --git a/525.743/code/web/templates/day.html b/525.743/code/web/templates/day.html index c7bf23f..06d5a61 100644 --- a/525.743/code/web/templates/day.html +++ b/525.743/code/web/templates/day.html @@ -1,59 +1,86 @@ -Beer Fermenation Control System - + Beer Fermenation Control System + + + -

${title}

- - - - - - - - - - - - - - - - - -

Time	Sensor 1	Sensor 2	Sensor 3	Sensor 4	Relay Status
${row[0]}	${row[1]}	${row[2]}	${row[3]}	${row[4]}	${int(row[5]) and 'on' or 'off'}

-
-Back +

${title}

Graph of Last 60 Readings

Table of All Readings

+ + + + + + + + + + + + + + + + + +

Time	Sensor 1	Sensor 2	Sensor 3	Sensor 4	Relay Status
${row[0]}	${row[1]}	${row[2]}	${row[3]}	${row[4]}	${int(row[5]) and 'on' or 'off'}

+
+ Back