diff --git a/sites/WeatherStation/HomeWeather/models.py b/sites/WeatherStation/HomeWeather/models.py
index fc78d19..79d4032 100644
--- a/sites/WeatherStation/HomeWeather/models.py
+++ b/sites/WeatherStation/HomeWeather/models.py
@@ -1,4 +1,5 @@
from django.db import models
+from django.utils import timezone
# Create your models here.
class Sensor(models.Model):
@@ -13,7 +14,7 @@ class Sensor(models.Model):
class Measurement(models.Model):
sensor = models.IntegerField(default=0)
- time = models.DateTimeField('timestamp', auto_now=True)
+ time = models.DateTimeField('timestamp', default=timezone.now)
temperature = models.FloatField(default=-400)
humidity = models.FloatField(default=-1)
pressure = models.FloatField(default=-1)
diff --git a/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html b/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html
new file mode 100644
index 0000000..4e31301
--- /dev/null
+++ b/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html
@@ -0,0 +1,17 @@
+
+
+
+
+
+ Measurement details
+
+
+ Measurement {{ meas.id }} on sensor {{ meas.sensor }}
+
+ - Time: {{ meas.time }}
+ - Temperature: {{ meas.temperature }}
+ - Humidity: {{ meas.humidity }}
+ - Pressure: {{ meas.pressure }}
+
+
+
diff --git a/sites/WeatherStation/HomeWeather/views.py b/sites/WeatherStation/HomeWeather/views.py
index efa664e..5c50718 100644
--- a/sites/WeatherStation/HomeWeather/views.py
+++ b/sites/WeatherStation/HomeWeather/views.py
@@ -9,8 +9,9 @@ def index(request):
return render(request, 'HomeWeather/index.html', context)
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})
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})
diff --git a/sites/WeatherStation/WeatherStation/settings.py b/sites/WeatherStation/WeatherStation/settings.py
index 7b75fb1..f0b9bf2 100644
--- a/sites/WeatherStation/WeatherStation/settings.py
+++ b/sites/WeatherStation/WeatherStation/settings.py
@@ -106,7 +106,7 @@ AUTH_PASSWORD_VALIDATORS = [
LANGUAGE_CODE = 'en-us'
-TIME_ZONE = 'UTC'
+TIME_ZONE = 'America/Chicago'
USE_I18N = True