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

auto new year stuff

Browse Source
This commit is contained in:
Philip Sargent
2024-03-15 01:50:34 +00:00
parent e1eb85969a
commit d970942f04
7 changed files with 68 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
core/views/scans.py
View File

@@ -14,6 +14,7 @@ from troggle.core.views.expo import getmimetype
from troggle.parsers.caves import add_cave_to_pending_list
from troggle.parsers.people import GetPersonExpeditionNameLookup
from troggle.parsers.survex import set_walletdate
from troggle.core.utils import current_expo
"""
@@ -255,7 +256,7 @@ def walletslistperson(request, slug):
request,
"personwallets.html",
{"manywallets": manywallets, "settings": settings, "person": p, "expeditions": expeditions,
"length_ug": length_ug}
"length_ug": length_ug, "year": current_expo()}
)
@@ -330,7 +331,7 @@ def cavewallets(request, caveid):
request,
"cavewallets.html",
{"manywallets": manywallets, "settings": settings, "cave": cave, "expeditions": expeditions,
"length_ug": length_ug}
"length_ug": length_ug, "year": current_expo()}
)
@@ -340,10 +341,10 @@ def oldwallet(request, path):
print(f"! - oldwallet path:{path}")
try:
wallet = Wallet.objects.get(walletname=urlunquote(path))
return render(request, "wallet_old.html", {"wallet": wallet, "settings": settings})
return render(request, "wallet_old.html", {"wallet": wallet, "settings": settings, "year": current_expo()})
except:
message = f"Scan folder error or not found '{path}' ."
return render(request, "errors/generic.html", {"message": message})
return render(request, "errors/generic.html", {"message": message,"year": current_expo()})
def scansingle(request, path, file):
@@ -377,5 +378,5 @@ def allscans(request):
# manywallets = Wallet.objects.all().prefetch_related('singlescan') fails as the link is defined on 'singlescan' not on 'wallet'
expeditions = Expedition.objects.all()
return render(
request, "walletsall.html", {"manywallets": manywallets, "settings": settings, "expeditions": expeditions}
request, "walletsall.html", {"manywallets": manywallets, "settings": settings, "expeditions": expeditions, "year": current_expo()}
)