Bug fix for app/emergency logs

This commit is contained in:
FusionPBX
2024-02-12 10:26:33 -07:00
committed by GitHub
parent 2654c50fe8
commit e08b82c160
4 changed files with 318 additions and 207 deletions
+19 -13
View File
@@ -78,9 +78,8 @@ if (!empty($_GET["show"])) {
$show = $_GET["show"];
}
//get the count
$sql = "select count(log_uuid) ";
$sql = "select count(emergency_log_uuid) ";
$sql .= "from v_emergency_logs ";
if ($show == 'all') {
$sql .= "where true ";
@@ -117,7 +116,13 @@ else {
}
//get the list
$sql = "select * ";
$sql = "select emergency_log_uuid, ";
$sql .= "domain_uuid, ";
$sql .= "extension, ";
$sql .= "event, ";
$sql .= "to_char(timezone(:time_zone, insert_date), 'DD Mon YYYY') as date_formatted, ";
$sql .= "to_char(timezone(:time_zone, insert_date), 'HH12:MI:SS am') as time_formatted, ";
$sql .= "insert_date ";
$sql .= "from v_emergency_logs ";
if ($show == 'all') {
$sql .= "where true ";
@@ -132,8 +137,9 @@ if (!empty($search)) {
$sql .= ") ";
$parameters['search'] = '%'.$search.'%';
}
$sql .= "order by insert_date desc ";
$sql .= limit_offset($rows_per_page, $offset);
$parameters['time_zone'] = $time_zone;
$database = new database;
$emergency_logs = $database->select($sql, $parameters ?? null, 'all');
unset($sql, $parameters);
@@ -143,12 +149,12 @@ $object = new token;
$token = $object->create($_SERVER['PHP_SELF']);
//additional includes
$document['title'] = 'Emergency Logs';
$document['title'] = $text['title-emergency_logs'];
require_once "resources/header.php";
//show the content
echo "<div class='action_bar' id='action_bar'>\n";
echo " <div class='heading'><b>Emergency Logs (".$num_rows.")</b></div>\n";
echo " <div class='heading'><b>".$text['title-emergency_logs']." (".$num_rows.")</b></div>\n";
echo " <div class='actions'>\n";
if ($emergency_logs) {
echo button::create(['type'=>'button','label'=>$text['button-delete'],'icon'=>$_SESSION['theme']['button_icon_delete'],'id'=>'btn_delete','name'=>'btn_delete','style'=>'display:none;','onclick'=>"modal_open('modal-delete','btn_delete');"]);
@@ -181,18 +187,18 @@ echo "<br /><br />\n";
echo "<table class='list'>\n";
echo "<tr class='list-header'>\n";
echo "<th class='left'>Time</th>\n";
echo "<th class='left'>Date</th>\n";
echo "<th class='left'>Extension</th>\n";
echo "<th class='left'>Event</th>\n";
echo "<th class='left'>".$text['label-emergency_time']."</th>\n";
echo "<th class='left'>".$text['label-emergency_date']."</th>\n";
echo "<th class='left'>".$text['label-emergency_extension']."</th>\n";
echo "<th class='left'>".$text['label-emergency_event']."</th>\n";
echo "</tr>\n";
if (!empty($emergency_logs) && is_array($emergency_logs) && @sizeof($emergency_logs) != 0) {
$x = 0;
foreach ($emergency_logs as $row) {
echo "<tr class='list-row'>\n";
echo " <td>".escape($row['time'])."</td>\n";
echo " <td>".escape($row['date'])."</td>\n";
echo " <td>".escape($row['time_formatted'])."</td>\n";
echo " <td>".escape($row['date_formatted'])."</td>\n";
echo " <td>".escape($row['extension'])."</td>\n";
echo " <td>".escape($row['event'])."</td>\n";
echo "</tr>\n";
@@ -210,4 +216,4 @@ echo "</form>\n";
//include the footer
require_once "resources/footer.php";
?>
?>