From b4b431938e502fdeff94420bf360cb1a997e8bc8 Mon Sep 17 00:00:00 2001
From: stephen waite <stephen.waite@cmsvt.com>
Date: Mon, 7 Jun 2021 19:59:36 -0400
Subject: [PATCH] styling and php warnings for flow/recall board (#4452)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

* Flow Board “CALL” response box

small fix to submit call log.

* styling and warnings addressed

Co-authored-by: ophthal <magauran@ophthal.org>
---
 interface/patient_tracker/patient_tracker.php |  5 +-
 library/MedEx/API.php                         | 84 ++++++++++++++-------------
 2 files changed, 47 insertions(+), 42 deletions(-)

diff --git a/interface/patient_tracker/patient_tracker.php b/interface/patient_tracker/patient_tracker.php
index 3a105ba94..e230eecf2 100644
--- a/interface/patient_tracker/patient_tracker.php
+++ b/interface/patient_tracker/patient_tracker.php
@@ -553,7 +553,7 @@ if (!$_REQUEST['flb_table']) {
                                     <span class='hidden' name='progCALLback_" . attr($appointment['eid']) . "' id='progCALLback_" . attr($appointment['eid']) . "'>
                                       <form id='notation_" . attr($appointment['eid']) . "' method='post'
                                       action='#'>
-                                        <input type='hidden' name='csrf_token_form' value='" . attr(CsrfUtils::collectCsrfToken()) ."' />
+                                        <input type='hidden' name='csrf_token_form' value='" . attr(CsrfUtils::collectCsrfToken()) . "' />
                                         <h4>" . xlt('Call Back Notes') . ":</h4>
                                         <input type='hidden' name='pc_eid' id='pc_eid' value='" . attr($appointment['eid']) . "'>
                                         <input type='hidden' name='pc_pid' id='pc_pid' value='" . attr($appointment['pc_pid']) . "'>
@@ -1148,4 +1148,5 @@ function myLocalJS()
         initTableButtons();
 
     </script>
-<?php } ?>
+<?php }
+?>
diff --git a/library/MedEx/API.php b/library/MedEx/API.php
index 64385aeb5..f0428d92b 100644
--- a/library/MedEx/API.php
+++ b/library/MedEx/API.php
@@ -2333,45 +2333,47 @@ class Display extends base
         $show['progression'] .= $show['EMAIL']['text'] . $show['SMS']['text'] . $show['AVM']['text'];
 
         $camps = '0';
