Merge branch 'python3-new' of ssh://expo.survex.com/home/expo/troggle into python3-new

11 files changed, 193 insertions, 33 deletions

diff --git a/templates/base.html b/templates/base.html
index 2661123..a25e13c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -31,13 +31,13 @@
     <a href="{% url "survexcavessingle" "359" %}">359</a> |
     <a href="/survexfile/">Survex</a> |
     <a href="{% url "survexcaveslist" %}">All Survex</a> |
-    <a href="{% url "allwallets" %}">Scans</a> |
+    <a href="{% url "allscans" %}">Scans</a> |
     <a href="{% url "scanupload"  '2022:01' %}">Upload Scans</a> |
     <a href="{% url "dwgallfiles" %}">Drawings</a> |
     <a href="{% url "dwgupload" %}">Upload Drawings</a> |
     <a href="{% url "photoupload" %}">Upload Photos</a> |
-    <a href="/1623/290/290.html">290 (FGH)</a> |
-    <a href="/1626/359/359.html">359 (Homecoming)</a> |
+    <a href="/1623/290/290">290 (FGH)</a> |
+    <a href="/1626/359/359">359 (Homecoming)</a> |
     <br>
     
     <a href="{% url "dataissues" %}">Data Issues</a> |
@@ -48,15 +48,15 @@
     <a id="folklink" href="/folk">expoers</a>  |
     <a id="caversLink" href="{% url "notablepersons" %}">survey lengths</a>  |
     <a href="{% url "stats" %}">statistics</a> |
-    <a href="{% url "expedition" 2018 %}">Expo2018</a> |
-    <a href="{% url "expedition" 2019 %}">Expo2019</a> |
+    <a href="/wallets/year/2019">Wallets(2019)</a> |
+    <a href="{% url "expedition" 2019 %}">Expo(2019)</a> |
     <a href="{% url "controlpanel" %}">import/export</a>  |
     <a href="/admin/">Django admin</a>
 </div>
     
 <div id="nav">
   {% block nav %} 
-  <!-- Use id="nav" for the left side menu -->
+  <!-- Not used any more? -->
   {% endblock %}
 </div>
  
@@ -65,16 +65,15 @@
   	{% block contentheader %}
     {% endblock %}
 
-<div id="related"> 
-{% block related %}
-
-{% endblock %}
-</div>
+    <div id="related"> 
+        {% block related %}
+        {% endblock %}
+    </div>
     {% block content %}
     REPLACE : The content
     {% endblock %}
-  </div>
-    <div class="footer">
-    </div>
+</div>
+<div class="footer">
+</div>
 </body>
 </html>
diff --git a/templates/cavewallets.html b/templates/cavewallets.html
index 2cbce29..8ce1da1 100644
--- a/templates/cavewallets.html
+++ b/templates/cavewallets.html
@@ -4,29 +4,41 @@
 
 {% block content %}
 
-<h3>Survey scans folders (wallets) for <a href="/{{cave.url}}">{{cave}}</a></h3>
+<h3>Wallets for <a href="/{{cave.url}}">{{cave}}</a> {{cave.official_name|safe}}</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.
-
+<p>This lists all the files in a wallet, some of which may not be for this specific cave.
+<p>See also wallets
+<ul>
+<li>per year, e.g. <a href="/wallets/year/2019">2019</a>
+<li>per person, e.g. <a href="/wallets/person/MichaelSargent">Michael Sargent</a>
+</ul>
+{% include 'wallet_table.html' %}
+<br />
 <table width=95%>
-<tr><th>Scans folder</th><th>Files</th><th>Survex blocks</th><th>Cave</th></tr>
-{% for scanswallet in manywallets|dictsort:"walletname" %}
+<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Wallet Name</th><th>People</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>
+{% for wallet in manywallets|dictsort:"walletname" %}
   <tr>
