Merge ae1812f into 6c3113f

elcid/models.py

@@ -6,6 +6,7 @@
 from django.dispatch import receiver
 from django.db import models
 from django.contrib.contenttypes.models import ContentType
+from django.utils import timezone
 from lab import models as lmodels
 import opal.models as omodels
 
@@ -221,10 +222,10 @@ def get_relevant_tests(self, patient):
             "GENTAMICIN LEVEL",
             "CLOTTING SCREEN"
         ]
-        six_months_ago = datetime.date.today() - datetime.timedelta(6*30)
+        three_weeks_ago = timezone.now() - datetime.timedelta(3*7)
         qs = UpstreamLabTest.objects.filter(
             patient=patient,
-            datetime_ordered__gt=six_months_ago
+            datetime_ordered__gt=three_weeks_ago
         ).order_by("datetime_ordered")
         return [i for i in qs if i.extras.get("test_name") in relevent_tests]
 

elcid/templates/partials/lab_test_sparklines.html

@@ -23,7 +23,7 @@ <h2 class="text-center no-results">No results found</h2>
             [[ date | shortDate ]]
           </th>
           <th class="text-center">
-            3 month trend
+            3 week trend
           </th>
         </tr>
       </thead>

elcid/test/test_models.py

@@ -1,6 +1,6 @@
 import datetime
-
 from django.test import TestCase
+from django.utils import timezone
 from django.contrib.contenttypes.models import ContentType
 
 from opal.core import exceptions
@@ -364,6 +364,57 @@ def test_update_from_dict(self):
         # validate that is hasn't been saved
         self.assertIsNone(hl7_result.id)
 
+    def test_get_relevant_tests(self):
+        patient, _ = self.new_patient_and_episode_please()
+        upstream_lab_test = emodels.UpstreamLabTest(patient=patient)
+        yesterday = timezone.now() - datetime.timedelta(
+            1
+        )
+        upstream_lab_test.datetime_ordered = yesterday
+        upstream_lab_test.extras = dict(test_name="C REACTIVE PROTEIN")
+        upstream_lab_test.save()
+
+        relevant = emodels.UpstreamLabTest.get_relevant_tests(patient)
+        self.assertEqual(
+            len(relevant), 1
+        )
+        self.assertEqual(
+            relevant[0].datetime_ordered, yesterday
+        )
+        self.assertEqual(
+            relevant[0].extras["test_name"], "C REACTIVE PROTEIN"
+        )
+
+    def test_get_relevant_tests_over_three_weeks(self):
+        patient, _ = self.new_patient_and_episode_please()
+        upstream_lab_test = emodels.UpstreamLabTest(patient=patient)
+        four_weeks_ago = timezone.now() - datetime.timedelta(
+            4 * 7
+        )
+        upstream_lab_test.datetime_ordered = four_weeks_ago
+        upstream_lab_test.extras = dict(test_name="C REACTIVE PROTEIN")
+        upstream_lab_test.save()
+
+        relevant = emodels.UpstreamLabTest.get_relevant_tests(patient)
+        self.assertEqual(
+            len(relevant), 0
+        )
+
+    def test_get_not_relevant_tests(self):
+        patient, _ = self.new_patient_and_episode_please()
+        upstream_lab_test = emodels.UpstreamLabTest(patient=patient)
+        yesterday = timezone.now() - datetime.timedelta(
+            1
+        )
+        upstream_lab_test.datetime_ordered = yesterday
+        upstream_lab_test.extras = dict(test_name="SOME OTHER TEST")
+        upstream_lab_test.save()
+
+        relevant = emodels.UpstreamLabTest.get_relevant_tests(patient)
+        self.assertEqual(
+            len(relevant), 0
+        )
+
 
 class DiagnosisTest(OpalTestCase, AbstractEpisodeTestCase):