Refs #6078, add report metadata for Event subtable reports and make sure...

Refs #6078, add report metadata for Event subtable reports and make sure pivotBy works w/ Events plugins' secondaryDimension query parameter..

plugins/Events/Events.php

@@ -10,6 +10,7 @@ namespace Piwik\Plugins\Events;
 
 use Piwik\Common;
 use Piwik\Piwik;
+use Piwik\Plugin\Report;
 use Piwik\Plugin\ViewDataTable;
 
 class Events extends \Piwik\Plugin
@@ -171,6 +172,9 @@ class Events extends \Piwik\Plugin
         $view->config->addTranslations($this->getMetricTranslations());
         $this->addRelatedReports($view, $secondaryDimension);
         $this->addTooltipEventValue($view);
+
+        $subtableReport = Report::factory('Events', $view->config->subtable_controller_action);
+        $view->config->pivot_by_dimension = $subtableReport->getDimension()->getId();
     }
 
     private function addRelatedReports($view, $secondaryDimension)

plugins/Events/Reports/GetAction.php

@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Events\Reports;
 
+use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugins\Events\Columns\EventAction;
 
@@ -20,7 +21,11 @@ class GetAction extends Base
         $this->name          = Piwik::translate('Events_EventActions');
         $this->documentation = ''; // TODO
         $this->metrics       = array('nb_events', 'sum_event_value', 'min_event_value', 'max_event_value', 'avg_event_value', 'nb_events_with_value');
-        $this->actionToLoadSubTables = 'getNameFromActionId';
+        if (Common::getRequestVar('secondaryDimension', false) == 'eventCategory') {
+            $this->actionToLoadSubTables = 'getCategoryFromNameId';
+        } else {
+            $this->actionToLoadSubTables = 'getNameFromActionId';
+        }
         $this->order = 1;
         $this->widgetTitle  = 'Events_EventActions';
     }

plugins/Events/Reports/GetActionFromCategoryId.php

+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\Events\Columns\EventAction;
+
+/**
+ * Report metadata class for the Events.getActionFromCategoryId class.
+ */
+class GetActionFromCategoryId extends Report
+{
+    protected function init()
+    {
+        $this->category = 'Events_Events';
+        $this->processedMetrics = false;
+        $this->dimension     = new EventAction();
+        $this->name          = Piwik::translate('Events_EventActions');
+        $this->isSubtableReport = true;
+    }
+}
\ No newline at end of file

plugins/Events/Reports/GetActionFromNameId.php

+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\Events\Columns\EventAction;
+
+/**
+ * Report metadata class for the Events.getActionFromNameId class.
+ */
+class GetActionFromNameId extends Report
+{
+    protected function init()
+    {
+        $this->category = 'Events_Events';
+        $this->processedMetrics = false;
+        $this->dimension     = new EventAction();
+        $this->name          = Piwik::translate('Events_EventActions');
+        $this->isSubtableReport = true;
+    }
+}
\ No newline at end of file

plugins/Events/Reports/GetCategory.php

@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Events\Reports;
 
+use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugins\Events\Columns\EventCategory;
 
@@ -20,7 +21,11 @@ class GetCategory extends Base
         $this->name          = Piwik::translate('Events_EventCategories');
         $this->documentation = ''; // TODO
         $this->metrics       = array('nb_events', 'sum_event_value', 'min_event_value', 'max_event_value', 'avg_event_value', 'nb_events_with_value');
-        $this->actionToLoadSubTables = 'getActionFromCategoryId';
+        if (Common::getRequestVar('secondaryDimension', false) == 'eventName') {
+            $this->actionToLoadSubTables = 'getNameFromCategoryId';
+        } else {
+            $this->actionToLoadSubTables = 'getActionFromCategoryId';
+        }
         $this->order = 0;
         $this->widgetTitle  = 'Events_EventCategories';
     }

plugins/Events/Reports/GetCategoryFromActionId.php

+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\Events\Columns\EventCategory;
+
+/**
+ * Report metadata class for the Events.getCategoryFromActionId class.
+ */
+class GetCategoryFromActionId extends Report
+{
+    protected function init()
+    {
+        $this->category = 'Events_Events';
+        $this->processedMetrics = false;
+        $this->dimension     = new EventCategory();
+        $this->name          = Piwik::translate('Events_EventCategories');
+        $this->isSubtableReport = true;
+    }
+}
\ No newline at end of file

plugins/Events/Reports/GetCategoryFromNameId.php

+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\Events\Columns\EventCategory;
+
+/**
+ * Report metadata class for the Events.getCategoryFromNameId class.
+ */
+class GetCategoryFromNameId extends Report
+{
+    protected function init()
+    {
+        $this->category = 'Events_Events';
+        $this->processedMetrics = false;
+        $this->dimension     = new EventCategory();
+        $this->name          = Piwik::translate('Events_EventCategories');
+        $this->isSubtableReport = true;
+    }
+}
\ No newline at end of file

plugins/Events/Reports/GetName.php

@@ -8,6 +8,7 @@
  */
 namespace Piwik\Plugins\Events\Reports;
 
+use Piwik\Common;
 use Piwik\Piwik;
 use Piwik\Plugins\Events\Columns\EventName;
 
@@ -20,7 +21,11 @@ class GetName extends Base
         $this->name          = Piwik::translate('Events_EventNames');
         $this->documentation = ''; // TODO
         $this->metrics       = array('nb_events', 'sum_event_value', 'min_event_value', 'max_event_value', 'avg_event_value', 'nb_events_with_value');
-        $this->actionToLoadSubTables = 'getActionFromNameId';
+        if (Common::getRequestVar('secondaryDimension', false) == 'eventCategory') {
+            $this->actionToLoadSubTables = 'getCategoryFromNameId';
+        } else {
+            $this->actionToLoadSubTables = 'getActionFromNameId';
+        }
         $this->order = 2;
         $this->widgetTitle  = 'Events_EventNames';
     }

plugins/Events/Reports/GetNameFromActionId.php

+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\Events\Columns\EventName;
+
+/**
+ * Report metadata class for the Events.getNameFromActionId class.
+ */
+class GetNameFromActionId extends Report
+{
+    protected function init()
+    {
+        $this->category = 'Events_Events';
+        $this->processedMetrics = false;
+        $this->dimension     = new EventName();
+        $this->name          = Piwik::translate('Events_Names');
+        $this->isSubtableReport = true;
+    }
+}
\ No newline at end of file

plugins/Events/Reports/GetNameFromCategoryId.php

+<?php
+/**
+ * Piwik - free/libre analytics platform
+ *
+ * @link http://piwik.org
+ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
+ *
+ */
+namespace Piwik\Plugins\Events\Reports;
+
+use Piwik\Piwik;
+use Piwik\Plugin\Report;
+use Piwik\Plugins\Events\Columns\EventName;
+
+/**
+ * Report metadata class for the Events.getNameFromCategoryId class.
+ */
+class GetNameFromCategoryId extends Report
+{
+    protected function init()
+    {
+        $this->category = 'Events_Events';
+        $this->processedMetrics = false;
+        $this->dimension     = new EventName();
+        $this->name          = Piwik::translate('Events_EventNames');
+        $this->isSubtableReport = true;
+    }
+}
\ No newline at end of file