minor fixes to prior commit

DiscoverAndChange · Sep 19, 2016 · f4b3167 · f4b3167
1 parent 7e9518a
commit f4b3167
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/interface/patient_tracker/patient_tracker.php b/interface/patient_tracker/patient_tracker.php
@@ -84,6 +84,7 @@
 // xl('Canceled < 24h')
 $lres = sqlStatement("SELECT option_id, title FROM list_options WHERE list_id = ? AND activity=1", array('apptstat'));
 while ( $lrow = sqlFetchArray ( $lres ) ) {
+ // if exists, remove the legend character
  if($lrow['title'][1] == ' '){
  $splitTitle = explode(' ', $lrow['title']);
  array_shift($splitTitle);
@@ -180,9 +181,20 @@ function openNewTopWindow(newpid,newencounterid) {
 
 </head>
 
+<?php
+ if ($GLOBALS['pat_trkr_timer'] == '0') {
+ // if the screen is not set up for auto refresh, use standard page call
+ $action_page = "patient_tracker.php";
+ }
+ else {
+ // if the screen is set up for auto refresh, this will allow it to be closed by auto logoff
+ $action_page = "patient_tracker.php?skip_timeout_reset=1";
+ }
+
+?>
+<span class="title"><?php echo xlt("Flow Board") ?></span>
 <body class="body_top" >
-<?php if($GLOBALS['docs_see_entire_calendar'] !='1'){ ?>
-<form method='post' name='theform' id='theform' action='patient_tracker.php' onsubmit='return top.restoreSession()'>
+<form method='post' name='theform' id='theform' action='<?php echo $action_page; ?>' onsubmit='return top.restoreSession()'>
  <div id="flow_board_parameters">
  <table>
  <tr class="text">
@@ -248,12 +260,8 @@ function openNewTopWindow(newpid,newencounterid) {
  </table>
  </div>
 </form>
-<?php }?>
-<?php if ($GLOBALS['pat_trkr_timer'] == '0') { # if the screen is not set up for auto refresh it can be closed by auto log off ?>
-<form name='pattrk' id='pattrk' method='post' action='patient_tracker.php' onsubmit='return top.restoreSession()' enctype='multipart/form-data'>
-<?php } else { # if the screen is set up for auto refresh this will not allow it to be closed by auto logoff ?>
-<form name='pattrk' id='pattrk' method='post' action='patient_tracker.php?skip_timeout_reset=1' onsubmit='return top.restoreSession()' enctype='multipart/form-data'>
-<?php } ?>
+
+<form name='pattrk' id='pattrk' method='post' action='<?php echo $action_page; ?>' onsubmit='return top.restoreSession()' enctype='multipart/form-data'>
 
 <div>
  <?php if (count($chk_prov) == 1) {?>

diff --git a/library/patient_tracker.inc.php b/library/patient_tracker.inc.php
@@ -146,12 +146,9 @@ function get_Tracker_Time_Interval ($tracker_from_time, $tracker_to_time, $allow
 function fetch_Patient_Tracker_Events($from_date, $to_date, $provider_id = null, $facility_id = null, $form_apptstatus = null, $form_apptcat =null)
 {
  # used to determine which providers to display in the Patient Tracker
- if ($provider_id == null && $_SESSION['userauthorized'] && $GLOBALS['docs_see_entire_calendar'] !='1') {
- $provider_id = $_SESSION[authUserID];
- }
- //set null to $provider id if it's 'all'
- if($provider_id == 'ALL'){
- $provider_id = null;
+ if ($provider_id == 'ALL'){
+ //set null to $provider id if it's 'all'
+ $provider_id = null;
  }
  $events = fetchAppointments( $from_date, $to_date, null, $provider_id, $facility_id, $form_apptstatus, null, null, $form_apptcat, true );
  return $events;