From 5c7f249c3283fb86ee02fb69b5eb041af0ba2535 Mon Sep 17 00:00:00 2001
From: Brady Miller <brady.g.miller@gmail.com>
Date: Thu, 23 Nov 2017 20:05:51 -0800
Subject: [PATCH] cleaned up several reports

---
 interface/reports/appointments_report.php       | 214 ++++++++----------
 interface/reports/daily_summary_report.php      |  68 ++----
 interface/reports/encounters_report.php         | 221 ++++++++-----------
 interface/reports/patient_flow_board_report.php | 281 +++++++++---------------
 4 files changed, 312 insertions(+), 472 deletions(-)

diff --git a/interface/reports/appointments_report.php b/interface/reports/appointments_report.php
index 3d82f895a..ef7e680ff 100644
--- a/interface/reports/appointments_report.php
+++ b/interface/reports/appointments_report.php
@@ -2,40 +2,25 @@
 /**
  * This report shows upcoming appointments with filtering and
  * sorting by patient, practitioner, appointment type, and date.
- * 2012-01-01 - Added display of home and cell phone and fixed header
- * 2015-06-19 - brought up to security standards terry@lillysystems.com
  *
- * Copyright (C) 2005-2016 Rod Roark <rod@sunsetsystems.com>
- * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
- *
- * LICENSE: This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
- *
- * @package OpenEMR
- * @author  Rod Roark <rod@sunsetsystems.com>
- * @author  Brady Miller <brady.g.miller@gmail.com>
- * @link    http://www.open-emr.org
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Rod Roark <rod@sunsetsystems.com>
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @copyright Copyright (c) 2005-2016 Rod Roark <rod@sunsetsystems.com>
+ * @copyright Copyright (c) 2017 Brady Miller <brady.g.miller@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
 
 
-
-
-use OpenEMR\Core\Header;
-
 require_once("../globals.php");
 require_once("../../library/patient.inc");
 require_once "$srcdir/options.inc.php";
 require_once "$srcdir/appointments.inc.php";
 require_once "$srcdir/clinical_rules.php";
 
+use OpenEMR\Core\Header;
+
 # Clear the pidList session whenever load this page.
 # This session will hold array of patients that are listed in this
 # report, which is then used by the 'Superbills' and 'Address Labels'
@@ -45,13 +30,14 @@ unset($_SESSION['pidList']);
 $alertmsg = ''; // not used yet but maybe later
 $patient = $_REQUEST['patient'];
 
-if ($patient && ! $_POST['form_from_date']) {
+if ($patient && !isset($_POST['form_from_date'])) {
     // If a specific patient, default to 2 years ago.
     $tmp = date('Y') - 2;
     $from_date = date("$tmp-m-d");
+    $to_date = date('Y-m-d');
 } else {
-    $from_date = fixDate($_POST['form_from_date'], date('Y-m-d'));
-    $to_date = fixDate($_POST['form_to_date'], date('Y-m-d'));
+    $from_date = isset($_POST['form_from_date']) ? DateToYYYYMMDD($_POST['form_from_date']) : date('Y-m-d');
+    $to_date = isset($_POST['form_to_date']) ? DateToYYYYMMDD($_POST['form_to_date']) : date('Y-m-d');
 }
 
 $show_available_times = false;
@@ -69,7 +55,6 @@ if ($_POST['with_out_facility']) {
     $chk_with_out_facility = true;
 }
 
-//$to_date   = fixDate($_POST['form_to_date'], '');
 $provider  = $_POST['form_provider'];
 $facility  = $_POST['form_facility'];  //(CHEMED) facility filter
 $form_orderby = getComparisonOrder($_REQUEST['form_orderby']) ?  $_REQUEST['form_orderby'] : 'date';
@@ -119,71 +104,66 @@ function fetch_reminders($pid, $appt_date)
 <html>
 
 <head>
+    <title><?php echo xlt('Appointments Report'); ?></title>
+
+    <?php Header::setupHeader(["datetime-picker","report-helper"]); ?>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+            var win = top.printLogSetup ? top : opener.top;
+            win.printLogSetup(document.getElementById('printbutton'));
+
+            $('.datepicker').datetimepicker({
+                <?php $datetimepicker_timepicker = false; ?>
+                <?php $datetimepicker_showseconds = false; ?>
+                <?php $datetimepicker_formatInput = true; ?>
+                <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+                <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+            });
+
+        });
+
+        function dosort(orderby) {
+            var f = document.forms[0];
+            f.form_orderby.value = orderby;
+            f.submit();
+            return false;
+        }
 
-<title><?php echo xlt('Appointments Report'); ?></title>
-
-<?php Header::setupHeader(["datetime-picker","report-helper"]); ?>
-
-<script type="text/javascript">
-
- var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
-
- $(document).ready(function() {
-  var win = top.printLogSetup ? top : opener.top;
-  win.printLogSetup(document.getElementById('printbutton'));
-
-  $('.datepicker').datetimepicker({
-    <?php $datetimepicker_timepicker = false; ?>
-    <?php $datetimepicker_showseconds = false; ?>
-    <?php $datetimepicker_formatInput = false; ?>
-    <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-    <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-  });
-
- });
-
- function dosort(orderby) {
-    var f = document.forms[0];
-    f.form_orderby.value = orderby;
-    f.submit();
-    return false;
- }
-
- function oldEvt(eventid) {
-    dlgopen('../main/calendar/add_edit_event.php?eid=' + eventid, 'blank', 775, 500);
- }
-
- function refreshme() {
-    // location.reload();
-    document.forms[0].submit();
- }
+        function oldEvt(eventid) {
+            dlgopen('../main/calendar/add_edit_event.php?eid=' + eventid, 'blank', 775, 500);
+        }
 
-</script>
+        function refreshme() {
+            // location.reload();
+            document.forms[0].submit();
+        }
+        </script>
 
-<style type="text/css">
-/* specifically include & exclude from printing */
-@media print {
-        #report_parameters {
+        <style type="text/css">
+        /* specifically include & exclude from printing */
+        @media print {
+            #report_parameters {
                 visibility: hidden;
                 display: none;
-        }
-        #report_parameters_daterange {
+            }
+            #report_parameters_daterange {
                 visibility: visible;
                 display: inline;
-        }
-        #report_results table {
+            }
+            #report_results table {
                 margin-top: 0px;
+            }
         }
-}
 
-/* specifically exclude some from the screen */
-@media screen {
-    #report_parameters_daterange {
-        visibility: hidden;
-        display: none;
-    }
-}
-</style>
+        /* specifically exclude some from the screen */
+        @media screen {
+            #report_parameters_daterange {
+                visibility: hidden;
+                display: none;
+            }
+        }
+        </style>
 </head>
 
 <body class="body_top">
