merge exptl & stats, delete millenial & eyecandy

core/models_caves.py

@@ -128,7 +128,7 @@ class Cave(TroggleModel):
         return str("slug:"+self.slug())
 
     def get_QMs(self):
-        return QM.objects.filter(found_by__cave_slug=self.caveslug_set.all())	
+        return QM.objects.filter(found_by__cave_slug=self.caveslug_set.all())
 
     def new_QM_number(self, year=datetime.date.today().year):
             """Given a cave and the current year, returns the next QM number."""
@@ -275,7 +275,7 @@ class Entrance(TroggleModel):
 
     def find_location(self):
         r = {'':  'To be entered ',
-			 '?': 'To be confirmed:',
+             '?': 'To be confirmed:',
              'S': '',
              'L': 'Lost:',
              'R': 'Refindable:'}[self.findability]
@@ -566,12 +566,12 @@ class Survey(TroggleModel):
     comments = models.TextField(blank=True,null=True)
     location = models.CharField(max_length=400,blank=True,null=True) #REDUNDANT
     subcave = models.ForeignKey('NewSubCave', blank=True, null=True)
-    #notes_scan = models.ForeignKey('ScannedImage',related_name='notes_scan',blank=True, null=True)  	#Replaced by contents field of ScannedImage model
+    #notes_scan = models.ForeignKey('ScannedImage',related_name='notes_scan',blank=True, null=True)   #Replaced by contents field of ScannedImage model
     survex_block  = models.OneToOneField('SurvexBlock',blank=True, null=True)
     logbook_entry = models.ForeignKey('LogbookEntry')
     centreline_printed_on = models.DateField(blank=True, null=True)
     centreline_printed_by = models.ForeignKey('Person',related_name='centreline_printed_by',blank=True,null=True)
-    #sketch_scan = models.ForeignKey(ScannedImage,blank=True, null=True) 					#Replaced by contents field of ScannedImage model
+    #sketch_scan = models.ForeignKey(ScannedImage,blank=True, null=True)                    #Replaced by contents field of ScannedImage model
     tunnel_file = models.FileField(upload_to='surveyXMLfiles',blank=True, null=True)
     tunnel_main_sketch = models.ForeignKey('Survey',blank=True,null=True)
     integrated_into_main_sketch_on = models.DateField(blank=True,null=True)

core/views_caves.py

@@ -83,10 +83,6 @@ def caveindex(request):
     caves1626.sort(key=caveKey)
     return render(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':notablecaves, 'cavepage': True})
 
-def millenialcaves(request):
-    #RW messing around area
-    return HttpResponse("Test text", content_type="text/plain")
-
 def cave3d(request, cave_id=''):
     cave = getCave(cave_id)
     survexfilename = settings.SURVEX_DATA + cave.survex_file

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)

core/views_other.py

@@ -11,6 +11,7 @@ from django.template import Context, loader
 import databaseReset
 from troggle.core.models import Expedition, Person, PersonExpedition
 from troggle.core.models_caves import LogbookEntry, QM, Cave, PersonTrip
+from troggle.core.models_survex import SurvexLeg
 from troggle.helper import login_required_if_public
 
 
@@ -23,7 +24,22 @@ def stats(request):
     statsDict['caveCount'] = int(Cave.objects.count())
     statsDict['personCount'] = int(Person.objects.count())
     statsDict['logbookEntryCount'] = int(LogbookEntry.objects.count())
-    return render(request,'statistics.html', statsDict)
+
+    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])
+
+    renderDict = {**statsDict, **{ "nsurvexlegs":len(survexlegs), "totalsurvexlength":totalsurvexlength/1000, "legsbyexpo":legsbyexpo }} # new syntax
+    return render(request,'statistics.html',  renderDict)
 
 def frontpage(request):
     if request.user.is_authenticated():