diff --git a/sites/WeatherStation/HomeWeather/templates/HomeWeather/index.html b/sites/WeatherStation/HomeWeather/templates/HomeWeather/index.html
index 56f5329..3ca0f3b 100644
--- a/sites/WeatherStation/HomeWeather/templates/HomeWeather/index.html
+++ b/sites/WeatherStation/HomeWeather/templates/HomeWeather/index.html
@@ -10,7 +10,7 @@
{% if sensor_list %}
{% else %}
diff --git a/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html b/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html
index 4e31301..4685dc1 100644
--- a/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html
+++ b/sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html
@@ -6,7 +6,7 @@
Measurement details
- Measurement {{ meas.id }} on sensor {{ meas.sensor }}
+ Measurement {{ meas.id }} on sensor {{ meas.sensor }} ({{ sensor.name }})
- Time: {{ meas.time }}
- Temperature: {{ meas.temperature }}
diff --git a/sites/WeatherStation/HomeWeather/urls.py b/sites/WeatherStation/HomeWeather/urls.py
index 8f14f6f..96422e6 100644
--- a/sites/WeatherStation/HomeWeather/urls.py
+++ b/sites/WeatherStation/HomeWeather/urls.py
@@ -6,7 +6,7 @@ urlpatterns = [
# http://127.0.0.1:8000/home/
path('', views.index, name='homeweather_home'),
# http://127.0.0.1:8000/home/sensor/0/
- path('sensor//', views.sensor, name='sensor'),
+ path('sens//', views.sensor, name='sensor'),
# http://127.0.0.1:8000/home/meas/0/1/
- path('meas///', views.measurement, name='meas'),
+ path('meas//', views.measurement, name='meas'),
]
diff --git a/sites/WeatherStation/HomeWeather/views.py b/sites/WeatherStation/HomeWeather/views.py
index 5c50718..c53fc8b 100644
--- a/sites/WeatherStation/HomeWeather/views.py
+++ b/sites/WeatherStation/HomeWeather/views.py
@@ -12,6 +12,8 @@ def sensor(request, sensor):
s = get_object_or_404(Sensor, id=sensor)
return render(request, 'HomeWeather/sensor.html', {"sensor": s})
-def measurement(request, sensor, measurement):
- meas = get_object_or_404(Measurement, id=measurement)
- return render(request, 'HomeWeather/meas.html', {"meas": meas})
+def measurement(request, meas):
+ thisMeasurement = get_object_or_404(Measurement, id=meas)
+ thisSensor = get_object_or_404(Sensor, id=thisMeasurement.sensor)
+ context = {'sensor': thisSensor, 'meas': thisMeasurement }
+ return render(request, 'HomeWeather/meas.html', {"meas": thisMeasurement})