ViciDial/agc_2-X
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix for default HTML report format, issue #997

Browse Source 
Added HH:MM:SS option for DID report

git-svn-id: svn://192.168.202.10@2687 3d104415-ff17-0410-8863-d5cf3c621b8a
This commit is contained in:
mattf
2017-02-27 22:33:30 +00:00
parent 29391cfcd6
commit 2f458273b2
16 changed files with 163 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/vicidial/AST_CLOSER_service_level.php
+5 -2
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_CLOSER_service_level.php # AST_CLOSER_service_level.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -34,6 +34,7 @@
# 160227-1153 - Uniform form format # 160227-1153 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 160819-0054 - Fixed chart bugs caused by DST # 160819-0054 - Fixed chart bugs caused by DST
# 170227-1714 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -70,7 +71,7 @@ $db_source = 'M';
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -83,9 +84,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_CLOSERstats.php
+7 -4
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_CLOSERstats.php # AST_CLOSERstats.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES: # CHANGES:
# 60619-1714 - Added variable filtering to eliminate SQL injection attack threat # 60619-1714 - Added variable filtering to eliminate SQL injection attack threat
@@ -54,6 +54,7 @@
# 160227-1129 - Uniform form format # 160227-1129 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 160819-0054 - Fixed chart bugs # 160819-0054 - Fixed chart bugs
# 170227-1715 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -82,9 +83,9 @@ if (isset($_GET["EMAIL"])) {$EMAIL=$_GET["EMAIL"];}
elseif (isset($_POST["EMAIL"])) {$EMAIL=$_POST["EMAIL"];} elseif (isset($_POST["EMAIL"])) {$EMAIL=$_POST["EMAIL"];}
if (isset($_GET["DB"])) {$DB=$_GET["DB"];} if (isset($_GET["DB"])) {$DB=$_GET["DB"];}
elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];}
if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];} if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];}
elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];} elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
@@ -101,7 +102,7 @@ if ($DID=='Y')
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -114,9 +115,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_CLOSERstats_v2.php
+9 -6
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_CLOSERstats_v2.php # AST_CLOSERstats_v2.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES: # CHANGES:
# 60619-1714 - Added variable filtering to eliminate SQL injection attack threat # 60619-1714 - Added variable filtering to eliminate SQL injection attack threat
@@ -58,6 +58,7 @@
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 160819-0054 - Fixed chart bugs # 160819-0054 - Fixed chart bugs
# 161207-2037 - Fix for issue #982, formatting # 161207-2037 - Fix for issue #982, formatting
# 170227-1708 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -88,9 +89,9 @@ if (isset($_GET["CHAT"])) {$CHAT=$_GET["CHAT"];}
elseif (isset($_POST["CHAT"])) {$CHAT=$_POST["CHAT"];} elseif (isset($_POST["CHAT"])) {$CHAT=$_POST["CHAT"];}
if (isset($_GET["DB"])) {$DB=$_GET["DB"];} if (isset($_GET["DB"])) {$DB=$_GET["DB"];}
elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];}
if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];} if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];}
elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];} elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
@@ -106,7 +107,7 @@ if ($DID=='Y')
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -119,9 +120,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
@@ -551,7 +554,7 @@ if (mysqli_num_rows($call_time_rslt)>0) {
} }
$MAIN.="</SELECT>\n"; $MAIN.="</SELECT>\n";
$MAIN.="<BR>"._QXZ("Display as").":&nbsp; "; $MAIN.="<BR> &nbsp; &nbsp; &nbsp; "._QXZ("Display as").":&nbsp; ";
$MAIN.="<select name='report_display_type'>"; $MAIN.="<select name='report_display_type'>";
if ($report_display_type) {$MAIN.="<option value='$report_display_type' selected>$report_display_type</option>";} if ($report_display_type) {$MAIN.="<option value='$report_display_type' selected>$report_display_type</option>";}
$MAIN.="<option value='TEXT'>"._QXZ("TEXT")."</option><option value='HTML'>"._QXZ("HTML")."</option></select>\n<BR>"; $MAIN.="<option value='TEXT'>"._QXZ("TEXT")."</option><option value='HTML'>"._QXZ("HTML")."</option></select>\n<BR>";
@@ -2872,7 +2875,7 @@ if ($report_display_type=="HTML")
} }
} }
print_r($graph_stats); #print_r($graph_stats);
$GRAPH_text=""; $GRAPH_text="";
######### #########
$graph_array=array("ACS_CATBdata||CALL INITIAL QUEUE POSITION BREAKDOWN|integer|"); $graph_array=array("ACS_CATBdata||CALL INITIAL QUEUE POSITION BREAKDOWN|integer|");
www/vicidial/AST_CLOSERsummary_hourly.php
+6 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_CLOSERsummary_hourly.php # AST_CLOSERsummary_hourly.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -27,6 +27,7 @@
# 151125-1609 - Added search archive option # 151125-1609 - Added search archive option
# 160227-1151 - Uniform form format # 160227-1151 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1713 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -66,7 +67,7 @@ if (isset($_GET["DB"])) {$DB=$_GET["DB"];}
elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];}
if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];} if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];}
elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];} elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
@@ -80,7 +81,7 @@ $db_source = 'M';
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -93,9 +94,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_DIDstats.php
+72 -19
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_DIDstats.php # AST_DIDstats.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -30,6 +30,8 @@
# 160227-1150 - Uniform form format # 160227-1150 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 160819-0054 - Fixed bug causing TEXT report to repeat data # 160819-0054 - Fixed bug causing TEXT report to repeat data
# 170217-2115 - Added time entry option for date ranges
# 170227-1717 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -44,8 +46,12 @@ if (isset($_GET["group"])) {$group=$_GET["group"];}
elseif (isset($_POST["group"])) {$group=$_POST["group"];} elseif (isset($_POST["group"])) {$group=$_POST["group"];}
if (isset($_GET["query_date"])) {$query_date=$_GET["query_date"];} if (isset($_GET["query_date"])) {$query_date=$_GET["query_date"];}
elseif (isset($_POST["query_date"])) {$query_date=$_POST["query_date"];} elseif (isset($_POST["query_date"])) {$query_date=$_POST["query_date"];}
if (isset($_GET["time_BEGIN"])) {$time_BEGIN=$_GET["time_BEGIN"];}
elseif (isset($_POST["time_BEGIN"])) {$time_BEGIN=$_POST["time_BEGIN"];}
if (isset($_GET["end_date"])) {$end_date=$_GET["end_date"];} if (isset($_GET["end_date"])) {$end_date=$_GET["end_date"];}
elseif (isset($_POST["end_date"])) {$end_date=$_POST["end_date"];} elseif (isset($_POST["end_date"])) {$end_date=$_POST["end_date"];}
if (isset($_GET["time_END"])) {$time_END=$_GET["time_END"];}
elseif (isset($_POST["time_END"])) {$time_END=$_POST["time_END"];}
if (isset($_GET["shift"])) {$shift=$_GET["shift"];} if (isset($_GET["shift"])) {$shift=$_GET["shift"];}
elseif (isset($_POST["shift"])) {$shift=$_POST["shift"];} elseif (isset($_POST["shift"])) {$shift=$_POST["shift"];}
if (isset($_GET["submit"])) {$submit=$_GET["submit"];} if (isset($_GET["submit"])) {$submit=$_GET["submit"];}
@@ -61,14 +67,14 @@ if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_d
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
if (strlen($shift)<2) {$shift='ALL';} if (strlen($shift)<2) {$shift='--';}
$report_name = 'Inbound DID Report'; $report_name = 'Inbound DID Report';
$db_source = 'M'; $db_source = 'M';
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -81,9 +87,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
@@ -222,6 +230,8 @@ $STARTtime = date("U");
if (!isset($group)) {$group = '';} if (!isset($group)) {$group = '';}
if (!isset($query_date)) {$query_date = $NOW_DATE;} if (!isset($query_date)) {$query_date = $NOW_DATE;}
if (!isset($end_date)) {$end_date = $NOW_DATE;} if (!isset($end_date)) {$end_date = $NOW_DATE;}
if (!isset($time_BEGIN)) {$time_BEGIN = "00:00:00";}
if (!isset($time_END)) {$time_END = "23:59:59";}
$stmt="select did_id,did_pattern,did_description from vicidial_inbound_dids $whereLOGadmin_viewable_groupsSQL order by did_pattern;"; $stmt="select did_id,did_pattern,did_description from vicidial_inbound_dids $whereLOGadmin_viewable_groupsSQL order by did_pattern;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
@@ -370,7 +380,7 @@ $MAIN.="<b>"._QXZ("$report_name")."</b> $NWB#DIDstats$NWE\n";
$MAIN.="<TABLE CELLPADDING=3 CELLSPACING=0><TR><TD>"; $MAIN.="<TABLE CELLPADDING=3 CELLSPACING=0><TR><TD>";
$MAIN.="<FORM ACTION=\"$PHP_SELF\" METHOD=POST name=vicidial_report id=vicidial_report>\n"; $MAIN.="<FORM ACTION=\"$PHP_SELF\" METHOD=POST name=vicidial_report id=vicidial_report>\n";
$MAIN.="<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 BGCOLOR=\"#e3e3ff\"><TR><TD align=center valign=top>\n"; $MAIN.="<TABLE BORDER=0 CELLPADDING=3 CELLSPACING=0 BGCOLOR=\"#e3e3ff\"><TR><TD align=left valign=top>\n";
$MAIN.="<INPUT TYPE=TEXT NAME=query_date SIZE=10 MAXLENGTH=10 VALUE=\"$query_date\">"; $MAIN.="<INPUT TYPE=TEXT NAME=query_date SIZE=10 MAXLENGTH=10 VALUE=\"$query_date\">";
$MAIN.="<script language=\"JavaScript\">\n"; $MAIN.="<script language=\"JavaScript\">\n";
@@ -387,9 +397,10 @@ $MAIN.="});\n";
$MAIN.="o_cal.a_tpl.yearscroll = false;\n"; $MAIN.="o_cal.a_tpl.yearscroll = false;\n";
$MAIN.="// o_cal.a_tpl.weekstart = 1; // Monday week start\n"; $MAIN.="// o_cal.a_tpl.weekstart = 1; // Monday week start\n";
$MAIN.="</script>\n"; $MAIN.="</script>\n";
$MAIN.="<BR><INPUT TYPE=TEXT NAME=time_BEGIN SIZE=10 MAXLENGTH=8 VALUE=\"$time_BEGIN\">";
$MAIN.="<BR> "._QXZ("to")." <BR><INPUT TYPE=TEXT NAME=end_date SIZE=10 MAXLENGTH=10 VALUE=\"$end_date\">"; $MAIN.="<BR><div align='center'> "._QXZ("to")." </div><BR><INPUT TYPE=TEXT NAME=end_date SIZE=10 MAXLENGTH=10 VALUE=\"$end_date\">";
$MAIN.="<script language=\"JavaScript\">\n"; $MAIN.="<script language=\"JavaScript\">\n";
$MAIN.="var o_cal = new tcal ({\n"; $MAIN.="var o_cal = new tcal ({\n";
@@ -401,6 +412,7 @@ $MAIN.="});\n";
$MAIN.="o_cal.a_tpl.yearscroll = false;\n"; $MAIN.="o_cal.a_tpl.yearscroll = false;\n";
$MAIN.="// o_cal.a_tpl.weekstart = 1; // Monday week start\n"; $MAIN.="// o_cal.a_tpl.weekstart = 1; // Monday week start\n";
$MAIN.="</script>\n"; $MAIN.="</script>\n";
$MAIN.="<BR><INPUT TYPE=TEXT NAME=time_END SIZE=10 MAXLENGTH=8 VALUE=\"$time_END\">";
$MAIN.="</TD><TD align=center valign=top>\n"; $MAIN.="</TD><TD align=center valign=top>\n";
$MAIN.="<SELECT SIZE=5 NAME=group[] multiple>\n"; $MAIN.="<SELECT SIZE=5 NAME=group[] multiple>\n";
@@ -414,7 +426,7 @@ while ($groups_to_print > $o)
$o++; $o++;
} }
$MAIN.="</SELECT>\n"; $MAIN.="</SELECT>\n";
$MAIN.="</TD><TD align=left valign=top><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=2>\n"; $MAIN.="</TD><TD align=left valign=top><FONT FACE=\"ARIAL,HELVETICA\" COLOR=BLACK SIZE=2>"._QXZ("Shift").":<BR>\n";
$MAIN.="<SELECT SIZE=1 NAME=shift>\n"; $MAIN.="<SELECT SIZE=1 NAME=shift>\n";
$MAIN.="<option selected value=\"$shift\">$shift</option>\n"; $MAIN.="<option selected value=\"$shift\">$shift</option>\n";
$MAIN.="<option value=\"\">--</option>\n"; $MAIN.="<option value=\"\">--</option>\n";
@@ -461,23 +473,64 @@ else
{ {
### FOR SHIFTS IT IS BEST TO STICK TO 15-MINUTE INCREMENTS FOR START TIMES ### ### FOR SHIFTS IT IS BEST TO STICK TO 15-MINUTE INCREMENTS FOR START TIMES ###
$suffix=" SHIFT: $shift ";
switch($shift) {
case "AM":
$time_BEGIN = "00:00:00";
$time_END = "11:59:59";
break;
case "PM":
$time_BEGIN = "12:00:00";
$time_END = "23:59:59";
break;
case "ALL":
$time_BEGIN = "00:00:00";
$time_END = "23:59:59";
break;
case "DAYTIME":
$time_BEGIN = "08:45:00";
$time_END = "00:59:59";
break;
case "10AM-5PM":
$time_BEGIN = "10:00:00";
$time_END = "16:59:59";
break;
case "10AM-6PM":
$time_BEGIN = "10:00:00";
$time_END = "17:59:59";
break;
case "9AM-11PM":
$time_BEGIN = "09:00:00";
$time_END = "22:59:59";
break;
case "9AM-10PM":
$time_BEGIN = "09:00:00";
$time_END = "21:59:59";
break;
case "9AM-1AM":
$time_BEGIN = "09:00:00";
$time_END = "00:59:59";
break;
case "845-1745":
$time_BEGIN = "08:45:00";
$time_END = "17:44:59";
break;
case "1745-100":
$time_BEGIN = "17:45:00";
$time_END = "00:59:59";
break;
default:
$suffix="";
break;
}
/*
if ($shift == 'AM') if ($shift == 'AM')
{ {
# $time_BEGIN=$AM_shift_BEGIN;
# $time_END=$AM_shift_END;
# if (strlen($time_BEGIN) < 6) {$time_BEGIN = "03:45:00";}
# if (strlen($time_END) < 6) {$time_END = "15:15:00";}
if (strlen($time_BEGIN) < 6) {$time_BEGIN = "00:00:00";} if (strlen($time_BEGIN) < 6) {$time_BEGIN = "00:00:00";}
if (strlen($time_END) < 6) {$time_END = "11:59:59";} if (strlen($time_END) < 6) {$time_END = "11:59:59";}
# if (strlen($time_BEGIN) < 6) {$time_BEGIN = "12:00:00";}
# if (strlen($time_END) < 6) {$time_END = "11:59:59";}
} }
if ($shift == 'PM') if ($shift == 'PM')
{ {
# $time_BEGIN=$PM_shift_BEGIN;
# $time_END=$PM_shift_END;
# if (strlen($time_BEGIN) < 6) {$time_BEGIN = "15:15:00";}
# if (strlen($time_END) < 6) {$time_END = "23:15:00";}
if (strlen($time_BEGIN) < 6) {$time_BEGIN = "12:00:00";} if (strlen($time_BEGIN) < 6) {$time_BEGIN = "12:00:00";}
if (strlen($time_END) < 6) {$time_END = "23:59:59";} if (strlen($time_END) < 6) {$time_END = "23:59:59";}
} }
@@ -526,7 +579,7 @@ else
if (strlen($time_BEGIN) < 6) {$time_BEGIN = "17:45:00";} if (strlen($time_BEGIN) < 6) {$time_BEGIN = "17:45:00";}
if (strlen($time_END) < 6) {$time_END = "00:59:59";} if (strlen($time_END) < 6) {$time_END = "00:59:59";}
} }
*/
$query_date_BEGIN = "$query_date $time_BEGIN"; $query_date_BEGIN = "$query_date $time_BEGIN";
$query_date_END = "$end_date $time_END"; $query_date_END = "$end_date $time_END";
@@ -556,11 +609,11 @@ else
$MAIN.=_QXZ("Inbound DID Report",40)." $NOW_TIME\n"; $MAIN.=_QXZ("Inbound DID Report",40)." $NOW_TIME\n";
$MAIN.="\n"; $MAIN.="\n";
$MAIN.=_QXZ("Time range")." $DURATIONday "._QXZ("days").": $query_date_BEGIN "._QXZ("to")." $query_date_END\n\n"; $MAIN.=_QXZ("Time range")." $DURATIONday "._QXZ("days").": $query_date_BEGIN "._QXZ("to")." $query_date_END $suffix\n\n";
#$MAIN.="Time range day sec: $SQsec - $EQsec Day range in epoch: $SQepoch - $EQepoch Start: $SQepochDAY\n"; #$MAIN.="Time range day sec: $SQsec - $EQsec Day range in epoch: $SQepoch - $EQepoch Start: $SQepochDAY\n";
$CSV_text1.="\""._QXZ("Inbound DID Report")."\",\"$NOW_TIME\"\n\n"; $CSV_text1.="\""._QXZ("Inbound DID Report")."\",\"$NOW_TIME\"\n\n";
$CSV_text1.="\""._QXZ("Time range")." $DURATIONday "._QXZ("days").":\",\"$query_date_BEGIN "._QXZ("to")." $query_date_END\"\n\n"; $CSV_text1.="\""._QXZ("Time range")." $DURATIONday "._QXZ("days").":\",\"$query_date_BEGIN "._QXZ("to")." $query_date_END\",\"$suffix\"\n\n";
$d=0; $d=0;
while ($d < $DURATIONday) while ($d < $DURATIONday)
www/vicidial/AST_IVRstats.php
+7 -4
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_IVRstats.php # AST_IVRstats.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# 81026-2026 - First build # 81026-2026 - First build
@@ -35,6 +35,7 @@
# 151204-0544 - Added code to look for "CALL_MENU" and "XML_PULL" In-Group permissions for those list options # 151204-0544 - Added code to look for "CALL_MENU" and "XML_PULL" In-Group permissions for those list options
# 160227-1130 - Uniform form format # 160227-1130 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1712 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -61,9 +62,9 @@ if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];}
elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];}
if (isset($_GET["DB"])) {$DB=$_GET["DB"];} if (isset($_GET["DB"])) {$DB=$_GET["DB"];}
elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];}
if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];} if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];}
elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];} elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
@@ -79,7 +80,7 @@ $db_source = 'M';
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -92,9 +93,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_LISTS_campaign_stats.php
+5 -2
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_LISTS_campaign_stats.php # AST_LISTS_campaign_stats.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# This is a list inventory report, not a calling report. This report will show # This is a list inventory report, not a calling report. This report will show
# statistics for all of the lists in the selected campaigns # statistics for all of the lists in the selected campaigns
@@ -26,6 +26,7 @@
# 151229-2009 - Added archive search option # 151229-2009 - Added archive search option
# 160227-1043 - Uniform form format # 160227-1043 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1719 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -65,7 +66,7 @@ $JS_onload="onload = function() {\n";
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -78,9 +79,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_LISTS_pass_report.php
+6 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_LISTS_pass_report.php # AST_LISTS_pass_report.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# This is a list inventory report, not a calling report. This report will show # This is a list inventory report, not a calling report. This report will show
# statistics for all of the lists in the selected campaigns # statistics for all of the lists in the selected campaigns
@@ -16,6 +16,7 @@
# 151125-1640 - Added search archive option # 151125-1640 - Added search archive option
# 160227-1138 - Uniform form format # 160227-1138 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1711 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -38,7 +39,7 @@ if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];}
elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];}
if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];} if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];}
elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];} elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["use_lists"])) {$use_lists=$_GET["use_lists"];} if (isset($_GET["use_lists"])) {$use_lists=$_GET["use_lists"];}
elseif (isset($_POST["use_lists"])) {$use_lists=$_POST["use_lists"];} elseif (isset($_POST["use_lists"])) {$use_lists=$_POST["use_lists"];}
@@ -58,7 +59,7 @@ $JS_onload="onload = function() {\n";
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -71,9 +72,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_OUTBOUNDsummary_interval.php
+6 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_OUTBOUNDsummary_interval.php # AST_OUTBOUNDsummary_interval.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -28,6 +28,7 @@
# 160227-1136 - Uniform form format # 160227-1136 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170220-2040 - Fixed bug causing sale/dncs to be counted multiple times when dispos repeated between campaigns # 170220-2040 - Fixed bug causing sale/dncs to be counted multiple times when dispos repeated between campaigns
# 170227-1709 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -65,7 +66,7 @@ if (isset($_GET["DB"])) {$DB=$_GET["DB"];}
elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];}
if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];} if (isset($_GET["file_download"])) {$file_download=$_GET["file_download"];}
elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];} elseif (isset($_POST["file_download"])) {$file_download=$_POST["file_download"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
@@ -86,7 +87,7 @@ $JS_onload="onload = function() {\n";
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -99,9 +100,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_VDADstats.php
+5 -2
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_VDADstats.php # AST_VDADstats.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# 60619-1718 - Added variable filtering to eliminate SQL injection attack threat # 60619-1718 - Added variable filtering to eliminate SQL injection attack threat
@@ -49,6 +49,7 @@
# 160227-1101 - Uniform form format # 160227-1101 - Uniform form format
# 160515-1412 - Added UK OFCOM feature # 160515-1412 - Added UK OFCOM feature
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1716 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -112,7 +113,7 @@ $JS_onload="onload = function() {\n";
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,ofcom_uk_drop_calc FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,ofcom_uk_drop_calc,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {echo "$stmt\n";} if ($DB) {echo "$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -126,9 +127,11 @@ if ($qm_conf_ct > 0)
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSofcom_uk_drop_calc = $row[6]; $SSofcom_uk_drop_calc = $row[6];
$SSreport_default_format = $row[7];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
$DROPANSWERpercent_adjustment=0; $DROPANSWERpercent_adjustment=0;
if (file_exists('options.php')) if (file_exists('options.php'))
www/vicidial/AST_agent_timeclock_detail.php
+6 -3
View File
@@ -3,7 +3,7 @@
# #
# Pulls all timeclock records for an agent # Pulls all timeclock records for an agent
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# 90602-2244 - First build # 90602-2244 - First build
@@ -24,6 +24,7 @@
# 141230-1520 - Added code for on-the-fly language translations display # 141230-1520 - Added code for on-the-fly language translations display
# 160227-1934 - Uniform form format # 160227-1934 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1726 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -54,7 +55,7 @@ if (isset($_GET["submit"])) {$submit=$_GET["submit"];}
elseif (isset($_POST["submit"])) {$submit=$_POST["submit"];} elseif (isset($_POST["submit"])) {$submit=$_POST["submit"];}
if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];} if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];}
elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (strlen($shift)<2) {$shift='ALL';} if (strlen($shift)<2) {$shift='ALL';}
if (strlen($stage)<2) {$stage='ID';} if (strlen($stage)<2) {$stage='ID';}
@@ -64,7 +65,7 @@ $db_source = 'M';
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {echo "$stmt\n";} if ($DB) {echo "$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -77,9 +78,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
if ($non_latin < 1) if ($non_latin < 1)
{ {
www/vicidial/AST_campaign_status_list_report.php
+5 -2
View File
@@ -4,7 +4,7 @@
# This report is designed to show the breakdown by list_id of the calls and # This report is designed to show the breakdown by list_id of the calls and
# their statuses for all lists within a campaign for a set time period # their statuses for all lists within a campaign for a set time period
# #
# Copyright (C) 2016 Joe Johnson, Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Joe Johnson, Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -23,6 +23,7 @@
# 151219-0107 - Added option for searching archived data # 151219-0107 - Added option for searching archived data
# 160227-1059 - Uniform form format # 160227-1059 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1720 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -65,7 +66,7 @@ if (!isset($end_date_T)) {$end_date_T="23:59:59";}
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$HTML_text.="$stmt\n";} if ($DB) {$HTML_text.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -78,9 +79,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/AST_inbound_daily_report.php
+6 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
# AST_inbound_daily_report.php # AST_inbound_daily_report.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -28,6 +28,7 @@
# 160227-1142 - Uniform form format # 160227-1142 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 160819-0054 - Fixed chart bugs caused by DST # 160819-0054 - Fixed chart bugs caused by DST
# 170227-1710 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -65,7 +66,7 @@ if (isset($_GET["SUBMIT"])) {$SUBMIT=$_GET["SUBMIT"];}
elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];} elseif (isset($_POST["SUBMIT"])) {$SUBMIT=$_POST["SUBMIT"];}
if (isset($_GET["DB"])) {$DB=$_GET["DB"];} if (isset($_GET["DB"])) {$DB=$_GET["DB"];}
elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];}
if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];} if (isset($_GET["report_display_type"])) {$report_display_type=$_GET["report_display_type"];}
elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];} elseif (isset($_POST["report_display_type"])) {$report_display_type=$_POST["report_display_type"];}
if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];} if (isset($_GET["search_archived_data"])) {$search_archived_data=$_GET["search_archived_data"];}
elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];} elseif (isset($_POST["search_archived_data"])) {$search_archived_data=$_POST["search_archived_data"];}
@@ -79,7 +80,7 @@ if ($ignore_afterhours=="checked") {$status_clause=" and status!='AFTHRS'";}
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -92,9 +93,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
www/vicidial/fcstats.php
+7 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
# fcstats.php # fcstats.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -34,6 +34,7 @@
# 160211-2249 - Overhauled report calculations and labeling to make the report more accurate and "universal" # 160211-2249 - Overhauled report calculations and labeling to make the report more accurate and "universal"
# 160227-1131 - Uniform form format # 160227-1131 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 170227-1717 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -78,7 +79,7 @@ $JS_onload="onload = function() {\n";
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$HTML_text.="$stmt\n";} if ($DB) {$HTML_text.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -91,9 +92,12 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
if ($DB) {echo "report_display_type:|$report_display_type|$SSreport_default_format|\n";}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
@@ -360,7 +364,7 @@ $HTML_text.="<SELECT SIZE=1 NAME=group>\n";
$HTML_text.="</SELECT>\n"; $HTML_text.="</SELECT>\n";
$HTML_text.=" &nbsp; "; $HTML_text.=" &nbsp; ";
$HTML_text.="<select name='report_display_type'>"; $HTML_text.="<select name='report_display_type'>";
if ($report_display_type) {$MAIN.="<option value='$report_display_type' selected>$report_display_type</option>";} if ($report_display_type) {$HTML_text.="<option value='$report_display_type' selected>$report_display_type</option>";}
$HTML_text.="<option value='TEXT'>"._QXZ("TEXT")."</option><option value='HTML'>"._QXZ("HTML")."</option></select>\n"; $HTML_text.="<option value='TEXT'>"._QXZ("TEXT")."</option><option value='HTML'>"._QXZ("HTML")."</option></select>\n";
$HTML_text.="<SELECT SIZE=1 NAME=shift>\n"; $HTML_text.="<SELECT SIZE=1 NAME=shift>\n";
$HTML_text.="<option selected value=\"$shift\">$shift</option>\n"; $HTML_text.="<option selected value=\"$shift\">$shift</option>\n";
www/vicidial/fcstats_detail.php
+6 -3
View File
@@ -1,7 +1,7 @@
<?php <?php
# fcstats_detail.php # fcstats_detail.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -35,6 +35,7 @@
# 160227-1131 - Uniform form format # 160227-1131 - Uniform form format
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 161021-1326 - Rewrote most of this report to show detail records # 161021-1326 - Rewrote most of this report to show detail records
# 170227-1718 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -89,7 +90,7 @@ $JS_onload="onload = function() {\n";
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,enable_languages,language_method,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$HTML_text.="$stmt\n";} if ($DB) {$HTML_text.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -102,9 +103,11 @@ if ($qm_conf_ct > 0)
$reports_use_slave_db = $row[3]; $reports_use_slave_db = $row[3];
$SSenable_languages = $row[4]; $SSenable_languages = $row[4];
$SSlanguage_method = $row[5]; $SSlanguage_method = $row[5];
$SSreport_default_format = $row[6];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
### ARCHIVED DATA CHECK CONFIGURATION ### ARCHIVED DATA CHECK CONFIGURATION
$archives_available="N"; $archives_available="N";
@@ -533,7 +536,7 @@ $HTML_text.="</SELECT>\n";
$HTML_text.="<BR><BR>"; $HTML_text.="<BR><BR>";
$HTML_text.="Display: <select name='report_display_type'>"; $HTML_text.="Display: <select name='report_display_type'>";
if ($report_display_type) {$MAIN.="<option value='$report_display_type' selected>$report_display_type</option>";} if ($report_display_type) {$HTML_text.="<option value='$report_display_type' selected>$report_display_type</option>";}
$HTML_text.="<option value='TEXT'>"._QXZ("TEXT")."</option><option value='HTML'>"._QXZ("HTML")."</option></select><BR><BR>\n"; $HTML_text.="<option value='TEXT'>"._QXZ("TEXT")."</option><option value='HTML'>"._QXZ("HTML")."</option></select><BR><BR>\n";
$HTML_text.="Shift: <SELECT SIZE=1 NAME=shift>\n"; $HTML_text.="Shift: <SELECT SIZE=1 NAME=shift>\n";
$HTML_text.="<option selected value=\"$shift\">$shift</option>\n"; $HTML_text.="<option selected value=\"$shift\">$shift</option>\n";
www/vicidial/timeclock_report.php
+5 -2
View File
@@ -1,7 +1,7 @@
<?php <?php
# timeclock_report.php # timeclock_report.php
# #
# Copyright (C) 2016 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2 # Copyright (C) 2017 Matt Florell <vicidial@gmail.com> LICENSE: AGPLv2
# #
# CHANGES # CHANGES
# #
@@ -28,6 +28,7 @@
# 141230-0948 - Added code for on-the-fly language translations display # 141230-0948 - Added code for on-the-fly language translations display
# 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs
# 161019-2253 - Added screen colors # 161019-2253 - Added screen colors
# 170227-1723 - Fix for default HTML report format, issue #997
# #
$startMS = microtime(); $startMS = microtime();
@@ -70,7 +71,7 @@ $db_source = 'M';
############################################# #############################################
##### START SYSTEM_SETTINGS LOOKUP ##### ##### START SYSTEM_SETTINGS LOOKUP #####
$stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,webroot_writable,enable_languages,language_method,admin_screen_colors FROM system_settings;"; $stmt = "SELECT use_non_latin,outbound_autodial_active,slave_db_server,reports_use_slave_db,webroot_writable,enable_languages,language_method,admin_screen_colors,report_default_format FROM system_settings;";
$rslt=mysql_to_mysqli($stmt, $link); $rslt=mysql_to_mysqli($stmt, $link);
if ($DB) {$MAIN.="$stmt\n";} if ($DB) {$MAIN.="$stmt\n";}
$qm_conf_ct = mysqli_num_rows($rslt); $qm_conf_ct = mysqli_num_rows($rslt);
@@ -85,9 +86,11 @@ if ($qm_conf_ct > 0)
$SSenable_languages = $row[5]; $SSenable_languages = $row[5];
$SSlanguage_method = $row[6]; $SSlanguage_method = $row[6];
$SSadmin_screen_colors = $row[7]; $SSadmin_screen_colors = $row[7];
$SSreport_default_format = $row[8];
} }
##### END SETTINGS LOOKUP ##### ##### END SETTINGS LOOKUP #####
########################################### ###########################################
if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;}
$STARTtime = date("U"); $STARTtime = date("U");
$TODAY = date("Y-m-d"); $TODAY = date("Y-m-d");