fields rearranged & a new one

core/views/new_hole.py

@@ -47,19 +47,17 @@ class NewHoleForm(forms.Form):
     
     # Discovery
     discoverers = forms.CharField(label="Discoverers / Investigators today", 
-        widget=forms.TextInput(attrs={'placeholder': 'e.g.   Dour, Animal, Becka'}),
+        widget=forms.TextInput(attrs={'placeholder': 'e.g.   Dour, Animal, Mealy'}),
         max_length=255, required=True)
     surface_wallet = forms.CharField(label="Old wallet used to find the entrance (if any)", 
         widget=forms.TextInput(attrs={'placeholder': 'e.g.  2005 # 63'}),
         max_length=100, required=False)
-    survey_wallet = forms.CharField(label="New Wallet for all this data (must match the year of the trip)", 
+    survey_wallet = forms.CharField(label="New Wallet for all this (will be created)", 
         widget=forms.TextInput(attrs={'placeholder': 'e.g.  2029 # 88'}),
         required=True)
     
     # GPS Data
-    gps_owner = forms.CharField(label="GPS: Whose device?", 
-        widget=forms.TextInput(attrs={'placeholder': 'e.g.   Becka'}),
-        max_length=100, required=True)
+ 
     gps_lat = forms.FloatField(
         label="GPS Latitude",
         widget=forms.TextInput(attrs={'placeholder': 'e.g.  47.6964483 N'}), required=True
@@ -72,11 +70,15 @@ class NewHoleForm(forms.Form):
         label="Time of GPS reading", 
         widget=forms.TimeInput(attrs={'type': 'time'})
     )
-    gps_screenshot = forms.BooleanField(label="Screenshot taken of GPSTest while GPS device in situ?", 
+    gps_screenshot = forms.BooleanField(label="Screenshot taken of GPSTest while GPS device in situ ?", 
         initial=True,
         required=False)
-    gps_photo = forms.BooleanField(label="Photo taken of GPS device in situ with view of entrance?", 
-         initial=True, required=False)
+    gps_log = forms.BooleanField(label="GPS track recorded during this part of the day ?", 
+        initial=True,
+        required=False)
+    gps_owner = forms.CharField(label="GPS: Whose device (may be more than one person)?", 
+        widget=forms.TextInput(attrs={'placeholder': 'e.g.   Skellet, Planc'}),
+        max_length=100, required=True)
     
     # Navigation
     dist_to_ent = forms.FloatField(label="Distance from GPS to entrance (m)",
@@ -92,7 +94,9 @@ class NewHoleForm(forms.Form):
     
     # Media: Entrance Photo (Replaced dropdown with checkboxes)
     photo_ent_no = forms.BooleanField(label="Entrance photos ?",  initial=True, required=False)
-    photo_ent_who = forms.CharField(label="Who has photos of entrance, tag and GPS?", 
+    gps_photo = forms.BooleanField(label="Photo taken of GPS device in situ with view of entrance ?", 
+         initial=True, required=False)    
+    photo_ent_who = forms.CharField(label="Who has photos of entrance, GPS in-situ (and tag) ?", 
         widget=forms.TextInput(attrs={'placeholder': 'e.g.   c densham'}),
         required=False)
 

templates/new_hole.html

@@ -141,7 +141,9 @@
  (git commits use your logged-in identity in the "Who are you ?" field)
 <li>Update the database with this new information
 <li>Return you to this form if any important data is missing, invalid or inconsistent
-<li>Take you to a new Wallet for this information and this trip (if it does not exist)
+<li>Take you to the new Wallet for this information and this trip <br />
+  (and create a new digital wallet if it does not already exist)<br />
+  If left blank, it will create the next Wallet number as yet unallocated.
 <li>If all is fine, will take you to <br />
 - the Entrance edit page for you to upload the photos<br />
 - a new Wallet edit page to upload the <em>GPTTest</em> screenshot and trip details