summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
Diffstat (limited to 'templates')
-rw-r--r--templates/controlPanel.html3
-rw-r--r--templates/survexdebug.html25
-rw-r--r--templates/survexreport.html17
3 files changed, 35 insertions, 10 deletions
diff --git a/templates/controlPanel.html b/templates/controlPanel.html
index 7b5903e..4203821 100644
--- a/templates/controlPanel.html
+++ b/templates/controlPanel.html
@@ -24,7 +24,8 @@
<li><a href="/pathsreport">Folder paths used</a> -folders settings used by this troggle installation
<li><a href="/aliases/2022">Expoer name aliases</a> -short names recognised by troggle
<li><a href="/dataissues">Data Issues on Imports</a> - warnings and errors from the recent data import
-<li><a href="/surveximport">Survex import record</a> - indented *include and begin/end tree<br /><li><a href="/therionissues">Therion Import issues</a> - warnings from the recent data import<br /><br />
+<li><a href="/surveximport">Survex import record</a> - indented *include and begin/end tree<br /><li><a href="/survexdebug">Survex debug report</a> - warnings and details<br />
+<li><a href="/therionissues">Therion Import issues</a> - warnings from the recent data import<br /><br />
<li><a href="/admin/">Django admin</a> - Deep magic access to all models and data
</ul>
<h3>This control panel is being redeveloped</h3>
diff --git a/templates/survexdebug.html b/templates/survexdebug.html
new file mode 100644
index 0000000..ec78fbd
--- /dev/null
+++ b/templates/survexdebug.html
@@ -0,0 +1,25 @@
+{% extends "base.html" %}
+{% block title %}Data import report{% endblock %}
+
+{% block content %}
+<h1>Expo Survex debug report</h1>
+
+
+<h3>Running list of warnings during import</h3>
+
+<hr>
+<p>See <a href="/surveximport">Survex import record</a> - indented *include and begin/end tree<br />
+<p>Go to <a href="/controlpanel">Control panel</a> - for other import reports<br>
+<hr>
+<pre>
+<p style="font-family: Consolas, Lucida Console, monospace; font-size: small">
+{{log}}
+</pre>
+<p>This report is generated from <code>templates/survexdebug.html</code> and
+by <code>survexdebug(request)</code> in <code>core/views/statistics.py </code>
+<hr>
+<p>Go to <a href="/surveximport">Survex import record</a> - indented *include and begin/end tree<br />
+<p>Go to <a href="/controlpanel">Control panel</a> - for other import reports
+<p>Go to <a href="/handbook/troggle/trogmanual.html">Troggle maintenance manuals</a>
+{% endblock %}
+
diff --git a/templates/survexreport.html b/templates/survexreport.html
index aec0435..535cec4 100644
--- a/templates/survexreport.html
+++ b/templates/survexreport.html
@@ -10,19 +10,18 @@
<p>An extra line *edulcni is inserted to show where an included file ends. The *include and *edulcni lines omit the ".svx" from the end of the filename.
<p>The survex files which are NOT part of the main include tree have been collected together and included under a constructed file "_unseens" following the line "0 *include _unseens" into a begin/end block labelled "troggle_unseens".
<hr>
-<p>Go to <a href="/controlpanel">Control panel</a> - for other import reports
+Go to <a href="/survexdebug">Survex debug report</a> - warnings and details<br />
+Go to <a href="/controlpanel">Control panel</a> - for other import reports
<hr>
+<pre>
<p style="font-family: Consolas, Lucida Console, monospace;">
-{% for line in log %}
-{{line|safe}}<br />
-{% empty %}
-<b>No import report file found. Re-import using databaseReset.py</b>
-{% endfor %}
-
+{{log}}
+</pre>
<p>This report is generated from <code>templates/survexreport.html</code> and
by <code>survexreport(request)</code> in <code>core/views/statistics.py </code>
<hr>
-<p>Go to <a href="/controlpanel">Control panel</a> - for other import reports
-<p>Go to <a href="/handbook/troggle/trogmanual.html">Troggle maintenance manuals</a>
+Go to <a href="/survexdebug">Survex debug report</a> - warnings and details<br />
+Go to <a href="/controlpanel">Control panel</a> - for other import reports
+Go to <a href="/handbook/troggle/trogmanual.html">Troggle maintenance manuals</a>
{% endblock %}