static files redone

This commit is contained in:
Philip Sargent
2020-06-18 21:50:16 +01:00
parent bd6490631f
commit d9c6986a89
25 changed files with 122 additions and 151 deletions

View File

@@ -4,7 +4,7 @@ import re
import django.db.models
from django.db.models import Min, Max
from django.core.urlresolvers import reverse
from django.urls import reverse
from django.http import HttpResponse, HttpResponseRedirect
from django.shortcuts import render, render_to_response
from django.template import Context, loader
@@ -185,11 +185,9 @@ def experimental(request):
addupsurvexlength = 0
for expedition in Expedition.objects.all():
survexblocks = expedition.survexblock_set.all()
#survexlegs = [ ]
legsyear=0
survexleglength = 0.0
for survexblock in survexblocks:
#survexlegs.extend(survexblock.survexleg_set.all())
survexleglength += survexblock.totalleglength
try:
legsyear += int(survexblock.text)
@@ -199,9 +197,6 @@ def experimental(request):
legsbyexpo.append((expedition, {"nsurvexlegs":legsyear, "survexleglength":survexleglength}))
legsbyexpo.reverse()
#removing survexleg objects completely
#survexlegs = models.SurvexLeg.objects.all()
#totalsurvexlength = sum([survexleg.tape for survexleg in survexlegs])
return render(request, 'experimental.html', { "nsurvexlegs":nimportlegs, "totalsurvexlength":totalsurvexlength, "addupsurvexlength":addupsurvexlength, "legsbyexpo":legsbyexpo })
@login_required_if_public