xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

tidying unused fileds on classes

Browse Source
This commit is contained in:
Philip Sargent
2025-10-11 23:59:11 +03:00
parent e842ae1ca3
commit d25a2154af
4 changed files with 348 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

344
_cave_caves284.html Normal file
View File

@@ -0,0 +1,344 @@
<!DOCTYPE html>
<!-- cavebase.html - this text visible because this template has been included -->
<html lang="en">
<head>
<script>document.interestCohort = null;</script> <!-- Turn off Google FLoC -->
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>
</title>
<link rel="stylesheet" type="text/css" href="/css/main2.css" />
</head>
<body>
<!-- the year now as used in header text -->
<br />
<style>
.toolbarlinks
{
padding:5px;
background-color:#9ff;
text-align:center;
font-weight:bold;
}
.toolbarlinkslocal
{
padding:5px;
background-color:#f9f;
text-align:center;
font-weight:bold;
}
</style>
<div class="toolbarlinkslocal">
<a href="/logbookedit/">Logbook Entry</a> |
<a id="cavesLink" href="/caves_recent">Caves</a> |
<a id="qmsLink" href="/cave/qms/1623-290">QMs</a> |
<a href="/survexfile">Survex</a> |
<a href="/survexfile/caves">All Survex</a> |
<a href="/survey_scans">Scans</a> |
<a href="/walletedit">Upload Scans</a> |
<a href="/dwgfiles">Drawings</a> |
<a href="/dwgupload">Upload Drawings</a> |
<a href="/photoupload">Upload Photos</a> |
<a href="/gpxupload">Upload GPX</a> |
<br>
<a href="/dataissues">Data Issues</a> |
<a id="entsLink" href="/entrances">Entrances</a> |
<a id="entsLink" href="/stations">Stations</a> |
<a id="folklink" href="/folk">expoers</a> |
<a id="caversLink" href="/people">survey lengths</a> |
<a href="/stats">statistics</a> |
<a href="/wallets/year/2025">Wallets(2025)</a> |
<a href="/logreport/2025">Logbook(2025)</a> |
<a href="/expedition/2025">Expo(2025)</a> |
<a href="/controlpanel">Control panel</a>
</div>
<p>
<h1>Cave Index</h1>
<h3>Notable caves</h3>
<ul>
<li> 1623 <a href="/None">
290 <em></em></a>
<li> 1623 <a href="/None">
264 <em></em></a>
<li> 1623 <a href="/None">
161 <em></em></a>
<li> 1623 <a href="/None">
204 <em></em></a>
</ul>
Red star <span style="color: red">&#10033;</span> against a name indicates that no survex file is explicitly associated with the cave<br />
Blue star <span style="color: blue">&#10033;</span> against a name indicates that no survex file is explicitly associated with the cave but it is marked as 'fully explored'<br />
Blue triangle <span style="color: #43C6DB">&#x25BC;</span> against a name indicates that the cave is 'pending' creation properly.<br />
Orange triangle <span style="color: orange">&#x25B2;</span> against a name indicates that the cave has no Entrance (and is not 'pending').<br />
Black triangle <span style="color: black">&#x25B2;</span> against a name indicates that the cave has an Entrance, but no entrances have valid located survey stations.<br />
Red triangle <span style="color: red">&#x25BC;</span> against a name indicates that the cave has unticked QMs<br />
<span style="color:mediumvioletred">Cavename in this colour</span> means that the cave is undescended/unexplored.
<p>See <em><a href="/caves_undropped">Undropped Caves</a></em> for all unexplored caves<br />
See <em> <a href="/enttags">Lost Caves</a></em> for caves we have mislaid.<br />
See <em> <a href="/caves_recent">Recent Caves</a></em> for a shorter list of recent caves.
<p style="text-align:right">
<a href="/newcave/">New Cave</a><br>
<a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
</p>
<h3>This year's caves</h3>
<div style="column-count: 3;">
<table class="searchable">
</table>
</div>
<h3>1623</h3>
<div style="column-count: 3;">
<table class="searchable">
<a href="/1623/115.url">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
115 <em>Schnellzugh&ouml;hle</em></a>
(40m)
<span title="the cave has no Entrance (and is not 'pending')" style="color: orange">&#x25B2;</span>
</span>
<br />
<a href="/None">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
161 <em></em></a>
<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
<span title="no survex file is explicitly associated with the cave" style="color: red">&#10033;</span>
</span>
<br />
<a href="/None">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
204 <em></em></a>
<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
<span title="no survex file is explicitly associated with the cave" style="color: red">&#10033;</span>
</span>
<br />
<a href="/None">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
264 <em></em></a>
<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
<span title="no survex file is explicitly associated with the cave" style="color: red">&#10033;</span>
</span>
<br />
<a href="/1623/284/284.html">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
284 <em>Seetrichter (Lake bottom)</em></a>
<span title="the cave has no Entrance (and is not 'pending')" style="color: orange">&#x25B2;</span>
<span title="no survex file is explicitly associated with the cave" style="color: red">&#10033;</span>
</span>
<br />
<a href="/None">
<span style="color:mediumvioletred" title="The cave is marked as unexplored/undescended">
290 <em></em></a>
<span title="the cave is 'pending' creation properly" style="color: #43C6DB">&#x25BC;</span>
<span title="no survex file is explicitly associated with the cave" style="color: red">&#10033;</span>
</span>
<br />
</table>
</div>
<p style="text-align:right">
<a href="/newcave/">New Cave</a><br>
<a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
</p>
<h3>1626</h3>
<div style="column-count: 3;">
<table class="searchable">
</table>
</div>
<p style="text-align:right">
<a href="/newcave/">New Cave</a><br>
<a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
</p>
<h3>1627</h3>
<div style="column-count: 3;">
<table class="searchable">
</table>
</div>
<p style="text-align:right">
<a href="/newcave/">New Cave</a><br>
<a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
</p>
<h3>1624</h3>
<div style="column-count: 3;">
<table class="searchable">
</table>
</div>
<p style="text-align:right">
<a href="/newcave/">New Cave</a><br>
<a href="/noinfo/cave-number-index">Cave Number Index - kept updated</a>
</p>
<div id="menu">
<ul id="menulinks">
<li><a href="/index.htm">Home</a></li>
<li><a href="/handbook/index.htm">Handbook</a>
</li>
<li><a href="/handbook/computing/onlinesystems.html">Online systems</a></li>
<li><a href="/handbook/logbooks.html#form">Make Logbook Entry</a></li>
<li><a href="/caves_recent">Caves</a>
</li>
<li><a href="/infodx.htm">Site index</a></li>
<li><a href="/pubs.htm">Reports</a></li>
<ul><li><a href="/years/2025">2025</a></li></ul>
<li><a href="https://expo.survex.com/kanboard/board/2">Kanboard</a></li>
<li><a href="/handbook/troggle/training/trogbegin.html">Troggle</a></li>
<li><form name=P method=get
action="https://expo.survex.com/search"
target="_top">
<input id="omega-autofocus" type=search name=P size=8 autofocus>
<input type=submit value="Search"></form></li>
<li> <b style="color:red">RUNNING ON LOCALSERVER</b> <br>slug:<br>newslug:<br>url:
</ul>
</div>
</body>
</html>

