From 0321a52da3d2ea6dd0d9a1a9913da4c0e066130f Mon Sep 17 00:00:00 2001 From: mattf Date: Thu, 13 Mar 2014 14:23:52 +0000 Subject: [PATCH] Added warning to in-groups if they are not set as allowed in any campaigns in admin.php git-svn-id: svn://192.168.202.10@2087 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/admin.php | 112 +++++++++++++++++++++++++++++++++-------- 1 file changed, 90 insertions(+), 22 deletions(-) diff --git a/www/vicidial/admin.php b/www/vicidial/admin.php index ccb741ae..d19bb905 100644 --- a/www/vicidial/admin.php +++ b/www/vicidial/admin.php @@ -3277,12 +3277,13 @@ else # 140302-0958 - Added Webserver-URL Report # 140305-0846 - Bug fix for list modify admin logging issue # 140313-0727 - Added links to Called Counts List IDs Report +# 140313-1014 - Added warning to in-groups if they are not set as allowed in any campaigns # # make sure you have added a user to the vicidial_users MySQL table with at least user_level 8 to access this page the first time -$admin_version = '2.8-429a'; -$build = '140313-0727'; +$admin_version = '2.8-430a'; +$build = '140313-1014'; $STARTtime = date("U"); $SQLdate = date("Y-m-d H:i:s"); @@ -22299,6 +22300,7 @@ if ($ADD==3111) $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); + $query_group_id = $row[0]; $group_name = $row[1]; $group_color = $row[2]; $active = $row[3]; @@ -22537,16 +22539,30 @@ if ($ADD==3111) else {$Hgroups_menu .= "\n";} + $allowed_campaigns_count=0; + $allowed_campaigns_warning=''; + $stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $query_group_id %\" $LOGallowed_campaignsSQL;"; + $rslt=mysql_to_mysqli($stmt, $link); + $campin_to_print = mysqli_num_rows($rslt); + $vc_allowed_ct=0; + if ($campin_to_print > $vc_allowed_ct) + { + $rowc=mysqli_fetch_row($rslt); + $allowed_campaigns_count = $rowc[0]; + $vc_allowed_ct++; + } + if ($allowed_campaigns_count < 1) + {$allowed_campaigns_warning='
  Not set as allowed in any campaigns!';} - echo "
