expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-18 13:17:11 +00:00
Code Issues 18 Projects 3 Activity

separating out ARGE surveys from badly recorded Jenny&Olly surveys

Browse Source
This commit is contained in:
Philip Sargent
2025-06-28 18:27:25 +03:00
parent c89e8cea90
commit fc427993e7
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
core/models/survex.py
View File

@@ -214,6 +214,7 @@ class SurvexBlock(models.Model):
legsall = models.IntegerField(null=True) # summary data for this block legsall = models.IntegerField(null=True) # summary data for this block
legslength = models.FloatField(null=True) legslength = models.FloatField(null=True)
foreigners = models.BooleanField(default=False)
class Meta: class Meta:
ordering = ("id",) ordering = ("id",)

12
core/views/statistics.py
View File

@@ -44,13 +44,19 @@ def svxfilewild(request, year=None):
legsbyexpo.reverse() legsbyexpo.reverse()
svxwild = [] svxwild = []
svxforeign = []
wildlength = 0.0 wildlength = 0.0
foreignlength = 0.0
for expedition in expos: for expedition in expos:
survexblocks = expedition.survexblock_set.all() survexblocks = expedition.survexblock_set.all()
for sb in survexblocks: for sb in survexblocks:
# print(f"{sb=}") # print(f"{sb=}")
if sb.scanswallet == None: 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) svxwild.append(sb)
print(f" WILD {sb.survexfile} {sb.date}") print(f" WILD {sb.survexfile} {sb.date}")
wildlength += sb.legslength wildlength += sb.legslength
@@ -74,8 +80,10 @@ def svxfilewild(request, year=None):
"nsurvexlegs": addupsurvexlegs, "nsurvexlegs": addupsurvexlegs,
"walletslength": walletslength, "walletslength": walletslength,
"wildlength": wildlength, "wildlength": wildlength,
"foreignlength": foreignlength,
"year":year, "year":year,
"svxwild": svxwild} "svxwild": svxwild,
"svxforeign": svxforeign}
) )
def therionissues(request): def therionissues(request):