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

kinda working

Browse Source
This commit is contained in:
Nam Tran
2020-09-14 13:17:24 -05:00
parent f6278fea87
commit 8862c16feb
4 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sites/WeatherStation/HomeWeather/templates/HomeWeather/index.html
View File

@@ -10,7 +10,7 @@
{% if sensor_list %} {% if sensor_list %}
<ul> <ul>
{% for sensor in sensor_list %} {% for sensor in sensor_list %}
<li><a href="/home/sensor/{{ sensor.id }}/">{{ sensor.name }}</a></li> <li><a href="{% url 'sensor' sensor.id %}">{{ sensor.name }}</a></li>
{% endfor %} {% endfor %}
</ul> </ul>
{% else %} {% else %}

2
sites/WeatherStation/HomeWeather/templates/HomeWeather/meas.html
View File

@@ -6,7 +6,7 @@
<title>Measurement details </title> <title>Measurement details </title>
</head> </head>
<body> <body>
Measurement {{ meas.id }} on sensor {{ meas.sensor }} Measurement {{ meas.id }} on sensor {{ meas.sensor }} ({{ sensor.name }})
<ul> <ul>
<li> Time: {{ meas.time }}</li> <li> Time: {{ meas.time }}</li>
<li> Temperature: {{ meas.temperature }}</li> <li> Temperature: {{ meas.temperature }}</li>

4
sites/WeatherStation/HomeWeather/urls.py
View File

@@ -6,7 +6,7 @@ urlpatterns = [
# http://127.0.0.1:8000/home/ # http://127.0.0.1:8000/home/
path('', views.index, name='homeweather_home'), path('', views.index, name='homeweather_home'),
# http://127.0.0.1:8000/home/sensor/0/ # http://127.0.0.1:8000/home/sensor/0/
path('sensor/<int:sensor>/', views.sensor, name='sensor'), path('sens/<int:sensor>/', views.sensor, name='sensor'),
# http://127.0.0.1:8000/home/meas/0/1/ # http://127.0.0.1:8000/home/meas/0/1/
path('meas/<int:sensor>/<int:measurement>/', views.measurement, name='meas'), path('meas/<int:meas>/', views.measurement, name='meas'),
] ]

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

@@ -12,6 +12,8 @@ def sensor(request, sensor):
s = get_object_or_404(Sensor, id=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, meas):
meas = get_object_or_404(Measurement, id=measurement) thisMeasurement = get_object_or_404(Measurement, id=meas)
return render(request, 'HomeWeather/meas.html', {"meas": meas}) thisSensor = get_object_or_404(Sensor, id=thisMeasurement.sensor)
context = {'sensor': thisSensor, 'meas': thisMeasurement }
return render(request, 'HomeWeather/meas.html', {"meas": thisMeasurement})