diff options
Diffstat (limited to 'core/views/wallets_edit.py')
-rw-r--r-- | core/views/wallets_edit.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/core/views/wallets_edit.py b/core/views/wallets_edit.py index 1484639..c601667 100644 --- a/core/views/wallets_edit.py +++ b/core/views/wallets_edit.py @@ -50,6 +50,7 @@ WALLET_BLANK_JSON = { "people": ["Unknown"], "plan drawn": False, "plan not required": False, + "notes not required": False, "qms written": False, "survex file": [], "survex not required": False, @@ -72,6 +73,7 @@ class WalletForm(forms.Form): # not a model-form, just a form-form psg = forms.CharField(strip=True, required=False) freetext = forms.CharField(strip=True, required=False) plannr = forms.CharField(strip=True, required=False) + notesnr = forms.CharField(strip=True, required=False) electronic = forms.CharField(strip=True, required=False) pland = forms.CharField(strip=True, required=False) elevd = forms.CharField(strip=True, required=False) @@ -86,6 +88,7 @@ xlate = { "date": "date", "cave": "cave", "plannr": "plan not required", + "notesnr": "notes not required", "survexnr": "survex not required", "qmsw": "qms written", "elevnr": "elev not required", @@ -182,7 +185,7 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl): # Notes required if ticks["N"] != "green": complaints.append( - "The notes needs scanning (or renaming): no noteNN.jpg or XXnote.jpg file found; and this is not an electronic survey." + "The notes needs scanning (or renaming) or tick 'Notes not required' checkbox. No noteNN.jpg or XXnote.jpg file was found; this is not an electronic survey." ) # Plan drawing required @@ -197,7 +200,7 @@ def get_complaints(complaints, waldata, svxfiles, files, wallet, wurl): "The elevation needs drawing (or renaming, or tick 'Elev drawn' checkbox or 'Elev not required' checkbox): no elevNN.jpg or XXelev.jpg file found." ) - # ETherion + # Therion if ticks["T"] != "green": complaints.append( "Tunnel or Therion drawing files need drawing. Or if this an electronic survey, please tick the 'Electronic survey' checkbox." @@ -479,6 +482,7 @@ def walletedit(request, path=None): "plan drawn", "elev not required", "elev drawn", + "notes not required", "electronic survey", ] @@ -629,12 +633,15 @@ def walletedit(request, path=None): psg = "" freetext = "" chkplannr = "" + chknotesnr = "" chkpland = "" svxfiles = [] trips = [] checked = {} context = {} if waldata: # should always be true as populated by blank data if json file doesn't exist + if 'notes not required' not in waldata: + waldata['notes not required'] = False if ( not waldata["date"] |