[statistics] Per-location usage stats; include active lecture count

1 files changed, 34 insertions, 4 deletions

diff --git a/modules-available/statistics/hooks/cron.inc.php b/modules-available/statistics/hooks/cron.inc.php
index 7152b1da..d444c672 100644
--- a/modules-available/statistics/hooks/cron.inc.php
+++ b/modules-available/statistics/hooks/cron.inc.php
@@ -9,12 +9,42 @@ function logstats()
 		$join = 'LEFT JOIN runmode r USING (machineuuid)';
 		$where = 'AND (r.isclient IS NULL OR r.isclient <> 0)';
 	}
-	$known = Database::queryFirst("SELECT Count(*) AS val FROM machine m $join WHERE m.lastseen > $cutoff $where");
-	$on = Database::queryFirst("SELECT Count(*) AS val FROM machine m $join WHERE m.state IN ('IDLE', 'OCCUPIED') $where");
-	$used = Database::queryFirst("SELECT Count(*) AS val FROM machine m $join WHERE m.state = 'OCCUPIED' $where");
+	// Get total/online/in-use
+	$known = Database::queryKeyValueList("SELECT locationid, Count(*) AS val FROM machine m
+			$join WHERE m.lastseen > $cutoff $where
+			GROUP BY locationid");
+	$on = Database::queryKeyValueList("SELECT locationid, Count(*) AS val FROM machine m
+			$join WHERE m.state IN ('IDLE', 'OCCUPIED') $where
+			GROUP BY locationid");
+	$used = Database::queryKeyValueList("SELECT locationid, Count(*) AS val FROM machine m
+			$join WHERE m.state = 'OCCUPIED' $where
+			GROUP BY locationid");
+	// Get calendar data if available
+	if (Module::isAvailable('locationinfo')) {
+		// Refresh all calendars around 07:00
+		$calendars = LocationInfo::getAllCalendars(date('G') != 7 || date('i') >= 10);
+	}
+	// Mash together
+	$data = ['usage' => []];
+	foreach ($known as $lid => $val) {
+		$entry = ['t' => $val];
+		if (isset($on[$lid])) {
+			$entry['o'] = $on[$lid];
+		}
+		if (isset($used[$lid])) {
+			$entry['u'] = $used[$lid];
+		}
+		if (isset($calendars[$lid])) {
+			$title = LocationInfo::extractCurrentEvent($calendars[$lid]);
+			if (!empty($title)) {
+				$entry['event'] = $title;
+			}
+		}
+		$data['usage'][$lid] = $entry;
+	}
 	Database::exec("INSERT INTO statistic (dateline, typeid, clientip, username, data) VALUES (:now, '~stats', '', '', :vals)", array(
 		'now' => $NOW,
-		'vals' => $known['val'] . '#' . $on['val'] . '#' . $used['val'],
+		'vals' => json_encode($data),
 	));
 }