From db37710b9061eb68cb8ff3323e4be948c50d0953 Mon Sep 17 00:00:00 2001 From: Philip Sargent <philip.sargent@klebos.com> Date: Fri, 12 Jun 2020 14:52:00 +0100 Subject: [PATCH] fixes: stopped storing survex legs --- templates/experimental.html | 28 ---------------------------- templates/statistics.html | 5 ++++- 2 files changed, 4 insertions(+), 29 deletions(-) delete mode 100644 templates/experimental.html diff --git a/templates/experimental.html b/templates/experimental.html deleted file mode 100644 index 3e5d1f1..0000000 --- a/templates/experimental.html +++ /dev/null @@ -1,28 +0,0 @@ -{% extends "base.html" %} -{% load wiki_markup %} -{% load link %} - -{% block title %}Experimental{% endblock %} - -{% block content %} - -<h1>Expo Experimental</h1> - -<p>Number of survey legs: {{nsurvexlegs}}<br /> -Total length: {{totalsurvexlength}} m on importing survex files.<br /> -Total length: {{addupsurvexlength}} m adding up all the years below.</p> - -<table> -<tr><th>Year</th><th>Surveys</th><th>Survey Legs</th><th>Total length</th></tr> -{% for legs in legsbyexpo %} -<tr> - <td>{{legs.0.year}}</td> - <td>{{legs.0.survexblock_set.all|length}}</td> - <td>{{legs.1.nsurvexlegs}}</td> - <td>{{legs.1.survexleglength}}</td> -</tr> -{% endfor %} -</table> - -{% endblock %} - diff --git a/templates/statistics.html b/templates/statistics.html index 5c9810b..63c1dfc 100644 --- a/templates/statistics.html +++ b/templates/statistics.html @@ -9,7 +9,10 @@ <p>{{ expoCount }} expeditions: {{ personCount }} people have contributed {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries. -<p>Number of survey legs: {{nsurvexlegs}}, total length: {{totalsurvexlength|stringformat:".3f"}} km</p> +<p>Number of survey legs: {{nsurvexlegs}}<br /> +Total length: {{totalsurvexlength|stringformat:".3f"}} m on importing survex files.<br /> +Total length: {{addupsurvexlength|stringformat:".3f"}} m adding up all the years below.</p> + <table> <tr><th>Year</th><th>Surveys</th><th>Survey Legs</th><th>Total length<br>(km)</th></tr>