Skip to content
Snippets Groups Projects
Commit 022aab6c authored by Carlos Vega's avatar Carlos Vega
Browse files

format

parent 24d8daaf
No related branches found
No related tags found
1 merge request!178Feature/import data pdp
...@@ -14,19 +14,9 @@ logger = logging.getLogger(__name__) ...@@ -14,19 +14,9 @@ logger = logging.getLogger(__name__)
class StudySubjectForm(ModelForm): class StudySubjectForm(ModelForm):
datetime_contact_reminder = forms.DateTimeField(label="Contact on", datetime_contact_reminder = forms.DateTimeField(label="Contact on", widget=forms.DateTimeInput(DATETIMEPICKER_DATE_ATTRS), required=False)
widget=forms.DateTimeInput( referral_letter = forms.FileField(label='Referral letter', widget=SecuredFileWidget(), required=False)
DATETIMEPICKER_DATE_ATTRS), voucher_types = forms.ModelMultipleChoiceField(required=False, widget=forms.CheckboxSelectMultiple, queryset=VoucherType.objects.all())
required=False
)
referral_letter = forms.FileField(
label='Referral letter', widget=SecuredFileWidget(), required=False)
voucher_types = forms.ModelMultipleChoiceField(required=False,
widget=forms.CheckboxSelectMultiple,
queryset=VoucherType.objects.all(),
)
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(StudySubjectForm, self).__init__(*args, **kwargs) super(StudySubjectForm, self).__init__(*args, **kwargs)
...@@ -57,8 +47,7 @@ class StudySubjectAddForm(StudySubjectForm): ...@@ -57,8 +47,7 @@ class StudySubjectAddForm(StudySubjectForm):
if not screening_number: if not screening_number:
prefix_screening_number = self.get_prefix_screening_number() prefix_screening_number = self.get_prefix_screening_number()
if prefix_screening_number is not None: if prefix_screening_number is not None:
screening_number = get_new_screening_number( screening_number = get_new_screening_number(prefix_screening_number)
prefix_screening_number)
return screening_number return screening_number
def clean(self): def clean(self):
...@@ -79,8 +68,7 @@ class StudySubjectAddForm(StudySubjectForm): ...@@ -79,8 +68,7 @@ class StudySubjectAddForm(StudySubjectForm):
else: else:
subject_type = self.cleaned_data.get('type', None) subject_type = self.cleaned_data.get('type', None)
if subject_type is not None: if subject_type is not None:
screening_number_prefix = SCREENING_NUMBER_PREFIXES_FOR_TYPE[ screening_number_prefix = SCREENING_NUMBER_PREFIXES_FOR_TYPE[subject_type]
subject_type]
if screening_number_prefix is None: if screening_number_prefix is None:
return None return None
prefix_screening_number = screening_number_prefix + "-" prefix_screening_number = screening_number_prefix + "-"
...@@ -89,8 +77,7 @@ class StudySubjectAddForm(StudySubjectForm): ...@@ -89,8 +77,7 @@ class StudySubjectAddForm(StudySubjectForm):
def get_new_screening_number(screening_number_prefix): def get_new_screening_number(screening_number_prefix):
result_number = 0 result_number = 0
subjects = StudySubject.objects.filter( subjects = StudySubject.objects.filter(screening_number__contains=screening_number_prefix)
screening_number__contains=screening_number_prefix)
for subject in subjects: for subject in subjects:
screening_numbers = subject.screening_number.split(";") screening_numbers = subject.screening_number.split(";")
for screening_number in screening_numbers: for screening_number in screening_numbers:
...@@ -199,8 +186,7 @@ def validate_subject_screening_number(self, cleaned_data): ...@@ -199,8 +186,7 @@ def validate_subject_screening_number(self, cleaned_data):
subjects_from_db = StudySubject.objects.filter(screening_number=cleaned_data["screening_number"], subjects_from_db = StudySubject.objects.filter(screening_number=cleaned_data["screening_number"],
study=self.study) study=self.study)
if len(subjects_from_db) > 0: if len(subjects_from_db) > 0:
self.add_error('screening_number', self.add_error('screening_number', "Screening number already in use")
"Screening number already in use")
def validate_subject_nd_number(self, cleaned_data): def validate_subject_nd_number(self, cleaned_data):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment