From 423fec8c6052396add5ff9a7c668fe7842bad8b7 Mon Sep 17 00:00:00 2001
From: Carlos Vega <carlos.vega@uni.lu>
Date: Mon, 7 Jan 2019 14:15:47 +0100
Subject: [PATCH] improved nd_number checking
---
smash/web/forms/study_subject_forms.py | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/smash/web/forms/study_subject_forms.py b/smash/web/forms/study_subject_forms.py
index bc97e8b0..208410ad 100644
--- a/smash/web/forms/study_subject_forms.py
+++ b/smash/web/forms/study_subject_forms.py
@@ -192,7 +192,9 @@ def validate_subject_screening_number(self, cleaned_data):
def validate_subject_nd_number(self, cleaned_data):
if self.study.columns.nd_number:
nd_number = cleaned_data['nd_number']
- if nd_number != "":
+ if nd_number is None:
+ self.add_error('nd_number', "None ND number. ND number can be blank but not None.")
+ elif nd_number:
if not self.study.check_nd_number(nd_number):
self.add_error('nd_number', "Invalid ND number")
else:
@@ -201,7 +203,7 @@ def validate_subject_nd_number(self, cleaned_data):
if subjects_from_db:
if subjects_from_db[0].screening_number != cleaned_data.get('screening_number', ''):
self.add_error('nd_number', "ND number already in use")
-
+ #else: #empty nd_number is valid
def validate_subject_resign_reason(self, cleaned_data):
if self.study.columns.resigned and self.study.columns.resign_reason:
--
GitLab