-    <td style="padding:2px"><a href="{{scanswallet.get_absolute_url}}">{{scanswallet.walletname}}</a></td>
-    <td align="right" style="padding:2px">{{scanswallet.singlescan_set.all|length}}</td>
+    <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td>
+    
+    <td style="padding:2px">{{wallet.date}}</td>
+    <td style="padding:2px">{{wallet.name}}</td>
+    <td style="padding:2px">{{wallet.persons}}</td>
+    
+    <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td>
     <td style="padding:2px">
-    {% for survexblock in scanswallet.survexblock_set.all %}
+    {% for survexblock in wallet.survexblock_set.all %}
       <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a>
     {% endfor %}
     </td>
-    <td style="padding:2px">
-    {% for survexblock in scanswallet.survexblock_set.all %}
-        {% ifchanged survexblock.survexfile.cave %}
-        <a href="/{{survexblock.survexfile.cave.url}}">/{{survexblock.survexfile.cave.slug}}</a>
-        {% endifchanged %}
-    
+
+    <td style="padding:2px; font-size: 70%;">
+    {% for drawing in wallet.drawingfile_set.all %}
+      <a href="{% url "dwgfilesingle" drawing.dwgpath %}">{{drawing.dwgpath}}</a><br>
+    {% empty %}
+        (no Tunnel drawings found: but there might be Therion drawings)
     {% endfor %}
     </td>
   </tr>
diff --git a/templates/dataissues.html b/templates/dataissues.html
index 2127a0e..97c415e 100644
--- a/templates/dataissues.html
+++ b/templates/dataissues.html
@@ -6,7 +6,7 @@
 <h1>Loading data from files: Issues arising that need attention</h1>
 
 <p>
-This is work in progress (June 2022).The URL links to the offending objects are enabled on only some types of fault as yet.
+This is work in progress.The URL links to the offending objects are enabled on only some types of fault as yet.
 <p>
 See the 
 <a href="/handbook/computing/todo-data.html">Data Management To Do list</a> as well as these import/parsing issues.
diff --git a/templates/dwgfiles.html b/templates/dwgfiles.html
index 6367ad2..48f236d 100644
--- a/templates/dwgfiles.html
+++ b/templates/dwgfiles.html
@@ -13,7 +13,7 @@
     <td align="right" style="padding:2px">{{dwgfile.npaths}}</td>   
 
     <td style="padding:2px">
-    {% for scanswallet in dwgfile.manywallets.all %}
+    {% for scanswallet in dwgfile.dwgwallets.all %}
       <a href="{{scanswallet.get_absolute_url}}">{{scanswallet.walletname}}</a>
     {% endfor %}
     </td>   
diff --git a/templates/manywallets.html b/templates/manywallets.html
index 7fc04cb..7295ac5 100644
--- a/templates/manywallets.html
+++ b/templates/manywallets.html
@@ -9,6 +9,12 @@
 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.
+<p>See also wallets
+<ul>
+<li>per year, e.g. <a href="/wallets/year/2019">2019</a>
+<li>per cave, e.g. <a href="/cave/scans/1623-204">1623/204</a>
+<li>per person, e.g. <a href="/wallets/person/MichaelSargent">Michael Sargent</a>
+</ul>
 
 <!-- This should all be restructured to use .prefetch_related() and .select_related()
 see https://docs.djangoproject.com/en/3.2/ref/models/querysets/#prefetch-related
diff --git a/templates/person.html b/templates/person.html
index 8128760..d390b80 100644
--- a/templates/person.html
+++ b/templates/person.html
@@ -27,6 +27,9 @@
 </ul>
 </p>
 
+<h3>Surveys done</h3>
+Wallets and surveys mentioning <a href="/wallets/person/{{person}}">{{person}}</a>
+
 {% if person.blurb %}
 {{person.blurb|safe}}
 {% else %}
