From 426ad3f04e5f7b6e0e9d56331b9502afa2037341 Mon Sep 17 00:00:00 2001 From: BeezyT Date: Tue, 8 Nov 2011 14:13:00 +0000 Subject: refs #1454 API.get has no plugin prefix for metrics anymore git-svn-id: http://dev.piwik.org/svn/trunk@5414 59fd770c-687e-43c8-a1e3-f5a4ff64c105 --- plugins/VisitsSummary/Controller.php | 41 +++++++++++++++++++++++---------- plugins/VisitsSummary/VisitsSummary.php | 2 +- 2 files changed, 30 insertions(+), 13 deletions(-) (limited to 'plugins/VisitsSummary') diff --git a/plugins/VisitsSummary/Controller.php b/plugins/VisitsSummary/Controller.php index 8465be2e19..08c41ad59f 100644 --- a/plugins/VisitsSummary/Controller.php +++ b/plugins/VisitsSummary/Controller.php @@ -20,8 +20,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller { $view = Piwik_View::factory('index'); $this->setPeriodVariablesView($view); - $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph( true, - array('VisitsSummary.nb_visits', 'VisitsSummary.nb_uniq_visitors') ); + $view->graphEvolutionVisitsSummary = $this->getEvolutionGraph( true, array('nb_visits') ); $this->setSparklinesAndNumbers($view); echo $view->render(); } @@ -42,7 +41,7 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller $columns = Piwik::getArrayFromApiParameter($columns); } - $doc = Piwik_Translate('VisitsSummary_VisitsSummaryDocumentation').'
' + $documentation = Piwik_Translate('VisitsSummary_VisitsSummaryDocumentation').'
' . Piwik_Translate('General_BrokenDownReportDocumentation').'

' . ''.Piwik_Translate('General_ColumnNbVisits').': ' @@ -57,8 +56,26 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller . ''.Piwik_Translate('General_ColumnActionsPerVisit').': ' . Piwik_Translate('General_ColumnActionsPerVisitDocumentation'); + $selectableColumns = array( + // columns from VisitsSummary.get + 'nb_visits', + 'nb_uniq_visitors', + 'avg_time_on_site', + 'bounce_rate', + 'nb_actions_per_visit', + 'max_actions', + 'nb_visits_converted', + // columns from Actions.get + 'nb_pageviews', + 'nb_uniq_pageviews', + 'nb_downloads', + 'nb_uniq_downloads', + 'nb_outlinks', + 'nb_uniq_outlinks' + ); + $view = $this->getLastUnitGraphAcrossPlugins($this->pluginName, __FUNCTION__, $columns, - $selectableColumns = array('VisitsSummary.*', 'Actions.*'), $doc); + $selectableColumns, $documentation); return $this->renderView($view, $fetch); } @@ -85,14 +102,14 @@ class Piwik_VisitsSummary_Controller extends Piwik_Controller protected function setSparklinesAndNumbers($view) { - $view->urlSparklineNbVisits = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => $view->displayUniqueVisitors ? array('VisitsSummary.nb_visits', 'VisitsSummary.nb_uniq_visitors') : array('VisitsSummary.nb_visits'))); - $view->urlSparklineNbPageviews = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('Actions.nb_pageviews', 'Actions.nb_uniq_pageviews'))); - $view->urlSparklineNbDownloads = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('Actions.nb_downloads', 'Actions.nb_uniq_downloads'))); - $view->urlSparklineNbOutlinks = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('Actions.nb_outlinks', 'Actions.nb_uniq_outlinks'))); - $view->urlSparklineAvgVisitDuration = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('VisitsSummary.avg_time_on_site'))); - $view->urlSparklineMaxActions = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('VisitsSummary.max_actions'))); - $view->urlSparklineActionsPerVisit = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('VisitsSummary.nb_actions_per_visit'))); - $view->urlSparklineBounceRate = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('VisitsSummary.bounce_rate'))); + $view->urlSparklineNbVisits = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => $view->displayUniqueVisitors ? array('nb_visits', 'nb_uniq_visitors') : array('nb_visits'))); + $view->urlSparklineNbPageviews = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_pageviews', 'nb_uniq_pageviews'))); + $view->urlSparklineNbDownloads = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_downloads', 'nb_uniq_downloads'))); + $view->urlSparklineNbOutlinks = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_outlinks', 'nb_uniq_outlinks'))); + $view->urlSparklineAvgVisitDuration = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('avg_time_on_site'))); + $view->urlSparklineMaxActions = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('max_actions'))); + $view->urlSparklineActionsPerVisit = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('nb_actions_per_visit'))); + $view->urlSparklineBounceRate = $this->getUrlSparkline( 'getEvolutionGraph', array('columns' => array('bounce_rate'))); $dataTableVisit = self::getVisitsSummary(); $dataRow = $dataTableVisit->getFirstRow(); diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index 5a7b708a1d..e1ce17d21a 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -67,7 +67,7 @@ class Piwik_VisitsSummary extends Piwik_Plugin function addWidgets() { - Piwik_AddWidget( 'VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('VisitsSummary.nb_visits'))); + Piwik_AddWidget( 'VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetLastVisits', 'VisitsSummary', 'getEvolutionGraph', array('columns' => array('nb_visits'))); Piwik_AddWidget( 'VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetVisits', 'VisitsSummary', 'getSparklines'); Piwik_AddWidget( 'VisitsSummary_VisitsSummary', 'VisitsSummary_WidgetOverviewGraph', 'VisitsSummary', 'index'); } -- cgit v1.2.3