From d94c6f86a642af279ff96c8ed5e1ba2968c868f4 Mon Sep 17 00:00:00 2001 From: bradymiller Date: Tue, 26 Apr 2011 11:28:23 -0700 Subject: [PATCH] CDR Module: Fixed restoreSession calls and converted redirect mechanism to javascript. --- interface/patient_file/reminder/clinical_reminders.php | 6 +++--- interface/patient_file/reminder/patient_reminders.php | 2 +- interface/patient_file/rules/patient_data.php | 3 ++- interface/patient_file/summary/demographics.php | 2 ++ interface/reports/cqm.php | 5 +++-- interface/super/rules/base/template/redirect.php | 6 +++++- interface/super/rules/www/js/bucket.js | 3 ++- interface/super/rules/www/js/custom.js | 4 ++-- interface/super/rules/www/js/edit.js | 3 ++- interface/super/rules/www/js/jQuery.autocomplete.js | 4 +++- interface/super/rules/www/js/list.js | 3 ++- 11 files changed, 27 insertions(+), 14 deletions(-) diff --git a/interface/patient_file/reminder/clinical_reminders.php b/interface/patient_file/reminder/clinical_reminders.php index aa48ae164..e024244d9 100644 --- a/interface/patient_file/reminder/clinical_reminders.php +++ b/interface/patient_file/reminder/clinical_reminders.php @@ -66,9 +66,9 @@ $patient_id = ($_GET['patient_id']) ? $_GET['patient_id'] : ""; ?>
diff --git a/interface/patient_file/reminder/patient_reminders.php b/interface/patient_file/reminder/patient_reminders.php index 4e0ff4931..4be617b82 100644 --- a/interface/patient_file/reminder/patient_reminders.php +++ b/interface/patient_file/reminder/patient_reminders.php @@ -172,7 +172,7 @@ else {
diff --git a/interface/patient_file/rules/patient_data.php b/interface/patient_file/rules/patient_data.php index 3f3e01894..4bce0b3a9 100644 --- a/interface/patient_file/rules/patient_data.php +++ b/interface/patient_file/rules/patient_data.php @@ -111,6 +111,7 @@ if ($_POST['form_complete']) { // Close this window and refresh the patient summary display. echo "\n\n\n\n\n"; exit(); @@ -143,7 +144,7 @@ if (isset($entryID)) {

-
+
"; diff --git a/interface/patient_file/summary/demographics.php b/interface/patient_file/summary/demographics.php index e9628adae..c905506ed 100644 --- a/interface/patient_file/summary/demographics.php +++ b/interface/patient_file/summary/demographics.php @@ -241,6 +241,7 @@ $(document).ready(function(){ $("#disclosures_ps_expand").load("disc_fragment.php"); + top.restoreSession(); $("#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( { @@ -257,6 +258,7 @@ $(document).ready(function(){ + top.restoreSession(); $("#patient_reminders_ps_expand").load("patient_reminders_fragment.php"); diff --git a/interface/reports/cqm.php b/interface/reports/cqm.php index f3688615f..22162966f 100644 --- a/interface/reports/cqm.php +++ b/interface/reports/cqm.php @@ -53,6 +53,7 @@ $provider = trim($_POST['form_provider']); function refreshme() { // location.reload(); + top.restoreSession(); document.forms[0].submit(); } @@ -101,7 +102,7 @@ $provider = trim($_POST['form_provider']); - - +
@@ -203,7 +204,7 @@ $provider = trim($_POST['form_provider']);
- + diff --git a/interface/super/rules/base/template/redirect.php b/interface/super/rules/base/template/redirect.php index 5976603e8..b6aba9724 100644 --- a/interface/super/rules/base/template/redirect.php +++ b/interface/super/rules/base/template/redirect.php @@ -5,5 +5,9 @@ // modify it under the terms of the GNU General Public License // as published by the Free Software Foundation; either version 2 // of the License, or (at your option) any later version. +?> + -header("Location: $_redirect"); exit; ?> \ No newline at end of file diff --git a/interface/super/rules/www/js/bucket.js b/interface/super/rules/www/js/bucket.js index 06490a5c9..abcafcbab 100644 --- a/interface/super/rules/www/js/bucket.js +++ b/interface/super/rules/www/js/bucket.js @@ -20,6 +20,7 @@ var bucket = function( args ) { var fn_prep_options = function( select, listType, hidden, showMe ) { select.append( ""); + top.restoreSession(); $.getJSON('index.php?action=edit!' + listType, function(data) { $.each( data, function(i, item) { @@ -62,4 +63,4 @@ var bucket = function( args ) { } }; -} \ No newline at end of file +} diff --git a/interface/super/rules/www/js/custom.js b/interface/super/rules/www/js/custom.js index 9836f0cb7..b23b15989 100644 --- a/interface/super/rules/www/js/custom.js +++ b/interface/super/rules/www/js/custom.js @@ -19,7 +19,7 @@ var custom = function( args ) { var fn_fill_columns = function( table, callback ) { var colSelect = $("#fld_column"); colSelect.find(".populated").remove(); - + top.restoreSession(); $.getJSON('index.php?action=edit!columns&table=' + table, function(data) { $.each( data, function(i, item) { @@ -45,4 +45,4 @@ var custom = function( args ) { } }; -} \ No newline at end of file +} diff --git a/interface/super/rules/www/js/edit.js b/interface/super/rules/www/js/edit.js index 1820cbae4..18152bc53 100644 --- a/interface/super/rules/www/js/edit.js +++ b/interface/super/rules/www/js/edit.js @@ -81,6 +81,7 @@ var rule_edit = function( args ) { var fn_wire_events = function() { $('#btn_save').click( function() { if ( fn_validate() ) { + top.restoreSession(); $('#frm_submit').submit(); } }); @@ -95,4 +96,4 @@ var rule_edit = function( args ) { } }; -} \ No newline at end of file +} diff --git a/interface/super/rules/www/js/jQuery.autocomplete.js b/interface/super/rules/www/js/jQuery.autocomplete.js index a3522d99d..d3d473bc4 100644 --- a/interface/super/rules/www/js/jQuery.autocomplete.js +++ b/interface/super/rules/www/js/jQuery.autocomplete.js @@ -323,6 +323,7 @@ jQuery.autocomplete = function(input, options) { receiveData(q, data); // if an AJAX url has been supplied, try loading the data now } else if( (typeof options.url == "string") && (options.url.length > 0) ){ + top.restoreSession(); $.get(makeUrl(q), function(data) { data = parseData(data); addToCache(q, data); @@ -393,6 +394,7 @@ jQuery.autocomplete = function(input, options) { if (data) { findValueCallback(q, data); } else if( (typeof options.url == "string") && (options.url.length > 0) ){ + top.restoreSession(); $.get(makeUrl(q), function(data) { data = parseData(data) addToCache(q, data); @@ -504,4 +506,4 @@ jQuery.fn.indexOf = function(e){ if( this[i] == e ) return i; } return -1; -}; \ No newline at end of file +}; diff --git a/interface/super/rules/www/js/list.js b/interface/super/rules/www/js/list.js index f684b8269..f90679065 100644 --- a/interface/super/rules/www/js/list.js +++ b/interface/super/rules/www/js/list.js @@ -20,6 +20,7 @@ var list_rules = function( args ) { sort = 'title'; } + top.restoreSession(); $.getJSON('index.php?action=browse!getrows', function(data) { data.sort(function(a, b) { @@ -64,4 +65,4 @@ var list_rules = function( args ) { } }; -} \ No newline at end of file +} -- 2.11.4.GIT