summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-07-21 10:50:15 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-07-21 10:50:15 +0300
commit5161fce32e1f7f040ade2b4d8cfb859ae3ba2a0b (patch)
treed2ee5a90b9de5e6577ff834b0564c13dd7fdfddf
parent8245ee103e3569888145f8781b4405ee9fa657db (diff)
downloadtroggle-5161fce32e1f7f040ade2b4d8cfb859ae3ba2a0b.tar.gz
troggle-5161fce32e1f7f040ade2b4d8cfb859ae3ba2a0b.tar.bz2
troggle-5161fce32e1f7f040ade2b4d8cfb859ae3ba2a0b.zip
remove duplicate lines, add heading link
-rw-r--r--core/views/scans.py4
-rw-r--r--templates/cavewallets.html5
2 files changed, 4 insertions, 5 deletions
diff --git a/core/views/scans.py b/core/views/scans.py
index 8ecec0a..e3279f3 100644
--- a/core/views/scans.py
+++ b/core/views/scans.py
@@ -80,5 +80,5 @@ def cavewallets(request, cave_id):
print(f'cavewallets {cave_id=} {cave=}')
- manywallets = Wallet.objects.filter(survexblock__survexfile__cave=cave)
- return render(request, 'cavewallets.html', { 'manywallets':manywallets, 'settings': settings })
+ manywallets = set(Wallet.objects.filter(survexblock__survexfile__cave=cave))
+ return render(request, 'cavewallets.html', { 'manywallets':manywallets, 'settings': settings, 'cave': cave})
diff --git a/templates/cavewallets.html b/templates/cavewallets.html
index 670ce51..cc5e1f1 100644
--- a/templates/cavewallets.html
+++ b/templates/cavewallets.html
@@ -1,16 +1,15 @@
{% extends "base.html" %}
-{% block title %}All Survey scans folders (wallets){% endblock %}
+{% block title %}One Cave Survey scans folders (wallets){% endblock %}
{% block content %}
-<h3>Survey scans folders (wallets) for a specific cave</h3>
+<h3>Survey scans folders (wallets) for <a href="/{{cave.url}}">{{cave}}</a></h3>
<p>Each wallet contains the scanned original in-cave survey notes and sketches of
plans and elevations. It also contains scans of centre-line survex output on which
hand-drawn passage sections are drawn. These hand-drawn passages will eventually be
traced to produce Tunnel or Therion drawings and eventually the final complete cave survey.
-
<table width=95%>
<tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th><th>Cave</th></tr>
{% for scanswallet in manywallets %}