From 3a2b7dba57f56d9d0bea3ba786b3c8f3fd9ed7ae Mon Sep 17 00:00:00 2001
From: Rod Roark <rod@sunsetsystems.com>
Date: Fri, 24 Dec 2010 11:32:36 -0800
Subject: [PATCH] Misc fixes for athletic teams.

---
 interface/main/left_nav.php                   | 1 +
 interface/patient_file/history/encounters.php | 5 ++++-
 interface/reports/old_players_report.php      | 5 ++---
 interface/reports/players_report.php          | 1 +
 4 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/interface/main/left_nav.php b/interface/main/left_nav.php
index 06cb40334..0fb15b876 100644
--- a/interface/main/left_nav.php
+++ b/interface/main/left_nav.php
@@ -892,6 +892,7 @@ function removeOptionSelected(EncounterId)
   </li>
   <li><span><?php xl('Miscellaneous','e') ?></span>
     <ul>
+      <?php genTreeLink('RBot','msg',xl('Messages')); ?>
       <?php genTreeLink('RBot','aun',xl('Authorizations')); ?>
       <?php genTreeLink('RTop','fax',xl('Fax/Scan')); ?>
       <?php genTreeLink('RTop','adb',xl('Addr Book')); ?>
diff --git a/interface/patient_file/history/encounters.php b/interface/patient_file/history/encounters.php
index a1d55d9d5..7c3c9c24e 100644
--- a/interface/patient_file/history/encounters.php
+++ b/interface/patient_file/history/encounters.php
@@ -359,7 +359,10 @@ if ($result = getEncounters($pid)) {
                 // However athletic teams want it.
                 //
                 if ($GLOBALS['athletic_team']) {
-                  if ($enc['formdir'] != 'physical_exam' && substr($enc['formdir'],0,3) != 'LBF') {
+                  if ($enc['formdir'] != 'physical_exam' &&
+                    $enc['formdir'] != 'procedure_order' &&
+                    substr($enc['formdir'],0,3) != 'LBF')
+                  {
                     $frow = sqlQuery("select * from form_" . add_escape_custom($enc['formdir']) .
                                     " where id = ?", array($enc['form_id']) );
                     foreach ($frow as $fkey => $fvalue) {
diff --git a/interface/reports/old_players_report.php b/interface/reports/old_players_report.php
index 7d8a60d31..f0e5ebbb1 100644
--- a/interface/reports/old_players_report.php
+++ b/interface/reports/old_players_report.php
@@ -68,9 +68,8 @@ $fdefault = sqlQuery("SELECT * FROM list_options WHERE " .
 $maintop = $_GET['embed'] ? "top" : "opener.top";
 echo "  $maintop.restoreSession();\n";
 if ($GLOBALS['concurrent_layout']) {
-
-    echo "  $maintop.RTop.location = '../patient_file/summary/demographics.php?set_pid=' + pid;\n";
-
+  echo "  $maintop.RTop.location = '../patient_file/summary/demographics.php?set_pid=' + pid;\n";
+  echo "  $maintop.left_nav.forceDual();\n";
 } else {
   echo "  $maintop.location = '../patient_file/patient_file.php?set_pid=' + pid;\n";
 }
diff --git a/interface/reports/players_report.php b/interface/reports/players_report.php
index ec8c7b72c..ade0dd5b7 100644
--- a/interface/reports/players_report.php
+++ b/interface/reports/players_report.php
@@ -81,6 +81,7 @@ $maintop = $_GET['embed'] ? "top" : "opener.top";
 echo "  $maintop.restoreSession();\n";
 if ($GLOBALS['concurrent_layout']) {
   echo "  $maintop.RTop.location = '../patient_file/summary/demographics.php?set_pid=' + pid;\n";
+  echo "  $maintop.left_nav.forceDual();\n";
 } else {
   echo "  $maintop.location = '../patient_file/patient_file.php?set_pid=' + pid;\n";
 }
-- 
2.11.4.GIT