[statistics_reporting/statistics] Include system/runmode total counts

References #3781

2 files changed, 18 insertions, 0 deletions

diff --git a/modules-available/statistics_reporting/inc/queries.inc.php b/modules-available/statistics_reporting/inc/queries.inc.php
index fc61c68a..128d8e7d 100644
--- a/modules-available/statistics_reporting/inc/queries.inc.php
+++ b/modules-available/statistics_reporting/inc/queries.inc.php
@@ -437,5 +437,21 @@ class Queries
 		return (int)$res['total'];
 	}
 
+	public static function getBaseSystemStats(int $from, int $to)
+	{
+		return Database::queryAll("SELECT `data` AS `system`, Count(*) AS `count`
+			FROM statistic
+			WHERE (dateline BETWEEN $from AND $to) AND typeid = 'boot-system'
+			GROUP BY `system`");
+	}
+
+	public static function getRunmodeStats(int $from, int $to)
+	{
+		return Database::queryAll("SELECT `data` AS `mode`, Count(*) AS `count`
+			FROM statistic
+			WHERE (dateline BETWEEN $from AND $to) AND typeid = 'boot-runmode'
+			GROUP BY `mode`");
+	}
+
 }
 
diff --git a/modules-available/statistics_reporting/inc/remotereport.inc.php b/modules-available/statistics_reporting/inc/remotereport.inc.php
index 2de49d04..376691dd 100644
--- a/modules-available/statistics_reporting/inc/remotereport.inc.php
+++ b/modules-available/statistics_reporting/inc/remotereport.inc.php
@@ -90,6 +90,8 @@ class RemoteReport
 			$data['dozmod'] = Queries::getDozmodStats($from, $to);
 			$data['machines'] = Queries::getAggregatedMachineStats($from);
 			$data['exams'] = Queries::getExamStats($from, $to);
+			$data['baseSystem'] = Queries::getBaseSystemStats($from, $to);
+			$data['runmode'] = Queries::getRunmodeStats($from, $to);
 			$result['days' . $day] = $data;
 		}
 		$result['server'] = self::getLocalHardware();