expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-21 23:01:52 +00:00
Code Issues 19 Projects 3 Activity

Made kataster_status field invisible.

Browse Source
This commit is contained in:
Philip Sargent 2023-11-20 19:27:09 +00:00
parent 740a5a4fa8
commit bd81bd0b01
3 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/forms.py
View File

@ -59,10 +59,10 @@ class CaveForm(ModelForm):
widget=HTMLarea(attrs={"height": "80%", "rows": 20, "placeholder": "Enter page content (using HTML)"}), 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})) # survey = forms.CharField(required = False, widget=TinyMCE(attrs={'cols': 80, 'rows': 10}))
kataster_status = forms.CharField(required=False, # kataster_status = forms.CharField(required=False,
label = "Kataster status, see below", # label = "Kataster status, see below",
widget=forms.TextInput(attrs={"placeholder": "see example below"}) # widget=forms.TextInput(attrs={"placeholder": "see example below"})
) # )
kataster_code = forms.CharField(required=False, kataster_code = forms.CharField(required=False,
label = "Kataster code, see below", label = "Kataster code, see below",
widget=forms.TextInput(attrs={"placeholder": "see example below"}) widget=forms.TextInput(attrs={"placeholder": "see example below"})
@ -73,6 +73,7 @@ class CaveForm(ModelForm):
# ) # )
notes = forms.CharField( notes = forms.CharField(
required=False, required=False,
label = "Notes, e.g. progress on issuing kataster no.",
widget=HTMLarea(attrs={"height": "80%", "rows": 20, "placeholder": "Enter page content (using HTML)"}), widget=HTMLarea(attrs={"height": "80%", "rows": 20, "placeholder": "Enter page content (using HTML)"}),
) )
references = forms.CharField( references = forms.CharField(
@ -92,7 +93,7 @@ class CaveForm(ModelForm):
class Meta: class Meta:
model = Cave 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', 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' ] 'kataster_code', 'kataster_status' ]

4
parsers/caves.py
View File

@ -740,7 +740,7 @@ def read_cave(filename, cave=None):
equipment = getXMLmax1("equipment") equipment = getXMLmax1("equipment")
references = getXMLmax1("references") references = getXMLmax1("references")
survey = getXMLmax1("survey") survey = getXMLmax1("survey")
kataster_status = getXMLmax1("kataster_status") #kataster_status = getXMLmax1("kataster_status")
#underground_centre_line = getXMLmax1("underground_centre_line") #underground_centre_line = getXMLmax1("underground_centre_line")
notes = getXMLmax1("notes") notes = getXMLmax1("notes")
length = getXMLmax1("length") length = getXMLmax1("length")
@ -797,7 +797,7 @@ def read_cave(filename, cave=None):
cave.equipment=equipment[0] cave.equipment=equipment[0]
cave.references=references[0] cave.references=references[0]
cave.survey=survey[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.underground_centre_line=underground_centre_line[0]
cave.notes=notes[0] cave.notes=notes[0]
cave.length=length[0] cave.length=length[0]

4
templates/dataformat/cave.xml
View File

@ -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. --> <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. --> <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. --> <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> <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 -->
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 -->
<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) --> <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) --> <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> <extent>{{cave.extent|default_if_none:""|safe }}</extent>