From ded08245cc7cb1b0f0ec6d7801de800e51aff3ab Mon Sep 17 00:00:00 2001 From: Rucha Mahabal Date: Fri, 22 Jan 2021 08:52:17 +0530 Subject: [PATCH] fix: duplicate filters added on patient change --- erpnext/healthcare/page/patient_history/patient_history.html | 2 +- erpnext/healthcare/page/patient_history/patient_history.js | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/erpnext/healthcare/page/patient_history/patient_history.html b/erpnext/healthcare/page/patient_history/patient_history.html index deaaa97868..be486c62d1 100644 --- a/erpnext/healthcare/page/patient_history/patient_history.html +++ b/erpnext/healthcare/page/patient_history/patient_history.html @@ -10,7 +10,7 @@
-
+
diff --git a/erpnext/healthcare/page/patient_history/patient_history.js b/erpnext/healthcare/page/patient_history/patient_history.js index 05c5190f80..54343aae44 100644 --- a/erpnext/healthcare/page/patient_history/patient_history.js +++ b/erpnext/healthcare/page/patient_history/patient_history.js @@ -10,6 +10,7 @@ frappe.pages['patient_history'].on_page_load = function(wrapper) { frappe.breadcrumbs.add('Healthcare'); let pid = ''; page.main.html(frappe.render_template('patient_history', {})); + page.main.find('.header-separator').hide(); let patient = frappe.ui.form.make_control({ parent: page.main.find('.patient'), @@ -96,6 +97,7 @@ frappe.pages['patient_history'].on_page_load = function(wrapper) { }; let setup_filters = function(patient, me) { + $('.doctype-filter').empty(); frappe.xcall( 'erpnext.healthcare.page.patient_history.patient_history.get_patient_history_doctypes' ).then(document_types => { @@ -123,6 +125,7 @@ let setup_filters = function(patient, me) { }); doctype_filter.refresh(); + $('.date-filter').empty(); let date_range_field = frappe.ui.form.make_control({ df: { fieldtype: 'DateRange', @@ -389,9 +392,11 @@ let show_patient_vital_charts = function(patient, me, btn_show_id, pts, title) { formatTooltipY: d => d + ' ' + pts, } }); + me.page.main.find('.header-separator').show(); } else { me.page.main.find('.patient_vital_charts').html(''); me.page.main.find('.show_chart_btns').html(''); + me.page.main.find('.header-separator').hide(); } } });