Shiloh/brotherton-erpnext
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor: show Patient History feed as per configured date instead of creation

Browse Source
This commit is contained in:
Rucha Mahabal 2020-11-30 15:00:42 +05:30
parent ed3fc20731
commit 0d43ea5ebb
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
erpnext/healthcare/page/patient_history/patient_history.js
View File

@ -254,7 +254,7 @@ let add_to_records = function(me, data) {
}; };
let add_date_separator = function(data) { let add_date_separator = function(data) {
let date = frappe.datetime.str_to_obj(data.creation); let date = frappe.datetime.str_to_obj(data.communication_date);
let pdate = ''; let pdate = '';
let diff = frappe.datetime.get_day_diff(frappe.datetime.get_today(), frappe.datetime.obj_to_str(date)); let diff = frappe.datetime.get_day_diff(frappe.datetime.get_today(), frappe.datetime.obj_to_str(date));

10
erpnext/healthcare/page/patient_history/patient_history.py
View File

@ -14,10 +14,10 @@ def get_feed(name, document_types=None, date_range=None, start=0, page_length=20
filters = get_filters(name, document_types, date_range) filters = get_filters(name, document_types, date_range)
result = frappe.db.get_all('Patient Medical Record', result = frappe.db.get_all('Patient Medical Record',
fields=['name', 'owner', 'creation', fields=['name', 'owner', 'communication_date',
'reference_doctype', 'reference_name', 'subject'], 'reference_doctype', 'reference_name', 'subject'],
filters=filters, filters=filters,
order_by='creation DESC', order_by='communication_date DESC',
limit=cint(page_length), limit=cint(page_length),
start=cint(start) start=cint(start)
) )
@ -36,7 +36,7 @@ def get_filters(name, document_types=None, date_range=None):
try: try:
date_range = json.loads(date_range) date_range = json.loads(date_range)
if date_range: if date_range:
filters['creation'] = ['between', [date_range[0], date_range[1]]] filters['communication_date'] = ['between', [date_range[0], date_range[1]]]
except json.decoder.JSONDecodeError: except json.decoder.JSONDecodeError:
pass pass
@ -47,13 +47,13 @@ def get_filters(name, document_types=None, date_range=None):
def get_feed_for_dt(doctype, docname): def get_feed_for_dt(doctype, docname):
"""get feed""" """get feed"""
result = frappe.db.get_all('Patient Medical Record', result = frappe.db.get_all('Patient Medical Record',
fields=['name', 'owner', 'creation', fields=['name', 'owner', 'communication_date',
'reference_doctype', 'reference_name', 'subject'], 'reference_doctype', 'reference_name', 'subject'],
filters={ filters={
'reference_doctype': doctype, 'reference_doctype': doctype,
'reference_name': docname 'reference_name': docname
}, },
order_by='creation DESC' order_by='communication_date DESC'
) )
return result return result