-        foreach ($events as $event) {
-            if ($event['M_group'] != "RECALL") {
-                continue;
-            }
-               $pat = $this->possibleModalities($recall);
-            if ($pat['ALLOWED'][$event['M_type']] == 'NO') {
-                continue;    //it can't happen
-            }
-            if ($pat['facility']['status'] != 'ok') {
-                continue;    //it can't happen
-            }
-            if ($pat['provider']['status'] != 'ok') {
-                continue;    //it can't happen
-            }
+        if (is_countable($events)) {
+            foreach ($events as $event) {
+                if ($event['M_group'] != "RECALL") {
+                    continue;
+                }
+                $pat = $this->possibleModalities($recall);
+                if ($pat['ALLOWED'][$event['M_type']] == 'NO') {
+                    continue;    //it can't happen
+                }
+                if ($pat['facility']['status'] != 'ok') {
+                    continue;    //it can't happen
+                }
+                if ($pat['provider']['status'] != 'ok') {
+                    continue;    //it can't happen
+                }
 
-            if ($show['campaign'][$event['C_UID']]['status']) {
-                continue; //it is done
-            }
-               $camps++;                                                   //there is still work to be done
-            if ($show['campaign'][$event['C_UID']]['icon']) {
-                continue;   //but something has happened since it was scheduled.
-            }
+                if ($show['campaign'][$event['C_UID']]['status']) {
+                    continue; //it is done
+                }
+                $camps++;                                                   //there is still work to be done
+                if ($show['campaign'][$event['C_UID']]['icon']) {
+                    continue;   //but something has happened since it was scheduled.
+                }
 
-               ($event['E_timing'] < '3') ? ($interval = '-') : ($interval = '+');//this is only scheduled, 3 and 4 are for past appointments...
-               $show['campaign'][$event['C_UID']] = $event;
-               $show['campaign'][$event['C_UID']]['icon'] = $this->get_icon($event['M_type'], "SCHEDULED");
+                ($event['E_timing'] < '3') ? ($interval = '-') : ($interval = '+');//this is only scheduled, 3 and 4 are for past appointments...
+                $show['campaign'][$event['C_UID']] = $event;
+                $show['campaign'][$event['C_UID']]['icon'] = $this->get_icon($event['M_type'], "SCHEDULED");
 
-               $recall_date = date("Y-m-d", strtotime($interval . $event['E_fire_time'] . " days", strtotime($recall['r_eventDate'])));
-               $date1 = date('Y-m-d');
-               $date_diff = strtotime($date1) - strtotime($recall['r_eventDate']);
-            if ($date_diff >= '-1') { //if it is sched for tomorrow or earlier, queue it up
-                $show['campaign'][$event['C_UID']]['executed'] = "QUEUED";
-                $show['status'] = "whitish";
-            } else {
-                $execute = oeFormatShortDate($recall_date);
-                $show['campaign'][$event['C_UID']]['executed'] = $execute;
+                $recall_date = date("Y-m-d", strtotime($interval . $event['E_fire_time'] . " days", strtotime($recall['r_eventDate'])));
+                $date1 = date('Y-m-d');
+                $date_diff = strtotime($date1) - strtotime($recall['r_eventDate']);
+                if ($date_diff >= '-1') { //if it is sched for tomorrow or earlier, queue it up
+                    $show['campaign'][$event['C_UID']]['executed'] = "QUEUED";
+                    $show['status'] = "whitish";
+                } else {
+                    $execute = oeFormatShortDate($recall_date);
+                    $show['campaign'][$event['C_UID']]['executed'] = $execute;
+                }
+                $show['progression'] .= "<a href='https://medexbank.com/cart/upload/index.php?route=information/campaigns' class='nowrap text-left' target='_MedEx'>" .
+                                    $show['campaign'][$event['C_UID']]['icon'] . " " . text($show['campaign'][$event['C_UID']]['executed']) . "</a><br />";
             }
-               $show['progression'] .= "<a href='https://medexbank.com/cart/upload/index.php?route=information/campaigns' class='nowrap text-left' target='_MedEx'>" .
-                                   $show['campaign'][$event['C_UID']]['icon'] . " " . text($show['campaign'][$event['C_UID']]['executed']) . "</a><br />";
         }
 
         $query  = "SELECT * FROM openemr_postcalendar_events WHERE pc_eventDate > CURDATE() AND pc_pid =? AND pc_time >  CURDATE()- INTERVAL 16 HOUR";
@@ -2601,11 +2603,13 @@ class Display extends base
                                     $defaultProvider = $_SESSION['authUserID'];
                                 // or, if we have chosen a provider in the calendar, default to them
                                 // choose the first one if multiple have been selected
-                                    if (count($_SESSION['pc_username']) >= 1) {
-                                        // get the numeric ID of the first provider in the array
-                                        $pc_username = $_SESSION['pc_username'];
-                                        $firstProvider = sqlFetchArray(sqlStatement("SELECT id FROM users WHERE username=?", array($pc_username[0])));
-                                        $defaultProvider = $firstProvider['id'];
+                                    if (is_countable($_SESSION['pc_username'])) {
+                                        if (count($_SESSION['pc_username']) >= 1) {
+                                            // get the numeric ID of the first provider in the array
+                                            $pc_username = $_SESSION['pc_username'];
+                                            $firstProvider = sqlFetchArray(sqlStatement("SELECT id FROM users WHERE username=?", array($pc_username[0])));
+                                            $defaultProvider = $firstProvider['id'];
+                                        }
                                     }
                                 // if we clicked on a provider's schedule to add the event, use THAT.
                                     if ($userid) {
-- 
2.11.4.GIT