@@ -194,7 +174,7 @@ function fetch_reminders($pid, $appt_date)
 
 <span class='title'><?php echo xlt('Report'); ?> - <?php echo xlt('Appointments'); ?></span>
 
-<div id="report_parameters_daterange"><?php echo date("d F Y", strtotime($from_date)) ." &nbsp; to &nbsp; ". date("d F Y", strtotime($to_date)); #sets date range for calendars ?>
+<div id="report_parameters_daterange"><?php echo oeFormatShortDate($from_date) ." &nbsp; " . xlt('to') . " &nbsp; ". oeFormatShortDate($to_date); ?>
 </div>
 
 <form method='post' name='theform' id='theform' action='appointments_report.php' onsubmit='return top.restoreSession()'>
@@ -243,14 +223,12 @@ function fetch_reminders($pid, $appt_date)
                 <td class='control-label'><?php echo xlt('From'); ?>:</td>
                 <td><input type='text' name='form_from_date' id="form_from_date"
                     class='datepicker form-control'
-                    size='10' value='<?php echo attr($from_date) ?>'
-                    title='yyyy-mm-dd'>
+                    size='10' value='<?php echo oeFormatShortDate($from_date) ?>'>
                 </td>
                 <td class='control-label'><?php echo xlt('To'); ?>:</td>
                 <td><input type='text' name='form_to_date' id="form_to_date"
                     class='datepicker form-control'
-                    size='10' value='<?php echo attr($to_date) ?>'
-                    title='yyyy-mm-dd'>
+                    size='10' value='<?php echo oeFormatShortDate($to_date) ?>'>
                 </td>
             </tr>
 
@@ -280,9 +258,7 @@ function fetch_reminders($pid, $appt_date)
                 <td>
                     <div class="checkbox">
                         <label><input type='checkbox' name='form_show_available'
-                        <?php  if ($show_available_times) {
-                            echo ' checked';
-} ?>> <?php  echo xlt('Show Available Times'); # check this to show available times on the report ?>
+                        <?php  echo ($show_available_times) ? ' checked' : ''; ?>> <?php echo xlt('Show Available Times'); # check this to show available times on the report ?>
                         </label>
                     </div>
                 </td>
@@ -301,18 +277,14 @@ function fetch_reminders($pid, $appt_date)
                 <?php # these two selects will show entries that do not have a facility or a provider ?>
                 <td>
                     <div class="checkbox">
-                        <label><input type="checkbox" name="with_out_provider" id="with_out_provider" <?php if ($chk_with_out_provider) {
-                            echo "checked";
-}?>><?php echo xlt('Without Provider'); ?>
+                        <label><input type="checkbox" name="with_out_provider" id="with_out_provider" <?php echo ($chk_with_out_provider) ? "checked" : ""; ?>><?php echo xlt('Without Provider'); ?>
                         </label>
                     </div>
                 </td>
                 <td></td>
                 <td>
                     <div class="checkbox">
-                        <label><input type="checkbox" name="with_out_facility" id="with_out_facility" <?php if ($chk_with_out_facility) {
-                            echo "checked";
-}?>>&nbsp;<?php echo xlt('Without Facility'); ?>
+                        <label><input type="checkbox" name="with_out_facility" id="with_out_facility" <?php echo ($chk_with_out_facility) ? "checked" : ""; ?>>&nbsp;<?php echo xlt('Without Facility'); ?>
                         </label>
                     </div>
                 </td>
@@ -363,33 +335,23 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
 
     <thead>
         <th><a href="nojs.php" onclick="return dosort('doctor')"
-    <?php if ($form_orderby == "doctor") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Provider'); ?>
+    <?php echo ($form_orderby == "doctor") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Provider'); ?>
         </a></th>
 
         <th <?php echo $showDate ? '' : 'style="display:none;"' ?>><a href="nojs.php" onclick="return dosort('date')"
-    <?php if ($form_orderby == "date") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Date'); ?></a>
+    <?php echo ($form_orderby == "date") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Date'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('time')"
-    <?php if ($form_orderby == "time") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Time'); ?></a>
+    <?php echo ($form_orderby == "time") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Time'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('patient')"
-    <?php if ($form_orderby == "patient") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Patient'); ?></a>
+    <?php echo ($form_orderby == "patient") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Patient'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('pubpid')"
-    <?php if ($form_orderby == "pubpid") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('ID'); ?></a>
+    <?php echo ($form_orderby == "pubpid") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('ID'); ?></a>
         </th>
 
             <th><?php echo xlt('Home'); //Sorting by phone# not really useful ?></th>
@@ -397,15 +359,11 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
                 <th><?php echo xlt('Cell'); //Sorting by phone# not really useful ?></th>
 
         <th><a href="nojs.php" onclick="return dosort('type')"
-    <?php if ($form_orderby == "type") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Type'); ?></a>
+    <?php echo ($form_orderby == "type") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Type'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('status')"
-            <?php if ($form_orderby == "status") {
-                echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Status'); ?></a>
+            <?php echo ($form_orderby == "status") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Status'); ?></a>
         </th>
     </thead>
     <tbody>
@@ -480,19 +438,20 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
             <?php
                 //Appointment Status
             if ($pc_apptstatus != "") {
-                $frow['data_type']=1;
-                $frow['list_id']='apptstat';
-                generate_print_field($frow, $pc_apptstatus);
+                echo getListItemTitle('apptstat', $pc_apptstatus);
             }
             ?>
         </td>
     </tr>
 
-    <?php if ($patient_id && $incl_reminders) {
+    <?php
+    if ($patient_id && $incl_reminders) {
         // collect reminders first, so can skip it if empty
         $rems = fetch_reminders($patient_id, $appointment['pc_eventDate']);
-} ?>
-    <?php if ($patient_id && (!empty($rems) || !empty($appointment['pc_hometext']))) { // Not display of available slot or not showing reminders and comments empty ?>
+    }
+    ?>
+    <?php
+    if ($patient_id && (!empty($rems) || !empty($appointment['pc_hometext']))) { // Not display of available slot or not showing reminders and comments empty ?>
     <tr valign='top' id='p2.<?php echo attr($patient_id) ?>' >
        <td colspan=<?php echo $showDate ? '"3"' : '"2"' ?> class="detail" />
        <td colspan=<?php echo ($incl_reminders ? "3":"6") ?> class="detail" align='left'>
@@ -515,7 +474,7 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
         </td>
     </tr>
     <?php
-} // End of row 2 display
+    } // End of row 2 display
 
     $lastdocname = $docname;
     }
@@ -529,10 +488,11 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
     </tbody>
 </table>
 </div>
