From 977e3be9e2240ab151eb211160396f78932bdbe4 Mon Sep 17 00:00:00 2001
From: matrix-drorgo <drorgo@matrix.co.il>
Date: Wed, 28 Dec 2016 12:25:26 +0200
Subject: [PATCH] added new feature to the patient report - list recurring
 appointments. (#403)

---
 interface/patient_file/report/custom_report.php  | 41 ++++++++++++++++++++++--
 interface/patient_file/report/patient_report.php |  3 ++
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/interface/patient_file/report/custom_report.php b/interface/patient_file/report/custom_report.php
index 67d341a4b..bc1c2abf0 100644
--- a/interface/patient_file/report/custom_report.php
+++ b/interface/patient_file/report/custom_report.php
@@ -42,7 +42,7 @@ require_once($GLOBALS["include_root"] . "/orders/single_order_results.inc.php");
 if ($GLOBALS['gbl_portal_cms_enable']) {
   require_once($GLOBALS["include_root"] . "/cmsportal/portal.inc.php");
 }
-
+require_once("$srcdir/appointments.inc.php");
 // For those who care that this is the patient report.
 $GLOBALS['PATIENT_REPORT_ACTIVE'] = true;
 
@@ -308,7 +308,44 @@ foreach ($ar as $key => $val) {
     //
     if (stristr($key,"include_")) {
 
-        if ($val == "demographics") {
+        if($val == "recurring_days"){
+
+            /// label/header for recurring days
+            echo "<hr />";
+            echo "<div class='text' id='appointments'>\n";
+            print "<h1>".xlt('Recurrent Appointments').":</h1>";
+
+            //fetch the data of the recurring days
+            $recurrences = fetchRecurrences($pid);
+
+            //print the recurring days to screen
+            if($recurrences[0] == false){ //if there are no recurrent appointments:
+                echo "<div class='text' >";
+                echo "<span>" . xlt('None') . "</span>";
+                echo "</div>";
+                echo "<br>";
+            }
+            else {
+                foreach ($recurrences as $row) {
+                    //checks if there are recurrences and if they are current (git didn't end yet)
+                    if ($row == false || !recurrence_is_current($row['pc_endDate']))
+                        continue;
+                    echo "<div class='text' >";
+                    echo "<span>" . xlt('Appointment Category') . ': ' . text($row['pc_title']) . "</span>";
+                    echo "<br>";
+                    echo "<span>" . xlt('Recurrence') . ': ' .text($row['pc_recurrspec']) . "</span>";
+                    echo "<br>";
+                    $red_text = ""; //if ends in a week, make font red
+                    if (ends_in_a_week($row['pc_endDate'])) {
+                        $red_text = " style=\"color:red;\" ";
+                    }
+                    echo "<span" . $red_text . ">" . xlt('End Date') . ': ' . text($row['pc_endDate']) . "</span>";
+                    echo "</div>";
+                    echo "<br>";
+                }
+            }
+        }
+        elseif ($val == "demographics") {
 
             echo "<hr />";
             echo "<div class='text demographics' id='DEM'>\n";
diff --git a/interface/patient_file/report/patient_report.php b/interface/patient_file/report/patient_report.php
index 64b97beb7..9a1477d3a 100644
--- a/interface/patient_file/report/patient_report.php
+++ b/interface/patient_file/report/patient_report.php
@@ -218,6 +218,9 @@ function show_date_fun(){
    <input type='checkbox' name='include_transactions' id='include_transactions' value="transactions"><?php xl('Transactions','e'); ?><br>
    <input type='checkbox' name='include_batchcom' id='include_batchcom' value="batchcom"><?php xl('Communications','e'); ?><br>
   </td>
+     <td class="text">
+         <input type='checkbox' name='include_recurring_days' id='include_recurring_days' value="recurring_days" ><?php echo  xlt('Recurrent Appointments'); ?><br>
+     </td>
  </tr>
 </table>
 
-- 
2.11.4.GIT