From 878b80ef2fc143d5850eea4c7726a3bcb536cefb Mon Sep 17 00:00:00 2001 From: mattf Date: Sun, 13 Mar 2016 02:07:44 +0000 Subject: [PATCH] Added select/deselect all options to AC-CID modify page. Reworked max stats calculations git-svn-id: svn://192.168.202.10@2490 3d104415-ff17-0410-8863-d5cf3c621b8a --- agc_2-X/trunk/www/vicidial/admin.php | 46 +++++++++++++++------ agc_2-X/trunk/www/vicidial/admin_header.php | 27 ++++++++---- 2 files changed, 53 insertions(+), 20 deletions(-) diff --git a/agc_2-X/trunk/www/vicidial/admin.php b/agc_2-X/trunk/www/vicidial/admin.php index 3ea2c105..29d35635 100644 --- a/agc_2-X/trunk/www/vicidial/admin.php +++ b/agc_2-X/trunk/www/vicidial/admin.php @@ -3733,12 +3733,13 @@ else # 160304-2348 - Added link to API log report # 160305-2048 - Added alternate ivr(call menu) dtmf logging # 160306-1053 - Added new webphone options, added option to have carriers on all active asterisk servers +# 160312-1931 - Added select/deselect all options to AC-CID modify page. Reworked max stats calculations # # 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.12-541a'; -$build = '160306-1053'; +$admin_version = '2.12-542a'; +$build = '160312-1931'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -21873,6 +21874,8 @@ if ($ADD==31) ##### CAMPAIGN AREACODE CID ##### if ($SUB==202) { + $checkbox_list=''; + $checkbox_count=0; echo "

"._QXZ("AREACODE CIDS FOR THIS CAMPAIGN").":   $NWB#campaign_cid_areacodes$NWE
\n"; if ($use_custom_cid != 'AREACODE') {echo "
"._QXZ("The campaign setting Custom CallerID is not set to AREACODE")."!
";} @@ -21881,7 +21884,6 @@ if ($ADD==31) echo "\n"; echo "\n"; echo "
\n"; - echo "\n"; $stmt="SELECT areacode,outbound_cid,active,cid_description,call_count_today from vicidial_campaign_cid_areacodes where campaign_id='$campaign_id' $LOGallowed_campaignsSQL order by areacode,outbound_cid;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -21895,9 +21897,13 @@ if ($ADD==31) $Xactive[$o] = $rowx[2]; $Xcid_description[$o] = $rowx[3]; $Xcall_count_today[$o] = $rowx[4]; + $checkbox_list .= "|active_$Xareacode[$o]_$Xoutbound_cid[$o]"; $o++; + $checkbox_count++; } + echo "\n"; + $o=0; while ($accids_to_print > $o) { @@ -21941,11 +21947,11 @@ if ($ADD==31) echo "\n"; echo "\n"; @@ -25521,7 +25527,7 @@ if ($ADD==3111) $users_output .= "\n"; $users_output .= "\n"; } - echo "\n"; + echo "\n"; echo "$users_output"; @@ -26313,7 +26319,7 @@ if ($ADD==3811) $users_output .= "\n"; $users_output .= "\n"; } - echo "\n"; + echo "\n"; echo "$users_output"; @@ -27094,7 +27100,7 @@ if ($ADD==3911) $users_output .= "\n"; $users_output .= "\n"; } - echo "\n"; + echo "\n"; echo "$users_output"; @@ -36870,8 +36876,22 @@ if ($ADD==999990) } echo "
#"._QXZ("AREACODE").""._QXZ("CID NUMBER").""._QXZ("DESCRIPTION").""._QXZ("ACTIVE").""._QXZ("CALLS").""._QXZ("DELETE")."
#"._QXZ("AREACODE").""._QXZ("CID NUMBER").""._QXZ("DESCRIPTION").""._QXZ("ACTIVE")."
"._QXZ("select all")."		"._QXZ("CALLS").""._QXZ("DELETE")."
\n"; if ($Xactive[$o] == 'Y') { - echo ""; + echo ""; } else { - echo ""; + echo ""; } echo "   $Xcall_count_today[$o]$ARIG_calls[$o]
    "._QXZ("select all")."  
    "._QXZ("select all")."  
