Enhance [master] add column descriptions to xml_cdr (#2571)

update th_order_by to accept optional description parameter that will
populate the title field and append the , sort(order)
This commit is contained in:
Mafoo
2017-05-13 21:14:03 +01:00
committed by FusionPBX
parent 55ae0b2b42
commit 301b540600
3 changed files with 106 additions and 26 deletions

View File

@@ -450,20 +450,52 @@ $text['label-username']['sv-se'] = "Användarnamn";
$text['label-username']['uk-ua'] = "Ім’я користувача";
$text['label-tta']['en-us'] = "TTA";
$text['label-tta']['ar-eg'] = "";
$text['label-tta']['de-at'] = "TTA";
$text['label-tta']['de-de'] = "TTA";
$text['label-tta']['es-cl'] = "TTA";
$text['label-tta']['fr-fr'] = "TTA";
$text['label-tta']['he-il'] = "";
$text['label-tta']['it-it'] = "";
$text['label-tta']['nl-nl'] = "";
$text['label-tta']['pl-pl'] = "TTA";
$text['label-tta']['pt-br'] = "TTA";
$text['label-tta']['pt-pt'] = "TTA";
$text['label-tta']['ru-ru'] = "TTA";
$text['label-tta']['sv-se'] = "TTA";
$text['label-tta']['uk-ua'] = "TTA ";
$text['label-tta']['ar-eg'] = ""; //unsure of safe translation
$text['label-tta']['de-at'] = "ZZB"; //Google translate
$text['label-tta']['de-de'] = "ZZB"; //Google translate
$text['label-tta']['es-cl'] = "HDC"; //Google translate
$text['label-tta']['fr-fr'] = "LTDR"; //Google translate
$text['label-tta']['he-il'] = ""; //unsure of safe translation
$text['label-tta']['it-it'] = "TPR"; //Google translate
$text['label-tta']['nl-nl'] = "TOTA"; //Google translate
$text['label-tta']['pl-pl'] = "CNO"; //Google translate
$text['label-tta']['pt-br'] = "HDR"; //Google translate
$text['label-tta']['pt-pt'] = "HDR"; //Google translate
$text['label-tta']['ru-ru'] = ""; //unsure of safe translation
$text['label-tta']['sv-se'] = "DAS"; //Google translate
$text['label-tta']['uk-ua'] = ""; //unsure of safe translation
$text['label-pdd']['en-us'] = "PDD";
$text['label-pdd']['ar-eg'] = ""; //unsure of safe translation
$text['label-pdd']['de-at'] = ""; //unsure of safe translation
$text['label-pdd']['de-de'] = ""; //unsure of safe translation
$text['label-pdd']['es-cl'] = "RDMP"; //Google translate
$text['label-pdd']['fr-fr'] = "TDLPDP"; //Google translate
$text['label-pdd']['he-il'] = ""; //unsure of safe translation
$text['label-pdd']['it-it'] = "RDCP"; //Google translate
$text['label-pdd']['nl-nl'] = ""; //Google translate gave english
$text['label-pdd']['pl-pl'] = "ONZ"; //Google translate
$text['label-pdd']['pt-br'] = "ADDDP"; //Google translate
$text['label-pdd']['pt-pt'] = "ADDDP"; //Google translate
$text['label-pdd']['ru-ru'] = ""; //unsure of safe translation
$text['label-pdd']['sv-se'] = "SF"; //Google translate
$text['label-pdd']['uk-ua'] = ""; //unsure of safe translation
$text['label-mos']['en-us'] = "MOS";
$text['label-mos']['ar-eg'] = ""; //unsure of safe translation
$text['label-mos']['de-at'] = "MM"; //Google translate
$text['label-mos']['de-de'] = "MM"; //Google translate
$text['label-mos']['es-cl'] = "PDOM"; //Google translate
$text['label-mos']['fr-fr'] = "SMD"; //Google translate
$text['label-mos']['he-il'] = ""; //unsure of safe translation
$text['label-mos']['it-it'] = "PM"; //Google translate
$text['label-mos']['nl-nl'] = "GMS"; //Google translate
$text['label-mos']['pl-pl'] = "ŚOO"; //Google translate
$text['label-mos']['pt-br'] = "PDOM"; //Google translate
$text['label-mos']['pt-pt'] = "PDOM"; //Google translate
$text['label-mos']['ru-ru'] = ""; //unsure of safe translation
$text['label-mos']['sv-se'] = "GBP"; //Google translate
$text['label-mos']['uk-ua'] = ""; ///unsure of safe translation
$text['label-total']['en-us'] = "Total";
$text['label-total']['ar-eg'] = "";
@@ -1836,6 +1868,54 @@ $text['description']['ru-ru'] = "Подробные сведения о вызо
$text['description']['sv-se'] = "Detaljerad Samtalsinformation (CDR) är detaljerad information från samtalen.";
$text['description']['uk-ua'] = "Редагування інформації облікового запису";
$text['description-tta']['en-us'] = "Time to answer";
$text['description-tta']['ar-eg'] = "الوقت للإجابة"; //Google translate
$text['description-tta']['de-at'] = "Zeit zu beantworten"; //Google translate
$text['description-tta']['de-de'] = "Zeit zu beantworten"; //Google translate
$text['description-tta']['es-cl'] = "Hora de contestar"; //Google translate
$text['description-tta']['fr-fr'] = "Le temps de répondre"; //Google translate
$text['description-tta']['it-it'] = "Tempo per rispondere"; //Google translate
$text['description-tta']['he-il'] = "הגיע הזמן לענות"; //Google translate
$text['description-tta']['nl-nl'] = "Tijd om te antwoorden"; //Google translate
$text['description-tta']['pl-pl'] = "Czas na odpowiedź"; //Google translate
$text['description-tta']['pt-br'] = "Hora de responder"; //Google translate
$text['description-tta']['pt-pt'] = "Hora de responder"; //Google translate
$text['description-tta']['ru-ru'] = "Время ответа"; //Google translate
$text['description-tta']['sv-se'] = "Dags att svara"; //Google translate
$text['description-tta']['uk-ua'] = "час відповіді"; //Google translate
$text['description-pdd']['en-us'] = "Post dial delay";
$text['description-pdd']['ar-eg'] = "تأخير الاتصال الهاتفي"; //Google translate
$text['description-pdd']['de-at'] = "Pfostenwahlverzögerung"; //Google translate
$text['description-pdd']['de-de'] = "Pfostenwahlverzögerung"; //Google translate
$text['description-pdd']['es-cl'] = "Retardo de marcación posterior"; //Google translate
$text['description-pdd']['fr-fr'] = "Temporisation de la poste de poste"; //Google translate
$text['description-pdd']['it-it'] = "Ritardo di composizione postale"; //Google translate
$text['description-pdd']['he-il'] = "עיכוב בהמתנה"; //Google translate
$text['description-tta']['nl-nl'] = ""; //Google translate gave english
$text['description-pdd']['pl-pl'] = "Opóźnienie po zadzwonieniu"; //Google translate
$text['description-pdd']['pt-br'] = "Atraso de discagem de postagem"; //Google translate
$text['description-pdd']['pt-pt'] = "Atraso de discagem de postagem"; //Google translate
$text['description-pdd']['ru-ru'] = "Задержка после набора номера"; //Google translate
$text['description-pdd']['sv-se'] = "Sänd fördröjning"; //Google translate
$text['description-pdd']['uk-ua'] = "Повідомлення затримки набору"; //Google translate
$text['description-mos']['en-us'] = "Mean opinion score";
$text['description-mos']['ar-eg'] = "يعني النتيجة الرأي"; //Google translate
$text['description-mos']['de-at'] = "Mittlere Meinungsbewertung"; //Google translate
$text['description-mos']['de-de'] = "Mittlere Meinungsbewertung"; //Google translate
$text['description-mos']['es-cl'] = "Puntuación de opinión media"; //Google translate
$text['description-mos']['fr-fr'] = "Score moyen d'opinion"; //Google translate
$text['description-mos']['it-it'] = "Punteggio medio"; //Google translate
$text['description-mos']['he-il'] = "ציון דעת ממוצע"; //Google translate
$text['description-tta']['nl-nl'] = "Gemiddelde mening score"; //Google translate
$text['description-mos']['pl-pl'] = "Średnia ocena opinii"; //Google translate
$text['description-mos']['pt-br'] = "Pontuação de opinião média"; //Google translate
$text['description-mos']['pt-pt'] = "Pontuação de opinião média"; //Google translate
$text['description-mos']['ru-ru'] = "Средний оценочный показатель"; //Google translate
$text['description-mos']['sv-se'] = "Genomsnittlig bedömning poäng"; //Google translate
$text['description-mos']['uk-ua'] = "Середнє число думок"; //Google translate
$text['button-update']['en-us'] = "Update";
$text['button-update']['ar-eg'] = "";
$text['button-update']['de-at'] = "Aktualisieren";

View File

@@ -383,18 +383,18 @@
}
}
echo th_order_by('start_stamp', $text['label-start'], $order_by, $order, null, "style='text-align: center;'", $param);
echo th_order_by('tta', $text['label-tta'], $order_by, $order, null, "style='text-align: right;'", $param);
echo th_order_by('tta', $text['label-tta'], $order_by, $order, null, "style='text-align: right;'", $param, $text['description-tta']);
echo th_order_by('duration', $text['label-duration'], $order_by, $order, null, "style='text-align: center;'", $param);
if (file_exists($_SERVER["PROJECT_ROOT"]."/app/billing/app_config.php")){
echo "<th>".$text['label-price']."</th>\n";
$col_count++;
}
if (permission_exists('xml_cdr_pdd')) {
echo th_order_by('pdd_ms', 'PDD', $order_by, $order, null, "style='text-align: right;'", $param);
echo th_order_by('pdd_ms', $text['label-pdd'], $order_by, $order, null, "style='text-align: right;'", $param, $text['description-pdd']);
$col_count++;
}
if (permission_exists('xml_cdr_mos')) {
echo th_order_by('rtp_audio_in_mos', 'MOS', $order_by, $order, null, "style='text-align: center;'", $param);
echo th_order_by('rtp_audio_in_mos', $text['label-mos'], $order_by, $order, null, "style='text-align: center;'", $param, $text['description-mos']);
$col_count++;
}
if (if_group("admin") || if_group("superadmin") || if_group("cdr")) {

View File

@@ -460,20 +460,20 @@
if (!function_exists('th_order_by')) {
//html table header order by
function th_order_by($field_name, $columntitle, $order_by, $order, $app_uuid = '', $css = '', $additional_get_params='') {
function th_order_by($field_name, $columntitle, $order_by, $order, $app_uuid = '', $css = '', $additional_get_params='', $description='') {
if (strlen($app_uuid) > 0) { $app_uuid = "&app_uuid=".$app_uuid; } // accomodate need to pass app_uuid where necessary (inbound/outbound routes lists)
if (strlen($additional_get_params) > 0) {$additional_get_params = '&'.$additional_get_params; } // you may need to pass other parameters
$html = "<th ".$css." nowrap>";
if (strlen($order_by)==0) {
$html .= "<a href='?order_by=$field_name&order=desc".$app_uuid."$additional_get_params' title='ascending'>$columntitle</a>";
$description = (strlen($description) > 0) ? $description . ', ': '';
if (strlen($order_by) == 0)
$order = 'asc';
if ($order == "asc") {
$description .= 'sort(ascending)';
$html .= "<a href='?order_by=$field_name&order=desc".$app_uuid."$additional_get_params' title='$description'>$columntitle</a>";
}
else {
if ($order=="asc") {
$html .= "<a href='?order_by=$field_name&order=desc".$app_uuid."$additional_get_params' title='ascending'>$columntitle</a>";
}
else {
$html .= "<a href='?order_by=$field_name&order=asc".$app_uuid."$additional_get_params' title='descending'>$columntitle</a>";
}
$description .= 'sort(descending)';
$html .= "<a href='?order_by=$field_name&order=asc".$app_uuid."$additional_get_params' title='$description'>$columntitle</a>";
}
$html .= "</th>";
return $html;