Merge 8f72698 into f3e8cd0

.envrc

@@ -0,0 +1,2 @@
+layout python python3.4
+

changelog.md

@@ -1,5 +1,7 @@
 ### 0.14.0 (Major Release)
 
+Adds the `age` property to demographics that returns the patient's age.
+
 ### 0.13.1 (Minor Release)
 
 Upgrades the setup.py Django version from 2.0.9 to 2.0.13. Removes the six library dependency from setup.py.

doc/docs/reference/subrecords.md

@@ -224,3 +224,19 @@ fields external_system and external_identifier to allow us to track where
 they come from and how they are referenced by that system.
 
 These fields are then often used in forms to make the data read only
+
+
+### Specific subrecords
+
+#### Demographics
+Opal ships with a demographics model that models personally identifying information a patient.
+
+This model maps `first_name`, `middle name` `surname`, `title`, `date_of_birth`, `hospital_number` and `nhs_number` and other similar fields.
+
+It also has the properties:
+
+ - `name` - The first name and the surname combined.
+ - `age` - The current age of the patient (today - their date of birth)
+
+
+

opal/models.py

@@ -9,6 +9,7 @@
 import logging
 import random
 import os
+from dateutil.relativedelta import relativedelta
 
 from django.utils import timezone
 from django.db import models, transaction
@@ -1411,8 +1412,25 @@ class Demographics(PatientSubrecord):
 
     @property
     def name(self):
+        """
+        Property that returns the name of the patient constructed from
+        `first_name` and `surname`
+        """
         return '{0} {1}'.format(self.first_name, self.surname)
 
+    @property
+    def age(self):
+        """
+        Property that returns the age of the patient in years
+        or None if `date_of_birth` is not set.
+        """
+        if self.date_of_birth:
+            today = datetime.date.today()
+            return relativedelta(
+                today,
+                self.date_of_birth
+            ).years
+
     class Meta:
         abstract = True
         verbose_name_plural = "Demographics"

opal/tests/test_models.py

@@ -819,6 +819,16 @@ def test_name(self):
                                 middle_name='Obsidian')
         self.assertEqual('Jane Doe', d.name)
 
+    def test_age_no_date_of_birth(self):
+        d = models.Demographics(date_of_birth=None)
+        self.assertIsNone(d.age)
+
+    @patch("opal.models.datetime")
+    def test_age(self, dt):
+        dt.date.today.return_value = datetime.date(2017, 3, 1)
+        d = models.Demographics(date_of_birth=datetime.date(2016, 1, 28))
+        self.assertEqual(d.age, 1)
+
 
 class ExternalSystemTestCase(OpalTestCase):
     def test_get_footer(self):