From 6297cf191e15a26dc73c805f6231d262db3f3f35 Mon Sep 17 00:00:00 2001
From: Nate <github@najo.com>
Date: Fri, 7 Feb 2020 08:45:02 -0700
Subject: [PATCH] CDR Extension Summary: List and button updates, use css grid
 on search form.

---
 app/xml_cdr/xml_cdr_extension_summary.php | 242 ++++++++++------------
 1 file changed, 106 insertions(+), 136 deletions(-)

diff --git a/app/xml_cdr/xml_cdr_extension_summary.php b/app/xml_cdr/xml_cdr_extension_summary.php
index ebf06bc8bb..bd91828a1e 100644
--- a/app/xml_cdr/xml_cdr_extension_summary.php
+++ b/app/xml_cdr/xml_cdr_extension_summary.php
@@ -17,7 +17,7 @@
 
 	The Initial Developer of the Original Code is
 	Mark J Crane <markjcrane@fusionpbx.com>
-	Portions created by the Initial Developer are Copyright (C) 2008-2016
+	Portions created by the Initial Developer are Copyright (C) 2008-2020
 	the Initial Developer. All Rights Reserved.
 
 	Contributor(s):
@@ -43,10 +43,6 @@
 	$language = new text;
 	$text = $language->get();
 
-//additional includes
-	$document['title'] = $text['title-extension_summary'];
-	require_once "resources/header.php";
-
 //retrieve submitted data
 	$quick_select = $_REQUEST['quick_select'];
 	$start_stamp_begin = $_REQUEST['start_stamp_begin'];
@@ -65,7 +61,7 @@
 
 //set the http header
 	if ($_REQUEST['type'] == "csv") {
-	
+
 		//set the headers
 			header('Content-type: application/octet-binary');
 			header('Content-Disposition: attachment; filename=user-summary.csv');
@@ -82,7 +78,7 @@
 				$z++;
 			}
 			echo "\n";
-		
+
 		//add the values to the csv
 			$x = 0;
 			foreach($summary as $users) {
@@ -102,163 +98,137 @@
 			exit;
 	}
 
-//page title and description
-	echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-	echo "	<tr>\n";
-	echo "		<td align='left' width='50%' nowrap='nowrap' style='vertical-align: top;'>\n";
-	echo "			<b>".$text['title-extension_summary']."</b><br><br>\n";
-	echo "		</td>\n";
-	echo "		<td align='right' width='100%' style='vertical-align: top;'>";
-	echo "		<input type='button' class='btn' value='".$text['button-download_csv']."' ";
-	echo "onclick=\"window.location='xml_cdr_extension_summary.php?";
-	if (strlen($_SERVER["QUERY_STRING"]) > 0) { 
-		echo $_SERVER["QUERY_STRING"]."&type=csv';\">\n";
-	}
-	else {
-		echo "type=csv';\">\n";
-	}
+//include the header
+	$document['title'] = $text['title-extension_summary'];
+	require_once "resources/header.php";
 
+//css grid adjustment
+	echo "<style>\n";
+	echo "	div.form_grid {\n";
+	echo "		grid-template-columns: repeat(auto-fill, minmax(350px, 1fr));\n";
+	echo "		}\n";
+	echo "</style>\n";
+
+//show the content
+	echo "<div class='action_bar' id='action_bar'>\n";
+	echo "	<div class='heading'><b>".$text['title-extension_summary']."</b></div>\n";
+	echo "	<div class='actions'>\n";
 	if (permission_exists('xml_cdr_all') && $_GET['show'] != 'all') {
-		echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'link'=>'xml_cdr_extension_summary.php?show=all']);
+		echo button::create(['type'=>'button','label'=>$text['button-show_all'],'icon'=>$_SESSION['theme']['button_icon_all'],'collapse'=>'hide-sm-dn','link'=>'xml_cdr_extension_summary.php?show=all']);
 	}
