Merge pull request #27 from mattbk/speed-time
Remove timezone conversion
This commit is contained in:
		
							
								
								
									
										45
									
								
								pi_temp.py
									
									
									
									
									
								
							
							
						
						
									
										45
									
								
								pi_temp.py
									
									
									
									
									
								
							@@ -71,6 +71,7 @@ def lab_temp():
 | 
				
			|||||||
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()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    
 | 
				
			||||||
# 	Create new record tables so that datetimes are adjusted back to the user browser's time zone.
 | 
					# 	Create new record tables so that datetimes are adjusted back to the user browser's time zone.
 | 
				
			||||||
	time_series_adjusted_temperatures  = []
 | 
						time_series_adjusted_temperatures  = []
 | 
				
			||||||
	time_series_adjusted_humidities 	= []
 | 
						time_series_adjusted_humidities 	= []
 | 
				
			||||||
@@ -78,44 +79,44 @@ def history():
 | 
				
			|||||||
	time_series_humidity_values 		= []
 | 
						time_series_humidity_values 		= []
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	for record in temperatures:
 | 
						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_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").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
 | 
							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
 | 
																											  #so that Plotly respects it
 | 
				
			||||||
		time_series_humidity_values.append(round(record[2],2))
 | 
							time_series_humidity_values.append(round(record[2],2))
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	
 | 
						
 | 
				
			||||||
	temp = Scatter(
 | 
						temp = Scatter(
 | 
				
			||||||
        		x=time_series_adjusted_temperatures, 
 | 
									x=time_series_adjusted_temperatures, 
 | 
				
			||||||
        		y=time_series_temperature_values,
 | 
									y=time_series_temperature_values,
 | 
				
			||||||
        		name='Temperature',
 | 
									name='Temperature',
 | 
				
			||||||
                mode='lines',
 | 
									mode='lines',
 | 
				
			||||||
                line=Line(color='red')
 | 
									line=Line(color='red')
 | 
				
			||||||
    				)
 | 
										)
 | 
				
			||||||
	hum = Scatter(
 | 
						hum = Scatter(
 | 
				
			||||||
        		x=time_series_adjusted_humidities,
 | 
									x=time_series_adjusted_humidities,
 | 
				
			||||||
        		y=time_series_humidity_values,
 | 
									y=time_series_humidity_values,
 | 
				
			||||||
        		name='Humidity',
 | 
									name='Humidity',
 | 
				
			||||||
                line=Line(color='aqua')
 | 
									line=Line(color='aqua')
 | 
				
			||||||
    				)
 | 
										)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	data = Data([temp, hum])
 | 
						data = Data([temp, hum])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	layout = Layout(
 | 
						layout = Layout(
 | 
				
			||||||
					title="Temperature and Humidity",
 | 
										title="Temperature and Humidity",
 | 
				
			||||||
				    xaxis=XAxis(
 | 
										xaxis=XAxis(
 | 
				
			||||||
				        type='date',
 | 
											type='date',
 | 
				
			||||||
				        autorange=True
 | 
											autorange=True
 | 
				
			||||||
				    ),
 | 
										),
 | 
				
			||||||
				    yaxis=YAxis(
 | 
										yaxis=YAxis(
 | 
				
			||||||
				    	title='Fahrenheit / Percent',
 | 
											title='Fahrenheit / Percent',
 | 
				
			||||||
				        type='linear',
 | 
											type='linear',
 | 
				
			||||||
				        autorange=True
 | 
											autorange=True
 | 
				
			||||||
				    ),
 | 
										),
 | 
				
			||||||
					)
 | 
										)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	fig = Figure(data=data, layout=layout)
 | 
						fig = Figure(data=data, layout=layout)
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user