diff --git a/plugins/VisitorInterest/Controller.php b/plugins/VisitorInterest/Controller.php index 939318534ebabd6fe390be1615a55c595a46bfdf..835af723fe7ad3122879fd69f02b0219e0a765f2 100644 --- a/plugins/VisitorInterest/Controller.php +++ b/plugins/VisitorInterest/Controller.php @@ -18,26 +18,11 @@ class Controller extends \Piwik\Plugin\Controller { public function index() { - $byDimension = new View\ReportsByDimension('VisitorInterest'); - - $reportsToAdd = array( - new GetNumberOfVisitsPerVisitDuration(), - new GetNumberOfVisitsPerPage(), - new GetNumberOfVisitsByVisitCount(), - new GetNumberOfVisitsByDaysSinceLast() - ); - - foreach ($reportsToAdd as $report) { - /** @var \Piwik\Plugin\Report $report */ - $byDimension->addReport( - $report->getCategory(), - $report->getWidgetTitle(), - $report->getModule() . '.' . $report->getAction(), - array()); - } - $view = new View('@VisitorInterest/index'); - $view->reports = $byDimension->render(); + $view->dataTableNumberOfVisitsPerVisitDuration = $this->renderReport(new GetNumberOfVisitsPerVisitDuration()); + $view->dataTableNumberOfVisitsPerPage = $this->renderReport(new GetNumberOfVisitsPerPage()); + $view->dataTableNumberOfVisitsByVisitNum = $this->renderReport(new GetNumberOfVisitsByVisitCount()); + $view->dataTableNumberOfVisitsByDaysSinceLast = $this->renderReport(new GetNumberOfVisitsByDaysSinceLast()); return $view->render(); } -} +} \ No newline at end of file diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI index 0fe06fd7a0ad7ffe19ae1262a2c4dd44f3f64668..4e4eac96ab2051285ad453a0e845801e217d6f72 160000 --- a/tests/PHPUnit/UI +++ b/tests/PHPUnit/UI @@ -1 +1 @@ -Subproject commit 0fe06fd7a0ad7ffe19ae1262a2c4dd44f3f64668 +Subproject commit 4e4eac96ab2051285ad453a0e845801e217d6f72