From c9931fd45eaa0b05d1bce37d471e873b0955c125 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Mon, 18 Apr 2022 23:33:04 +0300
Subject: survey legs calc fixed

---
 core/views/statistics.py | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'core/views/statistics.py')

diff --git a/core/views/statistics.py b/core/views/statistics.py
index 02cbd43..9e7ff81 100644
--- a/core/views/statistics.py
+++ b/core/views/statistics.py
@@ -130,22 +130,21 @@ def stats(request):
 
     legsbyexpo = [ ]
     addupsurvexlength = 0
+    addupsurvexlegs = 0
     for expedition in Expedition.objects.all():
         survexblocks = expedition.survexblock_set.all()
         legsyear=0
         survexleglength = 0.0
         for survexblock in survexblocks:
             survexleglength += survexblock.legslength
-            try:
-                legsyear += int(survexblock.legsall)
-            except:
-                pass
+            legsyear += int(survexblock.legsall)
         addupsurvexlength += survexleglength
+        addupsurvexlegs += legsyear
         legsbyexpo.append((expedition, {"nsurvexlegs": "{:,}".format(legsyear), 
                 "survexleglength":"{:,.0f}".format(survexleglength)}))
     legsbyexpo.reverse() 
 
-    renderDict = {**statsDict, **{ "addupsurvexlength":addupsurvexlength/1000, "legsbyexpo":legsbyexpo }} # new syntax
+    renderDict = {**statsDict, **{ "addupsurvexlength":addupsurvexlength/1000, "legsbyexpo":legsbyexpo, "nsurvexlegs":addupsurvexlegs }} # new syntax
     return render(request,'statistics.html',  renderDict)
 
 def dataissues(request):
-- 
cgit v1.2.3