From c02b4101dd3deecd74c4d0e82cdddd66b6b8af33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Valentin=20Grou=C3=A8s?= <valentin.groues@uni.lu>
Date: Tue, 25 Apr 2017 09:45:46 +0200
Subject: [PATCH] set default value of year of diagnosis to None - fixes #106
---
.../0036_year_of_diagnosis_default.py | 22 +++++++++++++++++++
smash/web/models/subject.py | 1 -
smash/web/tests/test_SubjectAddForm.py | 1 +
3 files changed, 23 insertions(+), 1 deletion(-)
create mode 100644 smash/web/migrations/0036_year_of_diagnosis_default.py
diff --git a/smash/web/migrations/0036_year_of_diagnosis_default.py b/smash/web/migrations/0036_year_of_diagnosis_default.py
new file mode 100644
index 00000000..173f64b2
--- /dev/null
+++ b/smash/web/migrations/0036_year_of_diagnosis_default.py
@@ -0,0 +1,22 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.10.3 on 2017-04-25 07:28
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ('web', '0035_screening_number'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='subject',
+ name='year_of_diagnosis',
+ field=models.IntegerField(blank=True, null=True, verbose_name=b'Year of diagnosis (YYYY)'),
+ ),
+ migrations.RunSQL(
+ "UPDATE web_subject SET year_of_diagnosis=NULL WHERE year_of_diagnosis = 0;",
+ "UPDATE web_subject SET year_of_diagnosis=0 WHERE year_of_diagnosis = NULL;"),
+ ]
diff --git a/smash/web/models/subject.py b/smash/web/models/subject.py
index 394c7df1..d6543711 100644
--- a/smash/web/models/subject.py
+++ b/smash/web/models/subject.py
@@ -138,7 +138,6 @@ class Subject(models.Model):
verbose_name='Diagnosis'
)
year_of_diagnosis = models.IntegerField(
- default=0,
null=True,
blank=True,
verbose_name='Year of diagnosis (YYYY)'
diff --git a/smash/web/tests/test_SubjectAddForm.py b/smash/web/tests/test_SubjectAddForm.py
index 5e20ce73..bfdab7a8 100644
--- a/smash/web/tests/test_SubjectAddForm.py
+++ b/smash/web/tests/test_SubjectAddForm.py
@@ -39,6 +39,7 @@ class SubjectAddFormTests(TestCase):
form = SubjectAddForm(data=form_data, user=self.user)
form.is_valid()
self.assertTrue(form.is_valid())
+ self.assertIsNone(form.fields['year_of_diagnosis'].initial)
form.save()
form2 = SubjectAddForm(data=form_data, user=self.user)
--
GitLab