MODIFY A GROUPS RECORD: $row[0]
\n"; + echo "
MODIFY A GROUPS RECORD: $query_group_id\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "
\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -23325,6 +23341,7 @@ if ($ADD==3811) $rslt=mysql_to_mysqli($stmt, $link); $row=mysqli_fetch_row($rslt); + $query_group_id = $row[0]; $group_name = $row[1]; $group_color = $row[2]; $active = $row[3]; @@ -23554,16 +23571,30 @@ if ($ADD==3811) else {$Hgroups_menu .= "\n";} + $allowed_campaigns_count=0; + $allowed_campaigns_warning=''; + $stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $query_group_id %\" $LOGallowed_campaignsSQL;"; + $rslt=mysql_to_mysqli($stmt, $link); + $campin_to_print = mysqli_num_rows($rslt); + $vc_allowed_ct=0; + if ($campin_to_print > $vc_allowed_ct) + { + $rowc=mysqli_fetch_row($rslt); + $allowed_campaigns_count = $rowc[0]; + $vc_allowed_ct++; + } + if ($allowed_campaigns_count < 1) + {$allowed_campaigns_warning='
  Not set as allowed in any campaigns!';} - echo "
MODIFY AN EMAIL GROUPS RECORD: $row[0]\n"; + echo "
MODIFY AN EMAIL GROUPS RECORD: $query_group_id\n"; echo "\n"; - echo "\n"; + echo "\n"; echo "\n"; echo "\n"; echo "
Group ID: $row[0]$NWB#inbound_groups-group_id$NWE
Group Name: $NWB#inbound_groups-group_name$NWE
Group Color: $NWB#inbound_groups-group_color$NWE
Group ID: $query_group_id$NWB#inbound_groups-group_id$NWE $allowed_campaigns_warning
Group Name: $NWB#inbound_groups-group_name$NWE
Group Color: $NWB#inbound_groups-group_color$NWE
Active: $NWB#inbound_groups-active$NWE
In-Group Calldate: $group_calldate$NWB#inbound_groups-group_calldate$NWE
\n"; - echo "\n"; - echo "\n"; - echo "\n"; + echo "\n"; + echo "\n"; + echo "\n"; echo "\n"; echo "\n"; @@ -29492,18 +29523,46 @@ if ($ADD==1000) while ($ingroups_to_print > $o) { $row=mysqli_fetch_row($rslt); + $group_id_ary[$o] = $row[0]; + $group_name_ary[$o] = $row[1]; + $group_priority_ary[$o] = $row[2]; + $group_active_ary[$o] = $row[3]; + $group_time_ary[$o] = $row[4]; + $group_color_ary[$o] = $row[5]; + $group_group_ary[$o] = $row[6]; + $o++; + } + + $o=0; + while ($ingroups_to_print > $o) + { + $allowed_campaigns_count=0; + $allowed_campaigns_warning=''; + $stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $group_id_ary[$o] %\" $LOGallowed_campaignsSQL;"; + $rslt=mysql_to_mysqli($stmt, $link); + $campin_to_print = mysqli_num_rows($rslt); + $vc_allowed_ct=0; + if ($campin_to_print > $vc_allowed_ct) + { + $row=mysqli_fetch_row($rslt); + $allowed_campaigns_count = $row[0]; + $vc_allowed_ct++; + } + if ($allowed_campaigns_count < 1) + {$allowed_campaigns_warning='   NA';} + if (preg_match('/1$|3$|5$|7$|9$/i', $o)) {$bgcolor='bgcolor="#B9CBFD"';} else {$bgcolor='bgcolor="#9BB9FB"';} - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo ""; - echo "\n"; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo ""; + echo "\n"; $o++; } @@ -29542,11 +29601,20 @@ if ( ($ADD==1800) and ($SSallow_emails>0) ) $row=mysqli_fetch_row($rslt); ## Get unhandled count - $ct_stmt="select count(*) From vicidial_email_list where status='NEW' and group_id='$row[0]'"; + $ct_stmt="SELECT count(*) From vicidial_email_list where status='NEW' and group_id='$row[0]'"; $ct_rslt=mysql_to_mysqli($ct_stmt, $link); $ct_row=mysqli_fetch_row($ct_rslt); $unhandled_emails=$ct_row[0]; + $allowed_campaigns_warning=''; + ## Get campaign allowed count + $ct_stmt="SELECT count(*) from vicidial_campaigns where closer_campaigns LIKE \"% $row[0] %\" $LOGallowed_campaignsSQL;"; + $ct_rslt=mysql_to_mysqli($ct_stmt, $link); + $ct_row=mysqli_fetch_row($ct_rslt); + $email_allowed_campaigns_count=$ct_row[0]; + if ($email_allowed_campaigns_count < 1) + {$allowed_campaigns_warning='   NA';} + if (preg_match('/1$|3$|5$|7$|9$/i', $o)) {$bgcolor='bgcolor="#B9CBFD"';} else @@ -29554,7 +29622,7 @@ if ( ($ADD==1800) and ($SSallow_emails>0) ) echo ""; echo ""; echo ""; - echo ""; + echo ""; echo ""; echo ""; echo "";
Group ID: $row[0]$NWB#inbound_groups-group_id$NWE
Group Name: $NWB#inbound_groups-group_name$NWE
Group Color: $NWB#inbound_groups-group_color$NWE
Group ID: $query_group_id$NWB#inbound_groups-group_id$NWE $allowed_campaigns_warning
Group Name: $NWB#inbound_groups-group_name$NWE
Group Color: $NWB#inbound_groups-group_color$NWE
Active: $NWB#inbound_groups-active$NWE
In-Group Email Date: $group_calldate$NWB#inbound_groups-group_emaildate$NWE
$row[0] $row[1] $row[2] $row[3] $row[6] $row[4]  MODIFY
$group_id_ary[$o] $group_name_ary[$o] $group_priority_ary[$o] $group_active_ary[$o] $allowed_campaigns_warning $group_group_ary[$o] $group_time_ary[$o]  MODIFY
$row[0] $row[1] $row[2] $row[3] $row[3] $allowed_campaigns_warning $unhandled_emails $row[6] $row[4]