Merge pull request #1285 from bradymiller/reports-cleanup_2

charts reports cleanup
openemr · Dec 13, 2017 · c95e88f · c95e88f
2 parents 970d420 + 5dea971
commit c95e88f
Show file tree

Hide file tree

Showing 2 changed files with 91 additions and 88 deletions.
diff --git a/interface/reports/chart_location_activity.php b/interface/reports/chart_location_activity.php
@@ -1,12 +1,15 @@
 <?php
-// Copyright (C) 2008-2015 Rod Roark <rod@sunsetsystems.com>
-//
-// 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 2
-// of the License, or (at your option) any later version.
-
-// This reports checkins and checkouts for a specified patient's chart.
+/**
+ * This reports checkins and checkouts for a specified patient's chart.
+ *
+ * @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) 2008-2015 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
+ */
 
 
 require_once("../globals.php");
@@ -20,44 +23,41 @@
 ?>
 <html>
 <head>
-<title><?php echo xlt('Chart Location Activity'); ?></title>
-
-<?php Header::setupHeader(); ?>
-
-<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;
+    <title><?php echo xlt('Chart Location Activity'); ?></title>
+
+    <?php Header::setupHeader(); ?>
+
+    <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;
+    /* specifically exclude some from the screen */
+    @media screen {
+        #report_parameters_daterange {
+            visibility: hidden;
+            display: none;
+        }
     }
-}
-
-</style>
-
-<script language="JavaScript">
- $(document).ready(function() {
-  var win = top.printLogSetup ? top : opener.top;
-  win.printLogSetup(document.getElementById('printbutton'));
- });
-</script>
-
+    </style>
+
+    <script language="JavaScript">
+        $(document).ready(function() {
+            var win = top.printLogSetup ? top : opener.top;
+            win.printLogSetup(document.getElementById('printbutton'));
+        });
+    </script>
 </head>
 
 <body class="body_top">
@@ -85,7 +85,7 @@
 }
 
 if (!empty($ptrow)) {
-    echo '<span class="title">' . text(xl('for', '', '', ' '));
+    echo '<span class="title">' . xlt('for') . ' ';
     echo text($ptrow['lname']) . ', ' . text($ptrow['fname']) . ' ' . text($ptrow['mname']) . ' ';
     echo "(" . text($ptrow['pubpid']) . ")";
     echo "</span>\n";

diff --git a/interface/reports/charts_checked_out.php b/interface/reports/charts_checked_out.php
@@ -1,12 +1,16 @@
 <?php
-// Copyright (C) 2008-2010 Rod Roark <rod@sunsetsystems.com>
-//
-// 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 2
-// of the License, or (at your option) any later version.
+/**
+ * This reports checkins and checkouts for a specified patient's chart.
+ *
+ * @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) 2008-2010 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
+ */
 
-// This reports checkins and checkouts for a specified patient's chart.
 
 require_once("../globals.php");
 require_once("$srcdir/patient.inc");
@@ -17,42 +21,41 @@
 ?>
 <html>
 <head>
-
-<title><?php xl('Charts Checked Out', 'e'); ?></title>
-
-<?php Header::setupHeader(); ?>
-
-<style type="text/css">
-
-/* specifically include & exclude from printing */
-@media print {
-    #report_parameters {
-        visibility: hidden;
-        display: none;
+    <title><?php echo xlt('Charts Checked Out'); ?></title>
+
+    <?php Header::setupHeader(); ?>
+
+    <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;
+        }
     }
-    #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;
+    /* specifically exclude some from the screen */
+    @media screen {
+        #report_parameters_daterange {
+            visibility: hidden;
+            display: none;
+        }
     }
-}
 
-</style>
+    </style>
 </head>
 
 <body class="body_top">
 
-<span class='title'><?php xl('Report', 'e'); ?> - <?php xl('Charts Checked Out', 'e'); ?></span>
+<span class='title'><?php echo xlt('Report'); ?> - <?php echo xlt('Charts Checked Out'); ?></span>
 
 <div id="report_results">
 <br/>
@@ -82,27 +85,27 @@
     if ($data_ctr == 0) { ?>
     <table>
      <thead>
-          <th> <?php xl('Chart', 'e'); ?> </th>
-          <th> <?php xl('Patient', 'e'); ?> </th>
-          <th> <?php xl('Location', 'e'); ?> </th>
-          <th> <?php xl('As Of', 'e'); ?> </th>
+          <th> <?php echo xlt('Chart'); ?> </th>
+          <th> <?php echo xlt('Patient'); ?> </th>
+          <th> <?php echo xlt('Location'); ?> </th>
+          <th> <?php echo xlt('As Of'); ?> </th>
      </thead>
      <tbody>
     <?php
     } ?>
 
  <tr>
   <td>
-    <?php echo $row['pubpid']; ?>
+    <?php echo text($row['pubpid']); ?>
   </td>
   <td>
-    <?php echo $row['lname'] . ', ' . $row['fname'] . ' ' . $row['mname']; ?>
+    <?php echo text($row['lname'] . ', ' . $row['fname'] . ' ' . $row['mname']); ?>
   </td>
   <td>
-    <?php echo $row['ulname'] . ', ' . $row['ufname'] . ' ' . $row['umname']; ?>
+    <?php echo text($row['ulname'] . ', ' . $row['ufname'] . ' ' . $row['umname']); ?>
   </td>
   <td>
-    <?php echo text(oeFormatShortDate(substr($row['ct_when'], 0, 10))) . substr($row['ct_when'], 10); ?>
+    <?php echo text(oeFormatShortDate(substr($row['ct_when'], 0, 10))) . text(substr($row['ct_when'], 10)); ?>
   </td>
  </tr>
 <?php
@@ -111,7 +114,7 @@
 } // end while
 
 if ($data_ctr < 1) { ?>
-<span class='text'><?php xl('There are no charts checked out.', 'e'); ?></span>
+<span class='text'><?php echo xla('There are no charts checked out.'); ?></span>
 <?php
 }
 ?>