Import rejigging to fix circular refs

1 files changed, 6 insertions, 5 deletions

diff --git a/core/views_logbooks.py b/core/views_logbooks.py
index b02200f..1cb9f2c 100644
--- a/core/views_logbooks.py
+++ b/core/views_logbooks.py
@@ -14,8 +14,9 @@ from django.views.generic.list import ListView
 import troggle.core.models as models
 import troggle.parsers.logbooks as logbookparsers
 from troggle.core.forms import getTripForm  # , get_name, PersonForm
-from troggle.core.models import Expedition, LogbookEntry, Person,                                PersonExpedition, PersonTrip
-from troggle.core.models_survex import SurvexBlock
+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.helper import login_required_if_public
 from troggle.parsers.logbooks import LoadLogbookForExpedition
 from troggle.parsers.people import GetPersonExpeditionNameLookup
@@ -226,12 +227,12 @@ def experimental(request):
         for survexblock in survexblocks:
             survexlegs.extend(survexblock.survexleg_set.all())
             survexleglength += survexblock.totalleglength
-        legsbyexpo.append((expedition, {"nsurvexlegs":len(survexlegs), "survexleglength":survexleglength}))
+        legsbyexpo.append((expedition, {"nsurvexlegs":len(survexlegs), "survexleglength":survexleglength/1000}))
     legsbyexpo.reverse()
             
-    survexlegs = models.SurvexLeg.objects.all()
+    survexlegs = SurvexLeg.objects.all()
     totalsurvexlength = sum([survexleg.tape  for survexleg in survexlegs])
-    return render(request, 'experimental.html', { "nsurvexlegs":len(survexlegs), "totalsurvexlength":totalsurvexlength, "legsbyexpo":legsbyexpo })
+    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):