From d5dedf39c53710d3644ac2f35ae5cbfa9b18cfbd Mon Sep 17 00:00:00 2001 From: sunsetsystems Date: Thu, 14 Dec 2006 15:46:40 +0000 Subject: [PATCH] making forms compatible with new frame layout --- .../C_FormAdultProgressNote.class.php | 2 +- contrib/forms/assessment_intake/new.php | 5 +-- contrib/forms/assessment_intake/view.php | 4 +- contrib/forms/body_composition/new.php | 2 +- contrib/forms/body_composition/view.php | 2 +- contrib/forms/clinical_notes/new.php | 2 +- contrib/forms/clinical_notes/view.php | 2 +- contrib/forms/contacts/new.php | 2 +- contrib/forms/contacts/view.php | 2 +- contrib/forms/documents/new.php | 4 +- contrib/forms/documents/print.php | 2 +- .../forms/evaluation/C_FormEvaluation.class.php | 2 +- contrib/forms/example/3rd Party Form API.txt | 2 +- contrib/forms/example/new.php | 2 +- contrib/forms/example/print.php | 2 +- contrib/forms/example/view.php | 2 +- contrib/forms/football_injury_audit/new.php | 2 +- contrib/forms/football_injury_audit/view.php | 2 +- contrib/forms/habits/new.php | 4 +- contrib/forms/habits/print.php | 2 +- contrib/forms/hearingtest/new.php | 2 +- contrib/forms/hearingtest/view.php | 2 +- contrib/forms/high_risk_screening_record/new.php | 2 +- contrib/forms/high_risk_screening_record/view.php | 2 +- contrib/forms/hist_exam_plan/new.php | 2 +- contrib/forms/hist_exam_plan/view.php | 2 +- contrib/forms/hp_tje_primary/C_FormHpTje.class.php | 2 +- contrib/forms/immunization_record/new.php | 2 +- contrib/forms/immunization_record/view.php | 2 +- contrib/forms/individual_treatment_plan/new.php | 5 +-- contrib/forms/individual_treatment_plan/view.php | 21 +--------- contrib/forms/lab_results/new.php | 4 +- contrib/forms/lab_results/print.php | 2 +- contrib/forms/medical_decision/new.php | 2 +- contrib/forms/medical_decision/view.php | 2 +- contrib/forms/mh_therapy_progress/new.php | 5 +-- contrib/forms/mh_therapy_progress/view.php | 4 +- contrib/forms/neurologicalreview/new.php | 2 +- contrib/forms/neurologicalreview/view.php | 2 +- contrib/forms/obstetrical/new.php | 2 +- contrib/forms/obstetrical/view.php | 2 +- contrib/forms/pain/new.php | 2 +- contrib/forms/pain/view.php | 2 +- contrib/forms/patient_intake_history/new.php | 2 +- contrib/forms/patient_intake_history/view.php | 2 +- contrib/forms/ped_GI/new.php | 4 +- contrib/forms/ped_GI/view.php | 4 +- contrib/forms/ped_fever/new.php | 4 +- contrib/forms/ped_fever/view.php | 4 +- contrib/forms/ped_pain/new.php | 4 +- contrib/forms/ped_pain/view.php | 4 +- contrib/forms/phone_exam/new.php | 4 +- contrib/forms/phone_exam/print.php | 3 +- contrib/forms/physical_examination/new.php | 8 ++-- contrib/forms/physical_examination/view.php | 9 ++-- contrib/forms/physician_history/new.php | 4 +- contrib/forms/physician_history/view.php | 4 +- contrib/forms/plist/new.php | 4 +- contrib/forms/plist/view.php | 4 +- contrib/forms/podiatry/new.php | 2 +- contrib/forms/podiatry/view.php | 2 +- contrib/forms/prior_auth/C_FormPriorAuth.class.php | 7 +--- contrib/forms/progressnotes/new.php | 2 +- contrib/forms/progressnotes/view.php | 2 +- .../forms/prosthesis/C_FormProsthesis.class.php | 7 +--- .../C_FormReviewOfSystems.class.php | 7 +--- contrib/forms/reviewofs/new.php | 2 +- contrib/forms/reviewofs/view.php | 2 +- contrib/forms/rosform/new.php | 2 +- contrib/forms/rosform/view.php | 2 +- contrib/forms/routine_screening_record/new.php | 10 ++--- contrib/forms/routine_screening_record/view.php | 10 ++--- contrib/forms/scanned_notes/new.php | 4 +- contrib/forms/scanned_notes/view.php | 4 +- contrib/forms/soccer_injury/new.php | 2 +- contrib/forms/soccer_injury/view.php | 2 +- contrib/forms/specialist_notes/new.php | 2 +- contrib/forms/specialist_notes/view.php | 2 +- contrib/forms/sports_fitness/new.php | 2 +- contrib/forms/sports_fitness/view.php | 2 +- contrib/forms/vision/new.php | 2 +- contrib/forms/vision/view.php | 2 +- contrib/forms/vitals/new.php | 4 +- contrib/forms/vitals/view.php | 4 +- contrib/forms/vitalsigns/new.php | 2 +- contrib/forms/vitalsigns/view.php | 2 +- contrib/forms/well_child/C_FormWellChild.class.php | 5 +-- .../well_child_care/C_WellChildCare.class.php | 2 +- contrib/forms/well_child_care/new.php | 4 +- contrib/forms/well_child_care/view.php | 4 +- .../forms/well_infant/C_FormWellInfant.class.php | 5 +-- interface/forms/ankleinjury/new.php | 5 +-- interface/forms/ankleinjury/view.php | 5 +-- interface/forms/bronchitis/view.php | 4 +- interface/forms/soap/C_FormSOAP.class.php | 8 ++-- interface/main/left_nav.php | 49 ++++++++++++++-------- library/api.inc | 5 +++ library/forms.inc | 13 +++--- 98 files changed, 185 insertions(+), 209 deletions(-) diff --git a/contrib/forms/adult_progress_note/C_FormAdultProgressNote.class.php b/contrib/forms/adult_progress_note/C_FormAdultProgressNote.class.php index ce76a4cbc..a8b242779 100644 --- a/contrib/forms/adult_progress_note/C_FormAdultProgressNote.class.php +++ b/contrib/forms/adult_progress_note/C_FormAdultProgressNote.class.php @@ -14,7 +14,7 @@ class C_FormAdultProgressNote extends Controller { $this->template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/adult_progress_note/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } diff --git a/contrib/forms/assessment_intake/new.php b/contrib/forms/assessment_intake/new.php index 1e79ec7aa..5b892e684 100644 --- a/contrib/forms/assessment_intake/new.php +++ b/contrib/forms/assessment_intake/new.php @@ -1,4 +1,3 @@ -
Assessment and Intake


