From 99a1672b7e5296663d118705b72f797bba2dc519 Mon Sep 17 00:00:00 2001 From: sunsetsystems Date: Mon, 11 Dec 2006 02:23:50 +0000 Subject: [PATCH] yet more changes for new frame layout --- interface/forms/CAMOS/new.php | 5 ++++- interface/forms/CAMOS/print.php | 5 +++-- interface/forms/CAMOS/view.php | 3 ++- interface/forms/ankleinjury/new.php | 5 +++-- interface/forms/ankleinjury/view.php | 5 +++-- interface/forms/bronchitis/new.php | 5 +++-- interface/forms/bronchitis/view.php | 5 +++-- interface/forms/dictation/new.php | 3 ++- interface/forms/dictation/view.php | 3 ++- interface/forms/fee_sheet/new.php | 6 ++++-- interface/forms/fee_sheet/view.php | 6 ++++-- interface/forms/note/new.php | 5 +++-- interface/forms/note/view.php | 5 +++-- interface/forms/physical_exam/new.php | 4 +++- interface/forms/physical_exam/view.php | 4 +++- interface/forms/prior_auth/C_FormPriorAuth.class.php | 3 ++- interface/forms/reviewofs/new.php | 3 ++- interface/forms/reviewofs/view.php | 3 ++- interface/forms/ros/C_FormROS.class.php | 3 ++- interface/forms/soap/C_FormSOAP.class.php | 3 ++- interface/forms/vitals/C_FormVitals.class.php | 3 ++- interface/main/left_nav.php | 8 +++++++- library/api.inc | 4 ++-- 23 files changed, 66 insertions(+), 33 deletions(-) diff --git a/interface/forms/CAMOS/new.php b/interface/forms/CAMOS/new.php index 823a311b6..3181df8f0 100755 --- a/interface/forms/CAMOS/new.php +++ b/interface/forms/CAMOS/new.php @@ -3,6 +3,7 @@ include_once("../../globals.php"); include_once("../../../library/api.inc"); include_once("../../../library/sql.inc"); formHeader("Form: CAMOS"); +$returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php'; ?> @@ -473,7 +474,9 @@ if ( (mode == 'add') || (mode == 'alter') ) { f2.hidden_subcategory.value = subcategory; f2.hidden_item.value = item; f2.action = '/interface/patient_file/encounter/load_form.php?formname=CAMOS'; + f2.target = 'Main'; + f2.submit(); } } @@ -554,7 +557,7 @@ if ($error != '') { [do not save]"; +echo "[do not save]"; echo " | [help]"; echo $previous_encounter_data; ?> diff --git a/interface/forms/CAMOS/print.php b/interface/forms/CAMOS/print.php index 1f52f04bf..29baf14e2 100755 --- a/interface/forms/CAMOS/print.php +++ b/interface/forms/CAMOS/print.php @@ -2,6 +2,7 @@ include_once("../../globals.php"); include_once("../../../library/api.inc"); formHeader("Form: CAMOS"); +$returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php'; ?> @@ -11,7 +12,7 @@ formHeader("Form: CAMOS");

CAMOS

[do not save]"; +echo "[do not save]"; ?>

Computer Aided Medical Ordering System

@@ -19,7 +20,7 @@ echo "

category
item
content

[do not save]"; +echo "[do not save]"; ?> diff --git a/interface/forms/CAMOS/view.php b/interface/forms/CAMOS/view.php index 8b875d86a..d2008894d 100755 --- a/interface/forms/CAMOS/view.php +++ b/interface/forms/CAMOS/view.php @@ -3,6 +3,7 @@ include_once("../../globals.php"); include_once("../../../library/api.inc"); formHeader("Form: CAMOS"); +$returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php'; ?> @@ -11,7 +12,7 @@ formHeader("Form: CAMOS"); @@ -17,7 +18,7 @@ topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight [Save] -" class="link" style="color: #483D8B">[Don't Save] +" class="link" style="color: #483D8B">[Don't Save]

Date of Injury: @@ -206,7 +207,7 @@ wrap="virtual name">1.Rest [Save] -" class="link" style="color: #483D8B">[Don't Save] +" class="link" style="color: #483D8B">[Don't Save] @@ -15,7 +16,7 @@ $obj = formFetch("form_ankleinjury", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +" class="link">[Don't Save Changes]

Date of Injury: " > @@ -152,7 +153,7 @@ stripslashes($obj{"ankle_diagnosis4"});?>" size="50"> [Save]
-" class="link" target=Main>[Don't Save Changes] +" class="link">[Don't Save Changes] + topmargin='0' rightmargin='4' leftmargin='2' diff --git a/library/api.inc b/library/api.inc index 8545547d7..7f050bd04 100644 --- a/library/api.inc +++ b/library/api.inc @@ -67,9 +67,9 @@ function formUpdate ($tableName, $values, $id, $authorized = "0") function formJump ($address = "0") { + $returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php'; if ($address == "0") - $address = "{$GLOBALS['rootdir']}/patient_file/encounter/patient_encounter.php"; -// echo $address; + $address = "{$GLOBALS['rootdir']}/patient_file/encounter/$returnurl"; echo "\n\n"; exit; } -- 2.11.4.GIT