minor refactoring

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()