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
{{ cave.equipment|default_if_none:""|safe }}
{{ cave.references|default_if_none:""|safe }}
{{ cave.survey|default_if_none:""|safe }}
-{{ cave.kataster_status|default_if_none:""|safe }}
-Blank if not, or notes about status such as 'surveyed, but no entrance fix so not yet in dataset'. -->
-{{ cave.notes|default_if_none:""|safe }}
+{{ cave.notes|default_if_none:""|safe }}
{{ cave.length|default_if_none:""|safe }}
{{ cave.depth|default_if_none:""|safe }}
{{cave.extent|default_if_none:""|safe }}