$ARIG_calls[$o]
    "._QXZ("select all")."  
    "._QXZ("select all")."  
$ARIG_calls[$o]
    "._QXZ("select all")."  
    "._QXZ("select all")."  
\n"; - $stmt="SELECT * from vicidial_daily_max_stats where stats_date='$yesterday' and stats_type='TOTAL' order by stats_date, campaign_id asc"; + $total_calls=0; + $total_inbound=0; + $total_outbound=0; + $stmt="SELECT stats_type,sum(total_calls) from vicidial_daily_max_stats where campaign_id!='' and stats_flag='CLOSED' and stats_date='$yesterday' group by stats_type;"; $rslt=mysql_to_mysqli($stmt, $link); + $rows_to_print = mysqli_num_rows($rslt); + if ($rows_to_print > 0) + { + while ($rowx=mysqli_fetch_row($rslt)) + { + $total_calls += $rowx[1]; + if (preg_match('/INGROUP/', $rowx[0])) {$total_inbound+=$rowx[1];} + if (preg_match('/CAMPAIGN/', $rowx[0])) {$total_outbound+=$rowx[1];} + } + } + echo "
\n"; echo ""; echo ""; @@ -36884,15 +36904,17 @@ if ($ADD==999990) echo ""; echo ""; + $stmt="SELECT * from vicidial_daily_max_stats where stats_date='$yesterday' and stats_type='TOTAL' order by stats_date, campaign_id asc"; + $rslt=mysql_to_mysqli($stmt, $link); if (mysqli_num_rows($rslt)>0) { while ($row=mysqli_fetch_array($rslt)) { echo ""; #echo ""; - echo ""; - echo ""; - echo ""; + echo ""; + echo ""; + echo ""; echo ""; echo ""; } diff --git a/agc_2-X/trunk/www/vicidial/admin_header.php b/agc_2-X/trunk/www/vicidial/admin_header.php index 46851e06..cffdec6c 100644 --- a/agc_2-X/trunk/www/vicidial/admin_header.php +++ b/agc_2-X/trunk/www/vicidial/admin_header.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2016 Matt Florell LICENSE: AGPLv2 # # CHANGES @@ -56,6 +56,7 @@ # 151020-0654 - Added Status Groups # 151203-1922 - Fix for javascript timezone issues in editing of timeclock entries # 151212-0858 - Added Chat link at top of page +# 160312-1656 - Added FORM_selectall javascript, also used it to replace IGU_selectall # @@ -647,17 +648,17 @@ if ( ($ADD==131111111) or ($ADD==331111111) or ($ADD==431111111) ) length.value = shift_length; } - - function IGU_selectall(temp_count,temp_fields) +?> + function FORM_selectall(temp_count,temp_fields,temp_option,temp_span) { var fields_array=temp_fields.split('|'); var inc=0; @@ -665,11 +666,21 @@ if ( ($ADD==3111) or ($ADD==4111) or ($ADD==5111) or ($ADD==3811) or ($ADD==4811 { if (fields_array[inc].length > 0) { - document.getElementById(fields_array[inc]).checked=true; - // document.admin_form.fields_array[inc].checked=true; + if (temp_option == 'off') + {document.getElementById(fields_array[inc]).checked=false;} + else + {document.getElementById(fields_array[inc]).checked=true;} } inc++; } + if (temp_option == 'off') + { + document.getElementById(temp_span).innerHTML = ""; + } + else + { + document.getElementById(temp_span).innerHTML = ""; + } }
"._QXZ("Total Stats for Yesterday").":  "._QXZ("Total Outbound Calls")."    "._QXZ("Maximum Agents")."  
".$row["campaign_id"]."".($row["total_calls"]+0)."".($row["max_inbound"]+0)."".($row["max_outbound"]+0)."".($row["total_calls"]+0)." / ".($total_calls+0)."".($total_inbound+0)."".($total_outbound+0)."".($row["max_agents"]+0)."