summaryrefslogtreecommitdiffstats
path: root/modules-available/statistics_reporting/inc
diff options
context:
space:
mode:
authorChristian Hofmaier2016-12-23 16:01:58 +0100
committerChristian Hofmaier2016-12-23 16:01:58 +0100
commite61bb374f6bd7eddd6c7efdc80b835a88a1156e7 (patch)
tree5fd5eab16bdc427ebed69722ce20cd21f9e1c693 /modules-available/statistics_reporting/inc
parent[statistics_reporting] changed cutoffs (diff)
downloadslx-admin-e61bb374f6bd7eddd6c7efdc80b835a88a1156e7.tar.gz
slx-admin-e61bb374f6bd7eddd6c7efdc80b835a88a1156e7.tar.xz
slx-admin-e61bb374f6bd7eddd6c7efdc80b835a88a1156e7.zip
[statistics_reporting] location for clienttable
Diffstat (limited to 'modules-available/statistics_reporting/inc')
-rw-r--r--modules-available/statistics_reporting/inc/statisticreporting.inc.php5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules-available/statistics_reporting/inc/statisticreporting.inc.php b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
index 626aa290..c821701b 100644
--- a/modules-available/statistics_reporting/inc/statisticreporting.inc.php
+++ b/modules-available/statistics_reporting/inc/statisticreporting.inc.php
@@ -5,10 +5,11 @@ class StatisticReporting
{
public static function getClientStatistics($cutOff, $lowerTimeBound = 0, $upperTimeBound = 24) {
- $res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, longSessions, lastLogout, lastStart, shortSessions FROM (
- SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout'
+ $res = Database::simpleQuery("SELECT t1.name, timeSum, medianTime, offlineSum, longSessions, lastLogout, lastStart, shortSessions, locName FROM (
+ SELECT machine.hostname AS 'name', machine.machineuuid AS 'uuid', SUM(CAST(sessionTable.length AS UNSIGNED)) AS 'timeSum', GROUP_CONCAT(sessionTable.length) AS 'medianTime', SUM(sessionTable.length >= 60) AS 'longSessions', SUM(sessionTable.length < 60) AS 'shortSessions',MAX(sessionTable.dateline + sessionTable.data) AS 'lastLogout', IFNULL(location.locationname, '') AS 'locName'
FROM ".self::getBoundedTableQueryString('~session-length', $lowerTimeBound, $upperTimeBound, $cutOff)." sessionTable
INNER JOIN machine ON sessionTable.machineuuid = machine.machineuuid
+ LEFT JOIN location ON machine.locationid = location.locationid
GROUP BY machine.machineuuid
) t1
INNER JOIN (