Add rest of processed metrics from VisitsSummary.get as metric metadata.

2 files changed, 6 insertions, 9 deletions

diff --git a/plugins/VisitsSummary/API.php b/plugins/VisitsSummary/API.php
index 591a53f800..681b2d05a8 100644
--- a/plugins/VisitsSummary/API.php
+++ b/plugins/VisitsSummary/API.php
@@ -21,18 +21,13 @@ use Piwik\SettingsPiwik;
  */
 class API extends \Piwik\Plugin\API
 {
-    public function get($idSite, $period, $date, $segment = false, $columns = false)
+    public function get($idSite, $period, $date, $segment = false)
     {
         Piwik::checkUserHasViewAccess($idSite);
         $archive = Archive::build($idSite, $period, $date, $segment);
 
         $columns = $this->getCoreColumns($period);
         $dataTable = $archive->getDataTableFromNumeric($columns);
-
-        // Process ratio metrics from base metrics, when requested
-        $dataTable->filter('ColumnCallbackAddColumnQuotient', array('nb_actions_per_visit', 'nb_actions', 'nb_visits', 1));
-        $dataTable->filter('ColumnCallbackAddColumnQuotient', array('avg_time_on_site', 'sum_visit_length', 'nb_visits', 0));
-
         return $dataTable;
     }
 
diff --git a/plugins/VisitsSummary/Reports/Get.php b/plugins/VisitsSummary/Reports/Get.php
index 93d67eabf3..83493dc1ef 100644
--- a/plugins/VisitsSummary/Reports/Get.php
+++ b/plugins/VisitsSummary/Reports/Get.php
@@ -9,6 +9,8 @@
 namespace Piwik\Plugins\VisitsSummary\Reports;
 
 use Piwik\Piwik;
+use Piwik\Plugins\CoreHome\Metrics\ActionsPerVisit;
+use Piwik\Plugins\CoreHome\Metrics\AverageTimeOnSite;
 use Piwik\Plugins\CoreHome\Metrics\BounceRate;
 
 class Get extends \Piwik\Plugin\Report
@@ -20,15 +22,15 @@ class Get extends \Piwik\Plugin\Report
         $this->name          = Piwik::translate('VisitsSummary_VisitsSummary');
         $this->documentation = ''; // TODO
         $this->processedMetrics = array(
-            new BounceRate()
+            new BounceRate(),
+            new ActionsPerVisit(),
+            new AverageTimeOnSite()
         );
         $this->metrics       = array(
             'nb_uniq_visitors',
             'nb_visits',
             'nb_users',
             'nb_actions',
-            'nb_actions_per_visit',
-            'avg_time_on_site',
             'max_actions'
         );
         // Used to process metrics, not displayed/used directly