expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 17:07:13 +00:00
Code Issues 18 Projects 3 Activity

tunnel fucsia

Browse Source
This commit is contained in:
Philip Sargent
2025-07-25 16:54:16 +02:00
parent 29eae4e9b2
commit 5204e3cc68
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/models/wallets.py
View File

@@ -444,7 +444,7 @@ class Wallet(models.Model):
# Plan drawing required # Plan drawing required
plan_scanned = reduce(operator.or_, [f.startswith("plan") for f in files], False) plan_scanned = reduce(operator.or_, [f.startswith("plan") for f in files], False)
plan_scanned = reduce(operator.or_, [f.endswith("plan") for f in files], plan_scanned) #plan_scanned = reduce(operator.or_, [f.endswith("plan") for f in files], plan_scanned) # sexytopo does this, so we need to be clear
plan_drawing_required = not (plan_scanned or waldata["plan drawn"] or waldata["plan not required"]) plan_drawing_required = not (plan_scanned or waldata["plan drawn"] or waldata["plan not required"])
if plan_drawing_required: if plan_drawing_required:
ticks["P"] = "red" ticks["P"] = "red"
@@ -453,7 +453,7 @@ class Wallet(models.Model):
# Elev drawing required # Elev drawing required
elev_scanned = reduce(operator.or_, [f.startswith("elev") for f in files], False) elev_scanned = reduce(operator.or_, [f.startswith("elev") for f in files], False)
elev_scanned = reduce(operator.or_, [f.endswith("elev") for f in files], elev_scanned) #elev_scanned = reduce(operator.or_, [f.endswith("elev") for f in files], elev_scanned) # sexytopo does this, so we need to be clear
elev_scanned = reduce(operator.or_, [f.endswith("elevation") for f in files], elev_scanned) elev_scanned = reduce(operator.or_, [f.endswith("elevation") for f in files], elev_scanned)
elev_drawing_required = not (elev_scanned or waldata["elev drawn"] or waldata["elev not required"]) elev_drawing_required = not (elev_scanned or waldata["elev drawn"] or waldata["elev not required"])
if elev_drawing_required: if elev_drawing_required:
@@ -469,10 +469,12 @@ class Wallet(models.Model):
# ticks["T"] = "green" # No, this does not mean it has been 'tunneled' properly # ticks["T"] = "green" # No, this does not mean it has been 'tunneled' properly
# Tunnel / Therion # Tunnel / Therion
if elev_drawing_required or plan_drawing_required: # complete change in logic 2025
ticks["T"] = "red" ticks["T"] = "fuchsia"
else: # if elev_drawing_required or plan_drawing_required:
ticks["T"] = "green" # ticks["T"] = "red"
# else:
# ticks["T"] = "green"
# Website # Website
if waldata["website updated"]: if waldata["website updated"]:

1
templates/wallet_table.html
View File

@@ -62,4 +62,5 @@ which is probably more useful.
<p>Note that names in italics are copied from the related survex file block name.<br /> <p>Note that names in italics are copied from the related survex file block name.<br />
Note also that survex data recently uploaded will not appear in this table until a database reset is done on the server. Note also that survex data recently uploaded will not appear in this table until a database reset is done on the server.
<p>Note that all the Tunneled/Therioned boxes are fuchsia pending a proper method of setting this.