From 62cde9cf61f8964b04abc74599da4fb5949aac91 Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 28 Feb 2017 03:42:19 +0000 Subject: [PATCH] Change to allow horizontal_bar_chart header to be translated, issue #991 git-svn-id: svn://192.168.202.10@2689 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin.php | 59 ++++++++++++++++-------- agc_2-X/trunk/www/vicidial/functions.php | 10 ++-- 2 files changed, 46 insertions(+), 23 deletions(-) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index c78b9433..a0822b68 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -3945,12 +3945,13 @@ else # 170221-1542 - Added more DNC options for campaign setting 'manual dial filter', added counts to DNC add/delete page # 170223-0657 - Added warning for On Hold Message if too long, adjusted chooser placements # 170226-0850 - Added recording override options to chat and email groups to disable recordings for those, issue #992 +# 170227-2231 - Change to allow horizontal_bar_chart header to be translated, issue #991 # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 9 to access this page the first time -$admin_version = '2.14-594a'; -$build = '170226-0850'; +$admin_version = '2.14-595a'; +$build = '170227-2231'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -20653,7 +20654,8 @@ if ($ADD==31) echo ""._QXZ("Campaign Call Date").": $campaign_calldate   $NWB#campaigns-campaign_calldate$NWE\n"; echo "\n"; - horizontal_bar_chart($campaign_id,'8','campaign',$link,'total_calls','call count',1,'',''); + $temp_chart_title = _QXZ("8 Day outbound call count for this campaign"); + horizontal_bar_chart($campaign_id,'8','campaign',$link,'total_calls','call count',1,'','',$temp_chart_title); echo "\n"; echo ""._QXZ("Active").": $NWB#campaigns-active$NWE\n"; @@ -25522,7 +25524,8 @@ if ($ADD==3111) echo ""._QXZ("In-Group Calldate").": $group_calldate$NWB#inbound_groups-group_calldate$NWE\n"; echo "\n"; - horizontal_bar_chart($group_id,'8','in-group',$link,'total_calls','call count',1,'',''); + $temp_chart_title = _QXZ("8 Day inbound call count for this in-group"); + horizontal_bar_chart($group_id,'8','in-group',$link,'total_calls','call count',1,'','',$temp_chart_title); echo "\n"; echo ""._QXZ("Admin User Group").": \n"; @@ -27551,7 +27555,8 @@ if ($ADD==3911) echo ""._QXZ("Default List ID").": "; echo "\n"; - horizontal_bar_chart($group_id,'8','in-group',$link,'total_calls','call count',1,'',''); + $temp_chart_title = _QXZ("8 Day inbound call count for this in-group"); + horizontal_bar_chart($group_id,'8','in-group',$link,'total_calls','call count',1,'','',$temp_chart_title); echo "\n"; echo ""._QXZ("Admin User Group").": $NWB#remote_agents-on_hook_ring_time$NWE\n"; echo "\n"; - horizontal_bar_chart($user_start,'8','remote-agent',$link,'ra_total_calls','call count',1,'',''); + $temp_chart_title = _QXZ("8 Day call count for this remote-agent"); + horizontal_bar_chart($user_start,'8','remote-agent',$link,'ra_total_calls','call count',1,'','',$temp_chart_title); echo "\n"; echo ""._QXZ("Inbound Groups").": \n"; @@ -37918,25 +37924,33 @@ if ($ADD==999993) if ($stage == 'remote-agent') { echo "\n"; - horizontal_bar_chart($campaign_id,$day_count,$stage,$link,'ra_total_calls','call count',0,'',''); + $temp_chart_title = "$day_count " . _QXZ("Day call count for this remote-agent"); + horizontal_bar_chart($campaign_id,$day_count,$stage,$link,'ra_total_calls','call count',0,'','',$temp_chart_title); echo "\n"; echo "\n"; - horizontal_bar_chart($campaign_id,$day_count,$stage,$link,'ra_concurrent_calls','most concurrent calls',0,'',''); + $temp_chart_title = "$day_count " . _QXZ("Day most concurrent calls for this remote-agent"); + horizontal_bar_chart($campaign_id,$day_count,$stage,$link,'ra_concurrent_calls','most concurrent calls',0,'','',$temp_chart_title); echo "\n"; } else { echo "\n"; - horizontal_bar_chart($campaign_id,$day_count,$in_out,$link,'total_calls','call count',0,'',''); + $temp_chart_title = "$day_count " . _QXZ("Day inbound call count for this in-group"); + if ($in_out=='campaign') {$temp_chart_title = "$day_count " . _QXZ("Day outbound call count for this campaign");} + horizontal_bar_chart($campaign_id,$day_count,$in_out,$link,'total_calls','call count',0,'','',$temp_chart_title); echo "\n"; echo "\n"; - horizontal_bar_chart($campaign_id,$day_count,$in_out,$link,$max_type,'most concurrent calls',0,'',''); + $temp_chart_title = "$day_count " . _QXZ("Day inbound most concurrent calls for this in-group"); + if ($in_out=='campaign') {$temp_chart_title = "$day_count " . _QXZ("Day outbound most concurrent calls for this campaign");} + horizontal_bar_chart($campaign_id,$day_count,$in_out,$link,$max_type,'most concurrent calls',0,'','',$temp_chart_title); echo "\n"; echo "\n"; - horizontal_bar_chart($campaign_id,$day_count,$in_out,$link,'max_agents','most concurrent agents',0,'',''); + $temp_chart_title = "$day_count " . _QXZ("Day inbound most concurrent agents for this in-group"); + if ($in_out=='campaign') {$temp_chart_title = "$day_count " . _QXZ("Day outbound most concurrent agents for this campaign");} + horizontal_bar_chart($campaign_id,$day_count,$in_out,$link,'max_agents','most concurrent agents',0,'','',$temp_chart_title); echo "\n"; } } @@ -38011,37 +38025,44 @@ if ($ADD==999992) echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'total_calls','total call count in and out',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day total call count in and out for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'total_calls','total call count in and out',0,$end_date,$download_link,$temp_chart_title); echo "\n"; echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'total_calls_inbound_all','total inbound call count',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day total inbound call count for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'total_calls_inbound_all','total inbound call count',0,$end_date,$download_link,$temp_chart_title); echo "\n"; echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'total_calls_outbound_all','total outbound call count',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day total outbound call count for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'total_calls_outbound_all','total outbound call count',0,$end_date,$download_link,$temp_chart_title); echo "\n"; echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'(max_inbound + max_outbound)','most concurrent calls in and out',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day most concurrent calls in and out for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'(max_inbound + max_outbound)','most concurrent calls in and out',0,$end_date,$download_link,$temp_chart_title); echo "\n"; echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'max_inbound','most concurrent calls inbound total',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day most concurrent calls inbound total for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'max_inbound','most concurrent calls inbound total',0,$end_date,$download_link,$temp_chart_title); echo "\n"; echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'max_outbound','most concurrent calls outbound total',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day most concurrent calls outbound total for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'max_outbound','most concurrent calls outbound total',0,$end_date,$download_link,$temp_chart_title); echo "\n"; echo "\n"; $download_link="["._QXZ("DOWNLOAD")."]"; - horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'max_agents','most concurrent agents',0,$end_date,$download_link); + $temp_chart_title = "$num_graph_days " . _QXZ("Day most concurrent agents for this system"); + horizontal_bar_chart($campaign_id,$num_graph_days,'system',$link,'max_agents','most concurrent agents',0,$end_date,$download_link,$temp_chart_title); echo "\n"; } else diff --git a/agc_2-X/trunk/www/vicidial/functions.php b/agc_2-X/trunk/www/vicidial/functions.php index 1d88852c..e4e0a248 100644 --- a/agc_2-X/trunk/www/vicidial/functions.php +++ b/agc_2-X/trunk/www/vicidial/functions.php @@ -1,10 +1,10 @@ LICENSE: AGPLv2 +# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 # # # CHANGES: @@ -27,6 +27,7 @@ # 150516-1206 - Added missing TZCODE segment to gmt_lookup function # 160802-1149 - Added hex2rgb function # 161102-0039 - Patched sec_convert function to display hours +# 170227-2230 - Change to allow horizontal_bar_chart header to be translated, issue #991 # ##### BEGIN validate user login credentials, check for failed lock out ##### @@ -234,7 +235,7 @@ function array_group_count($array, $sort = false) ##### BEGIN bar chart using max stats data ##### -function horizontal_bar_chart($campaign_id,$days_graph,$title,$link,$metric,$metric_name,$more_link,$END_DATE,$download_link) +function horizontal_bar_chart($campaign_id,$days_graph,$title,$link,$metric,$metric_name,$more_link,$END_DATE,$download_link,$chart_title) { $stats_start_time = time(); if ($END_DATE) @@ -305,9 +306,10 @@ function horizontal_bar_chart($campaign_id,$days_graph,$title,$link,$metric,$met { if ($title=='campaign') {$out_in_type=' outbound';} if ($title=='in-group') {$out_in_type=' inbound';} + if (strlen($chart_title)<4) {$chart_title = "$days_graph Day $out_in_type $metric_name for this $title";} if ($more_link > 0) {$link_text = "more summary stats...";} echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "\n";
$days_graph Day $out_in_type $metric_name for this $title   $link_text   $NWB#max_stats$NWE
$chart_title   $link_text   $NWB#max_stats$NWE
date $metric_name