fixed merge conflict v0.3.0 -> v0.3.0rc2

elcid/fixtures/patients_records.json

@@ -142,50 +142,6 @@
             "date_of_diagnosis": "2013-07-25"
         }
     },
-    {
-        "pk": 1,
-        "model": "elcid.pastmedicalhistory",
-        "fields": {
-            "consistency_token": "12345678",
-            "episode": 1,
-            "condition_ft": "",
-            "condition_fk": 1,
-            "year": "1999"
-        }
-    },
-    {
-        "pk": 1,
-        "model": "elcid.presentingcomplaint",
-        "fields": {
-            "consistency_token": "12345678",
-            "episode": 1,
-            "duration": 1
-        }
-    },
-    {
-        "pk": 1,
-        "model": "elcid.generalnote",
-        "fields": {
-            "consistency_token": "12345678",
-            "episode": 1,
-            "date": "2013-07-25",
-            "comment": "A note"
-        }
-    },
-    {
-        "pk": 1,
-        "model": "elcid.travel",
-        "fields": {
-            "consistency_token": "12345678",
-            "episode": 1,
-            "destination_ft": "",
-            "destination_fk": 1,
-            "dates": "",
-            "reason_for_travel_ft": "",
-            "reason_for_travel_fk": 1,
-            "specific_exposures": ""
-        }
-    },
     {
         "pk": 1,
         "model": "elcid.antimicrobial",
@@ -219,65 +175,5 @@
             "change_in_antibiotic_prescription": true,
             "referred_to_opat": true
         }
-    },
-    {
-        "pk": 1,
-        "model": "elcid.todo",
-        "fields": {
-            "consistency_token": "12345678",
-            "episode": 1,
-            "details": "An action"
-        }
-    },
-    {
-        "pk": 1,
-        "model": "elcid.microbiologytest",
-        "fields": {
-            "consistency_token": "12345678",
-            "episode": 1,
-            "test": "Blood Culture",
-            "date_ordered": "2013-07-25",
-            "details": "",
-            "microscopy": "",
-            "organism": "",
-            "sensitive_antibiotics": "",
-            "resistant_antibiotics": "",
-            "result": "",
-            "igm": "",
-            "igg": "",
-            "vca_igg": "",
-            "vca_igm": "",
-            "ebna_igg": "",
-            "hbsag": "",
-            "anti_hbs": "",
-            "anti_hbcore_igm": "",
-            "anti_hbcore_igg": "",
-            "rpr": "",
-            "tppa": "",
-            "viral_load": "",
-            "parasitaemia": "",
-            "hsv": "",
-            "vzv": "",
-            "syphilis": "",
-            "c_difficile_antigen": "",
-            "c_difficile_toxin": "",
-            "species": "",
-            "hsv_1": "",
-            "hsv_2": "",
-            "enterovirus": "",
-            "cmv": "",
-            "ebv": "",
-            "influenza_a": "",
-            "influenza_b": "",
-            "parainfluenza": "",
-            "metapneumovirus": "",
-            "rsv": "",
-            "adenovirus": "",
-            "norovirus": "",
-            "rotavirus": "",
-            "giardia": "",
-            "entamoeba_histolytica": "",
-            "cryptosporidium": ""
-        }
     }
 ]

elcid/migrations/0010_auto_20171211_1321.py

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elcid', '0009_auto_20171107_2248'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='demographics',
+            name='date_of_birth',
+            field=models.DateField(null=True, verbose_name=b'Date of Birth', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='demographics',
+            name='date_of_death',
+            field=models.DateField(null=True, verbose_name=b'Date of Death', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='demographics',
+            name='death_indicator',
+            field=models.BooleanField(default=False, help_text=b'This field will be True if the patient is deceased.'),
+        ),
+        migrations.AlterField(
+            model_name='demographics',
+            name='gp_practice_code',
+            field=models.CharField(max_length=20, null=True, verbose_name=b'GP Practice Code', blank=True),
+        ),
+        migrations.AlterField(
+            model_name='demographics',
+            name='hospital_number',
+            field=models.CharField(help_text=b'The unique identifier for this patient at the hospital.', max_length=255, blank=True),
+        ),
+        migrations.AlterField(
+            model_name='demographics',
+            name='nhs_number',
+            field=models.CharField(max_length=255, null=True, verbose_name=b'NHS Number', blank=True),
+        ),
+    ]

elcid/migrations/0011_auto_20171212_1122.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elcid', '0010_auto_20171211_1321'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='contactdetails',
+            name='created_by',
+        ),
+        migrations.RemoveField(
+            model_name='contactdetails',
+            name='patient',
+        ),
+        migrations.RemoveField(
+            model_name='contactdetails',
+            name='updated_by',
+        ),
+        migrations.DeleteModel(
+            name='ContactDetails',
+        ),
+    ]

elcid/migrations/0012_auto_20171212_1207.py

@@ -0,0 +1,29 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elcid', '0011_auto_20171212_1122'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='carers',
+            name='created_by',
+        ),
+        migrations.RemoveField(
+            model_name='carers',
+            name='patient',
+        ),
+        migrations.RemoveField(
+            model_name='carers',
+            name='updated_by',
+        ),
+        migrations.DeleteModel(
+            name='Carers',
+        ),
+    ]

elcid/migrations/0013_auto_20171212_1225.py

@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elcid', '0012_auto_20171212_1207'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='presentingcomplaint',
+            name='created_by',
+        ),
+        migrations.RemoveField(
+            model_name='presentingcomplaint',
+            name='episode',
+        ),
+        migrations.RemoveField(
+            model_name='presentingcomplaint',
+            name='symptom_fk',
+        ),
+        migrations.RemoveField(
+            model_name='presentingcomplaint',
+            name='symptoms',
+        ),
+        migrations.RemoveField(
+            model_name='presentingcomplaint',
+            name='updated_by',
+        ),
+        migrations.DeleteModel(
+            name='PresentingComplaint',
+        ),
+    ]

elcid/migrations/0014_auto_20171212_1231.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elcid', '0013_auto_20171212_1225'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='consultantatdischarge',
+            name='consultant_fk',
+        ),
+        migrations.RemoveField(
+            model_name='consultantatdischarge',
+            name='created_by',
+        ),
+        migrations.RemoveField(
+            model_name='consultantatdischarge',
+            name='episode',
+        ),
+        migrations.RemoveField(
+            model_name='consultantatdischarge',
+            name='updated_by',
+        ),
+        migrations.DeleteModel(
+            name='ConsultantAtDischarge',
+        ),
+    ]

elcid/migrations/0015_auto_20171212_1234.py

@@ -0,0 +1,33 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('elcid', '0014_auto_20171212_1231'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='secondarydiagnosis',
+            name='condition_fk',
+        ),
+        migrations.RemoveField(
+            model_name='secondarydiagnosis',
+            name='created_by',
+        ),
+        migrations.RemoveField(
+            model_name='secondarydiagnosis',
+            name='episode',
+        ),
+        migrations.RemoveField(
+            model_name='secondarydiagnosis',
+            name='updated_by',
+        ),
+        migrations.DeleteModel(
+            name='SecondaryDiagnosis',
+        ),
+    ]