diff --git a/app/emergency/app_languages.php b/app/emergency/app_languages.php index 455852ef7d..8630b051e9 100644 --- a/app/emergency/app_languages.php +++ b/app/emergency/app_languages.php @@ -162,4 +162,31 @@ $text['label-emergency_event']['zh-cn'] = "事件"; $text['label-emergency_event']['ja-jp'] = "イベント"; $text['label-emergency_event']['ko-kr'] = "이벤트"; +$text['label-emergency_call_status']['en-us'] = "Call Status"; +$text['label-emergency_call_status']['en-gb'] = "Call Status"; +$text['label-emergency_call_status']['ar-eg'] = ""; +$text['label-emergency_call_status']['de-at'] = ""; +$text['label-emergency_call_status']['de-ch'] = ""; +$text['label-emergency_call_status']['de-de'] = ""; +$text['label-emergency_call_status']['el-gr'] = ""; +$text['label-emergency_call_status']['es-cl'] = ""; +$text['label-emergency_call_status']['es-mx'] = ""; +$text['label-emergency_call_status']['fr-ca'] = ""; +$text['label-emergency_call_status']['fr-fr'] = ""; +$text['label-emergency_call_status']['he-il'] = ""; +$text['label-emergency_call_status']['it-it'] = ""; +$text['label-emergency_call_status']['ka-ge'] = ""; +$text['label-emergency_call_status']['nl-nl'] = ""; +$text['label-emergency_call_status']['pl-pl'] = ""; +$text['label-emergency_call_status']['pt-br'] = ""; +$text['label-emergency_call_status']['pt-pt'] = ""; +$text['label-emergency_call_status']['ro-ro'] = ""; +$text['label-emergency_call_status']['ru-ru'] = ""; +$text['label-emergency_call_status']['sv-se'] = ""; +$text['label-emergency_call_status']['uk-ua'] = ""; +$text['label-emergency_call_status']['tr-tr'] = ""; +$text['label-emergency_call_status']['zh-cn'] = ""; +$text['label-emergency_call_status']['ja-jp'] = ""; +$text['label-emergency_call_status']['ko-kr'] = ""; + ?> diff --git a/app/emergency/emergency.php b/app/emergency/emergency.php index 6452043b3c..a8e76ce843 100644 --- a/app/emergency/emergency.php +++ b/app/emergency/emergency.php @@ -115,31 +115,35 @@ else { } //get the list -$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 "; +$sql = "select e.emergency_log_uuid, "; +$sql .= "e.domain_uuid, "; +$sql .= "e.extension, "; +$sql .= "e.event, "; +$sql .= "to_char(timezone(:time_zone, e.insert_date), 'DD Mon YYYY') as date_formatted, "; +$sql .= "to_char(timezone(:time_zone, e.insert_date), 'HH12:MI:SS am') as time_formatted, "; +$sql .= "e.insert_date, "; +$sql .= "c.status as status "; +$sql .= "from v_emergency_logs e "; +$sql .= "left join v_xml_cdr c "; +$sql .= "on e.emergency_log_uuid = c.xml_cdr_uuid "; if ($show == 'all') { $sql .= "where true "; } else { - $sql .= "where domain_uuid = :domain_uuid "; + $sql .= "where e.domain_uuid = :domain_uuid "; $parameters['domain_uuid'] = $_SESSION['domain_uuid']; } if (!empty($search)) { $sql .= "and ( "; - $sql .= " lower(event) like :search "; + $sql .= " lower(e.event) like :search "; $sql .= ") "; $parameters['search'] = '%'.$search.'%'; } -$sql .= "order by insert_date desc "; +$sql .= "order by e.insert_date desc "; $sql .= limit_offset($rows_per_page, $offset); $parameters['time_zone'] = $time_zone; $emergency_logs = $database->select($sql, $parameters ?? null, 'all'); + unset($sql, $parameters); //create token @@ -193,6 +197,7 @@ echo "