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

fix previous month bill view

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@2770 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2011-12-08 10:30:27 +00:00
parent 25f784b140
commit 6dc0feffbe
2 changed files with 16 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
html/bandwidth-graph.php
View File

@ -189,8 +189,8 @@
// Create the bar plots // Create the bar plots
$barplot_tot = new BarPlot($tot_data); $barplot_tot = new BarPlot($tot_data);
$barplot_tot->SetLegend("Traffic total"); $barplot_tot->SetLegend("Traffic total");
$barplot_tot->SetColor("darkred"); $barplot_tot->SetColor('darkgray');
$barplot_tot->SetFillColor("lightred@0.4"); $barplot_tot->SetFillColor('lightgray@0.4');
$barplot_tot->value->Show(); $barplot_tot->value->Show();
$barplot_tot->value->SetFormatCallback('format_bytes_billing_short'); $barplot_tot->value->SetFormatCallback('format_bytes_billing_short');

29
html/pages/bills/pmonth.inc.php
View File

@ -24,32 +24,31 @@
$day_data = getDates($bill['bill_day']); $day_data = getDates($bill['bill_day']);
$datefrom = $day_data['2']; $datefrom = $day_data['2'];
$dateto = $day_data['3']; $dateto = $day_data['3'];
// foreach (dbFetchRows("SELECT * FROM `bill_hist` ORDER BY `bill_datefrom` AND `bill_dateto` DESC LIMIT 24") as $history) foreach (dbFetchRows("SELECT * FROM `bill_history` WHERE `bill_id` = ? AND `bill_datefrom` = ? ORDER BY `bill_datefrom` LIMIT 1", array($bill['bill_id'], $datefrom, $dateto)) as $history)
foreach (dbFetchRows("SELECT * FROM `bill_hist` WHERE `bill_id` = ? AND `bill_datefrom` = ? AND `bill_dateto` = ? ORDER BY `bill_datefrom` AND `bill_dateto` LIMIT 1", array($bill['bill_id'], $datefrom, $dateto)) as $history)
{ {
unset($class); unset($class);
$type = $history['bill_type']; $type = $history['bill_type'];
$percent = $history['bill_percent']; $percent = $history['bill_percent'];
$dir_95th = $history['dir_95th']; $dir_95th = $history['dir_95th'];
$rate_95th = formatRates($history['rate_95th'] * 1000); $rate_95th = format_si($history['rate_95th'])."bps";
$total_data = formatStorage($history['traf_total'] * 1000 * 1000); $total_data = format_bytes_billing($history['traf_total']);
$background = get_percentage_colours($percent); $background = get_percentage_colours($percent);
$row_colour = ((!is_integer($i/2)) ? $list_colour_a : $list_colour_b); $row_colour = ((!is_integer($i/2)) ? $list_colour_a : $list_colour_b);
if ($type == "CDR") if ($type == "CDR")
{ {
$allowed = formatRates($history['bill_allowed'] * 1000); $allowed = format_si($history['bill_allowed'])."bps";
$used = formatRates($history['rate_95th'] * 1000); $used = format_si($history['rate_95th'])."bps";
$in = formatRates($history['rate_95th_in'] * 1000); $in = format_si($history['rate_95th_in'])."bps";
$out = formatRates($history['rate_95th_out'] * 1000); $out = format_si($history['rate_95th_out'])."bps";
$overuse = (($history['bill_overuse'] <= 0) ? "-" : "<span style=\"color: #".$background['left']."; font-weight: bold;\">".formatRates($history['bill_overuse'] * 1000)."</span>"); $overuse = (($history['bill_overuse'] <= 0) ? "-" : "<span style=\"color: #".$background['left']."; font-weight: bold;\">".format_si($history['bill_overuse'])."bps</span>");
} elseif ($type == "Quota") { } elseif ($type == "Quota") {
$allowed = formatStorage($history['bill_allowed'] * 1000 * 1000); $allowed = format_bytes_billing($history['bill_allowed']);
$used = formatStorage($history['total_data'] * 1000 * 1000); $used = format_bytes_billing($history['total_data']);
$in = formatStorage($history['traf_in'] * 1000 * 1000); $in = format_bytes_billing($history['traf_in']);
$out = formatStorage($history['traf_out'] * 1000 * 1000); $out = format_bytes_billing($history['traf_out']);
$overuse = (($history['bill_overuse'] <= 0) ? "-" : "<span style=\"color: #".$background['left']."; font-weight: bold;\">".formatStorage($history['bill_overuse'] * 1000 * 1000)."</span>"); $overuse = (($history['bill_overuse'] <= 0) ? "-" : "<span style=\"color: #".$background['left']."; font-weight: bold;\">".format_bytes_billing($history['bill_overuse'])."</span>");
} }
$total_data = (($type == "Quota") ? "<b>".$total_data."</b>" : $total_data); $total_data = (($type == "Quota") ? "<b>".$total_data."</b>" : $total_data);
@ -58,7 +57,7 @@
echo(" echo("
<tr style=\"background: $row_colour;\"> <tr style=\"background: $row_colour;\">
<td></td> <td></td>
<td><a href=\"bill/".$bill['bill_id']."/\"><span style=\"font-weight: bold;\" class=\"interface\">".$bill['bill_name']."</a></span><br />from ".strftime("%x", strtotime($datefrom))." to ".strftime("%x", strtotime($dateto))."</td> <td><a href=\"".generate_url(array('page' => "bill", 'bill_id' => $bill['bill_id']))."/\"><span style=\"font-weight: bold;\" class=\"interface\">".$bill['bill_name']."</a></span><br />from ".strftime("%x", strtotime($datefrom))." to ".strftime("%x", strtotime($dateto))."</td>
<td>$type</td> <td>$type</td>
<td>$allowed</td> <td>$allowed</td>
<td>$in</td> <td>$in</td>