From e665b55be857808a580e4b32dc7d4667ec20e944 Mon Sep 17 00:00:00 2001 From: mattf Date: Tue, 30 Jan 2018 02:05:27 +0000 Subject: [PATCH] For translation corrections, uses vicidial_state_report_functions.php instead of vicidial_state_report_functions.js in whiteboard report git-svn-id: svn://192.168.202.10@2897 3d104415-ff17-0410-8863-d5cf3c621b8a --- .../www/vicidial/AST_rt_whiteboard_rpt.php | 27 ++++---- ...s.js => vicidial_whiteboard_functions.php} | 64 ++++++++++--------- 2 files changed, 48 insertions(+), 43 deletions(-) rename agc_2-X/trunk/www/vicidial/{vicidial_whiteboard_functions.js => vicidial_whiteboard_functions.php} (83%) diff --git a/agc_2-X/trunk/www/vicidial/AST_rt_whiteboard_rpt.php b/agc_2-X/trunk/www/vicidial/AST_rt_whiteboard_rpt.php index ccd7df77..e0fdcb03 100644 --- a/agc_2-X/trunk/www/vicidial/AST_rt_whiteboard_rpt.php +++ b/agc_2-X/trunk/www/vicidial/AST_rt_whiteboard_rpt.php @@ -6,6 +6,7 @@ # Real-time report that allows users to create a customized, graphical display of various data sets # # 171027-2352 - First build +# 180129-1745 - Translation corrections, uses vicidial_state_report_functions.php instead of vicidial_state_report_functions.js # $startMS = microtime(); @@ -575,18 +576,18 @@ $MAIN.=""; $MAIN.=""._QXZ("Report Type").": $NWB#rt_whiteboard_report-report_type$NWE
"; $MAIN.="\n"; $MAIN.="\n"; @@ -843,7 +844,7 @@ $MAIN.=""; $MAIN.=""; -$MAIN.="\n"; +$MAIN.="\n"; $MAIN.=""; header("Content-type: text/html; charset=utf-8"); diff --git a/agc_2-X/trunk/www/vicidial/vicidial_whiteboard_functions.js b/agc_2-X/trunk/www/vicidial/vicidial_whiteboard_functions.php similarity index 83% rename from agc_2-X/trunk/www/vicidial/vicidial_whiteboard_functions.js rename to agc_2-X/trunk/www/vicidial/vicidial_whiteboard_functions.php index 717f8b6b..2372c701 100644 --- a/agc_2-X/trunk/www/vicidial/vicidial_whiteboard_functions.js +++ b/agc_2-X/trunk/www/vicidial/vicidial_whiteboard_functions.php @@ -1,3 +1,7 @@ + // vicidial_whiteboard_functions.php // // Copyright (C) 2017 Matt Florell , Joe Johnson LICENSE: AGPLv2 @@ -154,10 +158,10 @@ function RefreshReportWindow() { var InvForm = document.forms[0]; var x = 0; - var query_date_str="Start date: "+query_date+" "+query_time; + var query_date_str=": "+query_date+" "+query_time; if (hourly_display && hourly_display>0) { - query_date_str="Displaying last "+hourly_display+" hours"; + query_date_str=" "+hourly_display+" "; } var campaign_parameters_str=""; @@ -235,14 +239,14 @@ function RefreshReportWindow() { var report_parameters="
"; - report_parameters+="Report Type: "+report_type+"
\n"; + report_parameters+=": "+report_type+"
\n"; report_parameters+=query_date_str+"
\n"; - if (campaign_parameters_str.length>0) {report_parameters+="Campaigns: "+CPstr+"
\n";} - if (user_groups_parameters_str.length>0) {report_parameters+="User groups: "+UGPstr+"
\n";} - if (users_parameters_str.length>0) {report_parameters+="Users: "+USPstr+"
\n";} - if (groups_parameters_str.length>0) {report_parameters+="In-groups: "+GPstr+"
\n";} - if (did_parameters_str.length>0) {report_parameters+="DIDs: "+DPstr+"
\n";} - if (status_flags_parameters_str.length>0) {report_parameters+="Status flags: "+SFstr+"
\n";} + if (campaign_parameters_str.length>0) {report_parameters+=": "+CPstr+"
\n";} + if (user_groups_parameters_str.length>0) {report_parameters+=": "+UGPstr+"
\n";} + if (users_parameters_str.length>0) {report_parameters+=": "+USPstr+"
\n";} + if (groups_parameters_str.length>0) {report_parameters+=": "+GPstr+"
\n";} + if (did_parameters_str.length>0) {report_parameters+=": "+DPstr+"
\n";} + if (status_flags_parameters_str.length>0) {report_parameters+=": "+SFstr+"
\n";} report_parameters+="
\n"; document.getElementById("parameters_span").innerHTML=report_parameters; @@ -340,12 +344,12 @@ function RefreshReportWindow() { var Top10HTMLChart="
"; Top10HTMLChart+=""; - Top10HTMLChart+=""; + Top10HTMLChart+=""; Top10HTMLChart+=""; Top10HTMLChart+=""; Top10HTMLChart+=""; - Top10HTMLChart+=""; - Top10HTMLChart+=""; + Top10HTMLChart+=""; + Top10HTMLChart+=""; Top10HTMLChart+=""; Top10HTMLChart+=""; @@ -382,7 +386,7 @@ function RefreshReportWindow() { } } Top10HTMLChart+=""; - Top10HTMLChart+=""; + Top10HTMLChart+=""; Top10HTMLChart+=""; Top10HTMLChart+="
TOP 10 PERFORMERS
RANKNAME


