diff options
Diffstat (limited to 'core/views/statistics.py')
| -rw-r--r-- | core/views/statistics.py | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/core/views/statistics.py b/core/views/statistics.py index 49e8674..e344ed2 100644 --- a/core/views/statistics.py +++ b/core/views/statistics.py @@ -11,6 +11,7 @@ from troggle.core.models.survex import SurvexStation, SurvexPersonRole from troggle.core.models.troggle import DataIssue, Expedition, Person, PersonExpedition from troggle.core.models.wallets import Wallet from troggle.parsers.people import GetPersonExpeditionNameLookup, foreign_friends +from troggle.core.utils import current_expo # from django.views.generic.list import ListView """Very simple report pages summarizing data about the whole set of expeditions and of @@ -65,13 +66,15 @@ def svxfilewild(request, year=None): for w in wallets: for sb in w.survexblock_set.all(): walletslength += sb.legslength - - return render(request, "survexfilewild.html", + if not year: + year = current_expo() + return render(request, "survexfilewild.html", {"addupsurvexlength": addupsurvexlength / 1000, "legsbyexpo": legsbyexpo, "nsurvexlegs": addupsurvexlegs, "walletslength": walletslength, "wildlength": wildlength, + "year":year, "svxwild": svxwild} ) @@ -97,7 +100,7 @@ def therionissues(request): for line in therionlog: line = line.replace("! Un-parsed image filename:", "") newlog.append(line) - return render(request, "therionreport.html", {"therionlog": newlog}) + return render(request, "therionreport.html", {"therionlog": newlog, "year": current_expo()}) def surveximport(request): @@ -110,7 +113,7 @@ def surveximport(request): contents = f.read() else: print(f"{logpath} NOT FOUND {len(contents)}") - return render(request, "survexreport.html", {"log": contents}) + return render(request, "survexreport.html", {"log": contents, "year": current_expo()}) def survexdebug(request): @@ -123,7 +126,7 @@ def survexdebug(request): contents = f.read() else: print(f"{logpath} NOT FOUND {len(contents)}") - return render(request, "survexdebug.html", {"log": contents}) + return render(request, "survexdebug.html", {"log": contents, "year": current_expo()}) def pathsreport(request): @@ -227,7 +230,7 @@ def pathsreport(request): return render( request, "pathsreport.html", - {"pathsdict": pathsdict, "bycodeslist": bycodeslist2, "bypathslist": bypathslist, "ncodes": ncodes}, + {"pathsdict": pathsdict, "bycodeslist": bycodeslist2, "bypathslist": bypathslist, "ncodes": ncodes, "year": current_expo()}, ) @@ -258,7 +261,7 @@ def stats(request): renderDict = { **statsDict, - **{"addupsurvexlength": addupsurvexlength / 1000, "legsbyexpo": legsbyexpo, "nsurvexlegs": addupsurvexlegs}, + **{"addupsurvexlength": addupsurvexlength / 1000, "legsbyexpo": legsbyexpo, "nsurvexlegs": addupsurvexlegs, "year": current_expo()}, } # new syntax return render(request, "statistics.html", renderDict) @@ -272,7 +275,7 @@ def dataissues(request): dilist = list(DataIssue.objects.all()) dilist.sort(key=myFunc) - return render(request, "dataissues.html", {"didict": dilist}) + return render(request, "dataissues.html", {"didict": dilist, "year": current_expo()}) def stations(request): @@ -313,7 +316,7 @@ def stations(request): stations = SurvexStation.objects.all() # NB these are NOT all the stations in troggle_import_root.pos - return render(request, "stations.html", {"ents": ents, "gpsents": gpsents, "stations": stations}) + return render(request, "stations.html", {"ents": ents, "gpsents": gpsents, "stations": stations, "year": current_expo()}) def aliases(request, year): |