diff options
| -rw-r--r-- | core/views/statistics.py | 7 | ||||
| -rw-r--r-- | templates/survexfilewild.html | 5 |
2 files changed, 9 insertions, 3 deletions
diff --git a/core/views/statistics.py b/core/views/statistics.py index f56b821..a796d04 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -6,7 +6,7 @@ from django.shortcuts import render import troggle.settings as settings from troggle.core.models.caves import Cave, Entrance from troggle.core.models.logbooks import LogbookEntry -from troggle.core.models.survex import SurvexStation +from troggle.core.models.survex import SurvexStation, SurvexPersonRole from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition from troggle.parsers.people import GetPersonExpeditionNameLookup, foreign_friends @@ -49,6 +49,11 @@ def svxfilewild(request, year=None): if sb.name != "rootblock": svxwild.append(sb) print(f" WILD {sb.survexfile} {sb.date}") + people = SurvexPersonRole.objects.filter(survexblock=sb) + team = [] + for p in people: + team.append(p.personname) + sb.team = team # else: # print(f" TAME {sb.survexfile}") diff --git a/templates/survexfilewild.html b/templates/survexfilewild.html index 36cfbc3..ed90f7f 100644 --- a/templates/survexfilewild.html +++ b/templates/survexfilewild.html @@ -11,14 +11,15 @@ i.e. they have no *REF line which refers to the wallet holding the raw data for <p>WORK IN PROGRESS <table> -<tr><th>Survex Blocks</th><th>date</th><th>survex file</th><th>surveyed length</th></tr> +<tr><th>survex block with no *ref</th><th>date</th><th>parent block</th><th>within survex file</th><th>surveyed length</th><th>team</th></tr> {% for sb in svxwild %} <tr> <td style="text-align:center"> {{ sb }} </td> <td style="text-align:center"> {{sb.date }} </td> + <td style="text-align:center"> {{sb.parent }} </td> <td style="text-align:left"> <a href="{% url "svx" sb.survexfile.path %}">{{sb.survexfile.path}}</a> </td> <td style="text-align:center"> {{sb.legslength|floatformat:"1g" }}m </td> -</tr> + <td style="text-align:center"> {{sb.team|truncatechars:50 }} </td></tr> {% endfor %} </table> <br /> |