"; document.getElementById("top_10_display").innerHTML=Top10HTMLChart; @@ -399,12 +403,12 @@ function RefreshReportWindow() { TotalSeconds="0"+TotalSeconds; if (response_txt && response_txt=="REPORT RETURNED NO RESULTS") { - document.getElementById("total_calls_div").innerHTML="** NO RESULTS **"; - document.getElementById("total_sales_div").innerHTML="** NO RESULTS **"; - document.getElementById("total_time_div").innerHTML="** NO RESULTS **"; - document.getElementById("total_cph_div").innerHTML="** NO RESULTS **"; - document.getElementById("total_sph_div").innerHTML="** NO RESULTS **"; - document.getElementById("total_conv_div").innerHTML="** NO RESULTS **"; + document.getElementById("total_calls_div").innerHTML="** **"; + document.getElementById("total_sales_div").innerHTML="** **"; + document.getElementById("total_time_div").innerHTML="** **"; + document.getElementById("total_cph_div").innerHTML="** **"; + document.getElementById("total_sph_div").innerHTML="** **"; + document.getElementById("total_conv_div").innerHTML="** **"; } else { document.getElementById("total_calls_div").innerHTML=TotalCallCount; document.getElementById("total_sales_div").innerHTML=TotalSaleCount; @@ -440,12 +444,12 @@ function RefreshReportWindow() { // options: { elements: { point: { radius: 0 } } }, // no dots data: { datasets: [ - {label: 'Total calls', data: TotalCallCountArray, backgroundColor: "rgba(153,153,255,0.5)", hidden: hide_total}, // dataset 0, see below - {label: 'Total sales', data: TotalSaleCountArray, backgroundColor: "rgba(255,153,153,0.5)", hidden: hide_total}, // dataset 1, see below - {label: 'Calls per hour', data: CPHArray, backgroundColor: "rgba(255,255,0,0.5)", hidden: hide_rates}, // dataset 2, see below - {label: 'Sales per hour', data: SPHArray, backgroundColor: "rgba(153,255,153,0.5)", hidden: hide_rates}, // dataset 3, see below - {label: 'Conversion rate %', data: ConvRateArray, backgroundColor: "rgba(255,153,255,0.5)", hidden: hide_rates}, // dataset 4, see below - {label: 'Target gross', data: TGArray, type: 'line', pointRadius: 0, backgroundColor: "rgba(153,255,255,0.5)", hidden: hide_total} // dataset 5, see below + {label: '', data: TotalCallCountArray, backgroundColor: "rgba(153,153,255,0.5)", hidden: hide_total}, // dataset 0, see below + {label: '', data: TotalSaleCountArray, backgroundColor: "rgba(255,153,153,0.5)", hidden: hide_total}, // dataset 1, see below + {label: '', data: CPHArray, backgroundColor: "rgba(255,255,0,0.5)", hidden: hide_rates}, // dataset 2, see below + {label: '', data: SPHArray, backgroundColor: "rgba(153,255,153,0.5)", hidden: hide_rates}, // dataset 3, see below + {label: '', data: ConvRateArray, backgroundColor: "rgba(255,153,255,0.5)", hidden: hide_rates}, // dataset 4, see below + {label: '', data: TGArray, type: 'line', pointRadius: 0, backgroundColor: "rgba(153,255,255,0.5)", hidden: hide_total} // dataset 5, see below ], labels: LabelArray } @@ -490,11 +494,11 @@ function RefreshReportWindow() { // options: { elements: { point: { radius: 0 } } }, // no dots data: { datasets: [ - {label: 'Total calls', data: CallCountArray, backgroundColor: "rgba(153,153,255,0.5)", hidden: false}, // dataset 0, see below - {label: 'Total sales', data: SaleCountArray, backgroundColor: "rgba(255,153,153,0.5)", hidden: false}, // dataset 1, see below - {label: 'Sales per hour', data: SPHArray, backgroundColor: "rgba(153,255,153,0.5)", hidden: false}, // dataset 2, see below - {label: 'Conversion rate %', data: ConvRateArray, backgroundColor: "rgba(255,255,0,0.5)", hidden: false}, // dataset 3, see below - {label: 'Target per unit', data: TPAArray, type: 'line', pointRadius: 0, backgroundColor: "rgba(153,255,255,0.5)", hidden: false} // dataset 4, see below + {label: '', data: CallCountArray, backgroundColor: "rgba(153,153,255,0.5)", hidden: false}, // dataset 0, see below + {label: '', data: SaleCountArray, backgroundColor: "rgba(255,153,153,0.5)", hidden: false}, // dataset 1, see below + {label: '', data: SPHArray, backgroundColor: "rgba(153,255,153,0.5)", hidden: false}, // dataset 2, see below + {label: '', data: ConvRateArray, backgroundColor: "rgba(255,255,0,0.5)", hidden: false}, // dataset 3, see below + {label: '', data: TPAArray, type: 'line', pointRadius: 0, backgroundColor: "rgba(153,255,255,0.5)", hidden: false} // dataset 4, see below ], labels: LabelArray },