Merge branch 'master' of github.com:piwik/piwik

core/AssetManager/UIAssetFetcher/JScriptUIAssetFetcher.php

@@ -52,7 +52,11 @@ class JScriptUIAssetFetcher extends UIAssetFetcher
 
     protected function addThemeFiles()
     {
-        if(in_array($this->getTheme()->getThemeName(), $this->plugins)) {
+        $theme = $this->getTheme();
+        if(!$theme) {
+            return;
+        }
+        if(in_array($theme->getThemeName(), $this->plugins)) {
 
             $jsInThemes = $this->getTheme()->getJavaScriptFiles();
 

core/Plugin/Manager.php

@@ -16,6 +16,7 @@ use Piwik\EventDispatcher;
 use Piwik\Filesystem;
 use Piwik\Option;
 use Piwik\Plugin;
+use Piwik\SettingsServer;
 use Piwik\Singleton;
 use Piwik\Theme;
 use Piwik\Tracker;

core/View.php

@@ -135,7 +135,7 @@ class View implements ViewInterface
 
         $this->piwik_version = Version::VERSION;
         $this->userLogin = Piwik::getCurrentUserLogin();
-        $this->isSuperUser = Access::getInstance()->hasSuperUserAccess(); // TODO: redundancy w/ userIsSuperUser
+        $this->isSuperUser = Access::getInstance()->hasSuperUserAccess();
 
         try {
             $this->piwikUrl = SettingsPiwik::getPiwikUrl();
@@ -320,7 +320,6 @@ class View implements ViewInterface
 
     /**
      * Assign value to a variable for use in a template
-     * ToDo: This is ugly.
      * @param string|array $var
      * @param mixed $value
      * @ignore
@@ -354,7 +353,6 @@ class View implements ViewInterface
      *
      * @param string $title The report title.
      * @param string $reportHtml The report body HTML.
-     * @param bool $fetch If true, return report contents as a string; otherwise echo to screen.
      * @return string|void The report contents if `$fetch` is true.
      */
     static public function singleReport($title, $reportHtml)
@@ -362,7 +360,6 @@ class View implements ViewInterface
         $view = new View('@CoreHome/_singleReport');
         $view->title = $title;
         $view->report = $reportHtml;
-
         return $view->render();
     }
 }

piwik.php

@@ -90,6 +90,7 @@ if (file_exists(PIWIK_INCLUDE_PATH . '/vendor/autoload.php')) {
 } else {
     $vendorDirectory = PIWIK_INCLUDE_PATH . '/../..';
 }
+require_once $vendorDirectory . '/autoload.php';
 require_once $vendorDirectory . '/mustangostang/spyc/Spyc.php';
 require_once $vendorDirectory . '/piwik/device-detector/DeviceDetector.php';
 

CustomAlerts @ 302ad3ad

-Subproject commit 100b4c2e1633704c51841d7a201139fbee9ddd04
+Subproject commit 302ad3ad7e0a6539e5d7361d035b2594d255bd75

plugins/Events/API.php

@@ -43,14 +43,14 @@ class API extends \Piwik\Plugin\API
     /**
      * @ignore
      */
-    public function getSubtableAction($api)
+    public function getSubtableAction($apiMethod)
     {
-        return $this->mappingApiToApiLoadsubtables[$api];
+        return $this->mappingApiToApiLoadsubtables[$apiMethod];
     }
 
-    protected function getRecordNameForAction($method)
+    protected function getRecordNameForAction($apiMethod)
     {
-        return $this->mappingApiToRecord[$method];
+        return $this->mappingApiToRecord[$apiMethod];
     }
 
     protected function getDataTable($name, $idSite, $period, $date, $segment, $expanded = false, $idSubtable = null)

plugins/Events/Controller.php

@@ -6,146 +6,104 @@
  * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
  *
  */
-namespace Piwik\Plugins\Actions;
+namespace Piwik\Plugins\Events;
 
 use Piwik\Piwik;
+use Piwik\Plugins\Events\Events;
 use Piwik\View;
 use Piwik\ViewDataTable\Factory;
 
 /**
- * Actions controller
+ * Events controller
  *
  */
 class Controller extends \Piwik\Plugin\Controller
 {
-    //
-    // Actions that render whole pages
-    //
-
-    public function indexPageUrls()
-    {
-        return View::singleReport(
-            Piwik::translate('General_Pages'),
-            $this->getPageUrls(true));
-    }
-
-    public function indexEntryPageUrls()
-    {
-        return View::singleReport(
-            Piwik::translate('Actions_SubmenuPagesEntry'),
-            $this->getEntryPageUrls(true));
-    }
-
-    public function indexExitPageUrls()
+    public function index()
     {
-        return View::singleReport(
-            Piwik::translate('Actions_SubmenuPagesExit'),
-            $this->getExitPageUrls(true));
-    }
-
-    public function indexSiteSearch()
-    {
-        $view = new View('@Actions/indexSiteSearch');
-
-        $view->keywords = $this->getSiteSearchKeywords(true);
-        $view->noResultKeywords = $this->getSiteSearchNoResultKeywords(true);
-        $view->pagesUrlsFollowingSiteSearch = $this->getPageUrlsFollowingSiteSearch(true);
-
-        $categoryTrackingEnabled = \Piwik\Plugin\Manager::getInstance()->isPluginActivated('CustomVariables');
-        if ($categoryTrackingEnabled) {
-            $view->categories = $this->getSiteSearchCategories(true);
-        }
-
+        $view = new View('@Events/index');
+        $view->leftMenuReports = $this->getLeftMenuReports();
         return $view->render();
     }
 
-    public function indexPageTitles()
+    private function getLeftMenuReports()
     {
-        return View::singleReport(
-            Piwik::translate('Actions_SubmenuPageTitles'),
-            $this->getPageTitles(true));
-    }
-
-    public function indexDownloads()
-    {
-        return View::singleReport(
-            Piwik::translate('General_Downloads'),
-            $this->getDownloads(true));
-    }
-
-    public function indexOutlinks()
-    {
-        return View::singleReport(
-            Piwik::translate('General_Outlinks'),
-            $this->getOutlinks(true));
+        $reports = new View\ReportsByDimension('Events');
+        foreach(Events::getLabelTranslations() as $apiAction => $translations) {
+            // 'getCategory' is the API method, but we are loading 'indexCategory' which displays <h2>
+            $controllerAction = str_replace("get", "index", $apiAction, $count = 1);
+            $reports->addReport('Events_TopEvents', $translations[0], 'Events.' . $controllerAction);
+        }
+        return $reports->render();
     }
 
-    //
-    // Actions that render individual reports
-    //
-
-    public function getPageUrls()
+    public function indexCategory()
     {
-        return $this->renderReport(__FUNCTION__);
+        return $this->indexEvent(__FUNCTION__);
     }
 
-    public function getEntryPageUrls()
+    public function indexAction()
     {
-        return $this->renderReport(__FUNCTION__);
+        return $this->indexEvent(__FUNCTION__);
     }
 
-    public function getExitPageUrls()
+    public function indexName()
     {
-        return $this->renderReport(__FUNCTION__);
+        return $this->indexEvent(__FUNCTION__);
     }
 
-    public function getSiteSearchKeywords()
+    public function getCategory()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getSiteSearchNoResultKeywords()
+    public function getAction()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getSiteSearchCategories()
+    public function getName()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getPageUrlsFollowingSiteSearch()
+    public function getActionFromCategoryId()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getPageTitlesFollowingSiteSearch()
+    public function getNameFromCategoryId()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getPageTitles()
+    public function getCategoryFromActionId()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getEntryPageTitles()
+    public function getNameFromActionId()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getExitPageTitles()
+    public function getActionFromNameId()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getDownloads()
+    public function getCategoryFromNameId()
     {
         return $this->renderReport(__FUNCTION__);
     }
 
-    public function getOutlinks()
+    protected function indexEvent($controllerMethod)
     {
-        return $this->renderReport(__FUNCTION__);
+        $apiMethod = str_replace('index', 'get', $controllerMethod, $count = 1);
+        $events = new Events;
+        return View::singleReport(
+            $events->getReportTitleTranslation($apiMethod),
+            $this->$apiMethod()
+        );
     }
 }

plugins/Events/Events.php

@@ -8,8 +8,10 @@
  */
 namespace Piwik\Plugins\Events;
 
+use Piwik\Menu\MenuMain;
 use Piwik\Piwik;
 use Piwik\Plugin\ViewDataTable;
+use Piwik\WidgetsList;
 
 /**
  */
@@ -24,9 +26,24 @@ class Events extends \Piwik\Plugin
             'API.getSegmentDimensionMetadata'       => 'getSegmentsMetadata',
             'Metrics.getDefaultMetricTranslations'  => 'addMetricTranslations',
             'API.getReportMetadata'                 => 'getReportMetadata',
+            'ViewDataTable.configure'               => 'configureViewDataTable',
+            'Menu.Reporting.addItems'               => 'addMenus',
+            'WidgetsList.addWidgets'                => 'addWidgets',
         );
     }
 
