expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 07:11:52 +00:00
Code Issues 19 Projects 3 Activity

another todo quote

Browse Source
This commit is contained in:
Philip Sargent 2021-05-02 22:48:25 +01:00
parent 4782f3b184
commit 5a085ba7ba
2 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/views/other.py
View File

@ -41,6 +41,7 @@ def todos(request, module):
'''
from troggle.core.TESTS.tests import todo as tests
from troggle.core.views.logbooks import todo as viewlogbooks
from troggle.core.views.survex import todo as viewsurvex
from troggle.parsers.caves import todo as parserscaves
from troggle.parsers.logbooks import todo as parserslogbooks
from troggle.parsers.survex import todo as parserssurvex
@ -50,6 +51,7 @@ def todos(request, module):
tododict = {'views/other': todo,
'tests': tests,
'views/logbooks': viewlogbooks,
'views/survex': viewsurvex,
'parsers/caves': parserscaves,
'parsers/logbooks': parserslogbooks,
'parsers/survex': parserssurvex,
@ -200,7 +202,7 @@ def ajax_test(request):
class MyForm(forms.Form): # not a model-form, just a form-form
class FilesForm(forms.Form): # not a model-form, just a form-form
scanfiles = forms.FileField()
@login_required_if_public
@ -231,13 +233,15 @@ def scanupload(request, wallet=None):
if int(wnumber) == 0:
prev = f'{int(wnumber):02d}'
context = {'year': year, 'prev': prev, 'next': next, 'prevy': prevy, 'nexty': nexty}
wallet = wallet.replace(':','#')
dirpath = Path(settings.SURVEY_SCANS, year, wallet)
form = MyForm()
form = FilesForm()
if request.method == 'POST':
form = MyForm(request.POST,request.FILES)
form = FilesForm(request.POST,request.FILES)
if form.is_valid():
f = request.FILES["scanfiles"]
multiple = request.FILES.getlist('scanfiles')
@ -264,7 +268,11 @@ def scanupload(request, wallet=None):
files.append('(no wallet yet - would be created)')
if len(files) ==0 :
files.append('(no image files in wallet)')
else:
files = sorted(files)
if dirs:
dirs = sorted(dirs)
return render(request, 'scanuploadform.html',
{'form': form, 'wallet': wallet, 'year': year, 'prev': prev, 'next': next, 'prevy': prevy, 'nexty': nexty, 'files': files, 'dirs': dirs, 'filesaved': filesaved, 'actual_saved': actual_saved})
{'form': form, 'wallet': wallet, **context, 'files': files, 'dirs': dirs, 'filesaved': filesaved, 'actual_saved': actual_saved})

4
core/views/survex.py
View File

@ -23,6 +23,10 @@ from troggle.parsers.people import GetPersonExpeditionNameLookup
but also displays data on a cave or caves when there is ambiguity
'''
todo='''survexcavesingle is not properly producing any result for Homecoming, 1626-359, 2018-dm-07
even though there are dozens of surveys.
'''
survexdatasetpath = Path(settings.SURVEX_DATA)
survextemplatefile = """; *** THIS IS A TEMPLATE FILE NOT WHAT YOU MIGHT BE EXPECTING ***