expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2026-04-02 12:31:00 +01:00
Code Issues 18 Projects 3 Activity

Put colour bar on wallet editor

Browse Source
This commit is contained in:
Philip Sargent
2022-12-23 22:14:00 +00:00
parent 194470841e
commit 8374500da5
7 changed files with 35 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
templates/cavewallets.html
View File

@@ -21,6 +21,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
| <a <a href="/wallets/year/{{ otherexpedition.year }}">{{otherexpedition.year}}</a>
{% endfor %}</ul></ul>
{% include 'wallet_table.html' %}
<p>Note that names in italics are copied from the related survex file block name.
<br />
<table width=95%>
<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=25%>People</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>

4
templates/expedition.html
View File

@@ -64,10 +64,6 @@ an "S" for a survey trip. The colours are the same for people on the same trip.
{% endfor %}
</table>
{% if logged_in %}
<form action="" method="GET"><input type="submit" name="reload" value="Reload from logbook"></form>
{% endif %}
<h3 id="trips"> {{expedition.name}} - Records per day</h3>
<table class="expeditionlogbooks">

1
templates/personwallets.html
View File

@@ -20,6 +20,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
{% endfor %}</ul>
{% include 'wallet_table.html' %}
<p>Note that names in italics are copied from the related survex file block name.
<br />
<table width=95%>
<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=28%>Team</th><th width=8%>>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>

32
templates/wallet_table.html
View File

@@ -3,17 +3,17 @@
<tr><th>Wallet</th><th width=15%>Wallet Date</th><th>Cave</th><th>Wallet Name</th><th>Survex</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>
<th style="font-family: monospace; font-size: 150%;" title="Survex file exists">S</th>
<th style="font-family: monospace; font-size: 150%;" title="Cave Description in Survex file">C</th>
<th style="font-family: monospace; font-size: 150%;" title="QMs in Survex file">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="Notes exit">N</th>
<th style="font-family: monospace; font-size: 150%;" title="Plan done">P</th>
<th style="font-family: monospace; font-size: 150%;" title="Elevation done">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="Tunnel or Therion done">T</th>
<th style="font-family: monospace; font-size: 150%;" title="Website updated">W</th>
</tr>
@@ -38,16 +38,16 @@
{% endfor %}
<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.S}}" title="Survex file exists">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.C}}" title="Cave Description in Survex file">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.Q}}" title="QMs in Survex file">&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.N}}" title="Notes exit">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.P}}" title="Plan done">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.E}}" title="Elevation done">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.T}}">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.W}}">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.T}}" title="Tunnel or Therion done">&nbsp;</td>
<td style="padding:1px; background-color:{{wallet.ticks.W}}" title="Website updated">&nbsp;</td>
</tr>
{% empty %} <h2>No Wallets for this year</h2>
<b>Before 1998</b> we used a survey book system, not wallets. But 1983 has some scraps recreated as wallets.
@@ -61,4 +61,4 @@ their wallet names and the drawings that were created using them at <a href="/dw
which is probably more useful.
{% endfor %}
</table>
<p>Note that names in italics are copied from the related survex file block name.

6
templates/walletform.html
View File

@@ -106,7 +106,11 @@
{% endif %}
{% endif %}
<hr />
<!-- This won't work with a standard wallet object. To make it work we added extra fields to teh wallet object,-->
setting the .ticks field etc, e.g. in caveifywallet() in scans.py
{% include 'wallet_table.html' %}
{% if not create %}
<br>

1
templates/yearwallets.html
View File

@@ -28,6 +28,7 @@ traced to produce Tunnel or Therion drawings and eventually the final complete c
</ul>
{% include 'wallet_table.html' %}
<p>Note that names in italics are copied from the related survex file block name.
<br />
<table width=95%>
<tr><th>Wallet</th><th width=13%>Wallet Date</th><th>Wallet Name</th><th width=25%>People</th><th width=8%>Cave</th><th>Scans</th><th>Survex blocks</th><th>Drawings using these scans</th></tr>