-<!-- end of search results --> <?php } else { ?>
+<!-- end of search results -->
+<?php } else { ?>
 <div class='text'><?php echo xlt('Please input search criteria above, and click Submit to view results.'); ?>
 </div>
-    <?php } ?> <input type="hidden" name="form_orderby"
+<?php } ?> <input type="hidden" name="form_orderby"
     value="<?php echo attr($form_orderby) ?>" /> <input type="hidden"
     name="patient" value="<?php echo attr($patient) ?>" /> <input type='hidden'
     name='form_refresh' id='form_refresh' value='' /></form>
diff --git a/interface/reports/daily_summary_report.php b/interface/reports/daily_summary_report.php
index a31020142..3a5c01990 100644
--- a/interface/reports/daily_summary_report.php
+++ b/interface/reports/daily_summary_report.php
@@ -1,34 +1,20 @@
 <?php
-/*
+/**
  *  Daily Summary Report. (/interface/reports/daily_summary_report.php)
  *
- *
  *  This report shows date wise numbers of the Appointments Scheduled,
  *  New Patients, Visited patients, Total Charges, Total Co-pay and Balance amount for the selected facility & providers wise.
  *
- * Copyright (C) 2016 Rishabh Software
- * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
- *
- * LICENSE: This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
- *
- * @package OpenEMR
- * @author Rishabh Software
- * @author Brady Miller <brady.g.miller@gmail.com>
- * @link http://www.open-emr.org
- *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Rishabh Software
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @copyright Copyright (c) 2016 Rishabh Software
+ * @copyright Copyright (c) 2017 Brady Miller <brady.g.miller@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
 
 
-
 require_once("../globals.php");
 require_once "$srcdir/options.inc.php";
 require_once "$srcdir/appointments.inc.php";
@@ -38,25 +24,20 @@ use OpenEMR\Services\FacilityService;
 
 $facilityService = new FacilityService();
 
-$selectedFromDate = isset($_POST['form_from_date']) ? $_POST['form_from_date'] : date('Y-m-d'); // From date filter
-$selectedToDate = isset($_POST['form_to_date']) ? $_POST['form_to_date'] : date('Y-m-d');   // To date filter
+$from_date = isset($_POST['form_from_date']) ? DateToYYYYMMDD($_POST['form_from_date']) : date('Y-m-d'); // From date filter
+$to_date = isset($_POST['form_to_date']) ? DateToYYYYMMDD($_POST['form_to_date']) : date('Y-m-d');   // To date filter
 $selectedFacility = isset($_POST['form_facility']) ? $_POST['form_facility'] : "";  // facility filter
 $selectedProvider = isset($_POST['form_provider']) ? $_POST['form_provider'] : "";  // provider filter
-
-$from_date = fixDate($selectedFromDate, date('Y-m-d'));
-$to_date = fixDate($selectedToDate, date('Y-m-d'));
 ?>
 
 <html>
     <head>
 
+        <title><?php echo xlt('Daily Summary Report'); ?></title>
+
         <?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
 
         <script type="text/javascript">
-
-
-            var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
-
             function submitForm() {
                 var fromDate = $("#form_from_date").val();
                 var toDate = $("#form_to_date").val();
@@ -83,7 +64,7 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
                 $('.datepicker').datetimepicker({
                     <?php $datetimepicker_timepicker = false; ?>
                     <?php $datetimepicker_showseconds = false; ?>
-                    <?php $datetimepicker_formatInput = false; ?>
+                    <?php $datetimepicker_formatInput = true; ?>
                     <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
                     <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
                 });
@@ -111,15 +92,13 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
                                         <td>
                                             <input type='text' name='form_from_date' id="form_from_date"
                                                    class='datepicker form-control'
-                                                   size='10' value='<?php echo attr($from_date) ?>'
-                                                   title='yyyy-mm-dd'>
+                                                   size='10' value='<?php echo oeFormatShortDate($from_date); ?>'>
                                         </td>
                                         <td class='control-label'><?php echo xlt('To'); ?>:</td>
                                         <td>
                                             <input type='text' name='form_to_date' id="form_to_date"
                                                    class='datepicker form-control'
-                                                   size='10' value='<?php echo attr($to_date) ?>'
-                                                   title='yyyy-mm-dd'>
+                                                   size='10' value='<?php echo oeFormatShortDate($to_date); ?>'>
                                         </td>
                                         <td class='control-label'><?php echo xlt('Provider'); ?>:</td>
                                         <td>
@@ -140,7 +119,7 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
                                                 <a href='#' class='btn btn-default btn-save' onclick='return submitForm();'>
                                                     <?php echo xlt('Submit'); ?>
                                                 </a>
-                                                <a href='' class="btn btn-default btn-refresh" id='new0' onClick=" return top.window.parent.left_nav.loadFrame2('new0', 'RTop', 'reports/daily_summary_report.php')">
+                                                <a href='' class="btn btn-default btn-refresh" id='new0' onClick=" top.restoreSession(); window.location = window.location.href;">
                                                     <?php echo xlt('Reset'); ?>
                                                 </a>
                                             </div>
@@ -158,7 +137,7 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
 
         <?php
         $dateSet = $facilitySet = 0;
-        if (!empty($selectedFromDate) && !empty($selectedToDate)) {
+        if (!empty($from_date) && !empty($to_date)) {
             $dateSet = 1;
         }
 
@@ -217,13 +196,13 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
         // if date range wise search then append condition for date search
         if (1 === $dateSet) {
             $whereNewPatientConditions .= ' AND DATE(`OPE`.`pc_eventDate`) BETWEEN ? AND ?';
-            array_push($sqlBindArrayNewPatient, $selectedFromDate, $selectedToDate);
+            array_push($sqlBindArrayNewPatient, $from_date, $to_date);
             $whereTotalVisitConditions .= ' AND DATE(`fc`.`date`) BETWEEN ? AND ?';
-            array_push($sqlBindArrayTotalVisit, $selectedFromDate, $selectedToDate);
+            array_push($sqlBindArrayTotalVisit, $from_date, $to_date);
             $whereTotalPaymentConditions .= ' AND DATE(`b`.`date`) BETWEEN ? AND ?';
-            array_push($sqlBindArrayTotalPayment, $selectedFromDate, $selectedToDate);
+            array_push($sqlBindArrayTotalPayment, $from_date, $to_date);
             $wherePaidConditions .= ' AND DATE(`p`.`dtime`) BETWEEN ? AND ?';
-            array_push($sqlBindArrayPaid, $selectedFromDate, $selectedToDate);
+            array_push($sqlBindArrayPaid, $from_date, $to_date);
         }
 
         // if provider selected then append condition for provider
@@ -332,7 +311,7 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
         ?>
 
         <div id="report_results" style="font-size: 12px">
-            <?php echo '<b>' . xlt('From') . '</b> ' . $from_date . ' <b>' . xlt('To') . '</b> ' . $to_date; ?>
+            <?php echo '<b>' . xlt('From') . '</b> ' . oeFormatShortDate($from_date) . ' <b>' . xlt('To') . '</b> ' . oeFormatShortDate($to_date); ?>
 
             <table class="flowboard" cellpadding='5' cellspacing='2' id="ds_report">
                 <tr class="head">
@@ -355,7 +334,7 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
                                 foreach ($dataValue[$facility] as $provider => $information) { // array which consists different/dynamic values
                                     ?>
                                     <tr>
-                                        <td><?php echo text($date) ?></td>
+                                        <td><?php echo oeFormatShortDate($date) ?></td>
                                         <td><?php echo text($facility); ?></td>
                                         <td><?php echo text($provider); ?></td>
                                         <td><?php echo isset($information['appointments']) ? text($information['appointments']) : 0; ?></td>
@@ -412,5 +391,4 @@ $to_date = fixDate($selectedToDate, date('Y-m-d'));
             </table>
         </div>
     </body>
-
 </html>
diff --git a/interface/reports/encounters_report.php b/interface/reports/encounters_report.php
index 721ba20b6..0a4df27ba 100644
--- a/interface/reports/encounters_report.php
+++ b/interface/reports/encounters_report.php
@@ -1,34 +1,21 @@
 <?php
-/*
+/**
  *  Encounters report.
  *
  *  This report shows past encounters with filtering and sorting,
  *  Added filtering to show encounters not e-signed, encounters e-signed and forms e-signed.
  *
- * Copyright (C) 2015 Terry Hill <terry@lillysystems.com>
- * Copyright (C) 2007-2016 Rod Roark <rod@sunsetsystems.com>
- * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
- *
- * LICENSE: This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
- *
- * @package OpenEMR
- * @author Terry Hill <terry@lilysystems.com>
- * @author Rod Roark <rod@sunsetsystems.com>
- * @author Brady Miller <brady.g.miller@gmail.com>
- * @link http://www.open-emr.org
- *
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Rod Roark <rod@sunsetsystems.com>
+ * @author    Terry Hill <terry@lilysystems.com>
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @copyright Copyright (c) 2007-2016 Rod Roark <rod@sunsetsystems.com>
+ * @copyright Copyright (c) 2015 Terry Hill <terry@lillysystems.com>
+ * @copyright Copyright (c) 2017 Brady Miller <brady.g.miller@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
 
-use OpenEMR\Core\Header;
 
 require_once("../globals.php");
 require_once("$srcdir/forms.inc");
@@ -36,6 +23,8 @@ require_once("$srcdir/billing.inc");
 require_once("$srcdir/patient.inc");
 require_once "$srcdir/options.inc.php";
 
+use OpenEMR\Core\Header;
+
 $alertmsg = ''; // not used yet but maybe later
 
 // For each sorting option, specify the ORDER BY argument.
@@ -65,8 +54,8 @@ function show_doc_total($lastdocname, $doc_encounters)
     }
 }
 
-$form_from_date = fixDate($_POST['form_from_date'], date('Y-m-d'));
-$form_to_date = fixDate($_POST['form_to_date'], date('Y-m-d'));
+$form_from_date = (isset($_POST['form_from_date'])) ? DateToYYYYMMDD($_POST['form_from_date']) : date('Y-m-d');
+$form_to_date   = (isset($_POST['form_to_date'])) ? DateToYYYYMMDD($_POST['form_to_date']) : date('Y-m-d');
 $form_provider  = $_POST['form_provider'];
 $form_facility  = $_POST['form_facility'];
 $form_details   = $_POST['form_details'] ? true : false;
@@ -76,13 +65,13 @@ $form_not_esigned = $_POST['form_not_esigned'] ? true : false;
 $form_encounter_esigned = $_POST['form_encounter_esigned'] ? true : false;
 
 $form_orderby = $ORDERHASH[$_REQUEST['form_orderby']] ?
-  $_REQUEST['form_orderby'] : 'doctor';
+$_REQUEST['form_orderby'] : 'doctor';
 $orderby = $ORDERHASH[$form_orderby];
 
 // Get the info.
 //
-    $esign_fields = '';
-    $esign_joins = '';
+$esign_fields = '';
+$esign_joins = '';
 if ($form_encounter_esigned) {
     $esign_fields = ", es.table, es.tid ";
     $esign_joins = "LEFT OUTER JOIN esign_signatures AS es ON es.tid = fe.encounter ";
@@ -98,6 +87,8 @@ if ($form_not_esigned) {
     $esign_joins = "LEFT JOIN esign_signatures AS es on es.tid = fe.encounter ";
 }
 
+$sqlBindArray = array();
+
 $query = "SELECT " .
   "fe.encounter, fe.date, fe.reason, " .
   "f.formdir, f.form_name, " .
@@ -110,17 +101,21 @@ $query = "SELECT " .
   "$esign_joins" .
   "WHERE f.pid = fe.pid AND f.encounter = fe.encounter AND f.formdir = 'newpatient' ";
 if ($form_to_date) {
-    $query .= "AND fe.date >= '$form_from_date 00:00:00' AND fe.date <= '$form_to_date 23:59:59' ";
+    $query .= "AND fe.date >= ? AND fe.date <= ? ";
+    array_push($sqlBindArray, $form_from_date . ' 00:00:00', $form_to_date . ' 23:59:59');
 } else {
-    $query .= "AND fe.date >= '$form_from_date 00:00:00' AND fe.date <= '$form_from_date 23:59:59' ";
+    $query .= "AND fe.date >= ? AND fe.date <= ? ";
+    array_push($sqlBindArray, $form_from_date . ' 00:00:00', $form_from_date . ' 23:59:59');
 }
 
 if ($form_provider) {
-    $query .= "AND fe.provider_id = '$form_provider' ";
+    $query .= "AND fe.provider_id = ? ";
+    array_push($sqlBindArray, $form_provider);
 }
 
 if ($form_facility) {
-    $query .= "AND fe.facility_id = '$form_facility' ";
+    $query .= "AND fe.facility_id = ? ";
+    array_push($sqlBindArray, $form_facility);
 }
 
 if ($form_new_patients) {
@@ -141,73 +136,65 @@ if ($form_not_esigned) {
 
 $query .= "ORDER BY $orderby";
 
-$res = sqlStatement($query);
+$res = sqlStatement($query, $sqlBindArray);
 ?>
 <html>
 <head>
+    <title><?php echo xlt('Encounters Report'); ?></title>
 
-<title><?php echo xlt('Encounters Report'); ?></title>
-
-<?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
-
-<style type="text/css">
-
-/* specifically include & exclude from printing */
-@media print {
-    #report_parameters {
-        visibility: hidden;
-        display: none;
-    }
-    #report_parameters_daterange {
-        visibility: visible;
-        display: inline;
-    }
-    #report_results table {
-       margin-top: 0px;
-    }
-}
-
-/* specifically exclude some from the screen */
-@media screen {
-    #report_parameters_daterange {
-        visibility: hidden;
-        display: none;
-    }
-}
-
-</style>
-
-<script LANGUAGE="JavaScript">
-
- var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
+    <?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
 