-	echo "		</td>\n";
-	echo "	</tr>\n";
-	echo "</table>\n";
-	echo "<br>\n";
+	echo button::create(['type'=>'button','label'=>$text['button-download_csv'],'icon'=>$_SESSION['theme']['button_icon_download'],'collapse'=>'hide-sm-dn','link'=>'xml_cdr_extension_summary.php?'.(strlen($_SERVER["QUERY_STRING"]) > 0 ? $_SERVER["QUERY_STRING"].'&' : null).'type=csv']);
+	echo button::create(['type'=>'button','label'=>$text['button-reset'],'icon'=>$_SESSION['theme']['button_icon_reset'],'collapse'=>'hide-xs','style'=>'margin-left: 15px;','link'=>'xml_cdr_extension_summary.php']);
+	echo button::create(['type'=>'button','label'=>$text['button-update'],'icon'=>$_SESSION['theme']['button_icon_save'],'collapse'=>'hide-xs','onclick'=>"document.getElementById('frm').submit();"]);
+	echo "	</div>\n";
+	echo "	<div style='clear: both;'></div>\n";
+	echo "</div>\n";
 
 	if (permission_exists('xml_cdr_search')) {
 		echo "<form name='frm' id='frm' method='get' action=''>\n";
-		if (permission_exists('xml_cdr_all')) {
-			if ($_GET['show'] == 'all') {
-				echo "		<input type='hidden' name='show' value='all'>";
-			}
+
+		echo "<div class='form_grid' style='padding-bottom: 35px;'>\n";
+
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-preset']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field'>\n";
+		echo "			<select class='formfld' name='quick_select' id='quick_select' onchange=\"if (this.selectedIndex != 0) { document.getElementById('start_stamp_begin').value = ''; document.getElementById('start_stamp_end').value = ''; document.getElementById('frm').submit(); }\">\n";
+		echo "				<option value=''></option>\n";
+		echo "				<option value='1' ".(($quick_select == 1) ? "selected='selected'" : null).">".$text['option-last_seven_days']."</option>\n";
+		echo "				<option value='2' ".(($quick_select == 2) ? "selected='selected'" : null).">".$text['option-last_hour']."</option>\n";
+		echo "				<option value='3' ".(($quick_select == 3) ? "selected='selected'" : null).">".$text['option-today']."</option>\n";
+		echo "				<option value='4' ".(($quick_select == 4) ? "selected='selected'" : null).">".$text['option-yesterday']."</option>\n";
+		echo "				<option value='5' ".(($quick_select == 5) ? "selected='selected'" : null).">".$text['option-this_week']."</option>\n";
+		echo "				<option value='6' ".(($quick_select == 6) ? "selected='selected'" : null).">".$text['option-this_month']."</option>\n";
+		echo "				<option value='7' ".(($quick_select == 7) ? "selected='selected'" : null).">".$text['option-this_year']."</option>\n";
+		echo "			</select>\n";
+		echo "		</div>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-start_date_time']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field'>\n";
+		echo "			<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_begin' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_begin' id='start_stamp_begin' placeholder='".$text['label-from']."' value='".escape($start_stamp_begin)."'>\n";
+		echo "		</div>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-end_date_time']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field'>\n";
+		echo "			<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_end' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_end' id='start_stamp_end' placeholder='".$text['label-to']."' value='".escape($start_stamp_end)."'>\n";
+		echo "		</div>\n";
+		echo "	</div>\n";
+
+		echo "	<div class='form_set'>\n";
+		echo "		<div class='label'>\n";
+		echo "			".$text['label-include_internal']."\n";
+		echo "		</div>\n";
+		echo "		<div class='field'>\n";
+		echo "			<select class='formfld' name='include_internal' id='include_internal'>\n";
+		echo "				<option value='0'>".$text['option-false']."</option>\n";
+		echo "				<option value='1' ".(($include_internal == 1) ? "selected" : null).">".$text['option-true']."</option>\n";
+		echo "			</select>\n";
+		echo "		</div>\n";
+		echo "	</div>\n";
+
+		echo "</div>\n";
+
+		if (permission_exists('xml_cdr_all') && $_GET['show'] == 'all') {
+			echo "<input type='hidden' name='show' value='all'>";
 		}
-		echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "	<tr>\n";
-
-		echo "		<td width='25%' style='vertical-align: top;'>\n";
-		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "				<tr>\n";
-		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
-		echo "						".$text['label-preset']."\n";
-		echo "					</td>\n";
-		echo "					<td class='vtable' width='70%' align='left' style='white-space: nowrap;'>\n";
-		echo "						<select class='formfld' name='quick_select' id='quick_select' onchange=\"if (this.selectedIndex != 0) { document.getElementById('start_stamp_begin').value = ''; document.getElementById('start_stamp_end').value = ''; document.getElementById('frm').submit(); }\">\n";
-		echo "							<option value=''></option>\n";
-		echo "							<option value='1' ".(($quick_select == 1) ? "selected='selected'" : null).">".$text['option-last_seven_days']."</option>\n";
-		echo "							<option value='2' ".(($quick_select == 2) ? "selected='selected'" : null).">".$text['option-last_hour']."</option>\n";
-		echo "							<option value='3' ".(($quick_select == 3) ? "selected='selected'" : null).">".$text['option-today']."</option>\n";
-		echo "							<option value='4' ".(($quick_select == 4) ? "selected='selected'" : null).">".$text['option-yesterday']."</option>\n";
-		echo "							<option value='5' ".(($quick_select == 5) ? "selected='selected'" : null).">".$text['option-this_week']."</option>\n";
-		echo "							<option value='6' ".(($quick_select == 6) ? "selected='selected'" : null).">".$text['option-this_month']."</option>\n";
-		echo "							<option value='7' ".(($quick_select == 7) ? "selected='selected'" : null).">".$text['option-this_year']."</option>\n";
-		echo "						</select>\n";
-		echo "					</td>\n";
-		echo "				</tr>\n";
-		echo "			</table>\n";
-		echo "		</td>";
-
-		echo "		<td width='25%' style='vertical-align: top;'>\n";
-		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "				<tr>\n";
-		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
-		echo "						".$text['label-start_date_time']."\n";
-		echo "					</td>\n";
-		echo "					<td class='vtable' width='70%' align='left' style='position: relative; min-width: 135px;'>\n";
-		echo "						<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_begin' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_begin' id='start_stamp_begin' placeholder='".$text['label-from']."' value='".escape($start_stamp_begin)."'>\n";
-		echo "					</td>\n";
-		echo "				</tr>\n";
-		echo "			</table>\n";
-		echo "		</td>";
-
-		echo "		<td width='25%' style='vertical-align: top;'>\n";
-		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "				<tr>\n";
-		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
-		echo "						".$text['label-end_date_time']."\n";
-		echo "					</td>\n";
-		echo "					<td class='vtable' width='70%' align='left' style='position: relative; min-width: 135px;'>\n";
-		echo "						<input type='text' class='formfld datetimepicker' data-toggle='datetimepicker' data-target='#start_stamp_end' onblur=\"$(this).datetimepicker('hide');\" style='min-width: 115px; width: 115px; max-width: 115px;' name='start_stamp_end' id='start_stamp_end' placeholder='".$text['label-to']."' value='".escape($start_stamp_end)."'>\n";
-		echo "					</td>\n";
-		echo "				</tr>\n";
-		echo "			</table>\n";
-		echo "		</td>";
-
-		echo "		<td width='25%' style='vertical-align: top;'>\n";
-		echo "			<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
-		echo "				<tr>\n";
-		echo "					<td class='vncell' valign='top' nowrap='nowrap' width='30%'>\n";
-		echo "						".$text['label-include_internal']."\n";
-		echo "					</td>\n";
-		echo "					<td class='vtable' width='70%' align='left' style='white-space: nowrap;'>\n";
-		echo "						<select class='formfld' name='include_internal' id='include_internal'>\n";
-		echo "							<option value='0'>".$text['option-false']."</option>\n";
-		echo "							<option value='1' ".(($include_internal == 1) ? "selected" : null).">".$text['option-true']."</option>\n";
-		echo "						</select>\n";
-		echo "					</td>\n";
-		echo "				</tr>\n";
-		echo "			</table>\n";
-		echo "		</td>";
-
-		echo "	</tr>";
-		echo "	<tr>";
-		echo "		<td colspan='4' style='padding-top: 8px;' align='right'>";
-		echo "			<input type='button' class='btn' value='".$text['button-reset']."' onclick=\"document.location.href='xml_cdr_extension_summary.php';\">\n";
-		echo "			<input type='submit' class='btn' value='".$text['button-update']."'>\n";
-		echo "		</td>";
-		echo "	</tr>";
-		echo "</table>";
 
 		echo "</form>";
-		echo "<br /><br />";
 	}
 
 //show the results
-	echo "<table xclass='tr_hover' width='100%' cellpadding='0' cellspacing='0' border='0'>\n";
-	echo "	<tr>\n";
+	echo "<table class='list'>\n";
+	echo "	<tr class='list-header'>\n";
 	if ($_GET['show'] === "all" && permission_exists('xml_cdr_all')) {
 		echo "		<th>".$text['label-domain']."</th>\n";
 	}
 	echo "		<th>".$text['label-extension']."</th>\n";
 	echo "		<th>".$text['label-number_alias']."</th>\n";
-	echo "		<th>".$text['label-missed']."</th>\n";
-	echo "		<th>".$text['label-no_answer']."</th>\n";
-	echo "		<th>".$text['label-busy']."</th>\n";
-	echo "		<th>".$text['label-aloc']."</th>\n";
-	echo "		<th style='text-align: right;'>".$text['label-inbound_calls']."</th>\n";
-	echo "		<th style='text-align: right;'>".$text['label-inbound_duration']."</th>\n";
-	echo "		<th style='text-align: right;'>".$text['label-outbound_calls']."</th>\n";
-	echo "		<th style='text-align: right;'>".$text['label-outbound_duration']."</th>\n";
-	echo "		<th style='text-align: left;'>".$text['label-description']."</th>\n";
+	echo "		<th class='center'>".$text['label-missed']."</th>\n";
+	echo "		<th class='center'>".$text['label-no_answer']."</th>\n";
+	echo "		<th class='center'>".$text['label-busy']."</th>\n";
+	echo "		<th class='center'>".$text['label-aloc']."</th>\n";
+	echo "		<th class='center'>".$text['label-inbound_calls']."</th>\n";
+	echo "		<th class='center'>".$text['label-inbound_duration']."</th>\n";
+	echo "		<th class='center'>".$text['label-outbound_calls']."</th>\n";
+	echo "		<th class='center'>".$text['label-outbound_duration']."</th>\n";
+	echo "		<th class='hide-sm-dn'>".$text['label-description']."</th>\n";
 	echo "	</tr>\n";
 
 	if (is_array($summary)) {
 		foreach ($summary as $key => $row) {
-			$tr_link = "xhref='xml_cdr.php?'";
-			echo "<tr class='list-row' ".$tr_link.">\n";
+			echo "<tr class='list-row'>\n";
 			if ($_GET['show'] === "all" && permission_exists('xml_cdr_all')) {
-				echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['domain_name'])."</td>\n";
+				echo "	<td>".escape($row['domain_name'])."</td>\n";
 			}
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['extension'])."</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['number_alias'])."&nbsp;</td>\n";
-			//echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['answered'])."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['missed'])."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['no_answer'])."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."'>".escape($row['busy'])."&nbsp;</td>\n";
-			echo "  <td valign='top' class='".$row_style[$c]."'>".format_hours($row['aloc'])."&nbsp;</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."' style='text-align: right;'>&nbsp;". escape($row['inbound_calls']) ."</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."' style='text-align: right;'>".(($row['inbound_duration'] != '0') ? format_hours($row['inbound_duration']) : '0:00:00')."</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."' style='text-align: right;'>&nbsp;".(($row['outbound_calls'] != '') ? escape($row['outbound_calls']) : "0")."</td>\n";
-			echo "	<td valign='top' class='".$row_style[$c]."' style='text-align: right;'>".(($row['outbound_duration'] != '') ? format_hours($row['outbound_duration']) : '0:00:00')."</td>\n";
-			echo "	<td valign='top' class='row_stylebg'>".escape($row['description'])."&nbsp;</td>\n";
+			echo "	<td>".escape($row['extension'])."</td>\n";
+			echo "	<td>".escape($row['number_alias'])."&nbsp;</td>\n";
+			echo "	<td class='center'>".escape($row['missed'])."&nbsp;</td>\n";
+			echo "	<td class='center'>".escape($row['no_answer'])."&nbsp;</td>\n";
+			echo "	<td class='center'>".escape($row['busy'])."&nbsp;</td>\n";
+			echo "  <td class='center'>".format_hours($row['aloc'])."&nbsp;</td>\n";
+			echo "	<td class='center'>". escape($row['inbound_calls'])."&nbsp;</td>\n";
+			echo "	<td class='center'>".(($row['inbound_duration'] != '0') ? format_hours($row['inbound_duration']) : '0:00:00')."</td>\n";
+			echo "	<td class='center'>".(($row['outbound_calls'] != '') ? escape($row['outbound_calls']) : "0")."&nbsp;</td>\n";
+			echo "	<td class='center'>".(($row['outbound_duration'] != '') ? format_hours($row['outbound_duration']) : '0:00:00')."</td>\n";
+			echo "	<td class='description overflow hide-sm-dn'>".escape($row['description'])."&nbsp;</td>\n";
 			echo "</tr>\n";
 		}
 	}
 
-	echo "</table>";
-	echo "<br><br>";
+	echo "</table>\n";
+	echo "<br />\n";
 
 //show the footer
 	require_once "resources/footer.php";
 
-?>
+?>
\ No newline at end of file