From 6d824c4c83c1c6ac8920c116f562c3f3a38fb5e7 Mon Sep 17 00:00:00 2001 From: mattf Date: Fri, 1 Nov 2019 20:46:49 +0000 Subject: [PATCH] Added second script tab in agent screen option Added VM Message groups feature Fixed hundreds of translations issues in admin scripts git-svn-id: svn://192.168.202.10@3152 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/list_merge.php | 42 +++++++++++++++---- .../vicidial_whiteboard_functions.php | 8 +++- 2 files changed, 42 insertions(+), 8 deletions(-) diff --git a/www/vicidial/list_merge.php b/www/vicidial/list_merge.php index b57080b7..cd1f8aa1 100644 --- a/www/vicidial/list_merge.php +++ b/www/vicidial/list_merge.php @@ -8,7 +8,7 @@ # 170409-1548 - Added IP List validation code # 170819-1000 - Added allow_manage_active_lists option # 180508-2215 - Added new help display - +# 191101-1630 - Translation patch, removed function.js # $version = '2.14-3'; @@ -195,7 +195,35 @@ if ( $modify_lists < 1 ) echo "\n"; echo "\n"; echo ""; -echo "\n"; +#echo "\n"; +?> + +\n"; echo "\n"; @@ -545,7 +573,7 @@ if (($submit != "submit" ) && ($confirm != "CONFIRM")) # Available Lists echo ""._QXZ("Available Lists")."\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; # echo " "; #echo " Retain original list ID (stored in entry_list_id column)"; - echo "(Lists selected above will automatically populate here)\n"; + echo "("._QXZ("Lists selected above will automatically populate here").")\n"; # Destination List ID echo ""._QXZ("Alternate list information - only required if -ALTERNATE LIST- is selected above")."\n"; echo ""._QXZ("Alternate list ID:")."\n"; - echo " (digits only)\n"; + echo " ("._QXZ("digits only").")\n"; echo "\n"; echo ""._QXZ("Below fields are required ONLY if -Alternate list ID- is filled out and not an already-existing list")."\n"; @@ -602,7 +630,7 @@ if (($submit != "submit" ) && ($confirm != "CONFIRM")) echo "\n"; # Submit - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; diff --git a/www/vicidial/vicidial_whiteboard_functions.php b/www/vicidial/vicidial_whiteboard_functions.php index 315d7529..dc29b108 100644 --- a/www/vicidial/vicidial_whiteboard_functions.php +++ b/www/vicidial/vicidial_whiteboard_functions.php @@ -148,6 +148,7 @@ function RefreshReportWindow() { var target_per_agent=document.getElementById("target_per_agent").value; var rpt_field = document.getElementById("report_type"); var report_type = rpt_field.options[rpt_field.selectedIndex].value; + var report_type_text = rpt_field.options[rpt_field.selectedIndex].text; if (!target_per_agent) {target_per_agent=0;} if (!target_gross) {target_gross=0;} @@ -241,6 +242,7 @@ function RefreshReportWindow() { var regRPTrates = new RegExp("rates","g"); var regRPTcomma = new RegExp(", $","g"); var regRPTpipe = new RegExp("|$","g"); + var regRPTall = new RegExp("--ALL--","g"); var CPstr=campaign_parameters_str.replace(regRPTcomma, ''); var UGPstr=user_groups_parameters_str.replace(regRPTcomma, ''); @@ -249,9 +251,13 @@ function RefreshReportWindow() { var DPstr=did_parameters_str.replace(regRPTcomma, ''); var SFstr=status_flags_parameters_str.replace(regRPTcomma, ''); + var CPstr=CPstr.replace(regRPTall, ''); + var UGPstr=UGPstr.replace(regRPTall, ''); + var USPstr=USPstr.replace(regRPTall, ''); + var GPstr=GPstr.replace(regRPTall, ''); var report_parameters="
"; - report_parameters+=": "+report_type+"
\n"; + report_parameters+=": "+report_type_text+"
\n"; report_parameters+=query_date_str+"
\n"; if (campaign_parameters_str.length>0) {report_parameters+=": "+CPstr+"
\n";} if (user_groups_parameters_str.length>0) {report_parameters+=": "+UGPstr+"
\n";}