nam/mmo
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correct timezone setting

Browse Source
This commit is contained in:
Nam Tran
2020-09-14 12:06:32 -05:00
parent 4a584cc99b
commit f6278fea87
4 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sites/WeatherStation/HomeWeather/models.py
View File

@@ -1,4 +1,5 @@
from django.db import models from django.db import models
from django.utils import timezone
# Create your models here. # Create your models here.
class Sensor(models.Model): class Sensor(models.Model):
@@ -13,7 +14,7 @@ class Sensor(models.Model):
class Measurement(models.Model): class Measurement(models.Model):
sensor = models.IntegerField(default=0) sensor = models.IntegerField(default=0)
time = models.DateTimeField('timestamp', auto_now=True) time = models.DateTimeField('timestamp', default=timezone.now)
temperature = models.FloatField(default=-400) temperature = models.FloatField(default=-400)
humidity = models.FloatField(default=-1) humidity = models.FloatField(default=-1)
pressure = models.FloatField(default=-1) pressure = models.FloatField(default=-1)

17
sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html Normal file
View File

@@ -0,0 +1,17 @@
<!doctype html>
<html lang="en">
<head>
<meta charset="utf-8">
<meta name="viewport" content="width=device-width, initial-scale=1">
<title>Measurement details </title>
</head>
<body>
Measurement {{ meas.id }} on sensor {{ meas.sensor }}
<ul>
<li> Time: {{ meas.time }}</li>
<li> Temperature: {{ meas.temperature }}</li>
<li> Humidity: {{ meas.humidity }}</li>
<li> Pressure: {{ meas.pressure }}</li>
</ul>
</body>
</html>

5
sites/WeatherStation/HomeWeather/views.py
View File

@@ -9,8 +9,9 @@ def index(request):
return render(request, 'HomeWeather/index.html', context) return render(request, 'HomeWeather/index.html', context)
def sensor(request, sensor): def sensor(request, sensor):
s = get_object_or_404(Sensor, pk=sensor) s = get_object_or_404(Sensor, id=sensor)
return render(request, 'HomeWeather/sensor.html', {"sensor": s}) return render(request, 'HomeWeather/sensor.html', {"sensor": s})
def measurement(request, sensor, measurement): def measurement(request, sensor, measurement):
return HttpResponse(f"Sensor {sensor}, measurement {measurement}") meas = get_object_or_404(Measurement, id=measurement)
return render(request, 'HomeWeather/meas.html', {"meas": meas})

2
sites/WeatherStation/WeatherStation/settings.py
View File

@@ -106,7 +106,7 @@ AUTH_PASSWORD_VALIDATORS = [
LANGUAGE_CODE = 'en-us' LANGUAGE_CODE = 'en-us'
TIME_ZONE = 'UTC' TIME_ZONE = 'America/Chicago'
USE_I18N = True USE_I18N = True