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

TIdy and docum of cave entry code

Browse Source
This commit is contained in:
Philip Sargent 2022-10-11 21:01:02 +03:00
parent 47e2c6e214
commit 39683cc413
4 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/views/caves.py
View File

@ -303,7 +303,6 @@ def edit_cave(request, path = "", slug=None):
The format for the file being saved is in templates/dataformat/cave.xml The format for the file being saved is in templates/dataformat/cave.xml
It does save the data into into the database directly, not by parsing the file. It does save the data into into the database directly, not by parsing the file.
It does NOT yet commit to the git repo
''' '''
message = "" message = ""
if slug is not None: if slug is not None:
@ -525,13 +524,3 @@ def qm(request,cave_id,qm_id,year,grade=None, blockname=None):
return render(request,'errors/badslug.html', {'badslug': f'QM.DoesNotExist blockname is not empty string {cave_id=} {year=} {qm_id=} {grade=} {blockname=}'}) return render(request,'errors/badslug.html', {'badslug': f'QM.DoesNotExist blockname is not empty string {cave_id=} {year=} {qm_id=} {grade=} {blockname=}'})
# def get_qms(request, caveslug):
# '''Does not crash, but just returns a text list of the entrances for a cave.
# Used internally by the JSON export code? Archeology required..
# cf get_entrances() above
# '''
# try:
# cave = Cave.objects.get(caveslug__slug = caveslug)
# except:
# return render(request,'errors/badslug.html', {'badslug': caveslug})
# return render(request,'options.html', {"items": [(q.slug(), q.slug()) for q in cave.QMs()]})

2
core/views/survex.py
View File

@ -459,7 +459,7 @@ def survexcaveslist(request):
def survexcavesingle(request, survex_cave): def survexcavesingle(request, survex_cave):
'''parsing all the survex files of a single cave and showing that it's consistent and can find all '''parsing all the survex files of a single cave and showing that it's consistent and can find all
the files and people. Should explicity fix the kataster number thing. the files and people. Should explicitly fix the kataster number thing.
kataster numbers are not unique across areas. This used to be a db constraint but we need to manage kataster numbers are not unique across areas. This used to be a db constraint but we need to manage
this ourselves as we don't want the parser aborting with an error message. this ourselves as we don't want the parser aborting with an error message.

7
templates/dataformat/cave.xml
View File

@ -1,13 +1,16 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html --> <!-- This file is generated by troggle using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file --> <!-- Only put one cave in this file -->
<!-- If you edit this 1623-000.html file by hand, make sure you update the database by doing a full data import --> <!-- If you edit this 1623-nnn.html file by hand, make sure you update the database by doing a full data import -->
<!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html --> <!-- ALTERNATIVELY you can download an example template from expoweb/templates/cave_data.html -->
<html lang="en"> <html lang="en">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head> </head>
<body> <body>
<b>This file is generated by troggle</b> using the form documented at /handbook/survey/caveentry.html
<br>
<cave> <cave>
<non_public>{{ cave.non_public }}</non_public>{% for slug in cave.caveslug_set.all %}<!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. --> <non_public>{{ cave.non_public }}</non_public>{% for slug in cave.caveslug_set.all %}<!-- 'False' or 'True'. True if the cave should only be visible to logged-in users. Caves are normally public, so enter 'False' unless you know otherwise. -->
<caveslug>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}<!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195' --> <caveslug>{{ slug.slug|default_if_none:"1623-000"|safe }}</caveslug>{% endfor %}<!--(Required). Internal I.D. used to refer to this cave in entrance data files. Typically the same as the filebase, e.g. '1623-195' -->

4
templates/dataformat/entrance.xml
View File

@ -1,6 +1,6 @@
<!DOCTYPE html> <!DOCTYPE html>
<!-- Only put one entrance in this file --> <!-- Only put one entrance in this file -->
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html --> <!-- This file is generated by troggle using the form documented at handbook/survey/ententry.html -->
<!-- If you edit this file by hand, make sure you update the database by doing a full data import --> <!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form --> <!-- See http://expo.survex.com/handbook/survey/caveentryfields.html for current details on filling in this form -->
@ -12,6 +12,8 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
</head> </head>
<body> <body>
<b>This file is generated by troggle </b>using the form documented at handbook/survey/ententry.html
<br>
<entrance> <entrance>
<non_public>{{ entrance.non_public }}</non_public>{% for slug in entrance.entranceslug_set.all %} <non_public>{{ entrance.non_public }}</non_public>{% for slug in entrance.entranceslug_set.all %}
<slug>{{ slug.slug|default_if_none:""|safe }}</slug>{% endfor %} <slug>{{ slug.slug|default_if_none:""|safe }}</slug>{% endfor %}