From bd81bd0b013892c7cd05a6e319a1a960e21abb55 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@gmail.com>
Date: Mon, 20 Nov 2023 19:27:09 +0000
Subject: [PATCH] Made kataster_status field invisible.

---
 core/forms.py                 | 11 ++++++-----
 parsers/caves.py              |  4 ++--
 templates/dataformat/cave.xml |  4 +---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/core/forms.py b/core/forms.py
index bd90490..aeaa7ed 100644
--- a/core/forms.py
+++ b/core/forms.py
@@ -59,10 +59,10 @@ class CaveForm(ModelForm):
         widget=HTMLarea(attrs={"height": "80%", "rows": 20, "placeholder": "Enter page content (using HTML)"}),
     )
     # survey = forms.CharField(required = False, widget=TinyMCE(attrs={'cols': 80, 'rows': 10}))
-    kataster_status = forms.CharField(required=False, 
-        label = "Kataster status, see below",
-        widget=forms.TextInput(attrs={"placeholder": "see example below"})
-    )
+    # kataster_status = forms.CharField(required=False, 
+        # label = "Kataster status, see below",
+        # widget=forms.TextInput(attrs={"placeholder": "see example below"})
+    # )
     kataster_code = forms.CharField(required=False, 
         label = "Kataster code, see below",
         widget=forms.TextInput(attrs={"placeholder": "see example below"})
@@ -73,6 +73,7 @@ class CaveForm(ModelForm):
     # )
     notes = forms.CharField(
         required=False,
+        label = "Notes, e.g. progress on issuing kataster no.",
         widget=HTMLarea(attrs={"height": "80%", "rows": 20, "placeholder": "Enter page content (using HTML)"}),
     )
     references = forms.CharField(
@@ -92,7 +93,7 @@ class CaveForm(ModelForm):
 
     class Meta:
         model = Cave
-        exclude = ("filename","url", "underground_centre_line")
+        exclude = ("filename","url", "underground_centre_line", "kataster_status")
        
     field_order = ['unofficial_number', 'kataster_number', 'official_name', 'underground_description', 'survey', 'underground_centre_line', 'explorers', 'equipment', 'notes', 'references', 'description_file', 'survex_file', 'areacode', 'length', 'depth', 'extent',
     'kataster_code', 'kataster_status' ]
diff --git a/parsers/caves.py b/parsers/caves.py
index 4203368..d8c8006 100644
--- a/parsers/caves.py
+++ b/parsers/caves.py
@@ -740,7 +740,7 @@ def read_cave(filename, cave=None):
     equipment = getXMLmax1("equipment")
     references = getXMLmax1("references")
     survey = getXMLmax1("survey")
-    kataster_status = getXMLmax1("kataster_status")
+    #kataster_status = getXMLmax1("kataster_status")
     #underground_centre_line = getXMLmax1("underground_centre_line")
     notes = getXMLmax1("notes")
     length = getXMLmax1("length")
@@ -797,7 +797,7 @@ def read_cave(filename, cave=None):
     cave.equipment=equipment[0]
     cave.references=references[0]
     cave.survey=survey[0]
-    cave.kataster_status=kataster_status[0]
+    #cave.kataster_status=kataster_status[0]
     #cave.underground_centre_line=underground_centre_line[0]
     cave.notes=notes[0]
     cave.length=length[0]
diff --git a/templates/dataformat/cave.xml b/templates/dataformat/cave.xml
index cf60e7c..2a4e466 100644
--- a/templates/dataformat/cave.xml
+++ b/templates/dataformat/cave.xml
@@ -49,9 +49,7 @@ code used in the Austrian kataster e.g '1/S +' - https://expo/.survex.com/katast
 <equipment>{{ cave.equipment|default_if_none:""|safe }}</equipment><!-- For a small cave, summary of gear needed to descend. For longer caves it could be blank, a table, or just refer to the description/topos. Leave blank if this info is in the description. -->
 <references>{{ cave.references|default_if_none:""|safe }}</references><!-- References to documentation. Could be Journal articles or Logbook entries. Can be links if the docs are online. -->
 <survey>{{ cave.survey|default_if_none:""|safe }}</survey><!-- Drawn-up surveys. Scans of paper surveys or images/PDFs of electronic surveys. Should include HTML to display current plan and elevation, with links to larger versions (See section on URLs and files). Could list links to multiple years of survey, or even a separate survey page if it's complicated enough. -->
-<kataster_status>{{ cave.kataster_status|default_if_none:""|safe }}</kataster_status>
-Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-<notes>{{ cave.notes|default_if_none:""|safe }}</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost -->
+<notes>{{ cave.notes|default_if_none:""|safe }}</notes><!-- Normally empty, but place for anything else that should be noted, such as info on cave maybe being a duplicate, or lost, and whether a kataster form has been sent to Austria for this cave -->
 <length>{{ cave.length|default_if_none:""|safe }}</length><!-- Cave length. Can be left blank and system should fill it in automatically from survey data (it doesn't yet) -->
 <depth>{{ cave.depth|default_if_none:""|safe }}</depth><!--Cave depth. Can be left blank and system should fill it in automatically from survey data (it doesn't yet)  -->
 <extent>{{cave.extent|default_if_none:""|safe }}</extent>