From e97e2fef09dc8fafd2c6e886c2a658c53cc0695b Mon Sep 17 00:00:00 2001 From: visolve-selvi Date: Tue, 19 Oct 2010 10:51:52 +0000 Subject: [PATCH] Audit log changes for a. Patient ID is included b. Fix the php_warning (undefined index enable_auditlog) c. error while sorting [with groupname,success and checksum] --- interface/logview/logview.php | 30 ++++++++++++++++++++++++-- interface/main/calendar/find_patient_popup.php | 5 +++-- library/log.inc | 11 +++++++++- 3 files changed, 41 insertions(+), 5 deletions(-) diff --git a/interface/logview/logview.php b/interface/logview/logview.php index 80f82bdf9..fbe107b5e 100644 --- a/interface/logview/logview.php +++ b/interface/logview/logview.php @@ -54,6 +54,19 @@ function eventTypeChange(eventname) document.theform.type_event.disabled = false; } } + +// VicarePlus :: This invokes the find-patient popup. + function sel_patient() { + dlgopen('../main/calendar/find_patient_popup.php?pflag=0', '_blank', 500, 400); + } + +// VicarePlus :: This is for 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; + } + @@ -67,6 +80,9 @@ $start_date = formData('start_date','G'); if ($_GET["end_date"]) $end_date = formData('end_date','G'); +if ($_GET["form_patient"]) +$form_patient = formData('form_patient','G'); + /* * Start date should not be greater than end date - Date Validation */ @@ -82,6 +98,8 @@ if ($start_date && $end_date) ?> " title="" onkeyup="datekeyup(this,mypcc)" onblur="dateblur(this,mypcc)" /> [?]  + + +  : + + +' onclick='sel_patient()' title='' /> + + : @@ -270,7 +296,7 @@ if($eventname != "" && $type_event != "") else {$gev = $getevent;} -if ($ret = getEvents(array('sdate' => $get_sdate,'edate' => $get_edate, 'user' => $form_user, 'sortby' => $_GET['sortby'], 'levent' =>$gev, 'tevent' =>$tevent))) { +if ($ret = getEvents(array('sdate' => $get_sdate,'edate' => $get_edate, 'user' => $form_user, 'patient' => $form_pid, 'sortby' => $_GET['sortby'], 'levent' =>$gev, 'tevent' =>$tevent))) { foreach ($ret as $iter) { @@ -301,7 +327,7 @@ if ($ret = getEvents(array('sdate' => $get_sdate,'edate' => $get_edate, 'user' = if (($eventname=="disclosure") || ($gev == "")) { $eventname="disclosure"; -if ($ret = getEvents(array('sdate' => $get_sdate,'edate' => $get_edate, 'user' => $form_user, 'sortby' => $_GET['sortby'], 'event' =>$eventname))) { +if ($ret = getEvents(array('sdate' => $get_sdate,'edate' => $get_edate, 'user' => $form_user, 'patient' => $form_pid, 'sortby' => $_GET['sortby'], 'event' =>$eventname))) { foreach ($ret as $iter) { $comments=xl('Recipient Name').":".$iter["recipient"].";".xl('Disclosure Info').":".$iter["description"]; ?> diff --git a/interface/main/calendar/find_patient_popup.php b/interface/main/calendar/find_patient_popup.php index 57254bd21..22a765058 100644 --- a/interface/main/calendar/find_patient_popup.php +++ b/interface/main/calendar/find_patient_popup.php @@ -163,7 +163,7 @@ echo '
-
+'>