- $(document).ready(function() {
-  oeFixedHeaderSetup(document.getElementById('mymaintable'));
-  var win = top.printLogSetup ? top : opener.top;
-  win.printLogSetup(document.getElementById('printbutton'));
-
-  $('.datepicker').datetimepicker({
-    <?php $datetimepicker_timepicker = false; ?>
-    <?php $datetimepicker_showseconds = false; ?>
-    <?php $datetimepicker_formatInput = false; ?>
-    <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-    <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-  });
- });
-
- function dosort(orderby) {
-  var f = document.forms[0];
-  f.form_orderby.value = orderby;
-  f.submit();
-  return false;
- }
-
- function refreshme() {
-  document.forms[0].submit();
- }
+    <style type="text/css">
+        /* specifically include & exclude from printing */
+        @media print {
+            #report_parameters {
+                visibility: hidden;
+                display: none;
+            }
+            #report_parameters_daterange {
+                visibility: visible;
+                display: inline;
+            }
+            #report_results table {
+               margin-top: 0px;
+            }
+        }
 
-</script>
+        /* specifically exclude some from the screen */
+        @media screen {
+            #report_parameters_daterange {
+                visibility: hidden;
+                display: none;
+            }
+        }
+    </style>
+
+    <script LANGUAGE="JavaScript">
+        $(document).ready(function() {
+            oeFixedHeaderSetup(document.getElementById('mymaintable'));
+            var win = top.printLogSetup ? top : opener.top;
+            win.printLogSetup(document.getElementById('printbutton'));
+
+            $('.datepicker').datetimepicker({
+                <?php $datetimepicker_timepicker = false; ?>
+                <?php $datetimepicker_showseconds = false; ?>
+                <?php $datetimepicker_formatInput = true; ?>
+                <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+                <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+            });
+        });
+
+        function dosort(orderby) {
+            var f = document.forms[0];
+            f.form_orderby.value = orderby;
+            f.submit();
+            return false;
+        }
 