2
core/models/logbooks.py
View File

@@ -239,7 +239,7 @@ class QM(TroggleModel):
ticked = models.BooleanField(default=False) ticked = models.BooleanField(default=False)
location_description = models.TextField(blank=True, null=True) location_description = models.TextField(blank=True, null=True)
completion_description = models.TextField(blank=True, null=True) completion_description = models.TextField(blank=True, null=True)
completion_date = models.DateField(blank=True, null=True) # completion_date = models.DateField(blank=True, null=True) #never used in fact
nearest_station_name = models.CharField(max_length=200, blank=True, null=True) nearest_station_name = models.CharField(max_length=200, blank=True, null=True)
resolution_station_name = models.CharField(max_length=200, blank=True, null=True) resolution_station_name = models.CharField(max_length=200, blank=True, null=True)
area = models.CharField(max_length=100, blank=True, null=True) area = models.CharField(max_length=100, blank=True, null=True)

4
core/models/survex.py
View File

@@ -310,10 +310,10 @@ class DrawingFile(models.Model):
dwgname = models.CharField(max_length=200) dwgname = models.CharField(max_length=200)
dwgwallets = models.ManyToManyField("Wallet") # implicitly links via folders to scans to SVX files dwgwallets = models.ManyToManyField("Wallet") # implicitly links via folders to scans to SVX files
scans = models.ManyToManyField("SingleScan") # implicitly links via scans to SVX files scans = models.ManyToManyField("SingleScan") # implicitly links via scans to SVX files
dwgcontains = models.ManyToManyField("DrawingFile") # case when its a frame type # dwgcontains = models.ManyToManyField("DrawingFile") # case when its a frame type - not populated yet
filesize = models.IntegerField(default=0) filesize = models.IntegerField(default=0)
npaths = models.IntegerField(default=0) npaths = models.IntegerField(default=0)
survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files - not populated yet # survexfiles = models.ManyToManyField("SurvexFile") # direct link to SVX files - not populated yet
class Meta: class Meta:
ordering = ("dwgpath",) ordering = ("dwgpath",)

2
core/models/troggle.py
View File

@@ -174,7 +174,7 @@ class PersonExpedition(TroggleModel):
expedition = models.ForeignKey(Expedition, on_delete=models.CASCADE, db_index=True) expedition = models.ForeignKey(Expedition, on_delete=models.CASCADE, db_index=True)
person = models.ForeignKey(Person, on_delete=models.CASCADE, db_index=True) person = models.ForeignKey(Person, on_delete=models.CASCADE, db_index=True)
slugfield = models.SlugField(max_length=50, blank=True, null=True) # 2022 to be used in future # slugfield = models.SlugField(max_length=50, blank=True, null=True) # 2022 to be used in future
noncaver = models.BooleanField( noncaver = models.BooleanField(
help_text="if flagged as -1 in the folk.csv input file", help_text="if flagged as -1 in the folk.csv input file",
default=True, default=True,