diff options
| author | Philip Sargent <philip.sargent@klebos.com> | 2021-05-04 20:56:44 +0100 |
|---|---|---|
| committer | Philip Sargent <philip.sargent@klebos.com> | 2021-05-04 20:56:44 +0100 |
| commit | b3fcd7765e4b8cc55ec9b4f433d34cd89ae3bce9 (patch) | |
| tree | db7e5b64ea217a77dfcfc4c39589ed20755f6095 | |
| parent | dc3379c1862219f02dbb697b201ada7f2027e808 (diff) | |
| download | troggle-b3fcd7765e4b8cc55ec9b4f433d34cd89ae3bce9.tar.gz troggle-b3fcd7765e4b8cc55ec9b4f433d34cd89ae3bce9.tar.bz2 troggle-b3fcd7765e4b8cc55ec9b4f433d34cd89ae3bce9.zip | |
renamed to uploadfiles
| -rw-r--r-- | core/views/other.py | 14 | ||||
| -rw-r--r-- | templates/dwguploadform.html | 3 | ||||
| -rw-r--r-- | templates/scanuploadform.html | 3 |
3 files changed, 15 insertions, 5 deletions
diff --git a/core/views/other.py b/core/views/other.py index 582d3fa..a7dc427 100644 --- a/core/views/other.py +++ b/core/views/other.py @@ -32,6 +32,9 @@ todo = ''' so this is only a tool for a first pass, to be followed by extensive hand-editing! When we have done all the old logbooks, delete this function and the two templates. +-Do GIT stuff for upload forms + +-Move upload forms to proper file locations ''' def todos(request, module): @@ -41,8 +44,10 @@ 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.core.views.drawings import todo as viewdrawings from troggle.parsers.caves import todo as parserscaves from troggle.parsers.logbooks import todo as parserslogbooks + from troggle.parsers.drawings import todo as parsersdrawings from troggle.parsers.survex import todo as parserssurvex from troggle.core.models.caves import todo as modelcaves from troggle.core.middleware import todo as middleware @@ -51,8 +56,10 @@ def todos(request, module): 'tests': tests, 'views/logbooks': viewlogbooks, 'views/survex': viewsurvex, + 'views/drawings': viewdrawings, 'parsers/caves': parserscaves, 'parsers/logbooks': parserslogbooks, + 'parsers/drawings': parsersdrawings, 'parsers/survex': parserssurvex, 'core/models/caves': modelcaves, 'core/middleware': middleware, @@ -195,7 +202,7 @@ def exportlogbook(request,year=None,extension=None): class FilesForm(forms.Form): # not a model-form, just a form-form - scanfiles = forms.FileField() + uploadfiles = forms.FileField() @login_required_if_public def scanupload(request, wallet=None): @@ -311,6 +318,11 @@ def dwgupload(request, folder=None): actual_saved.append( fs.save(f.name, content=f) ) # print(f'! - FORM dwgupload multiple {actual_saved}') filesaved = True + + # DO GIT STUFF & load into Database too + # parsers.surveys.SetTunnelfileInfo(dwgfile) # commented out + # dwgfile.save() + files = [] dirs = [] diff --git a/templates/dwguploadform.html b/templates/dwguploadform.html index c99647c..ac65dab 100644 --- a/templates/dwguploadform.html +++ b/templates/dwguploadform.html @@ -11,8 +11,7 @@ {% csrf_token %} <br> <input class="fancybutton" type = "file" multiple="multiple" - placeholder = "Scanfiles" name = "scanfiles" id="scanfiles" /> - + name = "uploadfiles" id="uploadfiles" /> <br><br><br> <button class="fancybutton" style="padding: 0.5em 25px; margin-left: 155px" type = "submit" value = "Upload" > Upload diff --git a/templates/scanuploadform.html b/templates/scanuploadform.html index af14fbd..9356281 100644 --- a/templates/scanuploadform.html +++ b/templates/scanuploadform.html @@ -20,8 +20,7 @@ {% csrf_token %} <br> <input class="fancybutton" type = "file" multiple="multiple" - placeholder = "Scanfiles" name = "scanfiles" id="scanfiles" /> - + name = "uploadfiles" id="uploadfiles" /> <br><br><br> <button class="fancybutton" style="padding: 0.5em 25px; margin-left: 155px" type = "submit" value = "Upload" > Upload |