diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php index d1d589c977e..2a0c7ad1a1c 100644 --- a/interface/main/left_nav.php +++ b/interface/main/left_nav.php @@ -1112,9 +1112,9 @@ function selpopup(selobj) { - - - + + + diff --git a/interface/patient_file/summary/demographics.php b/interface/patient_file/summary/demographics.php index 7936407a824..e9628adae02 100644 --- a/interface/patient_file/summary/demographics.php +++ b/interface/patient_file/summary/demographics.php @@ -239,20 +239,26 @@ function toggleIndicator(target,div) { }); $("#pnotes_ps_expand").load("pnotes_fragment.php"); $("#disclosures_ps_expand").load("disc_fragment.php"); - $("#clinical_reminders_ps_expand").load("clinical_reminders_fragment.php", { 'embeddedScreen' : true }, function() { - // (note need to place javascript code here also to get the dynamic link to work) - $(".medium_modal").fancybox( { - 'overlayOpacity' : 0.0, - 'showCloseButton' : true, - 'frameHeight' : 500, - 'frameWidth' : 800, - 'centerOnScroll' : false, - 'callbackOnClose' : function() { - refreshme(); - } - }); - }); - $("#patient_reminders_ps_expand").load("patient_reminders_fragment.php"); + + + $("#clinical_reminders_ps_expand").load("clinical_reminders_fragment.php", { 'embeddedScreen' : true }, function() { + // (note need to place javascript code here also to get the dynamic link to work) + $(".medium_modal").fancybox( { + 'overlayOpacity' : 0.0, + 'showCloseButton' : true, + 'frameHeight' : 500, + 'frameWidth' : 800, + 'centerOnScroll' : false, + 'callbackOnClose' : function() { + refreshme(); + } + }); + }); + + + + $("#patient_reminders_ps_expand").load("patient_reminders_fragment.php"); + // Initialize the Vitals form if it is registered. @@ -686,9 +692,9 @@ function toggleIndicator(target,div) { - - - "; + // patient reminders collapse widget $widgetTitle = xl("Patient Reminders"); $widgetLabel = "patient_reminders"; $widgetButtonLabel = xl("Edit"); @@ -703,7 +709,9 @@ function toggleIndicator(target,div) {

- + + + "; echo "

"; - echo ""; + echo ""; + } // end if crw // appointments expand collapse widget $widgetTitle = xl("Appointments"); diff --git a/library/globals.inc.php b/library/globals.inc.php index 85c9f4e9834..d10e8c81b4d 100644 --- a/library/globals.inc.php +++ b/library/globals.inc.php @@ -797,10 +797,30 @@ ), - ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// - // PQRI Tab + // CDR (Clinical Decision Rules) // - 'PQRI Registry' => array( + 'CDR' => array( + + 'enable_cdr' => array( + xl('Enable Clinical Decisions Rules (CDR)'), + 'bool', // data type + '1', // default + xl('Enable Clinical Decisions Rules (CDR)') + ), + + 'enable_cdr_crw' => array( + xl('Enable Clinical Reminder Widget'), + 'bool', // data type + '1', // default + xl('Enable Clinical Reminder Widget') + ), + + 'enable_cdr_prw' => array( + xl('Enable Patient Reminder Widget'), + 'bool', // data type + '1', // default + xl('Enable Patient Reminder Widget') + ), 'pqri_registry_name' => array( xl('PQRI Registry Name'), @@ -808,17 +828,15 @@ 'Model Registry', // default xl('PQRI Registry Name') ), - + 'pqri_registry_id' => array( xl('PQRI Registry ID'), 'text', // data type '125789123', // default xl('PQRI Registry ID') ), - ), - /////////////////////////////////////////////////////////////////////////////////////////////////////////////////////// // Logging //