forked from expo/troggle
clean troggle menu and drawingfiles layout
This commit is contained in:
@@ -9,7 +9,8 @@ from django.http import HttpResponse, Http404
|
||||
from troggle.core.models_survex import ScansFolder, SingleScan, SurvexBlock, TunnelFile
|
||||
from troggle.flatpages import views as flatviews
|
||||
import parsers.surveys
|
||||
#from . import fileAbstraction
|
||||
|
||||
|
||||
|
||||
def fa_readFile(*path):
|
||||
try:
|
||||
|
||||
@@ -74,7 +74,7 @@ def numericalcmp(x, y):
|
||||
return cmp(padnumber(x), padnumber(y))
|
||||
|
||||
def caveKey(x):
|
||||
"""python3 function for sort.
|
||||
"""python3 function for sort. Done in a hurry.
|
||||
Note that cave kataster numbers are not generally integers.
|
||||
This needs to be fixed make a decent sort order.
|
||||
"""
|
||||
@@ -89,7 +89,7 @@ def getnotablecaves():
|
||||
cave = Cave.objects.get(kataster_number=kataster_number)
|
||||
notablecaves.append(cave)
|
||||
except:
|
||||
print(" ! FAILED to get only one cave per kataster_number for: "+kataster_number)
|
||||
print(" ! FAILED to get only one cave per kataster_number OR invalid number for: "+kataster_number)
|
||||
caves = Cave.objects.all().filter(kataster_number=kataster_number)
|
||||
for c in caves:
|
||||
print(c.kataster_number, c.slug())
|
||||
@@ -102,7 +102,6 @@ def caveindex(request):
|
||||
caves = Cave.objects.all()
|
||||
caves1623 = list(Cave.objects.filter(area__short_name = "1623"))
|
||||
caves1626 = list(Cave.objects.filter(area__short_name = "1626"))
|
||||
#python2 to python3 issue https://realpython.com/python-sort/
|
||||
caves1623.sort(key=caveKey)
|
||||
caves1626.sort(key=caveKey)
|
||||
return render(request,'caveindex.html', {'caves1623': caves1623, 'caves1626': caves1626, 'notablecaves':getnotablecaves(), 'cavepage': True})
|
||||
|
||||
Reference in New Issue
Block a user