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

use new upload page for most wallets

Browse Source
This commit is contained in:
Philip Sargent
2022-03-18 11:28:35 +00:00
parent e4ee4abce8
commit af7fc8f243
5 changed files with 145 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

202
templates/scanuploadform.html
View File

@@ -57,107 +57,109 @@
</div>
<hr />
<br>
<span style="font-family: monospace; font-size: 150%; ">
{% if cave %}<u>Cave ID</u>: <b>{{cave}}</b><br> {% endif %}
{% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %}
{% if svxfiles %}<u>Survey files</u>:
{% for svx in svxfiles%}
<a href="/survexfile/{{svx}}">{{svx}}</a>
{% endfor %}
{% if not create %}
<br>
<span style="font-family: monospace; font-size: 150%; ">
{% if cave %}<u>Cave ID</u>: <b>{{cave}}</b><br> {% endif %}
{% if psg %}<u>Survey area</u>: <b>{{psg}}</b><br>{% endif %}
{% if svxfiles %}<u>Survey files</u>:
{% for svx in svxfiles%}
<a href="/survexfile/{{svx}}">{{svx}}</a>
{% endfor %}
<br><br>
{% endif %}
</span>
<span style="font-family: monospace; font-size: 130%; ">
<!--
<table style="border: 1px; border-style: hidden;>
{% for d, value in waldata.items %}
<tr style="border-style: hidden;">
<td style="border-style: hidden; padding-right: 3em;">{{d}}</td>
<br><br>
{% endif %}
</span>
<span style="font-family: monospace; font-size: 130%; ">
<!--
<table style="border: 1px; border-style: hidden;>
{% for d, value in waldata.items %}
<tr style="border-style: hidden;">
<td style="border-style: hidden; padding-right: 3em;">{{d}}</td>
<td> <b>{{value}}</b></td>
<td> <b>{{value}}</b></td>
</tr>
{% empty %}
<p>&lt;No JSON data here&gt;
{% endfor %}
</table>
-->
</span>
<style>
input {font-family: monospace; font-weight: bold; font-size: 100%; padding: 0.5em; }
</style>
<div style = "max-width:100%; margin-left:15%; font-family: monospace; font-weight: bold; font-size: 150%; text-align: right; " >
<form method ='post'>
{% csrf_token %}
<label for="date">Date of the survey trip</label>
<input
label = "Date" name = "date" size="12"
title="Date of the trip in ISO format: 2020-08-17"
placeholder="{{date}}" value="{{date}}" required />
<br>
<label for="cave">Cave ID</label>
<input
label = "Cave" name = "cave" size="12"
title="Cave id e.g. 2017-DM-01 or 1623/256"
placeholder="{{cave}}" value="{{cave}}" />
<br>
<label for="psg">Survey area</label>
<input
label = "Survey area" name = "psg" size ="{{psgsize}}"
title="Survey area, e.g. White Elephant or Nieder Augst Eck"
placeholder="{{psg}}" value="{{psg}}" />
<br>
<label for="plannr">Plan not required ?</label>
<input type="checkbox" name="plannr" id="plannr" value=" True" {% if "plan not required" in checked %}checked{% endif %}>
<br>
<label for="elevnr">Elevation not required ?</label>
<input type="checkbox" name="elevnr" id="elevnr" value="True" {% if "elev not required" in checked %}checked{% endif %}>
<br>
<label for="survexvnr">Survex file not required ?</label>
<input type="checkbox" name="survexvnr" id="survexvnr" value="True" {% if "survex not required" in checked %}checked{% endif %}>
<br>
<label for="pland">Plan drawn ?</label>
<input type="checkbox" name="pland" id="pland" value="True" {{chkpland}} {% if "plan drawn" in checked %}checked{% endif %}>
<br>
<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>
<input type="checkbox" name="descriptionw" id="descriptionw" value="True" {% if "description written" in checked %}checked{% endif %}>
<br>
<label for="qmsw">QMs written ?</label>
<input type="checkbox" name="qmsw" id="qmsw" value="True" {% if "qms written" in checked %}checked{% endif %}>
<br>
<label for="websiteupt">Website updated ?</label>
<input type="checkbox" name="websiteupt" id="websiteupt" value="True" {% if "website updated" in checked %}checked{% endif %}>
<br>
<label for="electronic">Electronic survey ?</label>
<input type="checkbox" name="electronic" id="electronic" value="True" {% if "electronic survey" in checked %}checked{% endif %}>
<br>
<label for="people">List of people on the survey trip</label>
<input
label = "People" name = "people" size ="{{peoplesize}}"
title="List of people on the survey trip"
placeholder="{{people}}" value="{{people}}" />
<br>
<label for="url">URL of cave description</label>
<input
label = "URL" name = "url" size ="{{urlsize}}"
title="URL of cave description, e.g. /1623/264/264.html"
placeholder="{{url}}" value="{{url}}" />
<br>
<label for="survex">List of survex files</label>
<input
label = "survex" name = "survex" size ="{{survexsize}}"
title="List of survex files using this data"
placeholder="{{survex}}" value="{{survex}}" />
<br><br>
<button class="fancybutton" style="padding: 0.5em 25px; margin-left: 155px; font-size: 90%; "
type = "submit" value = "Edit" >
Submit changes
</button>
</form>
</div>
</tr>
{% empty %}
<p>&lt;No JSON data here&gt;
{% endfor %}
</table>
-->
</span>
<style>
input {font-family: monospace; font-weight: bold; font-size: 100%; padding: 0.5em; }
</style>
<div style = "max-width:100%; margin-left:15%; font-family: monospace; font-weight: bold; font-size: 150%; text-align: right; " >
<form method ='post'>
{% csrf_token %}
<label for="date">Date of the survey trip</label>
<input
label = "Date" name = "date" size="12"
title="Date of the trip in ISO format: 2020-08-17"
placeholder="{{date}}" value="{{date}}" required />
<br>
<label for="cave">Cave ID</label>
<input
label = "Cave" name = "cave" size="12"
title="Cave id e.g. 2017-DM-01 or 1623/256"
placeholder="{{cave}}" value="{{cave}}" />
<br>
<label for="psg">Survey area</label>
<input
label = "Survey area" name = "psg" size ="{{psgsize}}"
title="Survey area, e.g. White Elephant or Nieder Augst Eck"
placeholder="{{psg}}" value="{{psg}}" />
<br>
<label for="plannr">Plan not required ?</label>
<input type="checkbox" name="plannr" id="plannr" value=" True" {% if "plan not required" in checked %}checked{% endif %}>
<br>
<label for="elevnr">Elevation not required ?</label>
<input type="checkbox" name="elevnr" id="elevnr" value="True" {% if "elev not required" in checked %}checked{% endif %}>
<br>
<label for="survexvnr">Survex file not required ?</label>
<input type="checkbox" name="survexvnr" id="survexvnr" value="True" {% if "survex not required" in checked %}checked{% endif %}>
<br>
<label for="pland">Plan drawn ?</label>
<input type="checkbox" name="pland" id="pland" value="True" {{chkpland}} {% if "plan drawn" in checked %}checked{% endif %}>
<br>
<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>
<input type="checkbox" name="descriptionw" id="descriptionw" value="True" {% if "description written" in checked %}checked{% endif %}>
<br>
<label for="qmsw">QMs written ?</label>
<input type="checkbox" name="qmsw" id="qmsw" value="True" {% if "qms written" in checked %}checked{% endif %}>
<br>
<label for="websiteupt">Website updated ?</label>
<input type="checkbox" name="websiteupt" id="websiteupt" value="True" {% if "website updated" in checked %}checked{% endif %}>
<br>
<label for="electronic">Electronic survey ?</label>
<input type="checkbox" name="electronic" id="electronic" value="True" {% if "electronic survey" in checked %}checked{% endif %}>
<br>
<label for="people">List of people on the survey trip</label>
<input
label = "People" name = "people" size ="{{peoplesize}}"
title="List of people on the survey trip"
placeholder="{{people}}" value="{{people}}" />
<br>
<label for="url">URL of cave description</label>
<input
label = "URL" name = "url" size ="{{urlsize}}"
title="URL of cave description, e.g. /1623/264/264.html"
placeholder="{{url}}" value="{{url}}" />
<br>
<label for="survex">List of survex files</label>
<input
label = "survex" name = "survex" size ="{{survexsize}}"
title="List of survex files using this data"
placeholder="{{survex}}" value="{{survex}}" />
<br><br>
<button class="fancybutton" style="padding: 0.5em 25px; margin-left: 155px; font-size: 90%; "
type = "submit" value = "Edit" >
Submit changes
</button>
</form>
</div>
{% endif %} <!-- not create -->
{% endblock %}

8
templates/wallet.html → templates/wallet_old.html
View File

@@ -2,7 +2,9 @@
{% block title %}Survey Scans Wallet {% endblock %}
{% block content %}
<h3>Survey Scans in: {{wallet.walletname}}</h3>
<h3>Survey Scans in old wallet: {{wallet.walletname}}</h3>
<p>Wallets of 1999 and earlier are in a different structure and have not yet been edited to conform to the current
name format and folder structure.
<table>
{% for singlescan in wallet.singlescan_set.all %}
<tr>
@@ -17,7 +19,9 @@
</table>
<h3>Survex surveys referring to this wallet</h3>
<p><b>*ref</b> references have not been configured in most old survex files,
so it is unlikley that you will see anything here. To find survex files for this year look in the
survex column of the <a href="/expedition/1999">expedition page</a>.
<table>
{% for survexblock in wallet.survexblock_set.all %}
<tr>