+        function refreshme() {
+            document.forms[0].submit();
+        }
+    </script>
 </head>
 <body class="body_top">
 <!-- Required for the popup date selectors -->
@@ -216,7 +203,7 @@ $res = sqlStatement($query);
 <span class='title'><?php echo xlt('Report'); ?> - <?php echo xlt('Encounters'); ?></span>
 
 <div id="report_parameters_daterange">
-<?php echo date("d F Y", strtotime($form_from_date)) ." &nbsp; to &nbsp; ". date("d F Y", strtotime($form_to_date)); ?>
+<?php echo oeFormatShortDate($form_from_date) ." &nbsp; " . xlt('to') . " &nbsp; ". oeFormatShortDate($form_to_date); ?>
 </div>
 
 <form method='post' name='theform' id='theform' action='encounters_report.php' onsubmit='return top.restoreSession()'>
@@ -272,51 +259,39 @@ $res = sqlStatement($query);
                 <?php echo xlt('From'); ?>:
             </td>
             <td>
-               <input type='text' class='datepicker form-control' name='form_from_date' id="form_from_date" size='10' value='<?php echo attr($form_from_date) ?>'
-                title='yyyy-mm-dd'>
+               <input type='text' class='datepicker form-control' name='form_from_date' id="form_from_date" size='10' value='<?php echo oeFormatShortDate($form_from_date) ?>'>
             </td>
             <td class='control-label'>
                 <?php echo xlt('To'); ?>:
             </td>
             <td>
-               <input type='text' class='datepicker form-control' name='form_to_date' id="form_to_date" size='10' value='<?php echo attr($form_to_date) ?>'
-                title='yyyy-mm-dd'>
+               <input type='text' class='datepicker form-control' name='form_to_date' id="form_to_date" size='10' value='<?php echo oeFormatShortDate($form_to_date) ?>'>
             </td>
         </tr>
     <tr>
       <td></td>
       <td>
         <div class="checkbox">
-          <label><input type='checkbox' name='form_details'<?php  if ($form_details) {
-                echo ' checked';
-} ?>>
+          <label><input type='checkbox' name='form_details'<?php echo ($form_details) ? ' checked' : ''; ?>>
             <?php echo xlt('Details'); ?></label>
         </div>
         <div class="checkbox">
-          <label><input type='checkbox' name='form_new_patients' title='<?php echo xla('First-time visits only'); ?>'<?php  if ($form_new_patients) {
-                echo ' checked';
-} ?>>
+          <label><input type='checkbox' name='form_new_patients' title='<?php echo xla('First-time visits only'); ?>'<?php echo ($form_new_patients) ? ' checked' : ''; ?>>
             <?php  echo xlt('New'); ?></label>
         </div>
       </td>
       <td></td>
       <td>
         <div class="checkbox">
-          <label><input type='checkbox' name='form_esigned'<?php  if ($form_esigned) {
-                echo ' checked';
-} ?>>
+          <label><input type='checkbox' name='form_esigned'<?php echo ($form_esigned) ? ' checked' : ''; ?>>
             <?php  echo xlt('Forms Esigned'); ?></label>
         </div>
         <div class="checkbox">
-          <label><input type='checkbox' name='form_encounter_esigned'<?php  if ($form_encounter_esigned) {
-                echo ' checked';
-} ?>>
+          <label><input type='checkbox' name='form_encounter_esigned'<?php echo ($form_encounter_esigned) ? ' checked' : ''; ?>>
             <?php  echo xlt('Encounter Esigned'); ?></label>
         </div>
         <div class="checkbox">
-          <label><input type='checkbox' name='form_not_esigned'<?php  if ($form_not_esigned) {
-                echo ' checked';
-} ?>>
+          <label><input type='checkbox' name='form_not_esigned'<?php echo ($form_not_esigned) ? ' checked' : ''; ?>>
             <?php echo xlt('Not Esigned'); ?></label>
         </div>
       </td>
