From 88d4298182ebdc9bdd21327f4dd4dd20c8539e7e Mon Sep 17 00:00:00 2001 From: sunsetsystems Date: Tue, 17 May 2005 18:35:30 +0000 Subject: [PATCH] changed "New Patient Encounter" wording because it is confusing --- interface/forms/newpatient/new.php | 4 ++-- interface/forms/newpatient/view.php | 4 ++-- interface/patient_file/encounter/forms.php | 14 ++++---------- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/interface/forms/newpatient/new.php b/interface/forms/newpatient/new.php index 8f7431d3e..a4ec93f1d 100644 --- a/interface/forms/newpatient/new.php +++ b/interface/forms/newpatient/new.php @@ -12,14 +12,14 @@ $years = array("2004","2005","2006","2007"); -New Patient Encounter +New Encounter topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0 onload="javascript:document.new_encounter.reason.focus();">
-New Patient Encounter Form +New Encounter Form
diff --git a/interface/forms/newpatient/view.php b/interface/forms/newpatient/view.php index fa6b18cd5..d52f89895 100644 --- a/interface/forms/newpatient/view.php +++ b/interface/forms/newpatient/view.php @@ -27,7 +27,7 @@ $ons_day = substr($result{'onset_date'}, 8, 2); -New Patient Encounter +Patient Encounter topmargin=0 rightmargin=0 leftmargin=2 bottommargin=0 marginwidth=2 marginheight=0> @@ -35,7 +35,7 @@ $ons_day = substr($result{'onset_date'}, 8, 2); -New Patient Encounter Form +Patient Encounter Form
diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php index e0f21896d..073c87ed4 100644 --- a/interface/patient_file/encounter/forms.php +++ b/interface/patient_file/encounter/forms.php @@ -31,15 +31,15 @@ if (is_numeric($pid)) { if ($result = getFormByEncounter($pid, $encounter, "id, date, form_id, form_name,formdir,user")) { echo "
"; foreach ($result as $iter) { - //print "" . $iter{"form_name"} . "
\n"; - $form_info = getFormInfoById($iter['id']); echo ''; $user = $iter['user']; $user = getNameFromUsername($user); - + + $form_name = ($iter['formdir'] == 'newpatient') ? "Patient Encounter" : $iter['form_name']; + echo ''; - echo "
' . $user['fname'] . " " . $user['lname'] .'" . $iter{"form_name"} . ""; + echo "$form_name"; echo "\n"; $counter = 0; @@ -73,13 +73,7 @@ if ($result = getFormByEncounter($pid, $encounter, "id, date, form_id, form_name } echo "
"; } - - ?> - - - - -- 2.11.4.GIT