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
+43 -54
View File
@@ -19,78 +19,67 @@
$apps[$x]['description']['pt-pt'] = '';
$apps[$x]['description']['pt-br'] = '';
//permission details
$y=0;
$apps[$x]['permissions'][$y]['name'] = "emergency_logs_view";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['menu']['uuid'] = "23a6fc8a-77f1-11ee-88b0-005056a27559";
//permission details
$y=0;
$apps[$x]['permissions'][$y]['name'] = "emergency_logs_view";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['menu']['uuid'] = "23a6fc8a-77f1-11ee-88b0-005056a27559";
$y++;
$apps[$x]['permissions'][$y]['name'] = "emergency_logs_view_all";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$apps[$x]['permissions'][$y]['name'] = "emergency_logs_view_all";
$apps[$x]['permissions'][$y]['groups'][] = "superadmin";
$y++;
//schema details
$z=0;
$apps[$x]['db'][$y]['table']['name'] = "v_emergency_logs";
$apps[$x]['db'][$y]['table']['parent'] = "";
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'log_uuid';
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'emergency_log_uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'primary';
$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'time';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'domain_uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'uuid';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'text';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'char(36)';
$apps[$x]['db'][$y]['fields'][$z]['key']['type'] = 'foreign';
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['table'] = 'v_domains';
$apps[$x]['db'][$y]['fields'][$z]['key']['reference']['field'] = 'domain_uuid';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'extension';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'numeric';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = 'event';
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['description'] = '';
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_date";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_user";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "update_date";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "update_user";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
?>
$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_date";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "insert_user";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "update_date";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = 'timestamptz';
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = 'date';
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
$z++;
$apps[$x]['db'][$y]['fields'][$z]['name'] = "update_user";
$apps[$x]['db'][$y]['fields'][$z]['type']['pgsql'] = "uuid";
$apps[$x]['db'][$y]['fields'][$z]['type']['sqlite'] = "text";
$apps[$x]['db'][$y]['fields'][$z]['type']['mysql'] = "char(36)";
$apps[$x]['db'][$y]['fields'][$z]['description']['en-us'] = "";
?>
+133
View File
@@ -0,0 +1,133 @@
<?php
$text['title-emergency_logs']['en-us'] = "Emergency Logs";
$text['title-emergency_logs']['en-gb'] = "Emergency Logs";
$text['title-emergency_logs']['ar-eg'] = "سجلات الطوارئ";
$text['title-emergency_logs']['de-at'] = "Notfall-Protokolle";
$text['title-emergency_logs']['de-ch'] = "Notfall-Protokolle";
$text['title-emergency_logs']['de-de'] = "Notfall-Protokolle";
$text['title-emergency_logs']['el-gr'] = "Μητρώα Έκτακτης Ανάγκης";
$text['title-emergency_logs']['es-cl'] = "Registros de emergencia";
$text['title-emergency_logs']['es-mx'] = "Registros de emergencia";
$text['title-emergency_logs']['fr-ca'] = "Journaux d'urgence";
$text['title-emergency_logs']['fr-fr'] = "Journaux d'urgence";
$text['title-emergency_logs']['he-il'] = "יומני חירום";
$text['title-emergency_logs']['it-it'] = "Registri di emergenza";
$text['title-emergency_logs']['nl-nl'] = "Noodlogboeken";
$text['title-emergency_logs']['pl-pl'] = "Dzienniki awaryjne";
$text['title-emergency_logs']['pt-br'] = "Registros de emergência";
$text['title-emergency_logs']['pt-pt'] = "Registros de emergência";
$text['title-emergency_logs']['ro-ro'] = "Jurnalele de urgență";
$text['title-emergency_logs']['ru-ru'] = "Журналы аварийных ситуаций";
$text['title-emergency_logs']['sv-se'] = "Nödloggar";
$text['title-emergency_logs']['uk-ua'] = "Журнали надзвичайних ситуацій";
$text['title-emergency_logs']['tr-tr'] = "Acil Durum Günlükleri";
$text['title-emergency_logs']['zh-cn'] = "紧急日志";
$text['title-emergency_logs']['ja-jp'] = "緊急ログ";
$text['title-emergency_logs']['ko-kr'] = "비상 기록";
$text['label-emergency_time']['en-us'] = "Time";
$text['label-emergency_time']['en-gb'] = "Time";
$text['label-emergency_time']['ar-eg'] = "وقت";
$text['label-emergency_time']['de-at'] = "Zeitpunkt";
$text['label-emergency_time']['de-ch'] = "Zeitpunkt";
$text['label-emergency_time']['de-de'] = "Zeitpunkt";
$text['label-emergency_time']['el-gr'] = "χρόνος";
$text['label-emergency_time']['es-cl'] = "Tiempo";
$text['label-emergency_time']['es-mx'] = "Tiempo";
$text['label-emergency_time']['fr-ca'] = "Temps";
$text['label-emergency_time']['fr-fr'] = "Temps";
$text['label-emergency_time']['he-il'] = "זְמַן";
$text['label-emergency_time']['it-it'] = "Tempo";
$text['label-emergency_time']['nl-nl'] = "Tijd";
$text['label-emergency_time']['pl-pl'] = "Czas";
$text['label-emergency_time']['pt-br'] = "Tempo";
$text['label-emergency_time']['pt-pt'] = "Tempo";
$text['label-emergency_time']['ro-ro'] = "Timp";
$text['label-emergency_time']['ru-ru'] = "Время";
$text['label-emergency_time']['sv-se'] = "Tid";
$text['label-emergency_time']['uk-ua'] = "час";
$text['label-emergency_time']['tr-tr'] = "Zaman";
$text['label-emergency_time']['zh-cn'] = "时间";
$text['label-emergency_time']['ja-jp'] = "時間";
$text['label-emergency_time']['ko-kr'] = "시간";
$text['label-emergency_date']['en-us'] = "Date";
$text['label-emergency_date']['en-gb'] = "Date";
$text['label-emergency_date']['ar-eg'] = "تاريخ";
$text['label-emergency_date']['de-at'] = "Datum";
$text['label-emergency_date']['de-ch'] = "Datum";
$text['label-emergency_date']['de-de'] = "Datum";
$text['label-emergency_date']['el-gr'] = "Date";
$text['label-emergency_date']['es-cl'] = "Fecha";
$text['label-emergency_date']['es-mx'] = "Fecha";
$text['label-emergency_date']['fr-ca'] = "Date";
$text['label-emergency_date']['fr-fr'] = "Date";
$text['label-emergency_date']['he-il'] = "תַאֲרִיך";
$text['label-emergency_date']['it-it'] = "Data";
$text['label-emergency_date']['nl-nl'] = "Datum";
$text['label-emergency_date']['pl-pl'] = "Data";
$text['label-emergency_date']['pt-br'] = "Data";
$text['label-emergency_date']['pt-pt'] = "Data";
$text['label-emergency_date']['ro-ro'] = "Data";
$text['label-emergency_date']['ru-ru'] = "Дата";
$text['label-emergency_date']['sv-se'] = "Datum";
$text['label-emergency_date']['uk-ua'] = "Дата";
$text['label-emergency_date']['tr-tr'] = "Tarih";
$text['label-emergency_date']['zh-cn'] = "日期";
$text['label-emergency_date']['ja-jp'] = "日付";
$text['label-emergency_date']['ko-kr'] = "날짜";
$text['label-emergency_extension']['en-us'] = "Extension";
$text['label-emergency_extension']['en-gb'] = "Extension";
$text['label-emergency_extension']['ar-eg'] = "امتداد";
$text['label-emergency_extension']['de-at'] = "Nebenstelle";
$text['label-emergency_extension']['de-ch'] = "Nebenstelle";
$text['label-emergency_extension']['de-de'] = "Nebenstelle";
$text['label-emergency_extension']['el-gr'] = "Επέκταση";
$text['label-emergency_extension']['es-cl'] = "Extensión";
$text['label-emergency_extension']['es-mx'] = "Extensión";
$text['label-emergency_extension']['fr-ca'] = "Extension";
$text['label-emergency_extension']['fr-fr'] = "Extension";
$text['label-emergency_extension']['he-il'] = "סיומת";
$text['label-emergency_extension']['it-it'] = "Estensione";
$text['label-emergency_extension']['nl-nl'] = "Verlenging";
$text['label-emergency_extension']['pl-pl'] = "Rozszerzenie";
$text['label-emergency_extension']['pt-br'] = "Extensão";
$text['label-emergency_extension']['pt-pt'] = "Extensão";
$text['label-emergency_extension']['ro-ro'] = "Extensie";
$text['label-emergency_extension']['ru-ru'] = "Расширение";
$text['label-emergency_extension']['sv-se'] = "Förlängning";
$text['label-emergency_extension']['uk-ua'] = "Розширення";
$text['label-emergency_extension']['tr-tr'] = "Eklenti";
$text['label-emergency_extension']['zh-cn'] = "扩大";
$text['label-emergency_extension']['ja-jp'] = "拡大";
$text['label-emergency_extension']['ko-kr'] = "확대";
$text['label-emergency_event']['en-us'] = "Event";
$text['label-emergency_event']['en-gb'] = "Event";
$text['label-emergency_event']['ar-eg'] = "حدث";
$text['label-emergency_event']['de-at'] = "Ereignis";
$text['label-emergency_event']['de-ch'] = "Ereignis";
$text['label-emergency_event']['de-de'] = "Ereignis";
$text['label-emergency_event']['el-gr'] = "Εκδήλωση";
$text['label-emergency_event']['es-cl'] = "Evento";
$text['label-emergency_event']['es-mx'] = "Evento";
$text['label-emergency_event']['fr-ca'] = "Événement";
$text['label-emergency_event']['fr-fr'] = "Événement";
$text['label-emergency_event']['he-il'] = "מִקרֶה";
$text['label-emergency_event']['it-it'] = "Evento";
$text['label-emergency_event']['nl-nl'] = "Evenement";
$text['label-emergency_event']['pl-pl'] = "Wydarzenie";
$text['label-emergency_event']['pt-br'] = "Evento";
$text['label-emergency_event']['pt-pt'] = "Evento";
$text['label-emergency_event']['ro-ro'] = "Eveniment";
$text['label-emergency_event']['ru-ru'] = "Событие";
$text['label-emergency_event']['sv-se'] = "Händelse";
$text['label-emergency_event']['uk-ua'] = "Подія";
$text['label-emergency_event']['tr-tr'] = "Etkinlik";
$text['label-emergency_event']['zh-cn'] = "事件";
$text['label-emergency_event']['ja-jp'] = "イベント";
$text['label-emergency_event']['ko-kr'] = "이벤트";
?>
+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";
?>
?>