diff --git a/core/views/statistics.py b/core/views/statistics.py index f1b73cc69..6c1e53897 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -82,6 +82,7 @@ def svxfilewild(request, year=None): "wildlength": wildlength, "foreignlength": foreignlength, "year":year, + "expeditions": Expedition.objects.all(), "svxwild": svxwild, "svxforeign": svxforeign} ) diff --git a/parsers/survex.py b/parsers/survex.py index 270bcea26..42b71a382 100644 --- a/parsers/survex.py +++ b/parsers/survex.py @@ -26,7 +26,7 @@ todo = """ easier to understand and maintain https://mathspp.com/blog/til/re-match-groupdict -- replace hard-coded instuments list with reding an editable textfile in expoweb. +- replace hard-coded instuments list with reading an editable textfile in expoweb. - Obscure bug in the *team inheritance and rootblock initialization needs tracking down, probably in the team cache which should NOT be global, but should be an instance variable of @@ -1092,6 +1092,13 @@ class LoadingSurvex: # delete the object to save memory survexleg = None + + def LoadSurvexMessteam(self, survexblock, args): + """Interpret the ; Messteam and ; Zeichner records, + Currently this just sets a flag that the survex block is not CUCC + """ + survexblock.foreigners = True + survexblock.save() def LoadSurvexRef(self, survexblock, args): """Interpret the *ref record, and all the many variants @@ -1640,6 +1647,7 @@ class LoadingSurvex: team = self.rx_commteam.match(comment) if team: # print(f'rx_commteam -- {comment=} in {survexblock.survexfile.path} :: {survexblock}') + self.LoadSurvexMessteam(survexblock, comment) pass diff --git a/templates/survexfilewild.html b/templates/survexfilewild.html index b2bb7f302..ce9527625 100644 --- a/templates/survexfilewild.html +++ b/templates/survexfilewild.html @@ -3,12 +3,32 @@ {% block content %} -
These are survex files which have NO ATTACHED WALLET. + +
+{% for otherexpedition in expeditions %} + | {{otherexpedition.year}} +{% endfor %} + +
These are survex blocks within a survex file which have NO ATTACHED WALLET.
i.e. they have a survex block (begin..end) with no *REF line which refers to the wallet holding the raw data for that block of data.
+
These have "; Messteam" or "; Zeichner" in the survex block, so are non expo surveys. +
| survex block with no *ref | date | parent block | within survex file | surveyed length |
|---|---|---|---|---|
| {{ sb }} | +{{sb.date }} | +{{sb.parent }} | +{{sb.survexfile.path}} | +{{sb.legslength|floatformat:"1g" }}m | + +{% endfor %} +
These do not have "; Messteam" or "; Zeichner" in the survex block, so are probably expo surveys; definitely if they have identified team members (or have zero length).
| survex block with no *ref | date | parent block | within survex file | surveyed length | team |
|---|