expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-24 16:21:53 +00:00
Code Issues 19 Projects 3 Activity

nicer display

Browse Source
This commit is contained in:
Philip Sargent 2024-07-16 17:30:04 +02:00
parent ceb20f8565
commit 5b23b2df8a
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/views/logbooks.py
View File

@ -226,7 +226,7 @@ def logreport(request, year=1999):
PersonLogEntry.objects.filter(personexpedition__expedition=expo) PersonLogEntry.objects.filter(personexpedition__expedition=expo)
""" """
print(f"logreport(): begun") # print(f"logreport(): begun")
expeditions = Expedition.objects.all() # top menu only, evaluated only when template renders expeditions = Expedition.objects.all() # top menu only, evaluated only when template renders
dates = None dates = None
@ -257,7 +257,7 @@ def logreport(request, year=1999):
entry.who.append(p) entry.who.append(p)
print(f"logreport(): trying..") # print(f"logreport(): trying..")
context = { context = {
"year": year, "year": year,
"expedition": expo, "expedition": expo,
@ -265,8 +265,8 @@ def logreport(request, year=1999):
"settings": settings, "settings": settings,
"dateditems": dateditems, "dateditems": dateditems,
"dates": dates, "dates": dates,
} }
print(f"logreport(): rendering..") # print(f"logreport(): rendering..")
return render(request, "logreport.html", context) return render(request, "logreport.html", context)
except Exception as e: except Exception as e:

5
templates/logreport.html
View File

@ -18,6 +18,7 @@
{% endfor %} {% endfor %}
</p> </p>
<p>(Hover mouse over the date to see the slug for the entry.)
<table class="expeditionlogbooks"> <table class="expeditionlogbooks">
<tr><th>Date</th><th>Logged trips and diary entries</th><th>Cave</th><th>Text..</th><th>Words</th><th>Author</th><th>Who else</th></tr> <tr><th>Date</th><th>Logged trips and diary entries</th><th>Cave</th><th>Text..</th><th>Words</th><th>Author</th><th>Who else</th></tr>
@ -25,7 +26,7 @@
{% for date in dates %} {% for date in dates %}
{% for entry in date.list %} {% for entry in date.list %}
<tr> <tr>
<td>{{date.grouper|date:"D d M Y"}}</td> <td title="{{entry.slug}}">{{date.grouper|date:"D d M Y"}}</td>
<td> <td>
<a href="{{ entry.get_absolute_url }}">{{entry.title|truncatechars:30|safe|striptags}}</a>&nbsp; <a href="{{ entry.get_absolute_url }}">{{entry.title|truncatechars:30|safe|striptags}}</a>&nbsp;
</td> </td>
@ -58,7 +59,7 @@
{% endfor %} {% endfor %}
</table> </table>
<p>See also the <p>See also:
<ul> <ul>
<li> <a href="/expedition/{{expedition.year}}">full calendar page</a> for this Expo (slow page) <li> <a href="/expedition/{{expedition.year}}">full calendar page</a> for this Expo (slow page)
<li> <a href="/years/{{expedition.year}}/">documentation index</a> for this Expo <li> <a href="/years/{{expedition.year}}/">documentation index</a> for this Expo