expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-25 08:41:51 +00:00
Code Issues 19 Projects 3 Activity

Entrance locations explanations

Browse Source
This commit is contained in:
Philip Sargent 2023-08-02 10:17:48 +03:00
parent 7fc058b1da
commit 585eb534a9
3 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
core/forms.py
View File

@ -182,8 +182,12 @@ class EntranceForm(ModelForm):
required=False, required=False,
widget=forms.TextInput(attrs={"size": "50"}), label="Other station: Survex station id, e.g. 1623.2023-xx-01.33" widget=forms.TextInput(attrs={"size": "50"}), label="Other station: Survex station id, e.g. 1623.2023-xx-01.33"
) )
northing = forms.CharField(required=False) northing = forms.CharField(
easting = forms.CharField(required=False) required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Northing (UTM) - from survex data"
)
easting = forms.CharField(
required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Easting (UTM) - from survex data"
)
lat_wgs84 = forms.CharField( lat_wgs84 = forms.CharField(
required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Latitude (WSG84) - if no other location" required=False, widget=forms.TextInput(attrs={"size": "10"}), label="Latitude (WSG84) - if no other location"
) )

3
core/views/caves.py
View File

@ -477,7 +477,8 @@ def edit_entrance(request, path="", caveslug=None, entslug=None):
cave_file = cave.file_output() cave_file = cave.file_output()
write_and_commit([entrance_file, cave_file], f"Online edit of entrance {entrance.slug}") write_and_commit([entrance_file, cave_file], f"Online edit of entrance {entrance.slug}")
return HttpResponseRedirect("/" + cave.url) return HttpResponseRedirect("/" + cave.url)
else:
else: # GET the page, not POST, or if either of the forms were invalid when POSTed
if entrance: if entrance:
# re-read entrance data from file. # re-read entrance data from file.
filename = str(entrance.slug +".html") filename = str(entrance.slug +".html")

10
templates/editentrance.html
View File

@ -5,10 +5,18 @@
{% include 'html_editor_scripts_css.html' %} {% include 'html_editor_scripts_css.html' %}
{% endblock %} {% endblock %}
{% block content %} {% block content %}
<h1>Edit Entrance - at cave {{cave.official_name|safe}} - {{cave.kataster_number}}</h1> <h1>Edit Entrance at cave {{cave.official_name|safe}} - {{cave.unofficial_number}} - {{cave.kataster_number}}</h1>
{% include 'html_editor_pop_ups.html' %} {% include 'html_editor_pop_ups.html' %}
<h2>{{message}}</h2> <h2>{{message}}</h2>
<form action="" method="post">{% csrf_token %} <form action="" method="post">{% csrf_token %}
<p> When you first create a new entrance, you will probably not have any cave survey data for the entrance location,
<ul>
<li>
so the Easting/Northing fields will be blank.
<li>Put in the location of your new entrance in the WGS84 latitude and longitude fields.
<li>Read the <a href="/handbook/survey/coord2.html#summary">brief explanation</a> of location data in the handbook.
</ul>
{% if entlettereditable %} {% if entlettereditable %}
<table>{{ entletter }}</table> <table>{{ entletter }}</table>
{% else %} {% else %}