[Save] -" class="link">[Don't Save]
+[Don't Save]
[Save] -" class="link">[Don't Save]
+[Don't Save]
[Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]


[Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]   -'" /> +

diff --git a/contrib/forms/body_composition/view.php b/contrib/forms/body_composition/view.php index 43a1ff05d..644d4a16b 100644 --- a/contrib/forms/body_composition/view.php +++ b/contrib/forms/body_composition/view.php @@ -212,7 +212,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/clinical_notes/new.php b/contrib/forms/clinical_notes/new.php index db6cdbb1c..c8b578ae3 100644 --- a/contrib/forms/clinical_notes/new.php +++ b/contrib/forms/clinical_notes/new.php @@ -225,7 +225,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/clinical_notes/view.php b/contrib/forms/clinical_notes/view.php index db6cdbb1c..c8b578ae3 100644 --- a/contrib/forms/clinical_notes/view.php +++ b/contrib/forms/clinical_notes/view.php @@ -225,7 +225,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/contacts/new.php b/contrib/forms/contacts/new.php index 6c8ff443c..fc516d2e7 100644 --- a/contrib/forms/contacts/new.php +++ b/contrib/forms/contacts/new.php @@ -53,7 +53,7 @@ formHeader("Form: contacts");
[Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]
-
+ Scanned Documents Input
@@ -35,7 +35,7 @@ formHeader("Scanned Documents Input"); [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/documents/print.php b/contrib/forms/documents/print.php index 325249faf..a44d54d44 100644 --- a/contrib/forms/documents/print.php +++ b/contrib/forms/documents/print.php @@ -23,7 +23,7 @@ echo ("\"$relink\""); ?>
-Done +Done template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/evaluation/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } diff --git a/contrib/forms/example/3rd Party Form API.txt b/contrib/forms/example/3rd Party Form API.txt index 59b2040cd..5efb4fc9a 100644 --- a/contrib/forms/example/3rd Party Form API.txt +++ b/contrib/forms/example/3rd Party Form API.txt @@ -37,7 +37,7 @@ To initialize the 3rd party php library (from interface/forms/your_script_name/m $myArray['column_name1'] = 'my column1 value'; -The third argument to formSubmit() is a url to redirect to after the data from a form has been saved. If you set this to "0" (its default) then it will forward back to "openemr/interface/patient_file/encounter/patient_encounter.php". This is the preferred operation, since users expect to be taken back to the Patient Encounter screen after saving a new form. +The third argument to formSubmit() is a url to redirect to after the data from a form has been saved. If you set this to "0" (its default) then it will forward back to $GLOBALS['form_exit_url']. This is the preferred operation, since users expect to be taken back to the Patient Encounter screen after saving a new form. --->> formFetch("my_table", 'record id', 'columns wanted', 'activity state') diff --git a/contrib/forms/example/new.php b/contrib/forms/example/new.php index 1af3e0aee..0f878226d 100644 --- a/contrib/forms/example/new.php +++ b/contrib/forms/example/new.php @@ -5,7 +5,7 @@ formHeader("newerpatient form"); ?> <--REM note that every input method has the same name as a valid column, this will make things easier in save.php --> -
+ Newer Patient Encounter Form
diff --git a/contrib/forms/example/print.php b/contrib/forms/example/print.php index 6f06da439..b7048e62e 100644 --- a/contrib/forms/example/print.php +++ b/contrib/forms/example/print.php @@ -26,7 +26,7 @@ echo $data['cats'];


-i'm all done +i'm all done - + New Patient Encounter Form
diff --git a/contrib/forms/football_injury_audit/new.php b/contrib/forms/football_injury_audit/new.php index 3356a099a..24c860f5c 100644 --- a/contrib/forms/football_injury_audit/new.php +++ b/contrib/forms/football_injury_audit/new.php @@ -426,7 +426,7 @@ function docoding() {

  -'" /> +     -'" /> +   - + diff --git a/contrib/forms/habits/print.php b/contrib/forms/habits/print.php index da912540a..d08063751 100644 --- a/contrib/forms/habits/print.php +++ b/contrib/forms/habits/print.php @@ -11,7 +11,7 @@ formHeader("Habits form"); ?>
-Done +Done[Save]
-" class="link">[Don't Save] +[Don't Save][Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] - +
@@ -131,7 +131,7 @@ [Save]
-" class="link">[Don't Save] +[Don't Save]
[Save Data] " class="link_submit">[Don't Save] [Don't Save]
diff --git a/contrib/forms/high_risk_screening_record/view.php b/contrib/forms/high_risk_screening_record/view.php index 2b8a616d8..1f832a1fc 100644 --- a/contrib/forms/high_risk_screening_record/view.php +++ b/contrib/forms/high_risk_screening_record/view.php @@ -145,7 +145,7 @@ $rsi++; [Save Data] [Printable form] - " class="link_submit">[Don't Save] + [Don't Save] diff --git a/contrib/forms/hist_exam_plan/new.php b/contrib/forms/hist_exam_plan/new.php index 5a69fb072..d5b2c14ab 100644 --- a/contrib/forms/hist_exam_plan/new.php +++ b/contrib/forms/hist_exam_plan/new.php @@ -116,7 +116,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/hist_exam_plan/view.php b/contrib/forms/hist_exam_plan/view.php index 5a69fb072..d5b2c14ab 100644 --- a/contrib/forms/hist_exam_plan/view.php +++ b/contrib/forms/hist_exam_plan/view.php @@ -116,7 +116,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/hp_tje_primary/C_FormHpTje.class.php b/contrib/forms/hp_tje_primary/C_FormHpTje.class.php index a6bae8290..9063514e2 100644 --- a/contrib/forms/hp_tje_primary/C_FormHpTje.class.php +++ b/contrib/forms/hp_tje_primary/C_FormHpTje.class.php @@ -13,7 +13,7 @@ class C_FormHpTje extends Controller { $this->template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/hp_tje/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } diff --git a/contrib/forms/immunization_record/new.php b/contrib/forms/immunization_record/new.php index 539cab2db..bd8bf8813 100644 --- a/contrib/forms/immunization_record/new.php +++ b/contrib/forms/immunization_record/new.php @@ -148,7 +148,7 @@ $vacci++; - +
[Save Data] " class="link_submit">[Don't Save] [Don't Save]
diff --git a/contrib/forms/immunization_record/view.php b/contrib/forms/immunization_record/view.php index 69ed7e91f..a3d13de7b 100644 --- a/contrib/forms/immunization_record/view.php +++ b/contrib/forms/immunization_record/view.php @@ -143,7 +143,7 @@ $vacci++; [Save Data] [Printable form] - " class="link_submit">[Don't Save] + [Don't Save] diff --git a/contrib/forms/individual_treatment_plan/new.php b/contrib/forms/individual_treatment_plan/new.php index 9c66fcf4b..3e8169a52 100644 --- a/contrib/forms/individual_treatment_plan/new.php +++ b/contrib/forms/individual_treatment_plan/new.php @@ -1,4 +1,3 @@ -
Individual Treatment Plan


[Save] -" class="link_submit">[Don't Save]
+[Don't Save]


[Save] -" class="link_submit">[Don't Save]
+[Don't Save]
@@ -18,15 +17,11 @@ $obj = formFetch("form_individual_treatment_plan", $_GET["id"]);
Individual Treatment Plan


[Save] -" class="link" target=Main>[Don't Save Changes]
+[Don't Save Changes]

- - - - @@ -114,23 +109,11 @@ $result = SqlFetchArray($res); ?> ">

- - - - - - - - - - - -
[Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
+ Lab Results
@@ -24,7 +24,7 @@ formHeader("Lab Results"); [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/lab_results/print.php b/contrib/forms/lab_results/print.php index 1d7623f35..227e1cbd5 100644 --- a/contrib/forms/lab_results/print.php +++ b/contrib/forms/lab_results/print.php @@ -18,7 +18,7 @@ $row = formFetch('form_lab_results', $_GET['id']); echo $row['notes']; ?>

-Done +Done [Save Data] - " class="link_submit">[Don't Save] + [Don't Save] diff --git a/contrib/forms/medical_decision/view.php b/contrib/forms/medical_decision/view.php index 21d5bb0e0..f55da4f43 100644 --- a/contrib/forms/medical_decision/view.php +++ b/contrib/forms/medical_decision/view.php @@ -227,7 +227,7 @@ window.onload = initialize; - +
[Save Data] [Printable form] " class="link_submit">[Don't Save]
[Don't Save]
Therapy Progress Note


[Save] -" class="link_submit">[Don't Save]
+[Don't Save]


[Save] -" class="link_submit">[Don't Save]
+[Don't Save]
Therapy Progress Note


[Save] -" class="link" target=Main>[Don't Save Changes]
+[Don't Save Changes]

@@ -306,7 +306,7 @@ $result = SqlFetchArray($res); ?>
[Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] [Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] [Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] [Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] - +
[Save Data] " class="link_submit">[Don't Save] [Don't Save]
diff --git a/contrib/forms/patient_intake_history/view.php b/contrib/forms/patient_intake_history/view.php index 005d029a9..0e7b438d5 100644 --- a/contrib/forms/patient_intake_history/view.php +++ b/contrib/forms/patient_intake_history/view.php @@ -1862,7 +1862,7 @@ apply to you now or since adulthood - +
[Save Data] [Printable form] " class="link_submit">[Don't Save]
[Don't Save]

-
+ [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/ped_GI/view.php b/contrib/forms/ped_GI/view.php index 9352df2fd..f7df27612 100644 --- a/contrib/forms/ped_GI/view.php +++ b/contrib/forms/ped_GI/view.php @@ -17,7 +17,7 @@ $obj = formFetch("form_ped_GI", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]

@@ -28,7 +28,7 @@ $obj = formFetch("form_ped_GI", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]
-
+ [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/ped_fever/view.php b/contrib/forms/ped_fever/view.php index 454b6a8b4..49f187630 100644 --- a/contrib/forms/ped_fever/view.php +++ b/contrib/forms/ped_fever/view.php @@ -17,7 +17,7 @@ $obj = formFetch("form_ped_fever", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]

@@ -28,7 +28,7 @@ $obj = formFetch("form_ped_fever", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]
-
+ [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/ped_pain/view.php b/contrib/forms/ped_pain/view.php index ce78813d9..e06c83fab 100644 --- a/contrib/forms/ped_pain/view.php +++ b/contrib/forms/ped_pain/view.php @@ -17,7 +17,7 @@ $obj = formFetch("form_ped_pain", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]

@@ -28,7 +28,7 @@ $obj = formFetch("form_ped_pain", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0>
-
+ Phone Exam
@@ -24,7 +24,7 @@ formHeader("Phone Exam"); [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/phone_exam/print.php b/contrib/forms/phone_exam/print.php index 5f767a099..ddfb5c151 100644 --- a/contrib/forms/phone_exam/print.php +++ b/contrib/forms/phone_exam/print.php @@ -18,9 +18,8 @@ $row = formFetch('form_phone_exam', $_GET['id']); echo $row['notes']; ?>

-Done +Done - diff --git a/contrib/forms/physical_examination/new.php b/contrib/forms/physical_examination/new.php index 35c878fce..af2a4d7e7 100644 --- a/contrib/forms/physical_examination/new.php +++ b/contrib/forms/physical_examination/new.php @@ -52,8 +52,8 @@ examination is performed. For all other levels of examination, the total number reported.

- - + + @@ -494,11 +494,11 @@ ABNormal
LEVEL OF EXAMINATIONPERFORM AND DOCUMENT
PROBLEM FOCUSED1–5 ELEMENTS IDENTIFIED BY A BULLET
EXPANDED PROBLEM FOCUSED6–11 ELEMENTS IDENTIFIED BY A BULLET
PROBLEM FOCUSED15 ELEMENTS IDENTIFIED BY A BULLET
EXPANDED PROBLEM FOCUSED611 ELEMENTS IDENTIFIED BY A BULLET
DETAILED12 OR MORE ELEMENTS IDENTIFIED BY A BULLET
COMPREHENSIVEALL ELEMENTS IDENTIFIED BY A BULLET IN CONSTITUTIONAL AND GASTROINTESTINAL, ANY 7 BULLETS IN GYNECOLOGIC, AT LEAST 1 BULLET IN ALL OTHER SYSTEMS
[Save Data] -" class="link_submit">[Don't Save] +[Don't Save]
- \ No newline at end of file + diff --git a/contrib/forms/physical_examination/view.php b/contrib/forms/physical_examination/view.php index 6de9d7424..a00bbf390 100644 --- a/contrib/forms/physical_examination/view.php +++ b/contrib/forms/physical_examination/view.php @@ -6,7 +6,6 @@ include_once("$srcdir/api.inc"); include_once("$srcdir/forms.inc"); include_once("$srcdir/calendar.inc"); ?> - Physical examination @@ -35,8 +34,8 @@ examination is performed. For all other levels of examination, the total number reported.

- - + + @@ -481,11 +480,11 @@ ABNormal
LEVEL OF EXAMINATIONPERFORM AND DOCUMENT
PROBLEM FOCUSED1–5 ELEMENTS IDENTIFIED BY A BULLET
EXPANDED PROBLEM FOCUSED6–11 ELEMENTS IDENTIFIED BY A BULLET
PROBLEM FOCUSED15 ELEMENTS IDENTIFIED BY A BULLET
EXPANDED PROBLEM FOCUSED611 ELEMENTS IDENTIFIED BY A BULLET
DETAILED12 OR MORE ELEMENTS IDENTIFIED BY A BULLET
COMPREHENSIVEALL ELEMENTS IDENTIFIED BY A BULLET IN CONSTITUTIONAL AND GASTROINTESTINAL, ANY 7 BULLETS IN GYNECOLOGIC, AT LEAST 1 BULLET IN ALL OTHER SYSTEMS
- +
[Save Data] [Printable form] " class="link_submit">[Don't Save]
[Don't Save]
- \ No newline at end of file + diff --git a/contrib/forms/physician_history/new.php b/contrib/forms/physician_history/new.php index 4349e9dec..56012e7eb 100644 --- a/contrib/forms/physician_history/new.php +++ b/contrib/forms/physician_history/new.php @@ -1015,7 +1015,7 @@ HYperthyroid - +
[Save Data] " class="link_submit">[Don't Save] [Don't Save]
@@ -1023,4 +1023,4 @@ HYperthyroid formFooter(); ?> - \ No newline at end of file + diff --git a/contrib/forms/physician_history/view.php b/contrib/forms/physician_history/view.php index 41e870774..d911fb8d1 100644 --- a/contrib/forms/physician_history/view.php +++ b/contrib/forms/physician_history/view.php @@ -961,7 +961,7 @@ Hyperthyroid [Save Data] [Printable form] - " class="link_submit">[Don't Save] + [Don't Save] @@ -969,4 +969,4 @@ Hyperthyroid formFooter(); ?> - \ No newline at end of file + diff --git a/contrib/forms/plist/new.php b/contrib/forms/plist/new.php index ee7d1f192..ba4a7fc60 100644 --- a/contrib/forms/plist/new.php +++ b/contrib/forms/plist/new.php @@ -141,7 +141,7 @@ $pli++; - +
[Save Data] " class="link_submit">[Don't Save] [Don't Save]
@@ -149,4 +149,4 @@ $pli++; formFooter(); ?> - \ No newline at end of file + diff --git a/contrib/forms/plist/view.php b/contrib/forms/plist/view.php index f3b516686..39fac6c85 100644 --- a/contrib/forms/plist/view.php +++ b/contrib/forms/plist/view.php @@ -105,7 +105,7 @@ $pli++; [Save Data] [Printable form] - " class="link_submit">[Don't Save] + [Don't Save] @@ -113,4 +113,4 @@ $pli++; formFooter(); ?> - \ No newline at end of file + diff --git a/contrib/forms/podiatry/new.php b/contrib/forms/podiatry/new.php index bdc5395e6..9fd8e518a 100644 --- a/contrib/forms/podiatry/new.php +++ b/contrib/forms/podiatry/new.php @@ -157,7 +157,7 @@ if ($formid) {     -'" /> +

diff --git a/contrib/forms/podiatry/view.php b/contrib/forms/podiatry/view.php index bdc5395e6..9fd8e518a 100644 --- a/contrib/forms/podiatry/view.php +++ b/contrib/forms/podiatry/view.php @@ -157,7 +157,7 @@ if ($formid) {     -'" /> +

diff --git a/contrib/forms/prior_auth/C_FormPriorAuth.class.php b/contrib/forms/prior_auth/C_FormPriorAuth.class.php index 92bbd5274..bc4f2faf8 100644 --- a/contrib/forms/prior_auth/C_FormPriorAuth.class.php +++ b/contrib/forms/prior_auth/C_FormPriorAuth.class.php @@ -13,7 +13,7 @@ class C_FormPriorAuth extends Controller { $this->template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/prior_auth/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } @@ -53,7 +53,4 @@ class C_FormPriorAuth extends Controller { } } - - - -?> \ No newline at end of file +?> diff --git a/contrib/forms/progressnotes/new.php b/contrib/forms/progressnotes/new.php index c052b5f4f..fdcd4a422 100644 --- a/contrib/forms/progressnotes/new.php +++ b/contrib/forms/progressnotes/new.php @@ -532,7 +532,7 @@ formHeader("Form: progressnotes");
[Save]             -" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save] +[Don't Save] template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/prosthesis/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } @@ -67,7 +67,4 @@ class C_FormProsthesis extends Controller { } } - - - -?> \ No newline at end of file +?> diff --git a/contrib/forms/review_of_systems/C_FormReviewOfSystems.class.php b/contrib/forms/review_of_systems/C_FormReviewOfSystems.class.php index 35553b565..6c90d40c7 100644 --- a/contrib/forms/review_of_systems/C_FormReviewOfSystems.class.php +++ b/contrib/forms/review_of_systems/C_FormReviewOfSystems.class.php @@ -14,7 +14,7 @@ class C_FormReviewOfSystems extends Controller { $this->template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/review_of_systems/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } @@ -66,7 +66,4 @@ class C_FormReviewOfSystems extends Controller { } } - - - -?> \ No newline at end of file +?> diff --git a/contrib/forms/reviewofs/new.php b/contrib/forms/reviewofs/new.php index a0d1ebdf8..d469a0718 100644 --- a/contrib/forms/reviewofs/new.php +++ b/contrib/forms/reviewofs/new.php @@ -157,7 +157,7 @@ formHeader("Form: reviewofs");
[Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] [Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] 40-64 - EVERY 2–3 YEARS AFTER 3 + EVERY 23 YEARS AFTER 3 CONSECuTIVE NEGATIVE TEST RESULTS IF NO HISTORY OF CIN 2 OR 3, @@ -123,7 +123,7 @@ UNDER AGE 25 EVERY 5 YEARS BEGINNING AT AGE 45 - EVERY 1–2 YEARS UNTIL + EVERY 12 YEARS UNTIL AGE 50; YEARLY BEGINNING AT AGE 50 BEGINNING AT AGE 50 @@ -146,7 +146,7 @@ UNDER AGE 25 65 and older - EVERY 2–3 YEARS AFTER 3
+ EVERY 23 YEARS AFTER 3
CONSECUTIVE NEGATIVE TEST RESULTS IF NO HISTORY OF CIN 2 OR 3, @@ -220,7 +220,7 @@ $rsi++; - +
[Save Data] " class="link_submit">[Don't Save] [Don't Save]
@@ -228,4 +228,4 @@ $rsi++; formFooter(); ?> - \ No newline at end of file + diff --git a/contrib/forms/routine_screening_record/view.php b/contrib/forms/routine_screening_record/view.php index 0328b2ded..c135adc9d 100644 --- a/contrib/forms/routine_screening_record/view.php +++ b/contrib/forms/routine_screening_record/view.php @@ -99,7 +99,7 @@ UNDER AGE 25 40-64 - EVERY 2–3 YEARS AFTER 3 + EVERY 23 YEARS AFTER 3 CONSECuTIVE NEGATIVE TEST RESULTS IF NO HISTORY OF CIN 2 OR 3, @@ -110,7 +110,7 @@ UNDER AGE 25 EVERY 5 YEARS BEGINNING AT AGE 45 - EVERY 1–2 YEARS UNTIL + EVERY 12 YEARS UNTIL AGE 50; YEARLY BEGINNING AT AGE 50 BEGINNING AT AGE 50 @@ -133,7 +133,7 @@ UNDER AGE 25 65 and older - EVERY 2–3 YEARS AFTER 3
+ EVERY 23 YEARS AFTER 3
CONSECUTIVE NEGATIVE TEST RESULTS IF NO HISTORY OF CIN 2 OR 3, @@ -222,11 +222,11 @@ $rsi++; - +
[Save Data] [Printable form] " class="link_submit">[Don't Save]
[Don't Save]
- \ No newline at end of file + diff --git a/contrib/forms/scanned_notes/new.php b/contrib/forms/scanned_notes/new.php index b70fbe350..67e9df365 100644 --- a/contrib/forms/scanned_notes/new.php +++ b/contrib/forms/scanned_notes/new.php @@ -117,7 +117,7 @@ if ($formid) { // Called by the deleteme.php window on a successful delete. function imdeleted() { - location = ''; + location = ''; } @@ -169,7 +169,7 @@ if ($formid && is_file($imagepath)) {     -'" /> +   diff --git a/contrib/forms/scanned_notes/view.php b/contrib/forms/scanned_notes/view.php index b70fbe350..67e9df365 100644 --- a/contrib/forms/scanned_notes/view.php +++ b/contrib/forms/scanned_notes/view.php @@ -117,7 +117,7 @@ if ($formid) { // Called by the deleteme.php window on a successful delete. function imdeleted() { - location = ''; + location = ''; } @@ -169,7 +169,7 @@ if ($formid && is_file($imagepath)) {     -'" /> +   diff --git a/contrib/forms/soccer_injury/new.php b/contrib/forms/soccer_injury/new.php index d7bca8bff..87a520349 100644 --- a/contrib/forms/soccer_injury/new.php +++ b/contrib/forms/soccer_injury/new.php @@ -469,7 +469,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/soccer_injury/view.php b/contrib/forms/soccer_injury/view.php index d7bca8bff..87a520349 100644 --- a/contrib/forms/soccer_injury/view.php +++ b/contrib/forms/soccer_injury/view.php @@ -469,7 +469,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/specialist_notes/new.php b/contrib/forms/specialist_notes/new.php index ff201a82c..375f4ed84 100644 --- a/contrib/forms/specialist_notes/new.php +++ b/contrib/forms/specialist_notes/new.php @@ -157,7 +157,7 @@ if ($formid) {     -'" /> +

diff --git a/contrib/forms/specialist_notes/view.php b/contrib/forms/specialist_notes/view.php index ff201a82c..375f4ed84 100644 --- a/contrib/forms/specialist_notes/view.php +++ b/contrib/forms/specialist_notes/view.php @@ -157,7 +157,7 @@ if ($formid) {     -'" /> +

diff --git a/contrib/forms/sports_fitness/new.php b/contrib/forms/sports_fitness/new.php index 1c280910f..ce720c894 100644 --- a/contrib/forms/sports_fitness/new.php +++ b/contrib/forms/sports_fitness/new.php @@ -312,7 +312,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/sports_fitness/view.php b/contrib/forms/sports_fitness/view.php index 1c280910f..ce720c894 100644 --- a/contrib/forms/sports_fitness/view.php +++ b/contrib/forms/sports_fitness/view.php @@ -312,7 +312,7 @@ if ($formid) {

  -'" /> +

diff --git a/contrib/forms/vision/new.php b/contrib/forms/vision/new.php index 9506bcf42..72ec5a24b 100644 --- a/contrib/forms/vision/new.php +++ b/contrib/forms/vision/new.php @@ -50,7 +50,7 @@ formHeader("Form: vision");
[Save]
-" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]
-
+ [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/vitals/view.php b/contrib/forms/vitals/view.php index b3e93d5d6..a9310a203 100644 --- a/contrib/forms/vitals/view.php +++ b/contrib/forms/vitals/view.php @@ -17,7 +17,7 @@ $obj = formFetch("form_vitals", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]

@@ -28,7 +28,7 @@ $obj = formFetch("form_vitals", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] [Save]             -" class="link">[Don't Save] +[Don't Save] [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/well_child/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } @@ -80,7 +80,4 @@ class C_FormWellChild extends Controller { } } - - - ?> diff --git a/contrib/forms/well_child_care/C_WellChildCare.class.php b/contrib/forms/well_child_care/C_WellChildCare.class.php index de08fd749..755a24b39 100644 --- a/contrib/forms/well_child_care/C_WellChildCare.class.php +++ b/contrib/forms/well_child_care/C_WellChildCare.class.php @@ -573,4 +573,4 @@ class C_WellChildCare { \ No newline at end of file +?> diff --git a/contrib/forms/well_child_care/new.php b/contrib/forms/well_child_care/new.php index a8618bdea..82230e12e 100644 --- a/contrib/forms/well_child_care/new.php +++ b/contrib/forms/well_child_care/new.php @@ -17,7 +17,7 @@ include_once("C_WellChildCare.class.php");
-
+ [Save]
-" class="link">[Don't Save] +[Don't Save]
diff --git a/contrib/forms/well_child_care/view.php b/contrib/forms/well_child_care/view.php index 796612668..71def8dff 100644 --- a/contrib/forms/well_child_care/view.php +++ b/contrib/forms/well_child_care/view.php @@ -17,7 +17,7 @@ $obj = formFetch("form_well_child_care", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes]

@@ -32,7 +32,7 @@ $obj = formFetch("form_well_child_care", $_GET["id"]); [Save]
-" class="link" target=Main>[Don't Save Changes] +[Don't Save Changes] template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/well_infant/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/patient_encounter.php"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } @@ -81,7 +81,4 @@ class C_FormWellInfant extends Controller { } } - - - ?> diff --git a/interface/forms/ankleinjury/new.php b/interface/forms/ankleinjury/new.php index 896830026..6d94ca92a 100755 --- a/interface/forms/ankleinjury/new.php +++ b/interface/forms/ankleinjury/new.php @@ -4,7 +4,6 @@ include_once("../../globals.php"); include_once("$srcdir/api.inc"); formHeader("Form: ankleinjury"); -$returnurl = $GLOBALS['concurrent_layout'] ? 'encounter_top.php' : 'patient_encounter.php'; ?> @@ -18,7 +17,7 @@ topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight [Save]             -" class="link" style="color: #483D8B">[Don't Save] +[Don't Save]

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

Date of Injury: " > @@ -153,7 +152,7 @@ stripslashes($obj{"ankle_diagnosis4"});?>" size="50"> [Save]
-" class="link">[Don't Save Changes] +[Don't Save Changes] [Save]
-" class="link" target=Main>[Don't Save Changes] +" class="link">[Don't Save Changes]

Onset of Ilness: " >

@@ -420,7 +420,7 @@ stripslashes($obj{"diagnosis3_bronchitis_form"});?>" size="40">
[Save]
-" class="link" target=Main>[Don't Save Changes] +" class="link">[Don't Save Changes] template_mod = $template_mod; $this->template_dir = dirname(__FILE__) . "/templates/"; $this->assign("FORM_ACTION", $GLOBALS['web_root']); - $this->assign("DONT_SAVE_LINK",$GLOBALS['webroot'] . "/interface/patient_file/encounter/$returnurl"); + $this->assign("DONT_SAVE_LINK", $GLOBALS['form_exit_url']); $this->assign("STYLE", $GLOBALS['style']); } - + function default_action() { $form = new FormSOAP(); $this->assign("data",$form); - return $this->fetch($this->template_dir . $this->template_mod . "_new.html"); } diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php index 43657127e..7c3065272 100644 --- a/interface/main/left_nav.php +++ b/interface/main/left_nav.php @@ -63,9 +63,9 @@ // Our find_patient form, when submitted, invokes patient_select.php in the // upper frame. When the patient is selected, demographics.php is invoked // with the set_pid parameter, which establishes the new session pid and also - // calls the above setPatient() function. In this case demographics.php - // will also load the summary frameset into the bottom frame, invoking the - // above loadFrame() and setRadio() functions. + // calls the setPatient() function (below). In this case demographics.php + // will also load the summary frameset into the bottom frame, invoking our + // loadFrame() and setRadio() functions. // // Similarly, we have the concept of selecting an encounter from the // Encounters list, and then having that "stick" until some other encounter @@ -111,7 +111,7 @@ 'sum' => array('Summary' , 1, 'patient_file/summary/summary_bottom.php'), 'nen' => array('New Enctr' , 1, 'forms/newpatient/new.php?autoloaded=1&calenc='), 'enc' => array('Encounter' , 2, 'patient_file/encounter/encounter_top.php'), - 'cod' => array('Coding' , 2, 'patient_file/encounter/encounter_bottom.php'), + 'cod' => array('Charges' , 2, 'patient_file/encounter/encounter_bottom.php'), ); $admin_allowed = acl_check('admin', 'calendar') || @@ -163,15 +163,15 @@ var active_encounter = 0; // Expand and/or collapse frames in response to checkbox clicks. + // fnum indicates which checkbox was clicked (1=left, 2=right). function toggleFrame(fnum) { var f = document.forms[0]; var fset = top.document.getElementById('fsright'); - var rows = ''; if (!f.cb_top.checked && !f.cb_bot.checked) { if (fnum == 1) f.cb_bot.checked = true; else f.cb_top.checked = true; } - rows += f.cb_top.checked ? '*' : '0'; + var rows = f.cb_top.checked ? '*' : '0'; rows += f.cb_bot.checked ? ',*' : ',0'; fset.rows = rows; fset.rows = rows; @@ -243,9 +243,11 @@ } } - // Reload patient-specific frames, excluding a specified frame. At this - // point the new server-side pid may not be set and loading the same - // document for the new patient will not work, so load global info instead. + // This is called automatically when a new patient is set, to make sure + // there are no patient-specific documents showing stale data. If a frame + // was just loaded with data for the correct patient, its name is passed so + // that it will not be zapped. At this point the new server-side pid is not + // assumed to be set, so this function will only load global data. function reloadPatient(fname) { var f = document.forms[0]; for (var i = 0; i < f.rb_top.length; ++i) { @@ -386,7 +388,8 @@ $varr) { if ($key == 'ros' && !$GLOBALS['athletic_team']) continue; if ($key == 'adm' && !$admin_allowed ) continue; @@ -423,18 +426,30 @@ Active Encounter:

-Find: - - - - + + + + + + + - - + +
by: NameIDFind:  + +
by: + Name + + ID +
 SSNDOB + SSN + + DOB +
diff --git a/library/api.inc b/library/api.inc index 7f050bd04..2b0baccbc 100644 --- a/library/api.inc +++ b/library/api.inc @@ -3,6 +3,11 @@ include_once("../../globals.php"); include_once("{$GLOBALS['srcdir']}/sql.inc"); include_once("{$GLOBALS['srcdir']}/billing.inc"); + +$GLOBALS['form_exit_url'] = $GLOBALS['concurrent_layout'] ? + "$rootdir/patient_file/encounter/encounter_top.php" : + "$rootdir/patient_file/encounter/patient_encounter.php"; + function formHeader ($title = "My Form") { ?> diff --git a/library/forms.inc b/library/forms.inc index f6e5b6fb9..fb0948084 100644 --- a/library/forms.inc +++ b/library/forms.inc @@ -2,6 +2,10 @@ require_once("{$GLOBALS['srcdir']}/sql.inc"); +$GLOBALS['form_exit_url'] = $GLOBALS['concurrent_layout'] ? + "$rootdir/patient_file/encounter/encounter_top.php" : + "$rootdir/patient_file/encounter/patient_encounter.php"; + function getFormById ($id, $cols = "*") { $sql = "select $cols from forms where id='$id' order by date DESC limit 0,1"; @@ -22,7 +26,6 @@ function getFormInfoById ($id, $cols = "*") $result = sqlQuery($sql); //print_r($result); return $result; - } function getFormsByPid ($pid, $cols = "*") @@ -57,7 +60,6 @@ function addForm($encounter, $form_name, $form_id, $formdir, $pid, $authorized = $sql .= ", '$encounter', '$form_name', '$form_id', '$pid', '" . $_SESSION['authUser'] . "', '" . $_SESSION['authProvider'] . "', '$authorized', '$formdir')"; return sqlInsert( $sql ); - } function authorizeForm($id, $authorized = "1") @@ -65,7 +67,6 @@ function authorizeForm($id, $authorized = "1") sqlQuery("update forms set authorized = '$authorized' where id = '$id'"); } - function getEncounters($pid) { // $res = sqlStatement("select distinct encounter from forms where pid='$pid' order by date desc;"); @@ -79,19 +80,15 @@ function getEncounters($pid) return $all; } - function getEncounterDateByEncounter($encounter) { // $sql = "select date from forms where encounter='$encounter' order by date"; - $sql = "select date from form_encounter where encounter='$encounter' order by date"; + $sql = "select date from form_encounter where encounter='$encounter' order by date"; return sqlQuery($sql); } - function getFormNameByFormdir ($formdir) { return sqlQuery("select form_name from forms where formdir='$formdir'"); } - - ?> -- 2.11.4.GIT