diff --git a/pi_temp.py b/pi_temp.py index b5f90c9..172a767 100755 --- a/pi_temp.py +++ b/pi_temp.py @@ -70,7 +70,8 @@ def lab_temp(): @app.route("/history", methods=['GET']) #Add date limits in the URL #Arguments: from=2015-03-04&to=2015-03-05 def history(): temperatures, humidities, timezone, from_date_str, to_date_str = get_records() - + + # Create new record tables so that datetimes are adjusted back to the user browser's time zone. time_series_adjusted_temperatures = [] time_series_adjusted_humidities = [] @@ -78,44 +79,44 @@ def history(): time_series_humidity_values = [] for record in temperatures: - local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone) + 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_temperature_values.append(round(record[2],2)) for record in humidities: - local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm").to(timezone) + local_timedate_series = arrow.get(record[0], "YYYY-MM-DD HH:mm") time_series_adjusted_humidities.append(local_timedate_series.format('YYYY-MM-DD HH:mm')) #Best to pass datetime in text #so that Plotly respects it time_series_humidity_values.append(round(record[2],2)) temp = Scatter( - x=time_series_adjusted_temperatures, - y=time_series_temperature_values, - name='Temperature', - mode='lines', - line=Line(color='red') - ) + x=time_series_adjusted_temperatures, + y=time_series_temperature_values, + name='Temperature', + mode='lines', + line=Line(color='red') + ) hum = Scatter( - x=time_series_adjusted_humidities, - y=time_series_humidity_values, - name='Humidity', - line=Line(color='aqua') - ) + x=time_series_adjusted_humidities, + y=time_series_humidity_values, + name='Humidity', + line=Line(color='aqua') + ) data = Data([temp, hum]) layout = Layout( title="Temperature and Humidity", - xaxis=XAxis( - type='date', - autorange=True - ), - yaxis=YAxis( - title='Fahrenheit / Percent', - type='linear', - autorange=True - ), + xaxis=XAxis( + type='date', + autorange=True + ), + yaxis=YAxis( + title='Fahrenheit / Percent', + type='linear', + autorange=True + ), ) fig = Figure(data=data, layout=layout)