Skip to content

Commit

Permalink
display additional information in city detail view (#166)
Browse files Browse the repository at this point in the history
Co-authored-by: Nik Sauer <nik.sauer@luftdaten.at>
  • Loading branch information
n11ik and Nik Sauer authored Feb 19, 2025
1 parent 8d0b4b6 commit 5d246ee
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
11 changes: 8 additions & 3 deletions app/cities/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,12 @@
from main.enums import Dimension, SensorModel, OutputFormat, Precision, Order

def CitiesDetailView(request, pk):
api_url = f"{settings.API_URL}/city/current?city_slug={pk}"
print(api_url)
api_url = f"{settings.API_URL}/city/current"
params = {
"city_slug": {pk},
}
try:
response = requests.get(api_url)
response = requests.get(api_url, params=params)
response.raise_for_status() # Prüft, ob die Anfrage erfolgreich war
station_data = response.json() # Daten im JSON-Format

Expand All @@ -25,6 +27,7 @@ def CitiesDetailView(request, pk):
'timezone': properties.get('timezone'),
'coordinates': geometry.get('coordinates'),
'last_updated': properties.get('time'),
'station_count': properties.get('station_count'),
'values': []
}

Expand All @@ -36,6 +39,8 @@ def CitiesDetailView(request, pk):
city_info['values'].append({
'dimension': translated_dimension,
'value': value.get("value"),
'value_count': value.get('value_count'),
'station_count': value.get('station_count'),
'unit': Dimension.get_unit(dimension_id)
})

Expand Down
4 changes: 3 additions & 1 deletion app/templates/cities/detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -28,14 +28,16 @@ <h1>{{ city.name }}</h1>
</div>
</div>
<div class="row">
<h3>Aktuelle Durchschnittswerte</h3>
<h3>Aktuell sind {{ city.station_count }} Stationen aktiv</h3>
<h3>Durchschnittswerte der letzten Stunde</h3>
{% for value in city.values %}
{% if value.dimension in "PM1.0,PM2.5,PM10.0,Humidity,Temperature" %}
<div class="col-sm-4 mb-4">
<div class="card text-center">
<div class="card-body">
<h6 class="card-subtitle mb-2 text-muted">{{ value.dimension }}</h6>
<p class="card-text display-4">{{ value.value|floatformat:2 }} {{ value.unit }}</p>
<h6 class="card-subtitle mb-2 text-muted">Berechnung aus {{ value.value_count }} Werten von {{ value.station_count }} Stationen</h6>
</div>
</div>
</div>
Expand Down

0 comments on commit 5d246ee

Please sign in to comment.