From 3ba6b94f9bd37fc15e9d3c6205b0eb7898b2d717 Mon Sep 17 00:00:00 2001 From: sunsetsystems Date: Mon, 24 Oct 2005 18:23:09 +0000 Subject: [PATCH] misc cosmetic cleanups for sports team use --- interface/patient_file/deleter.php | 4 +- interface/patient_file/encounter/forms.php | 59 ++++--------------------- interface/patient_file/summary/demographics.php | 4 +- interface/reports/absences_report.php | 2 +- interface/reports/players_report.php | 12 ++--- 5 files changed, 20 insertions(+), 61 deletions(-) diff --git a/interface/patient_file/deleter.php b/interface/patient_file/deleter.php index b57f65e09..041723f4a 100644 --- a/interface/patient_file/deleter.php +++ b/interface/patient_file/deleter.php @@ -126,7 +126,6 @@ td { font-size:10pt; } ?>
-

 
Do you really want to delete @@ -140,6 +139,9 @@ Do you really want to delete echo "issue $issue"; } ?> and all subordinate data? This action will be logged!

+ +
+

 
  diff --git a/interface/patient_file/encounter/forms.php b/interface/patient_file/encounter/forms.php index 9cf42bdb1..3dcc97d76 100644 --- a/interface/patient_file/encounter/forms.php +++ b/interface/patient_file/encounter/forms.php @@ -18,7 +18,7 @@ return false; } - // Called by the deleteme.php window on a successful delete. + // Called by the deleter.php window on a successful delete. function imdeleted() { top.Title.location.href = '../patient_file/encounter/encounter_title.php'; top.Main.location.href = '../patient_file/encounter/patient_encounter.php?mode=new'; @@ -54,73 +54,32 @@ if ($result = getFormByEncounter($pid, $encounter, "id, date, form_id, form_name,formdir,user")) { echo ""; foreach ($result as $iter) { + $formdir = $iter['formdir']; // Skip forms that we are not authorized to see. if (($auth_notes_a) || ($auth_notes && $iter['user'] == $_SESSION['authUser']) || - ($auth_relaxed && $iter['formdir'] == 'sports_fitness')) ; + ($auth_relaxed && ($formdir == 'sports_fitness' || $formdir == 'podiatry'))) ; else continue; $form_info = getFormInfoById($iter['id']); echo ''; $user = getNameFromUsername($iter['user']); - $form_name = ($iter['formdir'] == 'newpatient') ? "Patient Encounter" : $iter['form_name']; + $form_name = ($formdir == 'newpatient') ? "Patient Encounter" : $iter['form_name']; echo ''; echo "\n" . "\n" . ""; } diff --git a/interface/patient_file/summary/demographics.php b/interface/patient_file/summary/demographics.php index 783829e16..b6e67cf2a 100644 --- a/interface/patient_file/summary/demographics.php +++ b/interface/patient_file/summary/demographics.php @@ -186,7 +186,8 @@ echo $result{"postal_code"}?> + diff --git a/interface/reports/absences_report.php b/interface/reports/absences_report.php index 012a515e4..e677eabbd 100644 --- a/interface/reports/absences_report.php +++ b/interface/reports/absences_report.php @@ -117,7 +117,7 @@ "FROM lists " . "LEFT OUTER JOIN codes " . "ON codes.code = lists.diagnosis AND " . - "(codes.code_type = 2 OR codes.code_type = 4 OR codes.code_type = 5) " . + "(codes.code_type = 2 OR codes.code_type = 4 OR codes.code_type = 5 OR codes.code_type = 8) " . "WHERE " . "(lists.enddate IS NULL OR lists.enddate >= '$from_date') AND lists.begdate <= '$to_date' " . "GROUP BY lists.diagnosis"; diff --git a/interface/reports/players_report.php b/interface/reports/players_report.php index 157139a6d..19d52688b 100644 --- a/interface/reports/players_report.php +++ b/interface/reports/players_report.php @@ -24,15 +24,11 @@ 'Full Play', 'Full Training', 'Restricted Training', - 'Injured Out' + 'Injured Out', + 'Rehabilitation' ); - $fitcolors = array( - '#00ff00', - '#ffff00', - '#ff8800', - '#ff3333' - ); + $fitcolors = array('#6677ff', '#00cc00', '#ffff00', '#ff3333', '#ff8800'); $alertmsg = ''; // not used yet but maybe later @@ -124,7 +120,7 @@  
' . $user['fname'] . " " . $user['lname'] .'$form_name"; - if (true) { - // Instead of the garbage below, let's use the form's report.php. - // - include_once($GLOBALS['incdir'] . "/forms/" . $iter['formdir'] . "/report.php"); - call_user_func($iter['formdir'] . "_report", $pid, $iter['encounter'], 2, $iter['form_id']); - } - else { - - // Garbage starts here. Delete this after some testing. - // - echo "\n"; - $counter = 0; - foreach ($form_info as $field_name => $field) { - if ($field_name == "id" || $field_name == "date" || $field_name == "pid" || - $field_name == "user" || $field_name == "groupname" || - $field_name == "authorized" || $field_name == "activity" || - $field_name == "encounter") { - ;// don't display meta data fields - $field_name=ucwords(str_replace("_"," ",$field_name)); - } - elseif (empty($field)) { - ;//don't diplay empty fields - } - elseif ($field == "0000-00-00" || $field == "00:00" || $field == "0000-00-00 00:00") { - ;//don't diplay empty dates - } - else { - $counter++; - $width=""; - if (strlen($field) > 15) { - // $width="width=\"300\""; - $counter += 2; - } - echo ''; - } - if ($counter > 4) { - echo ""; - $counter = 0; - } - } - echo "
' . - $field_name . ': ' . $field . '
\n"; - // - // End of garbage - - } + // Use the form's report.php for display. + // + include_once($GLOBALS['incdir'] . "/forms/$formdir/report.php"); + call_user_func($formdir . "_report", $pid, $iter['encounter'], 2, $iter['form_id']); echo "
-   +     -- 2.11.4.GIT