summaryrefslogtreecommitdiffstats
path: root/core/views_logbooks.py
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2020-06-04 21:57:04 +0100
committerPhilip Sargent <philip.sargent@klebos.com>2020-06-04 21:57:04 +0100
commitb7fea2042feb5ad12d99e7279498ad68c00c983b (patch)
treefe871bf7c98c28286b45277e6f432cf3a6aa05ad /core/views_logbooks.py
parentc6d68749e06892ce6607819081e4639a9d589409 (diff)
downloadtroggle-b7fea2042feb5ad12d99e7279498ad68c00c983b.tar.gz
troggle-b7fea2042feb5ad12d99e7279498ad68c00c983b.tar.bz2
troggle-b7fea2042feb5ad12d99e7279498ad68c00c983b.zip
merge exptl & stats, delete millenial & eyecandy
Diffstat (limited to 'core/views_logbooks.py')
-rw-r--r--core/views_logbooks.py20
1 files changed, 1 insertions, 19 deletions
diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index 53333fb..b430796 100644
--- a/core/views_logbooks.py
+++ b/core/views_logbooks.py
@@ -17,7 +17,7 @@ import troggle.parsers.logbooks as logbookparsers
from troggle.core.forms import getTripForm # , get_name, PersonForm
from troggle.core.models import Expedition, Person, PersonExpedition
from troggle.core.models_caves import LogbookEntry, PersonTrip
-from troggle.core.models_survex import SurvexBlock, SurvexLeg
+from troggle.core.models_survex import SurvexBlock
from troggle.helper import login_required_if_public
from troggle.parsers.logbooks import LoadLogbookForExpedition
from troggle.parsers.people import GetPersonExpeditionNameLookup
@@ -217,24 +217,6 @@ def pathsreport(request):
"bypathslist":bypathslist,
"ncodes":ncodes})
-
-
-def experimental(request):
- legsbyexpo = [ ]
- for expedition in Expedition.objects.all():
- survexblocks = expedition.survexblock_set.all()
- survexlegs = [ ]
- survexleglength = 0.0
- for survexblock in survexblocks:
- survexlegs.extend(survexblock.survexleg_set.all())
- survexleglength += survexblock.totalleglength
- legsbyexpo.append((expedition, {"nsurvexlegs":len(survexlegs), "survexleglength":survexleglength/1000}))
- legsbyexpo.reverse()
-
- survexlegs = SurvexLeg.objects.all()
- totalsurvexlength = sum([survexleg.tape for survexleg in survexlegs])
- return render(request, 'experimental.html', { "nsurvexlegs":len(survexlegs), "totalsurvexlength":totalsurvexlength/1000, "legsbyexpo":legsbyexpo })
-
@login_required_if_public
def newLogbookEntry(request, expeditionyear, pdate = None, pslug = None):
expedition = Expedition.objects.get(year=expeditionyear)