+    public function addWidgets()
+    {
+        foreach(self::getLabelTranslations() as $apiMethod => $labels) {
+            WidgetsList::add('Events_Events', $labels[0], 'Events', $apiMethod);
+        }
+    }
+
+    public function addMenus()
+    {
+        MenuMain::getInstance()->add('General_Actions', 'Events_Events', array('module' => 'Events', 'action' => 'index'), true, 20);
+    }
+
     public function addMetricTranslations(&$translations)
     {
         $translations = array_merge($translations, $this->getMetricTranslations());
@@ -34,24 +51,30 @@ class Events extends \Piwik\Plugin
 
     public function getMetricDocumentation()
     {
-        return array(
+        $documentation = array(
             'nb_events'            => 'Events_TotalEventsDocumentation',
             'sum_event_value'      => 'Events_TotalValueDocumentation',
             'min_event_value'      => 'Events_MinValueDocumentation',
             'max_event_value'      => 'Events_MaxValueDocumentation',
+            'avg_event_value'      => 'Events_AvgValueDocumentation',
             'nb_events_with_value' => 'Events_EventsWithValueDocumentation',
         );
+        $documentation = array_map(array('\\Piwik\\Piwik', 'translate'), $documentation);
+        return $documentation;
     }
 
     protected function getMetricTranslations()
     {
-        return array(
+        $metrics = array(
             'nb_events'            => 'Events_TotalEvents',
             'sum_event_value'      => 'Events_TotalValue',
             'min_event_value'      => 'Events_MinValue',
             'max_event_value'      => 'Events_MaxValue',
+            'avg_event_value'      => 'Events_AvgValue',
             'nb_events_with_value' => 'Events_EventsWithValue',
         );
+        $metrics = array_map(array('\\Piwik\\Piwik', 'translate'), $metrics);
+        return $metrics;
     }
 
     public function getSegmentsMetadata(&$segments)
@@ -115,12 +138,6 @@ class Events extends \Piwik\Plugin
     {
         $metrics = $this->getMetricTranslations();
         $documentation = $this->getMetricDocumentation();
-
-        // Translate
-        $callback = array('\\Piwik\\Piwik', 'translate');
-        $metrics = array_map($callback, $metrics);
-        $documentation = array_map($callback, $documentation);
-
         $labelTranslations = $this->getLabelTranslations();
 
         $order = 0;
@@ -142,34 +159,89 @@ class Events extends \Piwik\Plugin
     }
 
     /**
-     * Given Events.getCategory, returns the translations to use
-     *
-     * @param $apiReport
-     * @throws \Exception
      * @return array
      */
-    protected function getLabelTranslation($apiReport)
+    static public function getLabelTranslations()
+    {
+        return array(
+            'getCategory' => array('Events_EventCategories', 'Events_EventCategory'),
+            'getAction'   => array('Events_EventActions', 'Events_EventAction'),
+            'getName'     => array('Events_EventNames', 'Events_EventName'),
+        );
+    }
+
+
+    /**
+     * Given getCategory, returns "Event Categories"
+     *
+     * @param $apiMethod
+     * @return string
+     */
+    public function getReportTitleTranslation($apiMethod)
+    {
+        return $this->getTranslation($apiMethod, $index = 0);
+    }
+
+    /**
+     * Given getCategory, returns "Event Category"
+     *
+     * @param $apiMethod
+     * @return string
+     */
+    protected function getColumnTranslation($apiMethod)
+    {
+        return $this->getTranslation($apiMethod, $index = 1);
+    }
+
+
+    protected function getTranslation($apiMethod, $index)
     {
         $labels = $this->getLabelTranslations();
-        foreach($labels as $action => $translations) {
-            $action = 'Events.' . $action;
-            if($apiReport == $action) {
-                return $translations;
+        foreach ($labels as $action => $translations) {
+            // Events.getActionFromCategoryId returns translation for Events.getAction
+            if (strpos($apiMethod, $action) === 0) {
+                $columnLabel = $translations[$index];
+                return Piwik::translate($columnLabel);
             }
         }
-        throw new \Exception("Translation not found for report $apiReport");
+        throw new \Exception("Translation not found for report $apiMethod");
     }
 
-    /**
-     * @return array
-     */
-    protected function getLabelTranslations()
+    public function configureViewDataTable(ViewDataTable $view)
     {
-        return array(
-            'getCategory' => array('Events_EventCategories', 'Events_EventCategory'),
-            'getAction'   => array('Events_EventActions', 'Events_EventAction'),
-            'getName'     => array('Events_EventNames', 'Events_EventName'),
+        // eg. 'Events.getCategory'
+        $apiMethod = $view->requestConfig->getApiMethodToRequest();
+
+        if($view->requestConfig->getApiModuleToRequest() != 'Events') {
+            // this is not an Events apiMethod
+            return;
+        }
+
+        $view->config->addTranslation('label', $this->getColumnTranslation($apiMethod));
+        $view->config->addTranslations($this->getMetricTranslations());
+        $view->config->columns_to_display = array('label', 'nb_events', 'sum_event_value');
+        $view->config->subtable_controller_action  = API::getInstance()->getSubtableAction($apiMethod);
+
+        // Creates the tooltip message for Event Value column
+        $tooltipCallback = function ($hits, $min, $max, $avg) {
+            if (!$hits) {
+                return false;
+            }
+            $msgEventMinMax = Piwik::translate("Events_EventValueTooltip", array($hits, "<br />", $min, $max));
+            $msgEventAvg = Piwik::translate("Events_AvgEventValue", $avg);
+            return $msgEventMinMax . "<br/>" . $msgEventAvg;
+        };
+
+        // Add tooltip metadata column to the DataTable
+        $view->config->filters[] = array('ColumnCallbackAddMetadata',
+                                         array(
+                                             array('nb_events', 'min_event_value', 'max_event_value', 'avg_event_value'),
+                                             'sum_event_value_tooltip',
+                                             $tooltipCallback
+                                         )
         );
+
+        $view->config->custom_parameters = array('flat' => 0);
     }
 
 }

plugins/Events/lang/en.json

@@ -13,14 +13,18 @@
         "TotalValue": "Total value",
         "MinValue": "Minimum value",
         "MaxValue": "Maximum value",
+        "AvgValue": "Average value",
         "EventsWithValue": "Events with a value",
         "TotalEventsDocumentation": "Total number of events",
-        "TotalValueDocumentation": "Total value of events (sum of event values)",
-        "MinValueDocumentation": "Minimum value for this event",
-        "MaxValueDocumentation": "Maximum value for this event",
+        "TotalValueDocumentation": "The sum of event values",
+        "MinValueDocumentation": "The minimum value for this event",
+        "MaxValueDocumentation": "The maximum value for this event",
+        "AvgValueDocumentation": "The average of all values for this event",
         "EventsWithValueDocumentation": "Number of events where an Event value was set",
         "NameNotSet": "(Event Name not set)",
-        "EventValueTooltip": "Total Event value based on %s events %s between %s and %s.",
-        "AvgEventValue": "Average Event value is: %s"
+        "EventValueTooltip": "Total Event value is the sum of %s events values %s between minimum of %s and maximum of %s.",
+        "AvgEventValue": "Average Event value is: %s",
+        "TopEvents": "Top Events",
+        "ViewEvents": "View Events"
     }
 }
\ No newline at end of file

plugins/Events/templates/index.twig

+{{ leftMenuReports|raw }}
+

VisitorGenerator @ 728645ac

-Subproject commit 99e45b4eb480e8b949b21f03de570808820f188a
+Subproject commit 728645ac2dbd9a1f74ac59ecea156f44e138c601

tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getAction_lastN__API.getProcessedReport_day.xml

@@ -13,13 +13,15 @@
 			<sum_event_value>Total value</sum_event_value>
 			<min_event_value>Minimum value</min_event_value>
 			<max_event_value>Maximum value</max_event_value>
+			<avg_event_value>Average value</avg_event_value>
 			<nb_events_with_value>Events with a value</nb_events_with_value>
 		</metrics>
 		<metricsDocumentation>
 			<nb_events>Total number of events</nb_events>
-			<sum_event_value>Total value of events (sum of event values)</sum_event_value>
-			<min_event_value>Minimum value for this event</min_event_value>
-			<max_event_value>Maximum value for this event</max_event_value>
+			<sum_event_value>The sum of event values</sum_event_value>
+			<min_event_value>The minimum value for this event</min_event_value>
+			<max_event_value>The maximum value for this event</max_event_value>
+			<avg_event_value>The average of all values for this event</avg_event_value>
 			<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
 		</metricsDocumentation>
 		<actionToLoadSubTables>getNameFromActionId</actionToLoadSubTables>
@@ -33,6 +35,7 @@
 		<sum_event_value>Total value</sum_event_value>
 		<min_event_value>Minimum value</min_event_value>
 		<max_event_value>Maximum value</max_event_value>
+		<avg_event_value>Average value</avg_event_value>
 		<nb_events_with_value>Events with a value</nb_events_with_value>
 	</columns>
 	<reportData>
@@ -44,6 +47,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Search</label>
@@ -52,6 +56,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play25%</label>
@@ -60,6 +65,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play50%</label>
@@ -68,6 +74,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>play75%</label>
@@ -76,6 +83,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playEnd</label>
@@ -84,6 +92,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>rating</label>
@@ -92,6 +101,7 @@
 				<sum_event_value>57.32</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>10</max_event_value>
+				<avg_event_value>9.55</avg_event_value>
 			</row>
 			<row>
 				<label>clickBuyNow</label>
@@ -100,6 +110,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>event action Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -108,6 +119,7 @@
 				<sum_event_value>19.32</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
 			</row>
 			<row>
 				<label>play</label>
@@ -116,6 +128,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>playStart</label>
@@ -124,6 +137,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Purchase</label>
@@ -132,6 +146,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />

tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getCategory_lastN__API.getProcessedReport_day.xml

@@ -13,13 +13,15 @@
 			<sum_event_value>Total value</sum_event_value>
 			<min_event_value>Minimum value</min_event_value>
 			<max_event_value>Maximum value</max_event_value>
+			<avg_event_value>Average value</avg_event_value>
 			<nb_events_with_value>Events with a value</nb_events_with_value>
 		</metrics>
 		<metricsDocumentation>
 			<nb_events>Total number of events</nb_events>
-			<sum_event_value>Total value of events (sum of event values)</sum_event_value>
-			<min_event_value>Minimum value for this event</min_event_value>
-			<max_event_value>Maximum value for this event</max_event_value>
+			<sum_event_value>The sum of event values</sum_event_value>
+			<min_event_value>The minimum value for this event</min_event_value>
+			<max_event_value>The maximum value for this event</max_event_value>
+			<avg_event_value>The average of all values for this event</avg_event_value>
 			<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
 		</metricsDocumentation>
 		<actionToLoadSubTables>getActionFromCategoryId</actionToLoadSubTables>
@@ -33,6 +35,7 @@
 		<sum_event_value>Total value</sum_event_value>
 		<min_event_value>Minimum value</min_event_value>
 		<max_event_value>Maximum value</max_event_value>
+		<avg_event_value>Average value</avg_event_value>
 		<nb_events_with_value>Events with a value</nb_events_with_value>
 	</columns>
 	<reportData>
@@ -44,6 +47,7 @@
 				<sum_event_value>19.32</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
 			</row>
 			<row>
 				<label>Music</label>
@@ -52,6 +56,7 @@
 				<sum_event_value>38</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
 			</row>
 			<row>
 				<label>event category Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -60,6 +65,7 @@
 				<sum_event_value>19.32</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />

tests/PHPUnit/Integration/expected/test_CustomEvents_Events.getName_lastN__API.getProcessedReport_day.xml

@@ -13,13 +13,15 @@
 			<sum_event_value>Total value</sum_event_value>
 			<min_event_value>Minimum value</min_event_value>
 			<max_event_value>Maximum value</max_event_value>
+			<avg_event_value>Average value</avg_event_value>
 			<nb_events_with_value>Events with a value</nb_events_with_value>
 		</metrics>
 		<metricsDocumentation>
 			<nb_events>Total number of events</nb_events>
-			<sum_event_value>Total value of events (sum of event values)</sum_event_value>
-			<min_event_value>Minimum value for this event</min_event_value>
-			<max_event_value>Maximum value for this event</max_event_value>
+			<sum_event_value>The sum of event values</sum_event_value>
+			<min_event_value>The minimum value for this event</min_event_value>
+			<max_event_value>The maximum value for this event</max_event_value>
+			<avg_event_value>The average of all values for this event</avg_event_value>
 			<nb_events_with_value>Number of events where an Event value was set</nb_events_with_value>
 		</metricsDocumentation>
 		<actionToLoadSubTables>getActionFromNameId</actionToLoadSubTables>
@@ -33,6 +35,7 @@
 		<sum_event_value>Total value</sum_event_value>
 		<min_event_value>Minimum value</min_event_value>
 		<max_event_value>Maximum value</max_event_value>
+		<avg_event_value>Average value</avg_event_value>
 		<nb_events_with_value>Events with a value</nb_events_with_value>
 	</columns>
 	<reportData>
@@ -44,6 +47,7 @@
 				<sum_event_value>19.32</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
 			</row>
 			<row>
 				<label>La fiancée de l&amp;#039;eau</label>
@@ -52,6 +56,7 @@
 				<sum_event_value>38</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>10</max_event_value>
+				<avg_event_value>9.5</avg_event_value>
 			</row>
 			<row>
 				<label>(Event Name not set)</label>
@@ -60,6 +65,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>event name Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long Extremely long ---&gt; SHOULD APPEAR IN TEST OUTPUT NOT TRUNCATED &lt;---</label>
@@ -68,6 +74,7 @@
 				<sum_event_value>19.32</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>9.66</max_event_value>
+				<avg_event_value>9.66</avg_event_value>
 			</row>
 			<row>
 				<label>Ponyo (崖の上のポニョ)</label>
@@ -76,6 +83,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Princess Mononoke (もののけ姫)</label>
@@ -84,6 +92,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 			<row>
 				<label>Search query here</label>
@@ -92,6 +101,7 @@
 				<sum_event_value>0</sum_event_value>
 				<min_event_value>0</min_event_value>
 				<max_event_value>0</max_event_value>
+				<avg_event_value>0</avg_event_value>
 			</row>
 		</result>
 		<result prettyDate="Monday 4 January 2010" />

UI @ 9d2267f0

-Subproject commit 909cef7f14a0f85f3e92623e2f236f7a40fc7ed5
+Subproject commit 9d2267f0b3c88a98a8e780d79c170cd6803fab80