From ee7a7cf2da8190f4d05fd428be2a2d7cdfaf27a8 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Sun, 10 May 2020 19:25:41 +0200 Subject: [statistics] Fix lastboot, uptime and status filters --- modules-available/statistics/inc/statisticsfilter.inc.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/modules-available/statistics/inc/statisticsfilter.inc.php b/modules-available/statistics/inc/statisticsfilter.inc.php index e741652f..519e4315 100644 --- a/modules-available/statistics/inc/statisticsfilter.inc.php +++ b/modules-available/statistics/inc/statisticsfilter.inc.php @@ -222,8 +222,8 @@ abstract class StatisticsFilter 'firstseen' => new DateStatisticsFilter('firstseen', '2020-10-15 14:00'), 'lastseen' => new DateStatisticsFilter('lastseen', '2020-10-15 14:00'), 'logintime' => new DateStatisticsFilter('logintime', '2020-10-15 14:00'), - 'lastboot' => new RuntimeStatisticsFilter(), - 'runtime' => new SimpleStatisticsFilter('runtime', self::OP_ORDINAL, ''), + 'lastboot' => new DateStatisticsFilter('lastboot', '2020-10-15 14:00'), + 'runtime' => new RuntimeStatisticsFilter(), 'realcores' => new SimpleStatisticsFilter('realcores', self::OP_ORDINAL, ''), 'systemmodel' => new SimpleStatisticsFilter('systemmodel', self::OP_STRCMP, 'PC-365 (IBM)'), 'cpumodel' => new SimpleStatisticsFilter('cpumodel', self::OP_STRCMP, 'Pentium Pro 200 MHz'), @@ -455,12 +455,12 @@ class Id44GbStatisticsFilter extends GbToMbRangeStatisticsFilter } } -class StateStatisticsFilter extends StatisticsFilter +class StateStatisticsFilter extends EnumStatisticsFilter { public function __construct() { - parent::__construct('state', self::OP_NOMINAL); + parent::__construct('state', ['on', 'off', 'idle', 'occupied', 'standby']); } public function whereClause(string $operator, $argument, array &$args, array &$joins) -- cgit v1.2.3-55-g7522