From ed8937b8fdb446193723a6102b9485a06c5f3812 Mon Sep 17 00:00:00 2001
From: Robert Anderson <randerson@lbsd.net>
Date: Thu, 15 Jul 2010 08:57:53 +0000
Subject: [PATCH] Added total topup available
---
webgui/ajax.php | 4 ++++
.../include/ajax/functions/AdminUserLogs.php | 10 ++++++++++
webgui/include/ajax/functions/WiSPUserLogs.php | 10 ++++++++++
webgui/js/app/windows/AdminUserLogs.js | 18 ++++++++++--------
webgui/js/app/windows/WiSPUserLogs.js | 18 ++++++++++--------
5 files changed, 44 insertions(+), 16 deletions(-)
diff --git a/webgui/ajax.php b/webgui/ajax.php
index 37a1dc54..aff539b9 100644
--- a/webgui/ajax.php
+++ b/webgui/ajax.php
@@ -370,6 +370,8 @@
$res->addField('uptimeUsage','int');
$res->addField('trafficTopups','int');
$res->addField('uptimeTopups','int');
+ $res->addField('TotalTrafficTopups','int');
+ $res->addField('TotalUptimeTopups','int');
$res->addField('AllTrafficTopups','array');
$res->addField('AllUptimeTopups','array');
$res->parseHash($rawData);
@@ -391,6 +393,8 @@
$res->addField('uptimeUsage','int');
$res->addField('trafficTopups','int');
$res->addField('uptimeTopups','int');
+ $res->addField('TotalTrafficTopups','int');
+ $res->addField('TotalUptimeTopups','int');
$res->addField('AllTrafficTopups','array');
$res->addField('AllUptimeTopups','array');
$res->parseHash($rawData);
diff --git a/webgui/include/ajax/functions/AdminUserLogs.php b/webgui/include/ajax/functions/AdminUserLogs.php
index dd3f6b9d..7ebab2ea 100644
--- a/webgui/include/ajax/functions/AdminUserLogs.php
+++ b/webgui/include/ajax/functions/AdminUserLogs.php
@@ -200,6 +200,8 @@ function getAdminUserLogsSummary($params) {
# Loop through topups and add to return array
$resultArray['trafficTopups'] = 0;
$resultArray['uptimeTopups'] = 0;
+ $resultArray['TotalTrafficTopups'] = 0;
+ $resultArray['TotalUptimeTopups'] = 0;
# Traffic and uptime topups
$resultArray['AllTrafficTopups'] = array();
$resultArray['AllUptimeTopups'] = array();
@@ -219,6 +221,7 @@ function getAdminUserLogsSummary($params) {
# Set total available topups
$resultArray['trafficTopups'] += isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# Topup currently in use
} elseif (!isset($topupItem['CurrentLimit']) && $excessTraffic < $topupItem['Limit']) {
@@ -233,6 +236,7 @@ function getAdminUserLogsSummary($params) {
# Set total available topups
$resultArray['trafficTopups'] += $topupItem['Limit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessTraffic = 0;
@@ -248,6 +252,7 @@ function getAdminUserLogsSummary($params) {
# Set total available topups
$resultArray['trafficTopups'] += $topupItem['CurrentLimit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessTraffic = 0;
@@ -263,6 +268,7 @@ function getAdminUserLogsSummary($params) {
$t++;
$resultArray['trafficTopups'] += isset($topupItem['CurrentLimit']) ? $topupITem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# Subtract this topup from excessTraffic usage
$excessTraffic -= isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
@@ -282,6 +288,7 @@ function getAdminUserLogsSummary($params) {
# Set total available topups
$resultArray['uptimeTopups'] += isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# Topup currently in use
} elseif (!isset($topupItem['CurrentLimit']) && $excessUptime < $topupItem['Limit']) {
@@ -296,6 +303,7 @@ function getAdminUserLogsSummary($params) {
# Set total available topups
$resultArray['uptimeTopups'] += $topupItem['Limit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessUptime = 0;
@@ -311,6 +319,7 @@ function getAdminUserLogsSummary($params) {
# Set total available topups
$resultArray['uptimeTopups'] += $topupItem['CurrentLimit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessUptime = 0;
@@ -326,6 +335,7 @@ function getAdminUserLogsSummary($params) {
$u++;
$resultArray['uptimeTopups'] += isset($topupItem['CurrentLimit']) ? $topupITem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# Subtract this topup from excessUptime usage
$excessUptime -= isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
diff --git a/webgui/include/ajax/functions/WiSPUserLogs.php b/webgui/include/ajax/functions/WiSPUserLogs.php
index 1850baa0..9ecbff6b 100644
--- a/webgui/include/ajax/functions/WiSPUserLogs.php
+++ b/webgui/include/ajax/functions/WiSPUserLogs.php
@@ -200,6 +200,8 @@ function getWiSPUserLogsSummary($params) {
# Loop through topups and add to return array
$resultArray['trafficTopups'] = 0;
$resultArray['uptimeTopups'] = 0;
+ $resultArray['TotalTrafficTopups'] = 0;
+ $resultArray['TotalUptimeTopups'] = 0;
# Traffic and uptime topups
$resultArray['AllTrafficTopups'] = array();
$resultArray['AllUptimeTopups'] = array();
@@ -219,6 +221,7 @@ function getWiSPUserLogsSummary($params) {
# Set total available topups
$resultArray['trafficTopups'] += isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# Topup currently in use
} elseif (!isset($topupItem['CurrentLimit']) && $excessTraffic < $topupItem['Limit']) {
@@ -233,6 +236,7 @@ function getWiSPUserLogsSummary($params) {
# Set total available topups
$resultArray['trafficTopups'] += $topupItem['Limit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessTraffic = 0;
@@ -248,6 +252,7 @@ function getWiSPUserLogsSummary($params) {
# Set total available topups
$resultArray['trafficTopups'] += $topupItem['CurrentLimit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessTraffic = 0;
@@ -263,6 +268,7 @@ function getWiSPUserLogsSummary($params) {
$t++;
$resultArray['trafficTopups'] += isset($topupItem['CurrentLimit']) ? $topupITem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalTrafficTopups'] += $topupItem['Limit'];
# Subtract this topup from excessTraffic usage
$excessTraffic -= isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
@@ -282,6 +288,7 @@ function getWiSPUserLogsSummary($params) {
# Set total available topups
$resultArray['uptimeTopups'] += isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# Topup currently in use
} elseif (!isset($topupItem['CurrentLimit']) && $excessUptime < $topupItem['Limit']) {
@@ -296,6 +303,7 @@ function getWiSPUserLogsSummary($params) {
# Set total available topups
$resultArray['uptimeTopups'] += $topupItem['Limit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessUptime = 0;
@@ -311,6 +319,7 @@ function getWiSPUserLogsSummary($params) {
# Set total available topups
$resultArray['uptimeTopups'] += $topupItem['CurrentLimit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# If we hit this topup then all the rest of them are available
$excessUptime = 0;
@@ -326,6 +335,7 @@ function getWiSPUserLogsSummary($params) {
$u++;
$resultArray['uptimeTopups'] += isset($topupItem['CurrentLimit']) ? $topupITem['CurrentLimit'] : $topupItem['Limit'];
+ $resultArray['TotalUptimeTopups'] += $topupItem['Limit'];
# Subtract this topup from excessUptime usage
$excessUptime -= isset($topupItem['CurrentLimit']) ? $topupItem['CurrentLimit'] : $topupItem['Limit'];
diff --git a/webgui/js/app/windows/AdminUserLogs.js b/webgui/js/app/windows/AdminUserLogs.js
index 5bf650d7..e52454f4 100644
--- a/webgui/js/app/windows/AdminUserLogs.js
+++ b/webgui/js/app/windows/AdminUserLogs.js
@@ -292,14 +292,16 @@ function showAdminUserLogsWindow(id) {
// Topups
var trafficTopups = response.data.trafficTopups;
var uptimeTopups = response.data.uptimeTopups;
+ var totalTrafficTopups = response.data.TotalTrafficTopups;
+ var totalUptimeTopups = response.data.TotalUptimeTopups;
// Format string before printing
var trafficString = '';
// Prepaid traffic
if (trafficCap == -1) {
trafficCap = 'Prepaid';
- trafficString += sprintf('Traffic:\nCap: %s \nTopup: %d MB\nUsage: %d/%d MB\n',
- trafficCap,trafficTopups,trafficUsage,trafficTopups);
+ trafficString += sprintf('Traffic:\nCap: %s \nTopup Available: %d MB\nTotal Topups: %d MB\nUsage: %d/%d MB\n',
+ trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,trafficTopups);
trafficString += '---\n';
// Uncapped traffic
} else if (trafficCap == 0) {
@@ -309,9 +311,9 @@ function showAdminUserLogsWindow(id) {
// Capped traffic
} else {
var combinedTrafficCap = trafficCap + trafficTopups;
- trafficString += sprintf('Traffic:\nCap: %d MB\nTopup: %d MB\n'+
+ trafficString += sprintf('Traffic:\nCap: %d MB\nTopup Available: %d MB\nTotal Topups: %d MB\n'+
'Usage: %d/%d MB\n',
- trafficCap,trafficTopups,trafficUsage,combinedTrafficCap);
+ trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,combinedTrafficCap);
trafficString += '---\n';
}
@@ -320,9 +322,9 @@ function showAdminUserLogsWindow(id) {
// Prepaid uptime
if (uptimeCap == -1) {
uptimeCap = 'Prepaid';
- uptimeString += sprintf('Uptime:\nCap: %s \nTopup: %d Min\n'+
+ uptimeString += sprintf('Uptime:\nCap: %s \nTopup Available: %d Min\nTotal Topups: %d Min\n'+
'Usage: %d/%d Min\n',
- uptimeCap,uptimeTopups,uptimeUsage,uptimeTopups);
+ uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,uptimeTopups);
uptimeString += '---\n';
// Uncapped uptime
} else if (uptimeCap == 0) {
@@ -332,9 +334,9 @@ function showAdminUserLogsWindow(id) {
// Capped uptime
} else {
var combinedUptimeCap = uptimeCap + uptimeTopups;
- uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup: %d Min\n'+
+ uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup Available: %d Min\nTotal Topups: %d Min\n'+
'Usage: %d/%d Min\n',
- uptimeCap,uptimeTopups,uptimeUsage,combinedUptimeCap);
+ uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,combinedUptimeCap);
uptimeString += '---\n';
}
diff --git a/webgui/js/app/windows/WiSPUserLogs.js b/webgui/js/app/windows/WiSPUserLogs.js
index 619b35a2..5032c02f 100644
--- a/webgui/js/app/windows/WiSPUserLogs.js
+++ b/webgui/js/app/windows/WiSPUserLogs.js
@@ -292,14 +292,16 @@ function showWiSPUserLogsWindow(id) {
// Topups
var trafficTopups = response.data.trafficTopups;
var uptimeTopups = response.data.uptimeTopups;
+ var totalTrafficTopups = response.data.TotalTrafficTopups;
+ var totalUptimeTopups = response.data.TotalUptimeTopups;
// Format string before printing
var trafficString = '';
// Prepaid traffic
if (trafficCap == -1) {
trafficCap = 'Prepaid';
- trafficString += sprintf('Traffic:\nCap: %s \nTopup: %d MB\nUsage: %d/%d MB\n',
- trafficCap,trafficTopups,trafficUsage,trafficTopups);
+ trafficString += sprintf('Traffic:\nCap: %s \nTopup Available: %d MB\nTotal Topups: %d MB\nUsage: %d/%d MB\n',
+ trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,trafficTopups);
trafficString += '---\n';
// Uncapped traffic
} else if (trafficCap == 0) {
@@ -309,9 +311,9 @@ function showWiSPUserLogsWindow(id) {
// Capped traffic
} else {
var combinedTrafficCap = trafficCap + trafficTopups;
- trafficString += sprintf('Traffic:\nCap: %d MB\nTopup: %d MB\n'+
+ trafficString += sprintf('Traffic:\nCap: %d MB\nTopup Available: %d MB\nTotal Topups: %d MB\n'+
'Usage: %d/%d MB\n',
- trafficCap,trafficTopups,trafficUsage,combinedTrafficCap);
+ trafficCap,trafficTopups,totalTrafficTopups,trafficUsage,combinedTrafficCap);
trafficString += '---\n';
}
@@ -320,9 +322,9 @@ function showWiSPUserLogsWindow(id) {
// Prepaid uptime
if (uptimeCap == -1) {
uptimeCap = 'Prepaid';
- uptimeString += sprintf('Uptime:\nCap: %s \nTopup: %d Min\n'+
+ uptimeString += sprintf('Uptime:\nCap: %s \nTopup Available: %d Min\nTotal Topups: %d Min\n'+
'Usage: %d/%d Min\n',
- uptimeCap,uptimeTopups,uptimeUsage,uptimeTopups);
+ uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,uptimeTopups);
uptimeString += '---\n';
// Uncapped uptime
} else if (uptimeCap == 0) {
@@ -332,9 +334,9 @@ function showWiSPUserLogsWindow(id) {
// Capped uptime
} else {
var combinedUptimeCap = uptimeCap + uptimeTopups;
- uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup: %d Min\n'+
+ uptimeString += sprintf('Uptime:\nCap: %d Min\nTopup Available: %d Min\nTotal Topups: %d Min\n'+
'Usage: %d/%d Min\n',
- uptimeCap,uptimeTopups,uptimeUsage,combinedUptimeCap);
+ uptimeCap,uptimeTopups,totalUptimeTopups,uptimeUsage,combinedUptimeCap);
uptimeString += '---\n';
}
--
GitLab