Improve README

Make new style QMs from survexfiles work
This commit is contained in:
Sam Wenham
2019-07-19 01:04:18 +01:00
parent 08a41941f9
commit de22b071b0
13 changed files with 179 additions and 112 deletions

View File

@@ -50,7 +50,7 @@ def caveCmp(x, y):
return numericalcmp(x.unofficial_number, y.unofficial_number)
def caveindex(request):
caves = Cave.objects.all()
#caves = Cave.objects.all()
notablecavehrefs = settings.NOTABLECAVESHREFS
notablecaves = [Cave.objects.get(kataster_number=kataster_number) for kataster_number in notablecavehrefs ]
caves1623 = list(Cave.objects.filter(area__short_name = "1623"))
@@ -106,6 +106,7 @@ def caveQMs(request, slug):
return render(request,'nonpublic.html', {'instance': cave})
else:
return render(request,'cave_qms.html', {'cave': cave})
def caveLogbook(request, slug):
cave = Cave.objects.get(caveslug__slug = slug)
if cave.non_public and settings.PUBLIC_SITE and not request.user.is_authenticated():
@@ -210,10 +211,9 @@ def editEntrance(request, caveslug, slug=None):
'entletter': entletter
})
def qm(request,cave_id,qm_id,year,grade=None):
year=int(year)
def qm(request,qm_id):
try:
qm=getCave(cave_id).get_QMs().get(number=qm_id,found_by__date__year=year)
qm=QM.objects.get(id=qm_id)
return render(request,'qm.html',locals())
except QM.DoesNotExist: