From 2f458273b27c3810a706bdf8d9d3637b2d7822b1 Mon Sep 17 00:00:00 2001 From: mattf Date: Mon, 27 Feb 2017 22:33:30 +0000 Subject: [PATCH] Fix for default HTML report format, issue #997 Added HH:MM:SS option for DID report git-svn-id: svn://192.168.202.10@2687 3d104415-ff17-0410-8863-d5cf3c621b8a --- www/vicidial/AST_CLOSER_service_level.php | 7 +- www/vicidial/AST_CLOSERstats.php | 11 ++- www/vicidial/AST_CLOSERstats_v2.php | 15 +-- www/vicidial/AST_CLOSERsummary_hourly.php | 9 +- www/vicidial/AST_DIDstats.php | 91 +++++++++++++++---- www/vicidial/AST_IVRstats.php | 11 ++- www/vicidial/AST_LISTS_campaign_stats.php | 7 +- www/vicidial/AST_LISTS_pass_report.php | 9 +- www/vicidial/AST_OUTBOUNDsummary_interval.php | 9 +- www/vicidial/AST_VDADstats.php | 7 +- www/vicidial/AST_agent_timeclock_detail.php | 9 +- .../AST_campaign_status_list_report.php | 7 +- www/vicidial/AST_inbound_daily_report.php | 9 +- www/vicidial/fcstats.php | 10 +- www/vicidial/fcstats_detail.php | 9 +- www/vicidial/timeclock_report.php | 7 +- 16 files changed, 163 insertions(+), 64 deletions(-) diff --git a/www/vicidial/AST_CLOSER_service_level.php b/www/vicidial/AST_CLOSER_service_level.php index dd00a308..6e98195f 100644 --- a/www/vicidial/AST_CLOSER_service_level.php +++ b/www/vicidial/AST_CLOSER_service_level.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -34,6 +34,7 @@ # 160227-1153 - Uniform form format # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160819-0054 - Fixed chart bugs caused by DST +# 170227-1714 - Fix for default HTML report format, issue #997 # $startMS = microtime(); @@ -70,7 +71,7 @@ $db_source = 'M'; ############################################# ##### 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); if ($DB) {$MAIN.="$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -83,9 +84,11 @@ if ($qm_conf_ct > 0) $reports_use_slave_db = $row[3]; $SSenable_languages = $row[4]; $SSlanguage_method = $row[5]; + $SSreport_default_format = $row[6]; } ##### END SETTINGS LOOKUP ##### ########################################### +if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;} ### ARCHIVED DATA CHECK CONFIGURATION $archives_available="N"; diff --git a/www/vicidial/AST_CLOSERstats.php b/www/vicidial/AST_CLOSERstats.php index af781897..98891a2f 100644 --- a/www/vicidial/AST_CLOSERstats.php +++ b/www/vicidial/AST_CLOSERstats.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 # # CHANGES: # 60619-1714 - Added variable filtering to eliminate SQL injection attack threat @@ -54,6 +54,7 @@ # 160227-1129 - Uniform form format # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 160819-0054 - Fixed chart bugs +# 170227-1715 - Fix for default HTML report format, issue #997 # $startMS = microtime(); @@ -82,9 +83,9 @@ if (isset($_GET["EMAIL"])) {$EMAIL=$_GET["EMAIL"];} elseif (isset($_POST["EMAIL"])) {$EMAIL=$_POST["EMAIL"];} if (isset($_GET["DB"])) {$DB=$_GET["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"];} -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"];} 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"];} @@ -101,7 +102,7 @@ if ($DID=='Y') ############################################# ##### 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); if ($DB) {$MAIN.="$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -114,9 +115,11 @@ if ($qm_conf_ct > 0) $reports_use_slave_db = $row[3]; $SSenable_languages = $row[4]; $SSlanguage_method = $row[5]; + $SSreport_default_format = $row[6]; } ##### END SETTINGS LOOKUP ##### ########################################### +if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;} ### ARCHIVED DATA CHECK CONFIGURATION $archives_available="N"; diff --git a/www/vicidial/AST_CLOSERstats_v2.php b/www/vicidial/AST_CLOSERstats_v2.php index 74ad152b..462e22ca 100644 --- a/www/vicidial/AST_CLOSERstats_v2.php +++ b/www/vicidial/AST_CLOSERstats_v2.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 # # CHANGES: # 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 # 160819-0054 - Fixed chart bugs # 161207-2037 - Fix for issue #982, formatting +# 170227-1708 - Fix for default HTML report format, issue #997 # $startMS = microtime(); @@ -88,9 +89,9 @@ if (isset($_GET["CHAT"])) {$CHAT=$_GET["CHAT"];} elseif (isset($_POST["CHAT"])) {$CHAT=$_POST["CHAT"];} if (isset($_GET["DB"])) {$DB=$_GET["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"];} -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"];} 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"];} @@ -106,7 +107,7 @@ if ($DID=='Y') ############################################# ##### 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); if ($DB) {$MAIN.="$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -119,9 +120,11 @@ if ($qm_conf_ct > 0) $reports_use_slave_db = $row[3]; $SSenable_languages = $row[4]; $SSlanguage_method = $row[5]; + $SSreport_default_format = $row[6]; } ##### END SETTINGS LOOKUP ##### ########################################### +if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;} ### ARCHIVED DATA CHECK CONFIGURATION $archives_available="N"; @@ -551,7 +554,7 @@ if (mysqli_num_rows($call_time_rslt)>0) { } $MAIN.="\n"; -$MAIN.="
"._QXZ("Display as").":  "; +$MAIN.="
      "._QXZ("Display as").":  "; $MAIN.="\n
"; @@ -2872,7 +2875,7 @@ if ($report_display_type=="HTML") } } -print_r($graph_stats); +#print_r($graph_stats); $GRAPH_text=""; ######### $graph_array=array("ACS_CATBdata||CALL INITIAL QUEUE POSITION BREAKDOWN|integer|"); diff --git a/www/vicidial/AST_CLOSERsummary_hourly.php b/www/vicidial/AST_CLOSERsummary_hourly.php index 9f4c621a..524dac24 100644 --- a/www/vicidial/AST_CLOSERsummary_hourly.php +++ b/www/vicidial/AST_CLOSERsummary_hourly.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -27,6 +27,7 @@ # 151125-1609 - Added search archive option # 160227-1151 - Uniform form format # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs +# 170227-1713 - Fix for default HTML report format, issue #997 # $startMS = microtime(); @@ -66,7 +67,7 @@ if (isset($_GET["DB"])) {$DB=$_GET["DB"];} elseif (isset($_POST["DB"])) {$DB=$_POST["DB"];} if (isset($_GET["file_download"])) {$file_download=$_GET["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"];} 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"];} @@ -80,7 +81,7 @@ $db_source = 'M'; ############################################# ##### 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); if ($DB) {$MAIN.="$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -93,9 +94,11 @@ if ($qm_conf_ct > 0) $reports_use_slave_db = $row[3]; $SSenable_languages = $row[4]; $SSlanguage_method = $row[5]; + $SSreport_default_format = $row[6]; } ##### END SETTINGS LOOKUP ##### ########################################### +if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;} ### ARCHIVED DATA CHECK CONFIGURATION $archives_available="N"; diff --git a/www/vicidial/AST_DIDstats.php b/www/vicidial/AST_DIDstats.php index f9298329..37b202b3 100644 --- a/www/vicidial/AST_DIDstats.php +++ b/www/vicidial/AST_DIDstats.php @@ -1,7 +1,7 @@ LICENSE: AGPLv2 +# Copyright (C) 2017 Matt Florell LICENSE: AGPLv2 # # CHANGES # @@ -30,6 +30,8 @@ # 160227-1150 - Uniform form format # 160714-2348 - Added and tested ChartJS features for more aesthetically appealing graphs # 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(); @@ -44,8 +46,12 @@ if (isset($_GET["group"])) {$group=$_GET["group"];} elseif (isset($_POST["group"])) {$group=$_POST["group"];} if (isset($_GET["query_date"])) {$query_date=$_GET["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"];} 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"];} elseif (isset($_POST["shift"])) {$shift=$_POST["shift"];} 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"];} 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'; $db_source = 'M'; ############################################# ##### 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); if ($DB) {$MAIN.="$stmt\n";} $qm_conf_ct = mysqli_num_rows($rslt); @@ -81,9 +87,11 @@ if ($qm_conf_ct > 0) $reports_use_slave_db = $row[3]; $SSenable_languages = $row[4]; $SSlanguage_method = $row[5]; + $SSreport_default_format = $row[6]; } ##### END SETTINGS LOOKUP ##### ########################################### +if (strlen($report_display_type)<2) {$report_display_type = $SSreport_default_format;} ### ARCHIVED DATA CHECK CONFIGURATION $archives_available="N"; @@ -222,6 +230,8 @@ $STARTtime = date("U"); if (!isset($group)) {$group = '';} if (!isset($query_date)) {$query_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;"; $rslt=mysql_to_mysqli($stmt, $link); @@ -370,7 +380,7 @@ $MAIN.=""._QXZ("$report_name")." $NWB#DIDstats$NWE\n"; $MAIN.="
"; $MAIN.="
\n"; -$MAIN.="
\n"; +$MAIN.="
\n"; $MAIN.=""; $MAIN.="\n"; +$MAIN.="
"; -$MAIN.="
"._QXZ("to")."
"; +$MAIN.="
"._QXZ("to")."

"; $MAIN.="\n"; +$MAIN.="
"; $MAIN.="		\n"; $MAIN.="\n"; -$MAIN.="\n"; +$MAIN.=""._QXZ("Shift").":
\n"; $MAIN.="\n"; $HTML_text.="\n"; $HTML_text.="   "; $HTML_text.="\n"; $HTML_text.="\n"; $HTML_text.="

"; $HTML_text.="Display:

\n"; $HTML_text.="Shift: