matt/pi-temp
1
0
Fork 0
Code Issues 23 Pull Requests 1 Packages Projects Releases Wiki Activity

Remove timezone conversion #27

Merged
mattbk merged 6 commits from speed-time into master 2017-11-17 16:59:01 -06:00
Conversation 5 Commits 6 Files Changed 1 +13 -6
1 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 536ade30e5 - Show all commits

19
pi_temp.py
View File

@@ -68,6 +68,12 @@ def lab_temp():
return render_template("no_sensor.html") return render_template("no_sensor.html")
@app.route("/history", methods=['GET']) #Add date limits in the URL #Arguments: from=2015-03-04&to=2015-03-05 @app.route("/history", methods=['GET']) #Add date limits in the URL #Arguments: from=2015-03-04&to=2015-03-05
def change_tz(record):
local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone)
time_series_adjusted_temperatures.append(local_timedate_series.format('YYYY-MM-DD HH:mm'))
time_series_temperature_values.append(round(record[2],2))
return {'time':time_series_adjusted_temperatures,'value':time_series_temperature_values} #this is a dict
def history(): def history():
temperatures, humidities, timezone, from_date_str, to_date_str = get_records() temperatures, humidities, timezone, from_date_str, to_date_str = get_records()
@@ -77,11 +83,12 @@ def history():
time_series_temperature_values = [] time_series_temperature_values = []
time_series_humidity_values = [] time_series_humidity_values = []
local_timedate_series = [arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone) for record in temperatures] local_timedate_series = [change_tz(x) for x in temperatures]
for record in temperatures:
#for record in temperatures:
#local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm") #local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm")
time_series_adjusted_temperatures.append(local_timedate_series.format('YYYY-MM-DD HH:mm')) #time_series_adjusted_temperatures.append(local_timedate_series.format('YYYY-MM-DD HH:mm'))
time_series_temperature_values.append(round(record[2],2)) #time_series_temperature_values.append(round(record[2],2))
for record in humidities: for record in humidities:
local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm") local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm")
@@ -91,8 +98,8 @@ def history():
temp = Scatter( temp = Scatter(
x=time_series_adjusted_temperatures, x=local_timedate_series['time'],
y=time_series_temperature_values, y=local_timedate_series['value'],
name='Temperature', name='Temperature',
mode='lines', mode='lines',
line=Line(color='red') line=Line(color='red')