From 830150ade6be82091d0fcfca9a91c7cb363a6fdc Mon Sep 17 00:00:00 2001 From: Philip Sargent Date: Sat, 15 Oct 2022 21:28:56 +0300 Subject: [PATCH] Making page templates autoadjust to the current year --- core/views/scans.py | 7 ++++--- templates/cavewallets.html | 6 ++++-- templates/personwallets.html | 6 ++++-- templates/wallet_table.html | 10 ++++++++++ 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/core/views/scans.py b/core/views/scans.py index 38f1ed8..af26c47 100644 --- a/core/views/scans.py +++ b/core/views/scans.py @@ -152,8 +152,8 @@ def walletslistperson(request, first_name, last_name): return render(request, 'errors/generic.html', {'message': f'Unrecognised name of a expo person: "{first_name} {last_name}"'}) manywallets = tickspersonwallet(p) - - return render(request, 'personwallets.html', { 'manywallets':manywallets, 'settings': settings, 'person': p}) + expeditions = Expedition.objects.all() + return render(request, 'personwallets.html', { 'manywallets':manywallets, 'settings': settings, 'person': p, 'expeditions': expeditions}) def walletslistyear(request, year): @@ -223,7 +223,8 @@ def cavewallets(request, caveid): fillblankothers(w) w.ticks = w.get_ticks() # the complaints in colour form, from the json file on disc fixsurvextick(w, w.ticks) - return render(request, 'cavewallets.html', { 'manywallets':manywallets, 'settings': settings, 'cave': cave}) + expeditions = Expedition.objects.all() + return render(request, 'cavewallets.html', { 'manywallets':manywallets, 'settings': settings, 'cave': cave, 'expeditions': expeditions}) def oldwallet(request, path): diff --git a/templates/cavewallets.html b/templates/cavewallets.html index 3b9ca25..803eff3 100644 --- a/templates/cavewallets.html +++ b/templates/cavewallets.html @@ -15,9 +15,11 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c

This lists all the files in a wallet, some of which may not be for this specific cave.

See also wallets

+
  • per year: +{% for otherexpedition in expeditions %} + | {{otherexpedition.year}} +{% endfor %} {% include 'wallet_table.html' %}
    diff --git a/templates/personwallets.html b/templates/personwallets.html index 255d03e..c760e78 100644 --- a/templates/personwallets.html +++ b/templates/personwallets.html @@ -13,9 +13,11 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c

    See also wallets

    +
  • per year: +{% for otherexpedition in expeditions %} + | {{otherexpedition.year}} +{% endfor %} {% include 'wallet_table.html' %}
    diff --git a/templates/wallet_table.html b/templates/wallet_table.html index b943351..e14de2c 100644 --- a/templates/wallet_table.html +++ b/templates/wallet_table.html @@ -49,6 +49,16 @@
    • +{% empty %}

    No Wallets for this year

    +Before 1998 we used a survey book system, not wallets. But 1983 has some scraps recreated as wallets. +

    That is probably why you cannot see anything here. Look at the complete list of scanned files instead, +at Scans (it is slow, so be patient). +It lists things like "1984AndysNotebook" instead of a wallet identifier, but if you click on +"1984AndysNotebook" you +will see some of the the notes and sketches scanned from it. +

    Or look at all the scanned files, +their wallet names and the drawings that were created using them at Drawings +which is probably more useful. {% endfor %}

       

    Note that names in italics are copied from the related survex file block name.