ViciDial/ViciDialSVN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added called counts categories to medialog report

Browse Source 
Added more detail to active server column on reports page

git-svn-id: svn://192.168.202.10@2523 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2016-04-27 20:59:27 +00:00
parent 0ecd70e9c0
commit 298da6e1f0
2 changed files with 51 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
agc_2-X/trunk/www/vicidial/admin.php
+34 -31
View File
@@ -3754,12 +3754,13 @@ else
# 160331-2204 - Made URL form input fields longer
# 160404-0940 - design changes
# 160414-1013 - Added default_phone_code to system_settings
# 160427-1656 - Added more detail on active servers column on reports page
#
# 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-550a';
$build = '160414-1013';
$admin_version = '2.12-551a';
$build = '160427-1656';
$STARTtime = date("U");
$SQLdate = date("Y-m-d H:i:s");
@@ -35758,7 +35759,7 @@ if ($ADD==999999)
echo "<TABLE><TR><TD>\n";
echo "<FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=2>";
$stmt="SELECT server_id,server_description,server_ip,active,sysload,channels_total,cpu_idle_percent,disk_usage from servers order by server_id;";
$stmt="SELECT server_id,server_description,server_ip,active,sysload,channels_total,cpu_idle_percent,disk_usage,active_agent_login_server,active_asterisk_server from servers order by server_id;";
$rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {echo "$stmt\n";}
$servers_to_print = mysqli_num_rows($rslt);
@@ -35766,14 +35767,16 @@ if ($ADD==999999)
while ($i < $servers_to_print)
{
$row=mysqli_fetch_row($rslt);
$server_id[$i] = $row[0];
$server_description[$i] = $row[1];
$server_ip[$i] = $row[2];
$active[$i] = $row[3];
$sysload[$i] = $row[4];
$channels_total[$i] = $row[5];
$cpu_idle_percent[$i] = $row[6];
$disk_usage[$i] = $row[7];
$server_id[$i] = $row[0];
$server_description[$i] = $row[1];
$server_ip[$i] = $row[2];
$active[$i] = $row[3];
$sysload[$i] = $row[4];
$channels_total[$i] = $row[5];
$cpu_idle_percent[$i] = $row[6];
$disk_usage[$i] = $row[7];
$active_agent_login_server[$i] = $row[8];
$active_asterisk_server[$i] = $row[9];
$i++;
}
@@ -35994,13 +35997,13 @@ if ($ADD==999999)
if ($stage == 'TIME')
{
echo "<TR><TD>"._QXZ("SERVER")." <a href=\"$PHP_SELF?ADD=999999\">-</a></TD>";
echo "<TD>"._QXZ("DESCRIPTION")."</TD><TD>"._QXZ("IP")."</TD><TD>"._QXZ("ACT")."</TD><TD>"._QXZ("LOAD")."</TD><TD>"._QXZ("CHAN")."</TD><TD>"._QXZ("AGNT")."</TD><TD>"._QXZ("DISK")."</TD><TD>"._QXZ("TIME")."</TD><TD>"._QXZ("VER")."</TD></TR>\n";
echo "<TR><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("SERVER")." <a href=\"$PHP_SELF?ADD=999999\">-</a></TD>";
echo "<TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("DESCRIPTION")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("IP")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("ACT")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("LOAD")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("CHAN")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("AGNT")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("DISK")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("TIME")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("VER")."</TD></TR>\n";
}
else
{
echo "<TR><TD>"._QXZ("SERVER")." <a href=\"$PHP_SELF?ADD=999999&stage=TIME\">+</a></TD>";
echo "<TD>"._QXZ("DESCRIPTION")."</TD><TD>"._QXZ("IP")."</TD><TD>"._QXZ("ACT")."</TD><TD>"._QXZ("LOAD")."</TD><TD>"._QXZ("CHAN")."</TD><TD>"._QXZ("AGNT")."</TD><TD>"._QXZ("DISK")."</TD><TD>"._QXZ("OUTBOUND")."</TD><TD>"._QXZ("INBOUND")."</TD></TR>\n";
echo "<TR><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("SERVER")." <a href=\"$PHP_SELF?ADD=999999&stage=TIME\">+</a></TD>";
echo "<TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("DESCRIPTION")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("IP")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("ACT")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("LOAD")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("CHAN")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("AGNT")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("DISK")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("OUTBOUND")."</TD><TD><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("INBOUND")."</TD></TR>\n";
}
$o=0;
@@ -36085,14 +36088,14 @@ if ($ADD==999999)
}
}
echo "<TR$server_bgcolor>\n";
echo "<TD NOWRAP><a href=\"$PHP_SELF?ADD=311111111111&server_id=$server_id[$o]\">$server_id[$o]</a></TD>\n";
echo "<TD NOWRAP>$server_description[$o]</TD>\n";
echo "<TD NOWRAP>$server_ip[$o]</TD>\n";
echo "<TD NOWRAP>$active[$o]</TD>\n";
echo "<TD NOWRAP>$sysload[$o] - $cpu%</TD>\n";
echo "<TD NOWRAP>$channels_total[$o]</TD>\n";
echo "<TD NOWRAP>$agnt</TD>\n";
echo "<TD ALIGN=RIGHT NOWRAP>$disk</TD>\n";
echo "<TD NOWRAP><a href=\"$PHP_SELF?ADD=311111111111&server_id=$server_id[$o]\"><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$server_id[$o]</a></TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$server_description[$o]</TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$server_ip[$o]</TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=1>$active[$o] / $active_asterisk_server[$o] / $active_agent_login_server[$o]</TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$sysload[$o] - $cpu%</TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$channels_total[$o]</TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$agnt</TD>\n";
echo "<TD ALIGN=RIGHT NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$disk</TD>\n";
if ($stage == 'TIME')
{
$stmt="SELECT svn_revision from servers where server_ip='$server_ip[$o]';";
@@ -36104,29 +36107,29 @@ if ($ADD==999999)
$row=mysqli_fetch_row($rslt);
$s_ver = $row[0];
}
echo "<TD NOWRAP>$s_time</TD><TD NOWRAP>$s_ver</TD>";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$s_time</TD><TD NOWRAP>$s_ver</TD>";
}
else
{
if ( (preg_match("/Real-Time Main Report/",$LOGallowed_reports)) or (preg_match("/ALL REPORTS/",$LOGallowed_reports)) )
{
echo "<TD NOWRAP><a href=\"AST_timeonVDAD.php?server_ip=$server_ip[$o]\">"._QXZ("LINK")."</a></TD>\n";
echo "<TD NOWRAP><a href=\"AST_timeonVDAD.php?server_ip=$server_ip[$o]&closer_display=1\">"._QXZ("LINK")."</a></TD>\n";
echo "<TD NOWRAP><a href=\"AST_timeonVDAD.php?server_ip=$server_ip[$o]\"><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("LINK")."</a></TD>\n";
echo "<TD NOWRAP><a href=\"AST_timeonVDAD.php?server_ip=$server_ip[$o]&closer_display=1\"><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("LINK")."</a></TD>\n";
}
else
{
echo "<TD NOWRAP> &nbsp; </TD>\n";
echo "<TD NOWRAP> &nbsp; </TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2> &nbsp; </TD>\n";
echo "<TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2> &nbsp; </TD>\n";
}
}
echo "</TR>\n";
echo "$FROZEN_output";
echo "<FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$FROZEN_output</FONT>";
$o++;
}
if ($stage == 'TIME')
{
echo "<TR><TD COLSPAN=2 NOWRAP> &nbsp; </TD><TD NOWRAP>"._QXZ("PHP Time")."</TD><TD COLSPAN=5 NOWRAP> &nbsp; </TD><TD NOWRAP>" . date("Y-m-d H:i:s") . "</TD><TD NOWRAP> &nbsp; </TD></TR>";
echo "<TR><TD COLSPAN=2 NOWRAP> &nbsp; </TD><TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("PHP Time")."</TD><TD COLSPAN=5 NOWRAP> &nbsp; </TD><TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>" . date("Y-m-d H:i:s") . "</TD><TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2> &nbsp; </TD></TR>";
$stmt="SELECT NOW();";
$rslt=mysql_to_mysqli($stmt, $link);
@@ -36135,7 +36138,7 @@ if ($ADD==999999)
if ($dbtime_to_print)
{
$row=mysqli_fetch_row($rslt);
echo "<TR><TD COLSPAN=2 NOWRAP> &nbsp; </TD><TD NOWRAP>"._QXZ("DB Time")."</TD><TD COLSPAN=5 NOWRAP> &nbsp; </TD><TD NOWRAP>$row[0]</TD><TD NOWRAP> &nbsp; </TD></TR>";
echo "<TR><TD COLSPAN=2 NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2> &nbsp; </TD><TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>"._QXZ("DB Time")."</TD><TD COLSPAN=5 NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2> &nbsp; </TD><TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2>$row[0]</TD><TD NOWRAP><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK size=2> &nbsp; </TD></TR>";
}
}
echo "</TABLE>\n";
agc_2-X/trunk/www/vicidial/medialog_inventory_report.php
+17 -4
View File
@@ -9,6 +9,7 @@
# CHANGES
# 160411-1917 - First build based upon called_counts_multilist_report.php
# 160412-2022 - Callback bug fixed, modified Total count to use modify_date instead of entry_date
# 160427-1655 - Added called count categories
#
$startMS = microtime();
@@ -707,7 +708,14 @@ if (count($list_ids) > 0 && count($group) > 0)
$call_count_stmt="select ".$vicidial_log_table.".lead_id,".$vicidial_list_table.".called_count,".$vicidial_log_table.".status,".$vicidial_log_table.".call_date from ".$vicidial_list_table.", ".$vicidial_log_table." where ".$vicidial_log_table.".call_date>='$query_date 00:00:00' and ".$vicidial_log_table.".call_date<='$end_date 23:59:59' and ".$vicidial_log_table.".status in ('".implode("', '", $all_statuses)."') $group_SQLand $list_id_SQLandVLJOIN UNION select ".$vicidial_closer_log_table.".lead_id,".$vicidial_list_table.".called_count,".$vicidial_closer_log_table.".status,".$vicidial_closer_log_table.".call_date from ".$vicidial_list_table.", ".$vicidial_closer_log_table." where ".$vicidial_closer_log_table.".call_date>='$query_date 00:00:00' and ".$vicidial_closer_log_table.".call_date<='$end_date 23:59:59' and ".$vicidial_closer_log_table.".status in ('".implode("', '", $all_statuses)."') $list_id_SQLandVCLJOIN";
$stmt="select list_id, called_count, status from vicidial_list $list_id_SQLwhere"; # QUERY 1
$zb_counts=array();
$cc_stmt="select if(called_count>15, '4', if(called_count>10, '3', if(called_count>5, '2', if(called_count>0, '1', '0')))) as ary_index, count(*) from vicidial_list $list_id_SQLwhere group by ary_index";
$cc_rslt=mysql_to_mysqli($cc_stmt, $link);
while ($ccrow=mysqli_fetch_row($cc_rslt)) {
$zb_counts[$ccrow[0]]=$ccrow[1];
}
# $call_count_stmt="select ".$vicidial_log_table.".lead_id,".$vicidial_list_table.".called_count,".$vicidial_log_table.".status,".$vicidial_log_table.".call_date from ".$vicidial_list_table.", ".$vicidial_log_table." where ".$vicidial_log_table.".call_date>='$query_date 00:00:00' and ".$vicidial_log_table.".call_date<='$end_date 23:59:59' and ".$vicidial_log_table.".status in ('".implode("', '", $all_statuses)."') $group_SQLand $list_id_SQLandVLJOIN UNION select ".$vicidial_closer_log_table.".lead_id,".$vicidial_list_table.".called_count,".$vicidial_closer_log_table.".status,".$vicidial_closer_log_table.".call_date from ".$vicidial_list_table.", ".$vicidial_closer_log_table." where ".$vicidial_closer_log_table.".call_date>='$query_date 00:00:00' and ".$vicidial_closer_log_table.".call_date<='$end_date 23:59:59' and ".$vicidial_closer_log_table.".status in ('".implode("', '", $all_statuses)."') $list_id_SQLandVCLJOIN"; # QUERY 2
$call_count_stmt="select ".$vicidial_log_table.".lead_id,".$vicidial_list_table.".called_count,".$vicidial_log_table.".status,".$vicidial_log_table.".call_date from ".$vicidial_list_table.", ".$vicidial_log_table." where ".$vicidial_log_table.".call_date<='$end_date 23:59:59' and ".$vicidial_log_table.".status in ('".implode("', '", $all_statuses)."') $group_SQLand $list_id_SQLandVLJOIN UNION select ".$vicidial_closer_log_table.".lead_id,".$vicidial_list_table.".called_count,".$vicidial_closer_log_table.".status,".$vicidial_closer_log_table.".call_date from ".$vicidial_list_table.", ".$vicidial_closer_log_table." where ".$vicidial_closer_log_table.".call_date<='$end_date 23:59:59' and ".$vicidial_closer_log_table.".status in ('".implode("', '", $all_statuses)."') $list_id_SQLandVCLJOIN"; # QUERY 3
$stmt="select lead_id, called_count, status, max(call_date) from ($call_count_stmt) as dt group by lead_id, called_count, status"; # USED WITH QUERY 2 and 3
@@ -741,15 +749,19 @@ if (count($list_ids) > 0 && count($group) > 0)
if(in_array($status, $no_statuses)) {
$no_counts[0]++;
$no_counts[$ary_index]++;
$zb_counts[$ary_index]--;
} else if (in_array($status, $nixi_statuses)) {
$nixi_counts[0]++;
$nixi_counts[$ary_index]++;
$zb_counts[$ary_index]--;
} else if (in_array($status, $afc_statuses)) {
$afc_counts[0]++;
$afc_counts[$ary_index]++;
$zb_counts[$ary_index]--;
} else if (in_array($status, $sale_statuses)) {
$sales_counts[0]++;
$sales_counts[$ary_index]++;
$zb_counts[$ary_index]--;
} else {
$workoff_total++;
}
@@ -764,6 +776,7 @@ if (count($list_ids) > 0 && count($group) > 0)
$nixi_counts[$i]+=0;
$no_counts[$i]+=0;
$sales_counts[$i]+=0;
$zb_counts[$i]+=0;
}
@@ -838,14 +851,14 @@ if (count($list_ids) > 0 && count($group) > 0)
$CSV_text.="\"WV Team\",\"$anyone_counts[0]\",\"\",\"\",\"$anyone_counts[1]\",\"$anyone_counts[2]\",\"$anyone_counts[3]\",\"$anyone_counts[4]\"\n";
$CSV_text.="\"WV persönlich\",\"$useronly_counts[0]\",\"\",\"\",\"$useronly_counts[1]\",\"$useronly_counts[2]\",\"$useronly_counts[3]\",\"$useronly_counts[4]\"\n";
$CSV_text.="\"WV Vergangenheit \",\"$calledback_counts[0]\",\"\",\"\",\"$calledback_counts[1]\",\"$calledback_counts[2]\",\"$calledback_counts[3]\",\"$calledback_counts[4]\"\n\n";
$CSV_text.="\"Zu bearbeiten\",\"$workoff_total\"\n\n\n\n";
$CSV_text.="\"Zu bearbeiten\",\"$workoff_total\",\"\",\"\",\"$zb_counts[1]\",\"$zb_counts[2]\",\"$zb_counts[3]\",\"$zb_counts[4]\",\"$zb_counts[0] (undialed)\"\n\n\n\n";
$MAIN.="| WV Team | ".sprintf("%7s", $anyone_counts[0])." | ".sprintf("%7s", " ")." | | ".sprintf("%7s", $anyone_counts[1])." | ".sprintf("%7s", $anyone_counts[2])." | ".sprintf("%7s", $anyone_counts[3])." | ".sprintf("%7s", $anyone_counts[4])." |\n";
$MAIN.="| WV pers&ouml;nlich | ".sprintf("%7s", $useronly_counts[0])." | ".sprintf("%7s", " ")." | | ".sprintf("%7s", $useronly_counts[1])." | ".sprintf("%7s", $useronly_counts[2])." | ".sprintf("%7s", $useronly_counts[3])." | ".sprintf("%7s", $useronly_counts[4])." |\n";
$MAIN.="| WV Vergangenheit | ".sprintf("%7s", $calledback_counts[0])." | ".sprintf("%7s", " ")." | | ".sprintf("%7s", $calledback_counts[1])." | ".sprintf("%7s", $calledback_counts[2])." | ".sprintf("%7s", $calledback_counts[3])." | ".sprintf("%7s", $calledback_counts[4])." |\n";
$MAIN.=$head;
$MAIN.="| Zu bearbeiten | ".sprintf("%7s", $workoff_total)." |\n";
$MAIN.="+------------------+---------+\n\n\n";
$MAIN.="| Zu bearbeiten | ".sprintf("%7s", $workoff_total)." | ".sprintf("%7s", " ")." | | ".sprintf("%7s", $zb_counts[1])." | ".sprintf("%7s", $zb_counts[2])." | ".sprintf("%7s", $zb_counts[3])." | ".sprintf("%7s", $zb_counts[4])." | ".sprintf("%7s", $zb_counts[0])." (undialed)\n";
$MAIN.=$head;
## Lower section
$CSV_text.="\"Tagesstatus\"\n";