From 810d8c4da0c8a51c81dd26869035b087d9496cb2 Mon Sep 17 00:00:00 2001 From: mattf Date: Wed, 13 Mar 2019 10:46:43 +0000 Subject: [PATCH] Fix for columns display issue #1141 git-svn-id: svn://192.168.202.10@3077 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/AST_timeonVDADall.php | 54 ++++++++++++++++++------------ 1 file changed, 32 insertions(+), 22 deletions(-) diff --git a/www/vicidial/AST_timeonVDADall.php b/www/vicidial/AST_timeonVDADall.php index 97ce0f40..7f69fdcb 100644 --- a/www/vicidial/AST_timeonVDADall.php +++ b/www/vicidial/AST_timeonVDADall.php @@ -109,10 +109,11 @@ # 170615-0023 - Added DIAL status for manual dial agent calls that have not been answered # 180204-1538 - Added display of LIVE Inbound Callback Queue Calls # 190206-1616 - Added mobile device display variable +# 190313-0607 - Fix for columns display issue #1141 # -$version = '2.14-96'; -$build = '180204-1538'; +$version = '2.14-97'; +$build = '190313-0607'; header ("Content-type: text/html; charset=utf-8"); @@ -2632,7 +2633,7 @@ if ($report_display_type=='TEXT') $HTbegin = "|"; $HDstation = "----------------+"; $HTstation = " "._QXZ("STATION", 14)." |"; - $HDphone = "-------------+"; + $HDphone = "-------------------+"; $HTphone = " "._QXZ("PHONE",11)." |"; if ($RTajax > 0) {$HTphone = " "._QXZ("PHONE",11)." |";} @@ -2665,8 +2666,10 @@ if ($report_display_type=='TEXT') $HTusergroup = " "._QXZ("USER GROUP",12)." |"; if ($RTajax > 0) {$HTusergroup = " "._QXZ("USER GROUP",12)." |";} - $HDsessionid = "------------------+"; - $HTsessionid = " "._QXZ("SESSIONID",16)." |"; + $HDsessionid = "-----------+"; + $HTsessionid = " "._QXZ("SESSIONID",9)." |"; + $HDlisten = "--------+"; + $HTlisten = " "._QXZ("LISTEN",6)." |"; $HDbarge = "-------+"; $HTbarge = " "._QXZ("BARGE",5)." |"; $HDwhisper = "---------+"; @@ -2750,6 +2753,8 @@ if ($report_display_type=='HTML') {$HTusergroup = " "._QXZ("USER GROUP")." ";} $HDsessionid = ""; $HTsessionid = "  "._QXZ("SESSIONID")." "; + $HDlisten = ""; + $HTlisten = "  "._QXZ("LISTEN")." "; $HDbarge = ""; $HTbarge = "  "._QXZ("BARGE")." "; $HDwhisper = ""; @@ -2808,6 +2813,11 @@ if ($UGdisplay < 1) $HDusergroup = ''; $HTusergroup = ''; } +if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and (!preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) ) + { + $HDlisten = ''; + $HTlisten = ''; + } if ( ($SIPmonitorLINK<2) and ($IAXmonitorLINK<2) and (!preg_match("/BARGE/",$monitor_active) ) ) { $HDbarge = ''; @@ -2829,13 +2839,13 @@ if ($SERVdisplay < 1) if ($realtime_block_user_info > 0) { - $Aline = "$HDbegin$HDusergroup$HDsessionid$HDbarge$HDwhisper$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n"; - $Bline = "$HTbegin$HTusergroup$HTsessionid$HTbarge$HTwhisper$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n"; + $Aline = "$HDbegin$HDusergroup$HDsessionid$HDlisten$HDbarge$HDwhisper$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n"; + $Bline = "$HTbegin$HTusergroup$HTsessionid$HDlisten$HTbarge$HTwhisper$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n"; } else { - $Aline = "$HDbegin$HDstation$HDphone$HDuser$HDusergroup$HDsessionid$HDbarge$HDwhisper$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n"; - $Bline = "$HTbegin$HTstation$HTphone$HTuser$HTusergroup$HTsessionid$HTbarge$HTwhisper$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n"; + $Aline = "$HDbegin$HDstation$HDphone$HDuser$HDusergroup$HDsessionid$HDlisten$HDbarge$HDwhisper$HDstatus$HDpause$HDcustphone$HDserver_ip$HDcall_server_ip$HDtime$HDcampaign$HDcalls$HDigcall\n"; + $Bline = "$HTbegin$HTstation$HTphone$HTuser$HTusergroup$HTsessionid$HTlisten$HTbarge$HTwhisper$HTstatus$HTpause$HTcustphone$HTserver_ip$HTcall_server_ip$HTtime$HTcampaign$HTcalls$HTigcall\n"; } $Aecho .= "$Aline"; $Aecho .= "$Bline"; @@ -3082,7 +3092,7 @@ if ($talking_to_print > 0) } } - $phone = sprintf("%-12s", $phone_split[0]); + $phone = sprintf("%-18s", $phone_split[0]); $custphone = sprintf("%-11s", $custphone); $Luser = $Auser[$i]; $user = sprintf("%-20s", $Auser[$i]); @@ -3348,12 +3358,12 @@ if ($talking_to_print > 0) if ($report_display_type=='TEXT') { - if ($SIPmonitorLINK>0) {$L=" "._QXZ("LISTEN",6).""; $R='';} - if ($IAXmonitorLINK>0) {$L=" "._QXZ("LISTEN",6).""; $R='';} + if ($SIPmonitorLINK>0) {$L=" | "._QXZ("LISTEN",6).""; $R='';} + if ($IAXmonitorLINK>0) {$L=" | "._QXZ("LISTEN",6).""; $R='';} if ($SIPmonitorLINK>1) {$R=" | "._QXZ("BARGE",5)."";} if ($IAXmonitorLINK>1) {$R=" | BARGE";} if ( (strlen($monitor_phone)>1) and (preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) ) - {$L=" "._QXZ("LISTEN",6).""; $R='';} + {$L=" | "._QXZ("LISTEN",6).""; $R='';} if ( (strlen($monitor_phone)>1) and (preg_match("/BARGE|WHISPER/",$monitor_active) ) ) {$R=" | "._QXZ("BARGE",5)."";} if ($SIPmonitorLINK>1) {$R=" | WHISPER";} @@ -3412,18 +3422,18 @@ if ($talking_to_print > 0) if ($report_display_type=='HTML') { $G = preg_replace("/SPAN class=\"/",'SPAN class="H',$G); - if ($SIPmonitorLINK>0) {$L=" "._QXZ("LISTEN").""; $R='';} - if ($IAXmonitorLINK>0) {$L=" "._QXZ("LISTEN").""; $R='';} - if ($SIPmonitorLINK>1) {$R=" "._QXZ("BARGE")."";} - if ($IAXmonitorLINK>1) {$R=" BARGE";} + if ($SIPmonitorLINK>0) {$L=" "._QXZ("LISTEN").""; $R='';} + if ($IAXmonitorLINK>0) {$L=" "._QXZ("LISTEN").""; $R='';} + if ($SIPmonitorLINK>1) {$R=" "._QXZ("BARGE")."";} + if ($IAXmonitorLINK>1) {$R=" BARGE";} if ( (strlen($monitor_phone)>1) and (preg_match("/MONITOR|BARGE|WHISPER/",$monitor_active) ) ) - {$L=" "._QXZ("LISTEN").""; $R='';} + {$L=" "._QXZ("LISTEN").""; $R='';} if ( (strlen($monitor_phone)>1) and (preg_match("/BARGE|WHISPER/",$monitor_active) ) ) - {$R=" "._QXZ("BARGE")."";} - if ($SIPmonitorLINK>1) {$R=" WHISPER";} - if ($IAXmonitorLINK>1) {$R=" WHISPER";} + {$R=" "._QXZ("BARGE")."";} + if ($SIPmonitorLINK>1) {$R=" WHISPER";} + if ($IAXmonitorLINK>1) {$R=" WHISPER";} if ( (strlen($monitor_phone)>1) and (preg_match("/WHISPER/",$monitor_active) ) ) - {$R=" WHISPER";} + {$R=" WHISPER";} if ($CUSTPHONEdisplay > 0) {$CP = " $G$custphone$EG ";} else {$CP = "";}