From bf8d8817709c94046681e070c6d5c75a99f05057 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Thu, 12 Oct 2023 16:13:28 +0300
Subject: [PATCH] Edit entrance form explanation text

---
 parsers/locations.py        |  6 +++---
 templates/editentrance.html | 22 ++++++++++++++++++----
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/parsers/locations.py b/parsers/locations.py
index 568e79b..4c23b4c 100644
--- a/parsers/locations.py
+++ b/parsers/locations.py
@@ -83,7 +83,7 @@ def validate_entrance_stations(ent=None):
            print(message)
             
     def validate_ent(ent):
-        """For each of the three tag strings in an Entrance object,
+        """For each of the two station strings in an Entrance object,
         validate each string as referring to a valid SurvexStation object.
         But our list of created SurvexStation objects is created by taking a list of strings and using them
         to select from lines in a .pos file - so this is unnecessarily indirect.
@@ -97,10 +97,10 @@ def validate_entrance_stations(ent=None):
             cave = cavelist[0]
             url = f"/{cave.url}"     
         elif len(cavelist) > 1:
-            cave = cavelist[-1]
+            cave = cavelist[-1] # set to last in list
             url = f"/{cave.url}"
         else:
-            print(f"BUGGER {ent} {ent.cavelist()}")
+            print(f"BUGGER bad cave  '{cavelist}' on Entrance object {ent} ")
             url="/caves"
         for st, ent_type in {ent.other_station: "other", ent.tag_station: "tag"}.items():
             if st == "":
diff --git a/templates/editentrance.html b/templates/editentrance.html
index c07235d..2691d6e 100644
--- a/templates/editentrance.html
+++ b/templates/editentrance.html
@@ -9,11 +9,25 @@
 {% include 'html_editor_pop_ups.html' %}
 <h2>{{message}}</h2>
 <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, 
+<p>First, <em>DO YOU KNOW</em> how to use *fix data in survex files ?
+<ul>
+<li>YES I do.<br />
+<ol>
+<li>Create a *fix line in the appropriate file
+<li>Write in the name of the *fix location onto this form in the "tag station" or "other station" field. Remember to specifiy the correct 1623. or 1626. prefix.
+<li>Set the "Findability" field to "Coordinates"
+</ol>
+<br />
+<li>NO I don't.<br />
+<ol>
+<li>Put in the location of your new entrance in the WGS84 latitude, longitude and altitude fields.
+<li>Set the "Findability" field to "Coordinates"
+<li>[A nerd will use a report to detect that you have done this, and will do the *fix stuff for you.]
+
+</ol>
+</ul>
+<p> When you first create a new entrance, should have a GPS location and you will have filled out a New Cave data sheet. We do not use "bearings" these days, we use survex *fix points.
 <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>