mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update History Page to match

Browse Source
This commit is contained in:
Richard Lawley
2016-03-08 18:45:55 +00:00
parent 9f136c06de
commit bd640ebc08
1 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/bill/history.inc.php
+29 -19
View File
@@ -9,9 +9,18 @@ $img['his'] = '<img src="bandwidth-graph.php?bill_id='.$bill_id;
$img['his'] .= '&amp;type=historical';
$img['his'] .= '&amp;x=1190&amp;y=250';
$img['his'] .= '" style="margin: 15px 5px 25px 5px;" />';
?>
echo $img['his'];
<h3>Historical Usage</h3>
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">Monthly Usage</h3>
</div>
<?php echo $img['his'] ?>
</div>
<?php
function showDetails($bill_id, $imgtype, $from, $to, $bittype='Quota') {
if ($imgtype == 'bitrate') {
@@ -40,21 +49,24 @@ function showDetails($bill_id, $imgtype, $from, $to, $bittype='Quota') {
// $url = generate_url($vars, array('detail' => 'yes'));
$url = $PHP_SELF.'/bill/'.$bill_id.'/history/detail=all/';
echo '<table class="table">
echo '<table class="table table-striped">
<thead>
<tr style="font-weight: bold; ">
<td width="7"></td>
<td width="250">Period</td>
<td>Type</td>
<td>Allowed</td>
<td>Inbound</td>
<td>Outbound</td>
<td>Total</td>
<td>95th %ile</td>
<td style="text-align: center;">Overusage</td>
<td colspan="2" style="text-align: right;"><a href="'.generate_url($vars, array('detail' => 'all')).'">
<th width="7"></th>
<th width="250">Period</th>
<th>Type</th>
<th>Allowed</th>
<th>Inbound</th>
<th>Outbound</th>
<th>Total</th>
<th>95th %ile</th>
<th style="text-align: center;">Overusage</th>
<th colspan="2" style="text-align: right;"><a href="'.generate_url($vars, array('detail' => 'all')).'">
<img src="images/16/chart_curve.png" border="0" align="absmiddle" alt="Show details" title="Show details" /> Show all details</a>
</td>
</tr>';
</th>
</tr>
</thead>
<tbody>';
foreach (dbFetchRows('SELECT * FROM `bill_history` WHERE `bill_id` = ? ORDER BY `bill_datefrom` DESC LIMIT 24', array($bill_id)) as $history) {
if (bill_permitted($history['bill_id'])) {
@@ -68,7 +80,6 @@ foreach (dbFetchRows('SELECT * FROM `bill_history` WHERE `bill_id` = ? ORDER BY
$total_data = format_number($history['traf_total'], $config['billing']['base']);
$background = get_percentage_colours($percent);
$row_colour = ((!is_integer($i / 2)) ? $list_colour_a : $list_colour_b);
if ($type == 'CDR') {
$allowed = formatRates($history['bill_allowed']);
@@ -91,7 +102,7 @@ foreach (dbFetchRows('SELECT * FROM `bill_history` WHERE `bill_id` = ? ORDER BY
$url = generate_url($vars, array('detail' => $history['bill_hist_id']));
echo '
<tr style="background: '.$row_colour.';">
<tr>
<td></td>
<td><span style="font-weight: bold;" class="interface">'.strftime('%Y-%m-%d', strtotime($datefrom)).' to '.strftime('%Y-%m-%d', strtotime($dateto))."</span></td>
<td>$type</td>
@@ -123,9 +134,8 @@ foreach (dbFetchRows('SELECT * FROM `bill_history` WHERE `bill_id` = ? ORDER BY
</td>
</tr>';
}
$i++;
} //end if
}//end foreach
echo '</table>';
echo '</tbody>
</table>';