2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00

who to blame

This commit is contained in:
Philip Sargent 2023-08-05 12:57:38 +03:00
parent 7df2d44748
commit 33026ca9ea
2 changed files with 9 additions and 3 deletions

View File

@ -6,7 +6,7 @@ from django.shortcuts import render
import troggle.settings as settings import troggle.settings as settings
from troggle.core.models.caves import Cave, Entrance from troggle.core.models.caves import Cave, Entrance
from troggle.core.models.logbooks import LogbookEntry 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.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition
from troggle.parsers.people import GetPersonExpeditionNameLookup, foreign_friends from troggle.parsers.people import GetPersonExpeditionNameLookup, foreign_friends
@ -49,6 +49,11 @@ def svxfilewild(request, year=None):
if sb.name != "rootblock": if sb.name != "rootblock":
svxwild.append(sb) svxwild.append(sb)
print(f" WILD {sb.survexfile} {sb.date}") 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: # else:
# print(f" TAME {sb.survexfile}") # print(f" TAME {sb.survexfile}")

View File

@ -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 <p>WORK IN PROGRESS
<table> <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 %} {% for sb in svxwild %}
<tr> <tr>
<td style="text-align:center"> {{ sb }} </td> <td style="text-align:center"> {{ sb }} </td>
<td style="text-align:center"> {{sb.date }} </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:left"> <a href="{% url "svx" sb.survexfile.path %}">{{sb.survexfile.path}}</a> </td>
<td style="text-align:center"> {{sb.legslength|floatformat:"1g" }}m </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 %} {% endfor %}
</table> </table>
<br /> <br />