From 5a085ba7ba0303732c765d6d0a52e8d560ea9353 Mon Sep 17 00:00:00 2001
From: Philip Sargent <philip.sargent@klebos.com>
Date: Sun, 2 May 2021 22:48:25 +0100
Subject: another todo quote

---
 core/views/other.py | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

(limited to 'core/views/other.py')

diff --git a/core/views/other.py b/core/views/other.py
index c7d7eda..3159a33 100644
--- a/core/views/other.py
+++ b/core/views/other.py
@@ -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})
-- 
cgit v1.2.3