xle/troggle-unchained
2
0
Fork 0
forked from expo/troggle
Code Issues 4 Pull Requests Projects 1 Wiki Activity

survex_file field inconsistency detection & edit

Browse Source
This commit is contained in:
Philip Sargent
2021-04-02 23:21:23 +01:00
parent bd8d59b343
commit 52c1dabd0e
7 changed files with 120 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/dataformat/cave.xml
View File

@@ -1,5 +1,7 @@
<!DOCTYPE html>
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- Only put one cave in this file -->
<!-- If you edit this file, make sure you update the websites database -->
<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

4
templates/dataformat/entrance.xml
View File

@@ -1,5 +1,7 @@
<!DOCTYPE html>
<!-- Only put one entrance in this file -->
<!-- If you edit this file, make sure you update the websites database -->
<!-- This file is generated using the form documented at /handbook/survey/caveentry.html -->
<!-- If you edit this file by hand, make sure you update the database by doing a full data import -->
<html lang="en">
<head>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

15
templates/svxcaveseveral.html
View File

@@ -1,6 +1,6 @@
{% extends "base.html" %}
{% block title %}List of survex files{% endblock %}
{% load wiki_markup %}
{% block content %}
<!-- the only thing passed into this template is a list of object identifiers for caves.
All the processing to extract the survex subdriectories and survex files is done in this template -->
@@ -14,7 +14,7 @@
</p>
<p>
{% for survexdirectory in cave.survexdirectory_set.all %}
<a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a>
This cave has a linked survexdirectory: <a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a> in the database. See the table below.
{% empty %}
<p>If you were expecting to see a list of survex files here and a summary table of who did what and when, perhaps
because you followed a link from <a href="/survexfile/caves/">the master caves' survex list</a> page which showed that such survex files clearly existed, and yet there is nothing here but a blank; then this will be because the survex (.svx) files have been stored on the server in the
@@ -28,6 +28,15 @@
<a href="/handbook/survey/caveentry.html">this part of the survey handbook</a>.
{% endfor %}
</p>
<p>If you can see a filename here: [&nbsp;<a href="/survexfile/{{cave.survex_file}}">{{cave.survex_file}}</a> &nbsp;]
which does <em>not</em> match any in the list below <em>including the directories beginning with </em><strong>caves-162X/</strong></em>
not just the filename</em>, then (if logged on) you can
<strong>click here <var><a href="/cave/{{cave.slug}}/edit/">/cave{{cave.slug}}/edit</a></var></strong>
to go to a form to correct the online data.
Instructions for filling in this form are in this part
<a href="/handbook/survey/caveentry.html"> of the survey handbook</a>.
</p>
{% for survexdirectory in cave.survexdirectory_set.all %}
<h3 id="T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</h3>
<table>
@@ -86,7 +95,7 @@
</tr>
{% endfor %}
{% endfor %}
</table>
</table><p>
{% endfor %}
{% endfor %}
{% endblock %}

13
templates/svxcavesingle.html
View File

@@ -1,10 +1,10 @@
{% extends "base.html" %}
{% block title %}List of survex files{% endblock %}
{% load wiki_markup %}
{% block content %}
{% autoescape off %}
<h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - kataster:{{cave}}</h1>
<h1>Surveys for <a href="/{{cave.url}}">{{cave.official_name}}</a> - identifier:{{cave}}</h1>
{% endautoescape %}
<!-- the only thing passed into this template is the object identifier for a cave.
All the processing to extract the survex subdriectories and survex files is done in this template -->
@@ -13,7 +13,7 @@ All the processing to extract the survex subdriectories and survex files is done
</p>
<p>
{% for survexdirectory in cave.survexdirectory_set.all %}
<a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a>
<a href="#T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</a>
{% empty %}
<p>If you were expecting to see a list of survex files here and a summary table of who did what and when, perhaps
because you followed a link from <a href="/survexfile/caves/">the master caves' survex list</a> page which showed that such survex files clearly existed, and yet there is nothing here but a blank; then this will be because the survex (.svx) files have been stored on the server in the
@@ -27,6 +27,13 @@ All the processing to extract the survex subdriectories and survex files is done
<a href="/handbook/survey/caveentry.html">this part of the survey handbook</a>.
{% endfor %}
</p>
<p>If you can see a filename here: [&nbsp;<a href="/survexfile/{{cave.survex_file}}">{{cave.survex_file}}</a> &nbsp;] which does <em>not</em> match any in the list below <em>including the directories beginning with </em><strong>caves-162X/</strong></em>
not just the filename</em>, then (if logged on) you can
<strong>click here <var><a href="/cave/{{cave.slug}}/edit/">/cave{{cave.slug}}/edit</a></var></strong>
to go to a form to correct the online data.
Instructions for filling in this form are in this part
<a href="/handbook/survey/caveentry.html"> of the survey handbook</a>.
</p>
{% for survexdirectory in cave.survexdirectory_set.all %}
<h3 id="T_{{survexdirectory.primarysurvexfile.path}}">{{survexdirectory.path}}</h3>
<table>