@@ -360,27 +335,19 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
 <?php if ($form_details) { ?>
   <th>
    <a href="nojs.php" onclick="return dosort('doctor')"
-    <?php if ($form_orderby == "doctor") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php echo xlt('Provider'); ?> </a>
+    <?php echo ($form_orderby == "doctor") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Provider'); ?> </a>
   </th>
   <th>
    <a href="nojs.php" onclick="return dosort('time')"
-    <?php if ($form_orderby == "time") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php echo xlt('Date'); ?></a>
+    <?php echo ($form_orderby == "time") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Date'); ?></a>
   </th>
   <th>
    <a href="nojs.php" onclick="return dosort('patient')"
-    <?php if ($form_orderby == "patient") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php echo xlt('Patient'); ?></a>
+    <?php echo ($form_orderby == "patient") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Patient'); ?></a>
   </th>
   <th>
    <a href="nojs.php" onclick="return dosort('pubpid')"
-    <?php if ($form_orderby == "pubpid") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php echo xlt('ID'); ?></a>
+    <?php echo ($form_orderby == "pubpid") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('ID'); ?></a>
   </th>
   <th>
     <?php echo xlt('Status'); ?>
@@ -390,9 +357,7 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
   </th>
   <th>
    <a href="nojs.php" onclick="return dosort('encounter')"
-    <?php if ($form_orderby == "encounter") {
-        echo " style=\"color:#00cc00\"";
-} ?>><?php echo xlt('Encounter Number'); ?></a>
+    <?php echo ($form_orderby == "encounter") ? " style=\"color:#00cc00\"" : ""; ?>><?php echo xlt('Encounter Number'); ?></a>
   </th>
   <th>
     <?php echo xlt('Form'); ?>
@@ -470,7 +435,7 @@ if ($res) {
 
             // Figure product sales into billing status.
             $sres = sqlStatement("SELECT billed FROM drug_sales " .
-            "WHERE pid = '{$row['pid']}' AND encounter = '{$row['encounter']}'");
+            "WHERE pid = ? AND encounter = ?", array($row['pid'], $row['encounter']));
             while ($srow = sqlFetchArray($sres)) {
                 if ($srow['billed']) {
                     ++$billed_count;
diff --git a/interface/reports/patient_flow_board_report.php b/interface/reports/patient_flow_board_report.php
index b4f3b1e5d..3daf1616d 100644
--- a/interface/reports/patient_flow_board_report.php
+++ b/interface/reports/patient_flow_board_report.php
@@ -1,50 +1,38 @@
 <?php
-/*
+/**
  *  Patient Flow Board (Patient Tracker) (Report Based on the appointment report)
  *
  *  This program used to select and print the information captured in the Patient Flow Board program ,
  *  allowing the user to select and print the desired information.
  *
- * Copyright (C) 2015 Terry Hill <terry@lillysystems.com>
- * Copyright (C) 2017 Brady Miller <brady.g.miller@gmail.com>
- *
- * LICENSE: This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://opensource.org/licenses/gpl-license.php>;.
- *
- * @package OpenEMR
- * @author Terry Hill <terry@lilysystems.com>
- * @author Brady Miller <brady.g.miller@gmail.com>
- * @link http://www.open-emr.org
+ * @package   OpenEMR
+ * @link      http://www.open-emr.org
+ * @author    Terry Hill <terry@lilysystems.com>
+ * @author    Brady Miller <brady.g.miller@gmail.com>
+ * @copyright Copyright (c) 2015 Terry Hill <terry@lillysystems.com>
+ * @copyright Copyright (c) 2017 Brady Miller <brady.g.miller@gmail.com>
+ * @license   https://github.com/openemr/openemr/blob/master/LICENSE GNU General Public License 3
  */
 
 
-
-use OpenEMR\Core\Header;
-
 require_once("../globals.php");
 require_once("../../library/patient.inc");
 require_once "$srcdir/options.inc.php";
 require_once "$srcdir/appointments.inc.php";
 require_once("$srcdir/patient_tracker.inc.php");
 
+use OpenEMR\Core\Header;
+
 $patient = $_REQUEST['patient'];
 
-if ($patient && ! $_POST['form_from_date']) {
-    # This sets the dates in the date select calendars
-    # If a specific patient, default to 2 years ago.
+if ($patient && !isset($_POST['form_from_date'])) {
+    // If a specific patient, default to 2 years ago.
     $tmp = date('Y') - 2;
     $from_date = date("$tmp-m-d");
+    $to_date = date('Y-m-d');
 } else {
-    $from_date = fixDate($_POST['form_from_date'], date('Y-m-d'));
-    $to_date = fixDate($_POST['form_to_date'], date('Y-m-d'));
+    $from_date = isset($_POST['form_from_date']) ? DateToYYYYMMDD($_POST['form_from_date']) : date('Y-m-d');
+    $to_date = isset($_POST['form_to_date']) ? DateToYYYYMMDD($_POST['form_to_date']) : date('Y-m-d');
 }
 
 # check box information
@@ -81,74 +69,68 @@ if ($form_patient == '') {
 <html>
 
 <head>
+    <title><?php echo xlt('Patient Flow Board Report'); ?></title>
+
+    <?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
+
+    <script type="text/javascript">
+        $(document).ready(function() {
+            var win = top.printLogSetup ? top : opener.top;
+            win.printLogSetup(document.getElementById('printbutton'));
+
+            $('.datepicker').datetimepicker({
+                <?php $datetimepicker_timepicker = false; ?>
+                <?php $datetimepicker_showseconds = false; ?>
+                <?php $datetimepicker_formatInput = true; ?>
+                <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
+                <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
+            });
+        });
+
+        function dosort(orderby) {
+            var f = document.forms[0];
+            f.form_orderby.value = orderby;
+            f.submit();
+            return false;
+        }
 
-<title><?php echo xlt('Patient Flow Board Report'); ?></title>
-
-<?php Header::setupHeader(['datetime-picker', 'report-helper']); ?>
-
-<script type="text/javascript">
-
- var mypcc = '<?php echo $GLOBALS['phone_country_code'] ?>';
-
- $(document).ready(function() {
-  var win = top.printLogSetup ? top : opener.top;
-  win.printLogSetup(document.getElementById('printbutton'));
-
-  $('.datepicker').datetimepicker({
-    <?php $datetimepicker_timepicker = false; ?>
-    <?php $datetimepicker_showseconds = false; ?>
-    <?php $datetimepicker_formatInput = false; ?>
-    <?php require($GLOBALS['srcdir'] . '/js/xl/jquery-datetimepicker-2-5-4.js.php'); ?>
-    <?php // can add any additional javascript settings to datetimepicker here; need to prepend first setting with a comma ?>
-  });
- });
-
- function dosort(orderby) {
-    var f = document.forms[0];
-    f.form_orderby.value = orderby;
-    f.submit();
-    return false;
- }
-
-// CapMinds :: invokes  find-patient popup.
- function sel_patient() {
-  dlgopen('../main/calendar/find_patient_popup.php?pflag=0', '_blank', 500, 400);
- }
-
-// CapMinds :: callback by the find-patient popup.
- function setpatient(pid, lname, fname, dob) {
-  var f = document.theform;
-  f.form_patient.value = lname + ', ' + fname;
-  f.form_pid.value = pid;
-
- }
+        // CapMinds :: invokes  find-patient popup.
+        function sel_patient() {
+            dlgopen('../main/calendar/find_patient_popup.php?pflag=0', '_blank', 500, 400);
+        }
 
-</script>
+        // CapMinds :: callback by the find-patient popup.
+        function setpatient(pid, lname, fname, dob) {
+            var f = document.theform;
+            f.form_patient.value = lname + ', ' + fname;
+            f.form_pid.value = pid;
+        }
+    </script>
+
+    <style type="text/css">
+        /* specifically include & exclude from printing */
+        @media print {
+            #report_parameters {
+                    visibility: hidden;
+                    display: none;
+            }
+            #report_parameters_daterange {
+                    visibility: visible;
+                    display: inline;
+            }
+            #report_results table {
+                    margin-top: 0px;
+            }
+        }
 
-<style type="text/css">
-/* specifically include & exclude from printing */
-@media print {
-        #report_parameters {
+        /* specifically exclude some from the screen */
+        @media screen {
+            #report_parameters_daterange {
                 visibility: hidden;
                 display: none;
+            }
         }
-        #report_parameters_daterange {
-                visibility: visible;
-                display: inline;
-        }
-        #report_results table {
-                margin-top: 0px;
-        }
-}
-
-/* specifically exclude some from the screen */
-@media screen {
-    #report_parameters_daterange {
-        visibility: hidden;
-        display: none;
-    }
-}
-</style>
+    </style>
 </head>
 
 <body class="body_top">
