From 7a3c7bc63555ba69b9352ee5e73574cdcfd35479 Mon Sep 17 00:00:00 2001
From: James Curtis <james.curtis@opusvl.com>
Date: Mon, 5 Aug 2019 14:04:38 +0100
Subject: [PATCH 1/2] [FIX][I33] All patients column on mobile view should be
 'My Patients'

---
 nh_eobs_mobile/views/template.xml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nh_eobs_mobile/views/template.xml b/nh_eobs_mobile/views/template.xml
index b13137e3..d0af864c 100755
--- a/nh_eobs_mobile/views/template.xml
+++ b/nh_eobs_mobile/views/template.xml
@@ -36,7 +36,7 @@
                                     <a t-att-href="urls['task_list']" id="taskNavItem" class="selected">Tasks</a>
                                 </li>
                                 <li>
-                                    <a t-att-href="urls['patient_list']" id="patientNavItem">All Patients
+                                    <a t-att-href="urls['patient_list']" id="patientNavItem">My Patients
                                         <t t-if="notification_count and notification_count &gt; 0">
                                             <span class="urgent-badge">
                                                 <t t-esc="notification_count"/>
@@ -53,7 +53,7 @@
                                 </li>
                                 <li>
                                     <a t-att-href="urls['patient_list']" id="patientNavItem" class="selected">
-                                        All Patients
+                                        My Patients
                                         <t t-if="notification_count and notification_count &gt; 0">
                                             <span class="urgent-badge">
                                                 <t t-esc="notification_count"/>

From 79689a20db11fca62338e68a77753f12345ffb97 Mon Sep 17 00:00:00 2001
From: James Curtis <james.curtis@opusvl.com>
Date: Mon, 5 Aug 2019 14:08:06 +0100
Subject: [PATCH 2/2] [FIX][I33] Mobile view charts should get obs based off
 effective date

The mobile view gets obs to display using a different method to the desktop view. Either way the domain should be based off effective date.
---
 nh_eobs/api.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nh_eobs/api.py b/nh_eobs/api.py
index 5e62ccbb..1c8b4dde 100644
--- a/nh_eobs/api.py
+++ b/nh_eobs/api.py
@@ -1129,8 +1129,8 @@ def get_activities_for_patient(
         domain = [
             ('patient_id', '=', patient_id),
             ('state', '=', 'completed'),
-            ('date_terminated', '>=', start_date.strftime(DTF)),
-            ('date_terminated', '<=', end_date.strftime(DTF))] \
+            ('effective_date_terminated', '>=', start_date.strftime(DTF)),
+            ('effective_date_terminated', '<=', end_date.strftime(DTF))] \
             if activity_type \
             else [('patient_id', '=', patient_id),
                   ('state', 'not in', ['completed', 'cancelled']),