diff options
| -rw-r--r-- | core/models/survex.py | 1 | ||||
| -rw-r--r-- | core/views/statistics.py | 12 |
2 files changed, 11 insertions, 2 deletions
diff --git a/core/models/survex.py b/core/models/survex.py index 7160893..1d5e501 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -214,6 +214,7 @@ class SurvexBlock(models.Model): legsall = models.IntegerField(null=True) # summary data for this block legslength = models.FloatField(null=True) + foreigners = models.BooleanField(default=False) class Meta: ordering = ("id",) diff --git a/core/views/statistics.py b/core/views/statistics.py index 774336e..f1b73cc 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -44,13 +44,19 @@ def svxfilewild(request, year=None): legsbyexpo.reverse() svxwild = [] + svxforeign = [] wildlength = 0.0 + foreignlength = 0.0 for expedition in expos: survexblocks = expedition.survexblock_set.all() for sb in survexblocks: # print(f"{sb=}") if sb.scanswallet == None: - if sb.name != "rootblock": + if sb.foreigners: + svxforeign.append(sb) + print(f" FOREIGN {sb.survexfile} {sb.date}") + foreignlength += sb.legslength + elif sb.name != "rootblock": svxwild.append(sb) print(f" WILD {sb.survexfile} {sb.date}") wildlength += sb.legslength @@ -74,8 +80,10 @@ def svxfilewild(request, year=None): "nsurvexlegs": addupsurvexlegs, "walletslength": walletslength, "wildlength": wildlength, + "foreignlength": foreignlength, "year":year, - "svxwild": svxwild} + "svxwild": svxwild, + "svxforeign": svxforeign} ) def therionissues(request): |