Skip to content

I33 #71

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
james-opusvl merged 2 commits into from
Aug 5, 2019
Merged

I33 #71

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a3c7bc
[FIX][I33] All patients column on mobile view should be 'My Patients'
Aug 5, 2019
79689a2
[FIX][I33] Mobile view charts should get obs based off effective date
Aug 5, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nh_eobs/api.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']),
Expand Down
4 changes: 2 additions & 2 deletions nh_eobs_mobile/views/template.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"/>
Expand All @@ -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"/>
Expand Down