diff --git a/templates/personwallets.html b/templates/personwallets.html
new file mode 100644
index 0000000..f513e20
--- /dev/null
+++ b/templates/personwallets.html
@@ -0,0 +1,50 @@
+{% extends "base.html" %}
+
+{% block title %}One Person Survey scans folders (wallets){% endblock %}
+
+{% block content %}
+<h3>Wallets for <a href="{{person.get_absolute_url}}">{{person}}</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.
+
+<p>See also wallets
+<ul>
+<li>per year, e.g. <a href="/wallets/year/2019">2019</a>
+<li>per cave, e.g. <a href="/cave/scans/1623-161">1623/161</a>
+</ul>
+
+{% include 'wallet_table.html' %}
+<br />
+<table width=95%>
+<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Wallet Name</th><th  width=15%>Other People</th><th>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>
+{% for wallet in manywallets|dictsort:"walletname" %}
+  <tr>
+    <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td>
+    
+    <td style="padding:2px" >{{wallet.date}}</td>
+    <td style="padding:2px">{{wallet.name}}</td>
+    <td style="padding:2px">{{wallet.persons}}</td>
+    <td style="padding:2px">{{wallet.cave}}</td>
+    
+    <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td>
+    <td style="padding:2px">
+    {% for survexblock in wallet.survexblock_set.all %}
+      <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a>
+    {% endfor %}
+    </td>
+
+    <td style="padding:2px; font-size: 70%;">
+    {% for drawing in wallet.drawingfile_set.all %}
+      <a href="{% url "dwgfilesingle" drawing.dwgpath %}">{{drawing.dwgpath}}</a><br>
+    {% empty %}
+        (no Tunnel drawings found: but there might be Therion drawings)
+    {% endfor %}
+    </td>
+  </tr>
+{% endfor %}
+</table>
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/svxcavesingle.html b/templates/svxcavesingle.html
index ad8af8c..6b90b22 100644
--- a/templates/svxcavesingle.html
+++ b/templates/svxcavesingle.html
@@ -10,6 +10,7 @@
 All the processing to extract the survex subdriectories and survex files is done in this template -->
 
 <p>Cave description: <a href="/{{cave.url}}">{{cave.url}}</a>
+<p>Wallets: <a href="/cave/scans/{{cave|safe}}">{{cave|safe}}</a>
 </p>
 <p>
 {% for survexdirectory in cave.survexdirectory_set.all %}
diff --git a/templates/wallet_table.html b/templates/wallet_table.html
new file mode 100644
index 0000000..b239e91
--- /dev/null
+++ b/templates/wallet_table.html
@@ -0,0 +1,40 @@
+
+<table width=95%>
+<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Cave</th><th>Wallet Name</th>
+
+<!-- survex file-->
+<th style="font-family: monospace; font-size: 150%;" title="Survex data">S</th>
+<th style="font-family: monospace; font-size: 150%;" title="Survex Cave Description">C</th>
+<th style="font-family: monospace; font-size: 150%;" title="Survex QMs">Q</th>
+
+
+<!-- scanned-->
+<th style="font-family: monospace; font-size: 150%;" title="Notes">N</th>
+<th style="font-family: monospace; font-size: 150%;" title="Plan">P</th>
+<th style="font-family: monospace; font-size: 150%;" title="Elevation">E</th>
+
+<th style="font-family: monospace; font-size: 150%;" title="Tunnel or Therion">T</th>
+<th style="font-family: monospace; font-size: 150%;" title="Website updated">W</th>
+
+</tr>
+{% for wallet in manywallets|dictsort:"walletname" %}
+  <tr>
+    <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td>
+    
+    <td style="padding:2px" >{{wallet.date}}</td>
+    <td style="padding:2px">{{wallet.cave}}</td>
+    <td style="padding:2px">{{wallet.name}}</td>
+    
+    <td style="padding:1px; background-color:{{wallet.ticks.S}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.C}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.Q}}">&nbsp;</td>
+
+    <td style="padding:1px; background-color:{{wallet.ticks.N}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.P}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.E}}">&nbsp;</td>
+
+    <td style="padding:1px; background-color:{{wallet.ticks.T}}">&nbsp;</td>
+    <td style="padding:1px; background-color:{{wallet.ticks.W}}">&nbsp;</td>
+  </tr>
+{% endfor %}
+</table>
diff --git a/templates/walletform.html b/templates/walletform.html
index f120791..37b1c11 100644
--- a/templates/walletform.html
+++ b/templates/walletform.html
@@ -129,7 +129,7 @@
            title="Date of the trip in ISO format: 2020-08-17"
            placeholder="{{date}}" value="{{date}}" required /> 
     <br>        
