diff options
| -rw-r--r-- | core/models/survex.py | 7 | ||||
| -rw-r--r-- | core/views/uploads.py | 20 | ||||
| -rw-r--r-- | parsers/scans.py | 18 |
3 files changed, 26 insertions, 19 deletions
diff --git a/core/models/survex.py b/core/models/survex.py index 6bffb49..e5fd150 100644 --- a/core/models/survex.py +++ b/core/models/survex.py @@ -257,6 +257,13 @@ class Wallet(models.Model): ticks = {} waldata = self.get_json() if not waldata: + ticks["S"] = "black" + ticks["C"] = "black" + ticks["Q"] = "black" + ticks["N"] = "black" + ticks["P"] = "black" + ticks["E"] = "black" + ticks["T"] = "black" ticks["W"] = "black" return ticks ticks = {} diff --git a/core/views/uploads.py b/core/views/uploads.py index 0cc3f93..3a7e67b 100644 --- a/core/views/uploads.py +++ b/core/views/uploads.py @@ -23,7 +23,7 @@ from django.core.exceptions import ObjectDoesNotExist, MultipleObjectsReturned #from troggle import settings from troggle.parsers.imports import import_caves, import_people, import_surveyscans from troggle.parsers.imports import import_logbooks, import_QMs, import_drawingsfiles, import_survex -from troggle.parsers.scans import wallet_blank_json, contentsjson +from troggle.parsers.scans import contentsjson # from databaseReset import reinit_db # don't do this. databaseRest runs code *at import time* from troggle.core.models.troggle import DataIssue from troggle.core.models.troggle import Expedition, Person, PersonExpedition @@ -56,6 +56,24 @@ todo = ''' - Enable folder creation in dwguploads or as a separate form ''' +wallet_blank_json = { + "cave": "", + "date": "", + "description url": "1623/XXX", + "description written": False, + "electronic survey": False, + "elev drawn": False, + "elev not required": False, + "name": "", + "people": [ + "Unknown" + ], + "plan drawn": False, + "plan not required": False, + "qms written": False, + "survex file": [], + "survex not required": False, + "website updated": False} class FilesForm(forms.Form): # not a model-form, just a form-form uploadfiles = forms.FileField() diff --git a/parsers/scans.py b/parsers/scans.py index 1dbf17a..10c659f 100644 --- a/parsers/scans.py +++ b/parsers/scans.py @@ -25,24 +25,6 @@ contentsjson = "contents.json" git = settings.GIT # to do: create a 'low priority' field, so that any such wallet does not appear in summary reports -wallet_blank_json = { - "cave": "", - "date": "", - "description url": "1623/XXX", - "description written": False, - "electronic survey": False, - "elev drawn": False, - "elev not required": False, - "name": "", - "people": [ - "Unknown" - ], - "plan drawn": False, - "plan not required": False, - "qms written": False, - "survex file": [], - "survex not required": False, - "website updated": False} def CheckEmptyDate(wallet): |