[statistics] New filter UI

2 files changed, 7 insertions, 17 deletions

diff --git a/modules-available/statistics/pages/list.inc.php b/modules-available/statistics/pages/list.inc.php
index 4df60044..a709ab3d 100644
--- a/modules-available/statistics/pages/list.inc.php
+++ b/modules-available/statistics/pages/list.inc.php
@@ -13,7 +13,7 @@ class SubPage
 		$sortColumn = Request::any('sortColumn');
 		$sortDirection = Request::any('sortDirection');
 
-		$filters = StatisticsFilter::parseQuery(StatisticsFilter::getQuery());
+		$filters = StatisticsFilter::parseQuery();
 		$filterSet = new StatisticsFilterSet($filters);
 		$filterSet->setSort($sortColumn, $sortDirection);
 
@@ -21,9 +21,7 @@ class SubPage
 			Message::addError('main.no-permission');
 			Util::redirect('?do=main');
 		}
-		Render::openTag('div', array('class' => 'row'));
-		StatisticsFilter::renderFilterBox('list', $filterSet, StatisticsFilter::getQuery());
-		Render::closeTag('div');
+		StatisticsFilter::renderFilterBox('list', $filterSet);
 		self::showMachineList($filterSet);
 	}
 
@@ -119,11 +117,6 @@ class SubPage
 		$data = array(
 			'rowCount' => count($rows),
 			'rows' => $rows,
-			'query' => StatisticsFilter::getQuery(),
-			'delimiter' => StatisticsFilter::DELIMITER,
-			'sortDirection' => $filterSet->getSortDirection(),
-			'sortColumn' => $filterSet->getSortColumn(),
-			'columns' => json_encode(StatisticsFilter::$columns),
 			'showList' => 1,
 			'show' => 'list',
 			'redirect' => $_SERVER['QUERY_STRING'],
diff --git a/modules-available/statistics/pages/summary.inc.php b/modules-available/statistics/pages/summary.inc.php
index bf150f3e..c2e3ac80 100644
--- a/modules-available/statistics/pages/summary.inc.php
+++ b/modules-available/statistics/pages/summary.inc.php
@@ -15,7 +15,7 @@ class SubPage
 		$sortColumn = Request::any('sortColumn');
 		$sortDirection = Request::any('sortDirection');
 
-		$filters = StatisticsFilter::parseQuery(StatisticsFilter::getQuery());
+		$filters = StatisticsFilter::parseQuery();
 		$filterSet = new StatisticsFilterSet($filters);
 		$filterSet->setSort($sortColumn, $sortDirection);
 
@@ -31,8 +31,8 @@ class SubPage
 		}
 
 		$filterSet->filterNonClients();
+		StatisticsFilter::renderFilterBox('summary', $filterSet);
 		Render::openTag('div', array('class' => 'row'));
-		StatisticsFilter::renderFilterBox('summary', $filterSet, StatisticsFilter::getQuery());
 		self::showSummary($filterSet);
 		self::showMemory($filterSet);
 		self::showId44($filterSet);
@@ -87,7 +87,6 @@ class SubPage
 			}
 		}
 		$data['json'] = json_encode(array('labels' => $labels, 'datasets' => array($points1, $points2)));
-		$data['query'] = StatisticsFilter::getQuery();
 		if (Module::get('runmode') !== false) {
 			$res = Database::queryFirst('SELECT Count(*) AS cnt FROM runmode');
 			$data['runmode'] =  $res['cnt'];
@@ -123,7 +122,7 @@ class SubPage
 			++$id;
 		}
 		self::capChart($json, $lines, 0.92);
-		Render::addTemplate('cpumodels', array('rows' => $lines, 'query' => StatisticsFilter::getQuery(), 'json' => json_encode($json)));
+		Render::addTemplate('cpumodels', array('rows' => $lines, 'json' => json_encode($json)));
 	}
 
 	/**
@@ -167,7 +166,6 @@ class SubPage
 		}
 		self::capChart($json, $data['rows'], 0.92);
 		$data['json'] = json_encode($json);
-		$data['query'] = StatisticsFilter::getQuery();
 		Render::addTemplate('memory', $data);
 	}
 
@@ -189,7 +187,7 @@ class SubPage
 				'value' => $row['count'],
 			);
 		}
-		Render::addTemplate('kvmstate', array('rows' => $lines, 'query' => StatisticsFilter::getQuery(),'json' => json_encode($json)));
+		Render::addTemplate('kvmstate', array('rows' => $lines, 'json' => json_encode($json)));
 	}
 
 	/**
@@ -239,7 +237,6 @@ class SubPage
 		}
 		self::capChart($json, $data['rows'], 0.95);
 		$data['json'] = json_encode($json);
-		$data['query'] = StatisticsFilter::getQuery();
 		Render::addTemplate('id44', $data);
 	}
 
@@ -313,4 +310,4 @@ class SubPage
 		}
 	}
 
-}
\ No newline at end of file
+}