diff options
author | Sam Wenham <sam@wenhams.co.uk> | 2020-02-24 15:04:07 +0000 |
---|---|---|
committer | Sam Wenham <sam@wenhams.co.uk> | 2020-02-24 15:04:07 +0000 |
commit | 43dfe946b6385037141b94b775112037fe5f032f (patch) | |
tree | 72c352e67166f0702ab93d7063c902ff1bd2c621 /core/views_other.py | |
parent | 656ddcfe93061f2f82160ff8cc45b98d27e28bd3 (diff) | |
download | troggle-43dfe946b6385037141b94b775112037fe5f032f.tar.gz troggle-43dfe946b6385037141b94b775112037fe5f032f.tar.bz2 troggle-43dfe946b6385037141b94b775112037fe5f032f.zip |
Just removing dud whitespacedjango-1.10
Diffstat (limited to 'core/views_other.py')
-rw-r--r-- | core/views_other.py | 56 |
1 files changed, 28 insertions, 28 deletions
diff --git a/core/views_other.py b/core/views_other.py index 1297e7f..bb7e915 100644 --- a/core/views_other.py +++ b/core/views_other.py @@ -35,7 +35,7 @@ def frontpage(request): return render(request,'frontpage.html', locals()) def todo(request): - message = "no test message" #reverse('personn', kwargs={"name":"hkjhjh"}) + message = "no test message" #reverse('personn', kwargs={"name":"hkjhjh"}) if "reloadexpos" in request.GET: message = LoadPersonsExpos() message = "Reloaded personexpos" @@ -52,7 +52,7 @@ def controlPanel(request): jobs_completed=[] if request.method=='POST': if request.user.is_superuser: - + #importlist is mostly here so that things happen in the correct order. #http post data seems to come in an unpredictable order, so we do it this way. importlist=['reload_db', 'import_people', 'import_cavetab', 'import_logbooks', 'import_surveys', 'import_QMs'] @@ -85,7 +85,7 @@ def downloadSurveys(request): return response def downloadLogbook(request,year=None,extension=None,queryset=None): - + if year: current_expedition=Expedition.objects.get(year=year) logbook_entries=LogbookEntry.objects.filter(expedition=current_expedition) @@ -96,7 +96,7 @@ def downloadLogbook(request,year=None,extension=None,queryset=None): else: response = HttpResponse(content_type='text/plain') return response(r"Error: Logbook downloader doesn't know what year you want") - + if 'year' in request.GET: year=request.GET['year'] if 'extension' in request.GET: @@ -108,14 +108,14 @@ def downloadLogbook(request,year=None,extension=None,queryset=None): elif extension == 'html': response = HttpResponse(content_type='text/html') style='2005' - + template='logbook'+style+'style.'+extension - response['Content-Disposition'] = 'attachment; filename='+filename+'.'+extension + response['Content-Disposition'] = 'attachment; filename='+filename+'.'+extension t=loader.get_template(template) c=Context({'logbook_entries':logbook_entries}) response.write(t.render(c)) return response - + def downloadQMs(request): # Note to self: use get_cave method for the below @@ -131,14 +131,14 @@ def downloadQMs(request): response['Content-Disposition'] = 'attachment; filename=qm.csv' toqms.writeQmTable(response,cave) return response - + def ajax_test(request): post_text = request.POST['post_data'] - return HttpResponse("{'response_text': '"+post_text+" recieved.'}", + return HttpResponse("{'response_text': '"+post_text+" recieved.'}", content_type="application/json") - + def eyecandy(request): - return + return def ajax_QM_number(request): if request.method=='POST': @@ -158,14 +158,14 @@ def logbook_entry_suggestions(request): unwiki_QM_pattern=r"(?P<whole>(?P<explorer_code>[ABC]?)(?P<cave>\d*)-?(?P<year>\d\d\d?\d?)-(?P<number>\d\d)(?P<grade>[ABCDXV]?))" unwiki_QM_pattern=re.compile(unwiki_QM_pattern) #wikilink_QM_pattern=settings.QM_PATTERN - + slug=request.POST['slug'] date=request.POST['date'] lbo=LogbookEntry.objects.get(slug=slug, date=date) - + #unwiki_QMs=re.findall(unwiki_QM_pattern,lbo.text) unwiki_QMs=[m.groupdict() for m in unwiki_QM_pattern.finditer(lbo.text)] - + print(unwiki_QMs) for qm in unwiki_QMs: #try: @@ -180,7 +180,7 @@ def logbook_entry_suggestions(request): lbo=LogbookEntry.objects.get(date__year=qm['year'],title__icontains="placeholder for QMs in") except: print("failed to get placeholder for year "+str(qm['year'])) - + temp_QM=QM(found_by=lbo,number=qm['number'],grade=qm['grade']) temp_QM.grade=qm['grade'] qm['wikilink']=temp_QM.wiki_link() @@ -188,16 +188,16 @@ def logbook_entry_suggestions(request): #print 'failed' print(unwiki_QMs) - - + + #wikilink_QMs=re.findall(wikilink_QM_pattern,lbo.text) attached_QMs=lbo.QMs_found.all() unmentioned_attached_QMs=''#not implemented, fill this in by subtracting wiklink_QMs from attached_QMs - + #Find unattached_QMs. We only look at the QMs with a proper wiki link. #for qm in wikilink_QMs: - #Try to look up the QM. - + #Try to look up the QM. + print('got 208') any_suggestions=True print('got 210') @@ -217,11 +217,11 @@ def newFile(request, pslug = None): # personTripFormSet = PersonTripFormSet(request.POST) # if tripForm.is_valid() and personTripFormSet.is_valid(): # All validation rules pass # dateStr = tripForm.cleaned_data["date"].strftime("%Y-%m-%d") -# directory = os.path.join(settings.EXPOWEB, -# "years", -# expedition.year, +# directory = os.path.join(settings.EXPOWEB, +# "years", +# expedition.year, # "autologbook") -# filename = os.path.join(directory, +# filename = os.path.join(directory, # dateStr + "." + slugify(tripForm.cleaned_data["title"])[:50] + ".html") # if not os.path.isdir(directory): # os.mkdir(directory) @@ -229,7 +229,7 @@ def newFile(request, pslug = None): # delLogbookEntry(previouslbe) # f = open(filename, "w") # template = loader.get_template('dataformat/logbookentry.html') -# context = Context({'trip': tripForm.cleaned_data, +# context = Context({'trip': tripForm.cleaned_data, # 'persons': personTripFormSet.cleaned_data, # 'date': dateStr, # 'expeditionyear': expeditionyear}) @@ -254,11 +254,11 @@ def newFile(request, pslug = None): # "location": previouslbe.place, # "caveOrLocation": "location", # "html": previouslbe.text}) -# personTripFormSet = PersonTripFormSet(initial=[{"name": get_name(py.personexpedition), -# "TU": py.time_underground, +# personTripFormSet = PersonTripFormSet(initial=[{"name": get_name(py.personexpedition), +# "TU": py.time_underground, # "author": py.is_logbook_entry_author} # for py in previouslbe.persontrip_set.all()]) -# else: +# else: # fileform = UploadFileForm() # An unbound form return render(request, 'editfile.html', { |