tyler.durden/icingaweb2
1
0
Fork 0
mirror of https://github.com/Icinga/icingaweb2.git synced 2025-07-25 23:04:51 +02:00
Code Issues Packages Projects Releases Wiki Activity

Data\PivotTable: should work with new queries

Browse Source 
There is still some work to do be done here. And we should/could
rethink columns() VS getColumns().
This commit is contained in:
Thomas Gelf 2014-06-06 06:47:49 +00:00
parent db3accc704
commit 1e9bc6c7d4
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Icinga/Data/PivotTable.php
View File

@ -4,10 +4,10 @@
namespace Icinga\Data; namespace Icinga\Data;
use \Zend_Paginator;
use Icinga\Data\SimpleQuery; use Icinga\Data\SimpleQuery;
use Icinga\Application\Icinga; use Icinga\Application\Icinga;
use Icinga\Web\Paginator\Adapter\QueryAdapter; use Icinga\Web\Paginator\Adapter\QueryAdapter;
use Zend_Paginator;
class PivotTable class PivotTable
{ {
@ -70,10 +70,10 @@ class PivotTable
{ {
$this->xAxisQuery = clone $this->baseQuery; $this->xAxisQuery = clone $this->baseQuery;
$this->xAxisQuery->distinct(); $this->xAxisQuery->distinct();
$this->xAxisQuery->setColumns(array($this->xAxisColumn)); $this->xAxisQuery->columns(array($this->xAxisColumn));
$this->yAxisQuery = clone $this->baseQuery; $this->yAxisQuery = clone $this->baseQuery;
$this->yAxisQuery->distinct(); $this->yAxisQuery->distinct();
$this->yAxisQuery->setColumns(array($this->yAxisColumn)); $this->yAxisQuery->columns(array($this->yAxisColumn));
return $this; return $this;
} }
@ -85,7 +85,7 @@ class PivotTable
*/ */
protected function adjustSorting() protected function adjustSorting()
{ {
$currentOrderColumns = $this->baseQuery->getOrderColumns(); $currentOrderColumns = $this->baseQuery->getOrder();
$xAxisOrderColumns = array(array($this->baseQuery->getMappedField($this->xAxisColumn), SimpleQuery::SORT_ASC)); $xAxisOrderColumns = array(array($this->baseQuery->getMappedField($this->xAxisColumn), SimpleQuery::SORT_ASC));
$yAxisOrderColumns = array(array($this->baseQuery->getMappedField($this->yAxisColumn), SimpleQuery::SORT_ASC)); $yAxisOrderColumns = array(array($this->baseQuery->getMappedField($this->yAxisColumn), SimpleQuery::SORT_ASC));
@ -99,9 +99,10 @@ class PivotTable
$yAxisOrderColumns[] = $orderInfo; $yAxisOrderColumns[] = $orderInfo;
} }
} }
//TODO: simplify this whole function. No need to care about mapping
$this->xAxisQuery->setOrderColumns($xAxisOrderColumns); // foreach ($xAxisOrderColumns as
$this->yAxisQuery->setOrderColumns($yAxisOrderColumns); // $this->xAxisQuery->setOrder($xAxisOrderColumns);
// $this->yAxisQuery->setOrder($yAxisOrderColumns);
return $this; return $this;
} }