@@ -163,7 +145,7 @@ if ($form_patient == '') {
 <?php } ?>
 
 
-<div id="report_parameters_daterange"><?php echo date("d F Y", strtotime($from_date)) ." &nbsp; to &nbsp; ". date("d F Y", strtotime($to_date)); #sets date range for calendars ?>
+<div id="report_parameters_daterange"><?php echo oeFormatShortDate($from_date) ." &nbsp; " . xlt('to') . " &nbsp; ". oeFormatShortDate($to_date); #sets date range for calendars ?>
 </div>
 
 <form method='post' name='theform' id='theform' action='patient_flow_board_report.php' onsubmit='return top.restoreSession()'>
@@ -214,14 +196,12 @@ if ($form_patient == '') {
                 <td class='control-label'><?php echo xlt('From'); ?>:</td>
                 <td><input type='text' name='form_from_date' id="form_from_date"
                     class='datepicker form-control'
-                    size='10' value='<?php echo attr($from_date) ?>'
-                    title='yyyy-mm-dd'>
+                    size='10' value='<?php echo oeFormatShortDate($from_date) ?>'>
                 </td>
                 <td class='control-label'><?php echo xlt('To'); ?>:</td>
                 <td><input type='text' name='form_to_date' id="form_to_date"
                     class='datepicker form-control'
-                    size='10' value='<?php echo attr($to_date) ?>'
-                    title='yyyy-mm-dd'>
+                    size='10' value='<?php echo oeFormatShortDate($to_date) ?>'>
                 </td>
             </tr>
 
@@ -257,9 +237,7 @@ if ($form_patient == '') {
 
                 <td colspan="2">
                     <div class="checkbox">
-                        <label><input type="checkbox" name="show_details" id="show_details" <?php if ($chk_show_details) {
-                            echo "checked";
-}?>>&nbsp;<?php echo xlt('Show Details'); ?></label>
+                        <label><input type="checkbox" name="show_details" id="show_details" <?php echo ($chk_show_details) ? "checked" : ""; ?>>&nbsp;<?php echo xlt('Show Details'); ?></label>
                     </div>
                 </td>
             </tr>
@@ -273,16 +251,12 @@ if ($form_patient == '') {
                   # if both are selected then only completed drug screens will be displayed. ?>
             <td colspan="2">
                 <div class="checkbox">
-                    <label><input type="checkbox" name="show_drug_screens" id="show_drug_screens" <?php if ($chk_show_drug_screens) {
-                        echo "checked";
-}?>>&nbsp;<?php echo xlt('Show Selected for Drug Screens'); ?></label>
+                    <label><input type="checkbox" name="show_drug_screens" id="show_drug_screens" <?php echo ($chk_show_drug_screens) ? "checked" : ""; ?>>&nbsp;<?php echo xlt('Show Selected for Drug Screens'); ?></label>
                 </div>
             </td>
             <td colspan="2">
                 <div class="checkbox">
-                    <label><input type="checkbox" name="show_completed_drug_screens" id="show_completed_drug_screens" <?php if ($chk_show_completed_drug_screens) {
-                        echo "checked";
-}?>>&nbsp;<?php echo xlt('Show Status of Drug Screens'); ?></label>
+                    <label><input type="checkbox" name="show_completed_drug_screens" id="show_completed_drug_screens" <?php echo ($chk_show_completed_drug_screens) ? "checked" : ""; ?>>&nbsp;<?php echo xlt('Show Status of Drug Screens'); ?></label>
                 </div>
             </td>
             </tr>
@@ -327,52 +301,36 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
     <thead>
     <?php if (!$chk_show_drug_screens && !$chk_show_completed_drug_screens) { # the first part of this block is for the Patient Flow Board report ?>
         <th><a href="nojs.php" onclick="return dosort('doctor')"
-        <?php if ($form_orderby == "doctor") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Provider'); ?>
+        <?php echo ($form_orderby == "doctor") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Provider'); ?>
         </a></th>
 
         <th><a href="nojs.php" onclick="return dosort('date')"
-        <?php if ($form_orderby == "date") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Date'); ?></a>
+        <?php echo ($form_orderby == "date") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Date'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('time')"
-        <?php if ($form_orderby == "time") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Time'); ?></a>
+        <?php echo ($form_orderby == "time") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Time'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('patient')"
-        <?php if ($form_orderby == "patient") {
-            echo " style=\"color:#00cc00\"";
-} ?>>&nbsp;&nbsp;&nbsp;<?php  echo xlt('Patient'); ?></a>
+        <?php echo ($form_orderby == "patient") ? " style=\"color:#00cc00\"" : ""; ?>>&nbsp;&nbsp;&nbsp;<?php  echo xlt('Patient'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('pubpid')"
-        <?php if ($form_orderby == "pubpid") {
-            echo " style=\"color:#00cc00\"";
-} ?>>&nbsp;<?php  echo xlt('ID'); ?></a>
+        <?php echo ($form_orderby == "pubpid") ? " style=\"color:#00cc00\"" : ""; ?>>&nbsp;<?php  echo xlt('ID'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('type')"
-        <?php if ($form_orderby == "type") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Type'); ?></a>
+        <?php echo ($form_orderby == "type") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Type'); ?></a>
         </th>
 
         <?php if ($chk_show_details) { ?>
         <th><a href="nojs.php" onclick="return dosort('trackerstatus')"
-        <?php if ($form_orderby == "trackerstatus") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Status'); ?></a>
+        <?php echo ($form_orderby == "trackerstatus") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Status'); ?></a>
         </th>
         <?php } else { ?>
         <th><a href="nojs.php" onclick="return dosort('trackerstatus')"
-        <?php if ($form_orderby == "trackerstatus") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Final Status'); ?></a>
+        <?php echo ($form_orderby == "trackerstatus") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Final Status'); ?></a>
         </th>
         <?php } ?>
 
@@ -396,40 +354,28 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
     <?php } else { # this section is for the drug screen report ?>
 
         <th><a href="nojs.php" onclick="return dosort('doctor')"
-        <?php if ($form_orderby == "doctor") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Provider'); ?>
+        <?php echo ($form_orderby == "doctor") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Provider'); ?>
         </a></th>
 
         <th><a href="nojs.php" onclick="return dosort('date')"
-        <?php if ($form_orderby == "date") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Date'); ?></a>
+        <?php echo ($form_orderby == "date") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Date'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('time')"
-        <?php if ($form_orderby == "time") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Time'); ?></a>
+        <?php echo ($form_orderby == "time") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Time'); ?></a>
         </th>
 
         <th><a href="nojs.php" onclick="return dosort('patient')"
-        <?php if ($form_orderby == "patient") {
-            echo " style=\"color:#00cc00\"";
-} ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?php  echo xlt('Patient'); ?></a>
+        <?php echo ($form_orderby == "patient") ? " style=\"color:#00cc00\"" : ""; ?>>&nbsp;&nbsp;&nbsp;&nbsp;<?php  echo xlt('Patient'); ?></a>
         </th>
 
         <?php if (!$chk_show_completed_drug_screens) { ?>
         <th><a href="nojs.php" onclick="return dosort('pubpid')"
-        <?php if ($form_orderby == "pubpid") {
-            echo " style=\"color:#00cc00\"";
-} ?>>&nbsp;<?php  echo xlt('ID'); ?></a>
+        <?php echo ($form_orderby == "pubpid") ? " style=\"color:#00cc00\"" : ""; ?>>&nbsp;<?php  echo xlt('ID'); ?></a>
         </th>
         <?php } else { ?>
         <th><a href="nojs.php" onclick="return dosort('pubpid')"
-        <?php if ($form_orderby == "pubpid") {
-            echo " style=\"color:#00cc00\"";
-} ?>>&nbsp;<?php  echo xlt('ID'); ?></a>
+        <?php echo ($form_orderby == "pubpid") ? " style=\"color:#00cc00\"" : ""; ?>>&nbsp;<?php  echo xlt('ID'); ?></a>
         </th>
         <?php } ?>
 
@@ -439,9 +385,7 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
          <th>&nbsp;</th>
         <?php } else { ?>
          <th><a href="nojs.php" onclick="return dosort('completed')"
-        <?php if ($form_orderby == "completed") {
-            echo " style=\"color:#00cc00\"";
-} ?>><?php  echo xlt('Completed'); ?></a>
+        <?php echo ($form_orderby == "completed") ? " style=\"color:#00cc00\"" : ""; ?>><?php  echo xlt('Completed'); ?></a>
          </th>
         <?php } ?>
 
@@ -523,7 +467,8 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
         ?>
 
     <tr bgcolor='<?php echo $bgcolor ?>'>
-        <?php if (!$chk_show_drug_screens && !$chk_show_completed_drug_screens) { # the first part of this block is for the Patient Flow Board report ?>
+        <?php
+        if (!$chk_show_drug_screens && !$chk_show_completed_drug_screens) { # the first part of this block is for the Patient Flow Board report ?>
         <td class="detail">&nbsp;<?php echo ($docname == $lastdocname) ? "" : $docname ?>
         </td>
 
@@ -551,9 +496,7 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
                 }
             } else {
                 if ($tracker_status != "") {
-                    $frow['data_type']=1;
-                    $frow['list_id']='apptstat';
-                    generate_print_field($frow, $tracker_status);
+                    echo getListItemTitle('apptstat', $tracker_status);
                 }
             }
             ?>
@@ -570,7 +513,8 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
         <?php } else { ?>
         <td class="detail">&nbsp;</td>
         <?php } ?>
-        <?php if ($chk_show_details) { # lets show the detail lines
+        <?php
+        if ($chk_show_details) { # lets show the detail lines
               $i = '0';
               $k = '0';
             for ($x = 1; $x <= $last_seq; $x++) {
@@ -645,12 +589,13 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
 
             $i++;
             }
-}
+        }
         ?>
         </td>
         </tr>
 
-    <?php } else { # this section is for the drug screen report ?>
+        <?php
+        } else { # this section is for the drug screen report ?>
 
         <td class="detail">&nbsp;<?php echo ($docname == $lastdocname) ? "" : $docname ?>
         </td>
@@ -666,18 +611,10 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
 
         <td class="detail">&nbsp;<?php echo text($appointment['pubpid']) ?></td>
 
-        <td class="detail" align = >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php if ($appointment['random_drug_test'] == '1') {
-            echo xlt('Yes');
-} else {
-    echo xlt('No');
-}?></td>
+        <td class="detail" align = >&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo ($appointment['random_drug_test'] == '1') ? xlt('Yes') : xlt('No'); ?></td>
 
         <?php if ($chk_show_completed_drug_screens) { ?>
-          <td class="detail">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php if ($appointment['drug_screen_completed'] == '1') {
-                echo xlt('Yes');
-} else {
-    echo xlt('No');
-}?></td>
+          <td class="detail">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<?php echo ($appointment['drug_screen_completed'] == '1') ? xlt('Yes') : xlt('No'); ?></td>
         <?php } else { ?>
           <td class="detail">&nbsp; </td>
         <?php } ?>
@@ -688,7 +625,7 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
         <td class="detail">&nbsp;</td>
 
         <td class="detail">&nbsp;</td>
-    <?php } ?>
+        <?php } ?>
     </tr>
 
     <?php
@@ -705,15 +642,15 @@ if ($_POST['form_refresh'] || $_POST['form_orderby']) {
     </tbody>
 </table>
 </div>
-<!-- end of search results --> <?php } else { ?>
+<!-- end of search results -->
+<?php } else { ?>
 <div class='text'><?php echo xlt('Please input search criteria above, and click Submit to view results.'); ?>
 </div>
-    <?php } ?> <input type="hidden" name="form_orderby"
-    value="<?php echo attr($form_orderby) ?>" /> <input type="hidden"
-    name="patient" value="<?php echo attr($patient) ?>" /> <input type='hidden'
-    name='form_refresh' id='form_refresh' value='' /></form>
+<?php } ?> <input type="hidden" name="form_orderby"
+value="<?php echo attr($form_orderby) ?>" /> <input type="hidden"
+name="patient" value="<?php echo attr($patient) ?>" /> <input type='hidden'
+name='form_refresh' id='form_refresh' value='' /></form>
 
 </body>
 
 </html>
-
-- 
2.11.4.GIT