-           <label for="cave">Cave ID</label>
+           <label for="cave">Cave ID (only needed if no survex file yet)</label>
            <input 
            label = "Cave" name = "cave" size="12"
            title="Cave id e.g. 2017-DM-01 or 1623/256"
@@ -156,10 +156,10 @@
            <label for="elevd">Elevation drawn ?</label>
            <input type="checkbox" name="elevd" id="elevd" value="True" {% if "elev drawn" in checked %}checked{% endif %}>
     <br>
-           <label for="descriptionw">Cave description written ?</label>
+           <label for="descriptionw">Cave description written (or nothing recorded) ?</label>
            <input type="checkbox" name="descriptionw" id="descriptionw" value="True" {% if "description written" in checked %}checked{% endif %}>
     <br>
-           <label for="qmsw">QMs written ?</label>
+           <label for="qmsw">QMs written (or none seen) ?</label>
            <input type="checkbox" name="qmsw" id="qmsw" value="True" {% if "qms written" in checked %}checked{% endif %}>
     <br>
            <label for="websiteupt">Website updated ?</label>
@@ -174,7 +174,7 @@
            title="List of people on the survey trip"
            placeholder="{{people}}" value="{{people}}" /> 
     <br>
-           <label for="url">URL of cave description</label>
+           <label for="url">URL of survey area (only needed if not a cave)</label>
            <input 
            label = "URL" name = "url" size ="{{urlsize}}"
            title="URL of cave description, e.g. /1623/264/264.html"
diff --git a/templates/yearwallets.html b/templates/yearwallets.html
new file mode 100644
index 0000000..33b86ef
--- /dev/null
+++ b/templates/yearwallets.html
@@ -0,0 +1,49 @@
+{% extends "base.html" %}
+
+{% block title %}One Year Survey scans folders (wallets){% endblock %}
+
+{% block content %}
+<h3>Wallets for {{year}} </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.
+
+<p>See also wallets
+<ul>
+<li>per cave, e.g. <a href="/cave/scans/1623-161">1623/161</a>
+<li>per person, e.g. <a href="/wallets/person/MichaelSargent">Michael Sargent</a>
+</ul>
+
+{% include 'wallet_table.html' %}
+<br />
+<table width=95%>
+<tr><th>Wallet</th><th width=8%>Wallet Date</th><th>Wallet Name</th><th>People</th><th>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>
+{% for wallet in manywallets|dictsort:"walletname" %}
+  <tr>
+    <td style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.walletname}}</a></td>
+    
+    <td style="padding:2px">{{wallet.date}}</td>
+    <td style="padding:2px">{{wallet.name}}</td>
+    <td style="padding:2px">{{wallet.persons}}</td>
+    <td style="padding:2px">{{wallet.cave}}</td>
+    
+    <td align="center" style="padding:2px"><a href="{{wallet.get_absolute_url}}">{{wallet.singlescan_set.all|length}}</a></td>
+    <td style="padding:2px">
+    {% for survexblock in wallet.survexblock_set.all %}
+      <a href="{% url "svx" survexblock.survexfile.path %}">{{survexblock}}</a>
+    {% endfor %}
+    </td>
+
+    <td style="padding:2px;  font-size: 70%;">
+    {% for drawing in wallet.drawingfile_set.all %}
+      <a href="{% url "dwgfilesingle" drawing.dwgpath %}">{{drawing.dwgpath}}</a><br>
+    {% empty %}
+        (no Tunnel drawings found: but there might be Therion drawings)
+    {% endfor %}
+    </td>
+  </tr>
+{% endfor %}
+</table>
+
+{% endblock %}
\ No newline at end of file