diff options
author | diosmosis <benaka@piwik.pro> | 2014-11-06 22:00:10 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-11-07 04:49:22 +0300 |
commit | c1264ec0476fc2e88c29d052e2018990458f814d (patch) | |
tree | 148a599c6c1400df960a72fc1254f14e5f546582 /plugins/VisitsSummary | |
parent | d4e0c79caef3ca17dbad7890a52af9a000f07ee9 (diff) |
Moved processed metrics computation to DataTableGenericFilter, removed new filters & implemented as methods in Report to avoid confusion regarding re-use, allow adding processed metrics as DataTable metadata and use this to rewrite AddProcessedMetrics filter, correct name of Metrics::getMappingFromIdToName function, added placeholder AggregatedMetric class for future, revise Metric/ProcessedMetric hierarchy (add methods for translation/etc.), allow .get API methods to use metadata to automatically figure out which columns to select, get EcommerceOrderWithItemsTest to pass.
Diffstat (limited to 'plugins/VisitsSummary')
-rw-r--r-- | plugins/VisitsSummary/API.php | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php index 681b2d05a8..81fd49f8df 100644 --- a/plugins/VisitsSummary/API.php +++ b/plugins/VisitsSummary/API.php @@ -9,8 +9,10 @@ namespace Piwik\Plugins\VisitsSummary; use Piwik\Archive; +use Piwik\Common; use Piwik\MetricsFormatter; use Piwik\Piwik; +use Piwik\Plugin\Report; use Piwik\SettingsPiwik; /** @@ -21,12 +23,16 @@ use Piwik\SettingsPiwik; */ class API extends \Piwik\Plugin\API { - public function get($idSite, $period, $date, $segment = false) + public function get($idSite, $period, $date, $segment = false, $columns = false) { Piwik::checkUserHasViewAccess($idSite); $archive = Archive::build($idSite, $period, $date, $segment); - $columns = $this->getCoreColumns($period); + $columns = Piwik::getArrayFromApiParameter($columns); + + $report = Report::factory("VisitsSummary", "get"); + $columns = $report->getMetricsRequiredForReport($this->getCoreColumns($period), $columns); + $dataTable = $archive->getDataTableFromNumeric($columns); return $dataTable; } |