diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index c3cea1e..dcc26f8 100644
--- a/core/views_logbooks.py
+++ b/core/views_logbooks.py
@@ -84,9 +84,10 @@ def expedition(request, expeditionname):
def get_absolute_url(self):
return ('expedition', (expedition.year))
-class ExpeditionListView(ListView): # django thus expects a template called "expedition_list.html"
-# from the name of the object not the name of the class.
- model = Expedition
+# replaced by statistics page
+# class ExpeditionListView(ListView): # django thus expects a template called "expedition_list.html"
+# # from the name of the object not the name of the class.
+ # model = Expedition
class Expeditions_tsvListView(ListView):
diff --git a/templates/base.html b/templates/base.html
index 2a61aac..a8050e5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -47,8 +47,7 @@
tasks to do |
caves |
people |
- all expeditions |
- statistics |
+ expo statistics |
import/export data
Django admin
diff --git a/templates/core/expedition_list.html b/templates/core/expedition_list.html
deleted file mode 100644
index 15baa6b..0000000
--- a/templates/core/expedition_list.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "base.html" %}
-{% load wiki_markup %}
-{% load link %}
-
-{% block content %}
-
Expeditions
-
-{% for expedition in object_list %}
- - {{ expedition.year }} - {{ expedition.name }}
-{% empty %}
- - No articles yet.
-{% endfor %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/templates/core/expeditions_json_list.html b/templates/core/expeditions_json_list.html
index ad92206..a56c301 100644
--- a/templates/core/expeditions_json_list.html
+++ b/templates/core/expeditions_json_list.html
@@ -1,4 +1,5 @@
{% extends "baseapi.html" %}
{% block content %}{
-{% for expedition in object_list %}{% if not forloop.last %}"{{expedition.year}}": ["{{expedition.name}}","{{expedition.get_absolute_url}}"],{% endif %}{% if forloop.last %}"{{expedition.year}}": ["{{expedition.name}}","{{expedition.get_absolute_url}}"]{% endif %}
+{% for expedition in object_list %}{% if not forloop.last %}"{{expedition.year}}":
+ ["{{expedition.name}}","{{expedition.get_absolute_url}}"],{% endif %}{% if forloop.last %}"{{expedition.year}}": ["{{expedition.name}}","{{expedition.get_absolute_url}}"]{% endif %}
{% endfor %} }{% endblock %}
\ No newline at end of file
diff --git a/templates/statistics.html b/templates/statistics.html
index d279f4f..790b745 100644
--- a/templates/statistics.html
+++ b/templates/statistics.html
@@ -5,7 +5,8 @@
{% block title %}Expo statistics{% endblock %}
{% block content %}
-Expo Statistics
+
+Expedition Statistics
{{ expoCount }} expeditions: {{ personCount }} people, {{ caveCount }} caves and {{ logbookEntryCount }} logbook entries.
@@ -14,13 +15,13 @@ Total length: {{addupsurvexlength|stringformat:".1f"}} km adding up the total fo
These are uncorrected tape lengths which include pitches and duplicates but exclude splays or surface-surveys.
-This is work in progress (July 2020).
+This is work in progress (March 2021).
Year | Survex Survey Blocks | Survex Survey Legs | Total length (m) |
{% for legs in legsbyexpo %}
- {{legs.0.year}} |
+ {{legs.0}} |
{{legs.0.survexblock_set.all|length}} |
{{legs.1.nsurvexlegs|rjust:"10"}} |
{{legs.1.survexleglength}} |
@@ -30,4 +31,7 @@ This is work in progress (July 2020).
One Survex Survey Block is one *begin/*end block of data in a survex file.
Some files from other caving clubs may have a convention of using many more blocks per file than we do, e.g. if the
file is exported from other software into survex format.
+
+
+
{% endblock %}
\ No newline at end of file
diff --git a/urls.py b/urls.py
index 2c61054..84373b2 100644
--- a/urls.py
+++ b/urls.py
@@ -66,7 +66,6 @@ actualurlpatterns = [
# url(r'^personform/(.*)$', personForm),
url(r'^expedition/(\d+)$', views_logbooks.expedition, name="expedition"),
- url(r'^expeditions/?$', views_logbooks.ExpeditionListView.as_view(), name="expeditions"),
url(r'^api/expeditions_tsv$', views_logbooks.Expeditions_tsvListView.as_view()),
url(r'^api/expeditions_json$', views_logbooks.Expeditions_jsonListView.as_view()),
url(r'^personexpedition/(?P[A-Z]*[a-z&;]*)[^a-zA-Z]*(?P[A-Z]*[a-zA-Z&;]*)/(?P\d+)/?$', views_logbooks.personexpedition, name="personexpedition"),