length of unreference cave survey added

core/views/statistics.py

@@ -8,6 +8,7 @@ from troggle.core.models.caves import Cave, Entrance
 from troggle.core.models.logbooks import LogbookEntry
 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 django.views.generic.list import ListView
@@ -22,12 +23,12 @@ def svxfilewild(request, year=None):
     legsbyexpo = []
     addupsurvexlength = 0.0
     addupsurvexlegs = 0
-    
+ 
     if not year:
         expos = Expedition.objects.all()
     else:
         expos = Expedition.objects.filter(year=year)
-        
+    
     for expedition in expos:
         survexblocks = expedition.survexblock_set.all()
         legsyear = 0
@@ -41,6 +42,7 @@ def svxfilewild(request, year=None):
     legsbyexpo.reverse()
 
     svxwild = []
+    wildlength = 0.0
     for expedition in expos:
         survexblocks = expedition.survexblock_set.all()
         for sb in survexblocks:
@@ -49,19 +51,26 @@ def svxfilewild(request, year=None):
                 if sb.name != "rootblock":
                     svxwild.append(sb)
                     print(f"  WILD {sb.survexfile} {sb.date}")
+                    wildlength += sb.legslength
                     sb.year = f"{expedition}"
                     people = SurvexPersonRole.objects.filter(survexblock=sb)
                     team = []
                     for p in people:
                         team.append(p.personname)
                     sb.team = team
-            # else:
-                # print(f"  TAME {sb.survexfile}")
-
+    walletslength = 0.0
+    if year:
+        wallets = Wallet.objects.filter(walletyear__year=year)
+        for w in wallets:
+            for sb in w.survexblock_set.all():
+                walletslength += sb.legslength
+            
     return render(request, "survexfilewild.html", 
         {"addupsurvexlength": addupsurvexlength / 1000, 
         "legsbyexpo": legsbyexpo, 
         "nsurvexlegs": addupsurvexlegs,
+        "walletslength": walletslength,
+        "wildlength": wildlength,
         "svxwild": svxwild}
     )
     

templates/base.html

@@ -31,9 +31,10 @@
 {% else %}
 <div class="toolbarlinks">
 {% endif %}
-    <a href="/survexfile/caves-1623/264/264.svx">264</a> |
-    <a href="/survexfile/caves-1623/290/290.svx">290</a> |
-    <a href="/survexfile/caves-1626/359/359.svx">359</a> |
+    <a href="/1623/290/290">290 (FGH)</a> |
+    <a href="/1626/359/359.html">359 (HC)</a> |
+    <a id="cavesLink" href="{% url "caveindex" %}">caves</a>  |
+    <a id="qmsLink" href="{% url "caveQMs" "1623-290" %}">QMs</a>  |
     <a href="/survexfile/">Survex</a> |
     <a href="{% url "survexcaveslist" %}">All Survex</a> |
     <a href="{% url "allscans" %}">Scans</a> |
@@ -41,18 +42,16 @@
     <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">290 (FGH)</a> |
-    <a href="/1623/264/264.html">264 (Balkonh&ouml;hle)</a> |
+
     <br>
     
     <a href="{% url "dataissues" %}">Data Issues</a> |
     <a href="/handbook/computing/todo-data.html">tasks to do </a>  |
-    <a id="cavesLink" href="{% url "caveindex" %}">caves</a>  |
-    <a id="qmsLink" href="{% url "caveQMs" "1623-290" %}">QMs</a>  |
     <a id="entsLink" href="{% url "eastings" %}">ents</a>  |
     <a id="folklink" href="/folk">expoers</a>  |
     <a id="caversLink" href="{% url "notablepersons" %}">survey lengths</a>  |
     <a href="{% url "stats" %}">statistics</a> |
+    <a href="/survexfilewild/2023">Wild Survex(2023)</a> |
     <a href="/wallets/year/2023">Wallets(2023)</a> |
     <a href="{% url "expedition" 2023 %}">Expo(2023)</a> |
     <a href="{% url "controlpanel" %}">Control panel</a>  |

templates/controlPanel.html

@@ -22,13 +22,14 @@
 <h3>Administration Utilities</h3>
 <ul>
 <li><a href="/pathsreport">Folder paths used</a> -folders settings used by this troggle installation
-<li><a href="/aliases/2022">Expoer name aliases</a> -short names recognised by troggle
+<li><a href="/aliases/2023">Expoer name aliases</a> -short names recognised by troggle
 <li><a href="/dataissues">Data Issues on Imports</a> - warnings and errors from the recent data import
+<li><a href="/survexfilewild/2023">Wild survex files</a> - survex files contianing blocks with no related wallet
 <li><a href="/surveximport">Survex import record</a> - indented *include and begin/end tree<br /><li><a href="/survexdebug">Survex debug report</a> - warnings and  details<br />
 <li><a href="/therionissues">Therion Import issues</a> - warnings from the recent data import<br /><br />
 <li><a href="/admin/">Django admin</a> - Deep magic access to all models and data
 </ul>
-<h3>This control panel is being redeveloped</h3>
+<h3>This control panel is/will/mabe being redeveloped</h3>
 
 <p>Do not attempt to use any of these import functions as they are in active development. 
 <ol>

templates/survexfilewild.html

@@ -22,12 +22,16 @@ i.e. they have a survex block (begin..end) with no *REF line which refers to the
 {% endfor %}
 </table>
 <br />
+So we are missing {{wildlength|floatformat:"0g"}}m of surveyed cave from our wallet records.
+<br /><br />
 If the "team" field is empty, it probably means that the survex file has been created since the last database reset.
 <br />
 If the parent block says "troggle _unseens" or "None" then the survex file has not been plumbed in to the expo survex network yet.
 <br />
 If there is a *ref line of the correct format, then maybe that wallet has not been created yet. Create it, and fill in the data.
 <br /><br />
+Length of survex data referenced by wallets in this year {{walletslength|floatformat:"0g"}}m.
+<br /><br />
 <table>
 <tr><th>Year</th><th>Survex<br>Survey<br>Blocks</th><th>Survex<br>Survey Legs</th><th>Survex <br>length(m)</th></tr>
 {% for legs in legsbyexpo %}