diff --git a/smash/web/forms/study_subject_forms.py b/smash/web/forms/study_subject_forms.py
index 2c1f8b27982f5b74fd4e4f9c4898b5fe09791113..2877c70d21d2aeeb69ba6f0d6327fade333577c2 100644
--- a/smash/web/forms/study_subject_forms.py
+++ b/smash/web/forms/study_subject_forms.py
@@ -361,7 +361,6 @@ def prepare_study_subject_fields(fields, study):
prepare_field(fields, study.columns, 'flying_team')
prepare_field(fields, study.columns, 'comments')
prepare_field(fields, study.columns, 'referral')
- prepare_field(fields, study.columns, 'diagnosis')
prepare_field(fields, study.columns, 'year_of_diagnosis')
prepare_field(fields, study.columns, 'information_sent')
prepare_field(fields, study.columns, 'pd_in_family')
@@ -372,7 +371,6 @@ def prepare_study_subject_fields(fields, study):
prepare_field(fields, study.columns, 'referral_letter')
prepare_field(fields, study.columns, 'health_partner')
prepare_field(fields, study.columns, 'health_partner_feedback_agreement')
- prepare_field(fields, study.columns, 'screening')
prepare_field(fields, study.columns, 'previously_in_study')
prepare_field(fields, study.columns, 'voucher_types')
diff --git a/smash/web/migrations/0190_remove_study_related_fields.py b/smash/web/migrations/0190_remove_study_related_fields.py
index 7f671664ea1acfeef305a6e9b50bcc20cf2ff890..39c4965a2ea1eb9831377ceb712cae412d6b9471 100644
--- a/smash/web/migrations/0190_remove_study_related_fields.py
+++ b/smash/web/migrations/0190_remove_study_related_fields.py
@@ -13,10 +13,19 @@ def create_custom_fields(apps, schema_editor):
CustomStudySubjectField = apps.get_model("web", "CustomStudySubjectField")
# noinspection PyPep8Naming
CustomStudySubjectValue = apps.get_model("web", "CustomStudySubjectValue")
- field = CustomStudySubjectField.objects.create(name="MPower ID", type=CUSTOM_FIELD_TYPE_TEXT,
- study_id=GLOBAL_STUDY_ID, unique=True)
+
+ mpower_field = CustomStudySubjectField.objects.create(name="MPower ID", type=CUSTOM_FIELD_TYPE_TEXT,
+ study_id=GLOBAL_STUDY_ID, unique=True)
+ screening_field = CustomStudySubjectField.objects.create(name="Screening", type=CUSTOM_FIELD_TYPE_TEXT,
+ study_id=GLOBAL_STUDY_ID)
+ diagnosis_field = CustomStudySubjectField.objects.create(name="Diagnosis", type=CUSTOM_FIELD_TYPE_TEXT,
+ study_id=GLOBAL_STUDY_ID)
for subject in StudySubject.objects.all():
- CustomStudySubjectValue.objects.create(study_subject_field=field, value=subject.mpower_id,
+ CustomStudySubjectValue.objects.create(study_subject_field=mpower_field, value=subject.mpower_id,
+ study_subject=subject)
+ CustomStudySubjectValue.objects.create(study_subject_field=screening_field, value=subject.screening,
+ study_subject=subject)
+ CustomStudySubjectValue.objects.create(study_subject_field=diagnosis_field, value=subject.diagnosis,
study_subject=subject)
diff --git a/smash/web/migrations/0191_auto_20201201_1033.py b/smash/web/migrations/0191_auto_20201201_1033.py
index 9971722e5787ff1044c77082a8703f46de8b5917..db8b01307e8cbf4801ee1be1a854851bc4153983 100644
--- a/smash/web/migrations/0191_auto_20201201_1033.py
+++ b/smash/web/migrations/0191_auto_20201201_1033.py
@@ -14,8 +14,26 @@ class Migration(migrations.Migration):
model_name='studycolumns',
name='mpower_id',
),
+ migrations.RemoveField(
+ model_name='studycolumns',
+ name='diagnosis',
+ ),
+ migrations.RemoveField(
+ model_name='studycolumns',
+ name='screening',
+ ),
+
+
migrations.RemoveField(
model_name='studysubject',
name='mpower_id',
),
+ migrations.RemoveField(
+ model_name='studysubject',
+ name='diagnosis',
+ ),
+ migrations.RemoveField(
+ model_name='studysubject',
+ name='screening',
+ ),
]
diff --git a/smash/web/models/mail_template.py b/smash/web/models/mail_template.py
index d9c0640b36113ca45a97fa7d76f3d5a6a1c5d7c2..753245da55e091821f8e6dae8180f6fb30a8fdfe 100644
--- a/smash/web/models/mail_template.py
+++ b/smash/web/models/mail_template.py
@@ -341,7 +341,7 @@ class MailTemplate(models.Model):
"##S_DIAGNOSIS_YEAR##": str(study_subject.year_of_diagnosis),
"##S_DATE_ADDED##": date_to_str(study_subject.date_added, DATE_FORMAT_SHORT),
"##S_DATE_BORN##": date_born,
- "##S_DIAGNOSIS##": str(study_subject.diagnosis),
+ "##S_DIAGNOSIS##": study_subject.get_custom_field_value('Diagnosis'),
"##S_EMAIL##": str(study_subject.subject.email),
"##S_SEX##": study_subject.subject.get_sex_display(),
"##S_MPOWER_ID##": study_subject.get_custom_field_value('MPower ID'),
diff --git a/smash/web/models/study_columns.py b/smash/web/models/study_columns.py
index eb69d918b24f715cde08c95ab0264085b98a3415..137c7065267d8be179b9e7f135f5af58300bfbf9 100644
--- a/smash/web/models/study_columns.py
+++ b/smash/web/models/study_columns.py
@@ -48,10 +48,6 @@ class StudyColumns(models.Model):
default=True,
verbose_name='Referred by'
)
- diagnosis = models.BooleanField(
- default=True,
- verbose_name='Diagnosis'
- )
year_of_diagnosis = models.BooleanField(
default=True,
verbose_name='Year of diagnosis (YYYY)'
@@ -95,11 +91,6 @@ class StudyColumns(models.Model):
verbose_name='Agrees to give information to referral'
)
- screening = models.BooleanField(
- default=False,
- verbose_name='Screening'
- )
-
previously_in_study = models.BooleanField(
default=False,
verbose_name='Previously in PDP study',
diff --git a/smash/web/models/study_subject.py b/smash/web/models/study_subject.py
index 69f07e2e6f1f8094706dad8b4e344a421d925cd1..581508843fc6eb29babd7b10ab4adc1555bdd4a4 100644
--- a/smash/web/models/study_subject.py
+++ b/smash/web/models/study_subject.py
@@ -133,18 +133,6 @@ class StudySubject(models.Model):
default=False,
)
- screening = models.CharField(max_length=1024,
- null=True,
- blank=True,
- verbose_name='Screening'
- )
-
- diagnosis = models.CharField(max_length=1024,
- null=True,
- blank=True,
- verbose_name='Diagnosis'
- )
-
previously_in_study = models.BooleanField(
verbose_name='Previously in PDP study',
default=False,
diff --git a/smash/web/tests/functions.py b/smash/web/tests/functions.py
index 345ae58f04da8042407dd0db142d034f41444f3a..b55439a95f08ad789c937e22d720af5f1f50a3ff 100644
--- a/smash/web/tests/functions.py
+++ b/smash/web/tests/functions.py
@@ -53,7 +53,6 @@ def create_empty_study_columns():
nd_number=False,
comments=False,
referral=False,
- diagnosis=False,
year_of_diagnosis=False,
information_sent=False,
pd_in_family=False,