diff options
| -rw-r--r-- | plugins/API/API.php | 27 | ||||
| -rw-r--r-- | plugins/Actions/Actions.php | 4 | ||||
| -rw-r--r-- | plugins/CustomVariables/CustomVariables.php | 1 | ||||
| -rw-r--r-- | plugins/Goals/Goals.php | 2 | ||||
| -rw-r--r-- | plugins/Provider/Provider.php | 1 | ||||
| -rw-r--r-- | plugins/Referers/Referers.php | 7 | ||||
| -rw-r--r-- | plugins/UserCountry/UserCountry.php | 3 | ||||
| -rw-r--r-- | plugins/UserSettings/UserSettings.php | 15 | ||||
| -rw-r--r-- | plugins/VisitFrequency/VisitFrequency.php | 1 | ||||
| -rw-r--r-- | plugins/VisitTime/VisitTime.php | 2 | ||||
| -rw-r--r-- | plugins/VisitorInterest/VisitorInterest.php | 2 | ||||
| -rw-r--r-- | plugins/VisitsSummary/VisitsSummary.php | 1 | ||||
| -rw-r--r-- | tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml | 446 | ||||
| -rw-r--r-- | tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml | 446 |
14 files changed, 497 insertions, 461 deletions
diff --git a/plugins/API/API.php b/plugins/API/API.php index c7f8829aca..bc58e2ac9e 100644 --- a/plugins/API/API.php +++ b/plugins/API/API.php @@ -253,6 +253,9 @@ class Piwik_API_API // Some plugins need to add custom metrics after all plugins hooked in Piwik_PostEvent('API.getReportMetadata.end', $availableReports, $idSites); + // Sort results to ensure consistent order + usort($availableReports, array($this, 'sort')); + $knownMetrics = array_merge( $this->getDefaultMetrics(), $this->getDefaultProcessedMetrics() ); foreach($availableReports as &$availableReport) { @@ -293,9 +296,11 @@ class Piwik_API_API } } $availableReport['uniqueId'] = $uniqueId; + + // Order is used to order reports internally, but not meant to be used outside + unset($availableReport['order']); } - // Sort results to ensure consistent order - usort($availableReports, array($this, 'sort')); + return $availableReports; } @@ -509,15 +514,25 @@ class Piwik_API_API } /** - * API metadata are sorted by category/name + * API metadata are sorted by category/name, + * with a little tweak to replicate the standard Piwik category ordering + * * @param string $a * @param string $b * @return int */ private function sort($a, $b) { - return ($category = strcmp($a['category'], $b['category'])) != 0 - ? $category - : strcmp($a['action'], $b['action']); + $order = array( + Piwik_Translate('VisitsSummary_VisitsSummary'), + Piwik_Translate('Actions_Actions'), + Piwik_Translate('Referers_Referers'), + Piwik_Translate('Goals_Goals'), + Piwik_Translate('General_Visitors'), + Piwik_Translate('UserSettings_VisitorSettings'), + ); + return ($category = strcmp(array_search($a['category'], $order), array_search($b['category'], $order))) == 0 + ? ($a['order'] < $b['order'] ? -1 : 1) + : $category; } } diff --git a/plugins/Actions/Actions.php b/plugins/Actions/Actions.php index 85ae6e77d2..1362b38488 100644 --- a/plugins/Actions/Actions.php +++ b/plugins/Actions/Actions.php @@ -129,6 +129,7 @@ class Piwik_Actions extends Piwik_Plugin 'dimension' => Piwik_Translate('Actions_ColumnPageURL'), 'metrics' => $metrics, 'processedMetrics' => false, + 'order' => 1, ); $reports[] = array( @@ -139,6 +140,7 @@ class Piwik_Actions extends Piwik_Plugin 'dimension' => Piwik_Translate('Actions_ColumnPageName'), 'metrics' => $metrics, 'processedMetrics' => false, + 'order' => 3, ); // Outlinks and downloads only report basic metrics @@ -153,6 +155,7 @@ class Piwik_Actions extends Piwik_Plugin 'dimension' => Piwik_Translate('Actions_ColumnClickedURL'), 'metrics' => $metrics, 'processedMetrics' => false, + 'order' => 5, ); $reports[] = array( 'category' => Piwik_Translate('Actions_Actions'), @@ -162,6 +165,7 @@ class Piwik_Actions extends Piwik_Plugin 'dimension' => Piwik_Translate('Actions_ColumnDownloadURL'), 'metrics' => $metrics, 'processedMetrics' => false, + 'order' => 7, ); } diff --git a/plugins/CustomVariables/CustomVariables.php b/plugins/CustomVariables/CustomVariables.php index e7fd487510..389f5ce0ba 100644 --- a/plugins/CustomVariables/CustomVariables.php +++ b/plugins/CustomVariables/CustomVariables.php @@ -66,6 +66,7 @@ class Piwik_CustomVariables extends Piwik_Plugin 'module' => 'CustomVariables', 'action' => 'getCustomVariables', 'dimension' => Piwik_Translate('CustomVariables_ColumnCustomVariableName'), + 'order' => 10 ), )); } diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php index 015b4f016a..abe93203bd 100644 --- a/plugins/Goals/Goals.php +++ b/plugins/Goals/Goals.php @@ -78,6 +78,7 @@ class Piwik_Goals extends Piwik_Plugin 'action' => 'get', 'metrics' => $goalMetrics, 'processedMetrics' => array(), + 'order' => 1 ); /* @@ -119,6 +120,7 @@ class Piwik_Goals extends Piwik_Plugin 'parameters' => array('idGoal' => $goal['idgoal']), 'metrics' => $goalMetrics, 'processedMetrics' => false, + 'order' => 10 + $goal['idgoal'] ); } } diff --git a/plugins/Provider/Provider.php b/plugins/Provider/Provider.php index c0434e1240..30b79b2a86 100644 --- a/plugins/Provider/Provider.php +++ b/plugins/Provider/Provider.php @@ -52,6 +52,7 @@ class Piwik_Provider extends Piwik_Plugin 'module' => 'Provider', 'action' => 'getProvider', 'dimension' => Piwik_Translate('Provider_ColumnProvider'), + 'order' => 50 ); } diff --git a/plugins/Referers/Referers.php b/plugins/Referers/Referers.php index 75323f60f4..1fc22a94eb 100644 --- a/plugins/Referers/Referers.php +++ b/plugins/Referers/Referers.php @@ -60,7 +60,8 @@ class Piwik_Referers extends Piwik_Plugin 'name' => Piwik_Translate('Referers_Type'), 'module' => 'Referers', 'action' => 'getRefererType', - 'dimension' => Piwik_Translate('Referers_ColumnRefererType') + 'dimension' => Piwik_Translate('Referers_ColumnRefererType'), + 'order' => 1, ), array( 'category' => Piwik_Translate('Referers_Referers'), @@ -68,6 +69,7 @@ class Piwik_Referers extends Piwik_Plugin 'module' => 'Referers', 'action' => 'getKeywords', 'dimension' => Piwik_Translate('Referers_ColumnKeyword'), + 'order' => 3, ), array( 'category' => Piwik_Translate('Referers_Referers'), @@ -75,6 +77,7 @@ class Piwik_Referers extends Piwik_Plugin 'module' => 'Referers', 'action' => 'getWebsites', 'dimension' => Piwik_Translate('Referers_ColumnWebsite'), + 'order' => 5, ), array( 'category' => Piwik_Translate('Referers_Referers'), @@ -82,6 +85,7 @@ class Piwik_Referers extends Piwik_Plugin 'module' => 'Referers', 'action' => 'getSearchEngines', 'dimension' => Piwik_Translate('Referers_ColumnSearchEngine'), + 'order' => 7, ), array( 'category' => Piwik_Translate('Referers_Referers'), @@ -89,6 +93,7 @@ class Piwik_Referers extends Piwik_Plugin 'module' => 'Referers', 'action' => 'getCampaigns', 'dimension' => Piwik_Translate('Referers_ColumnCampaign'), + 'order' => 9, ), )); } diff --git a/plugins/UserCountry/UserCountry.php b/plugins/UserCountry/UserCountry.php index db8d80a541..8e436b7fcf 100644 --- a/plugins/UserCountry/UserCountry.php +++ b/plugins/UserCountry/UserCountry.php @@ -83,7 +83,7 @@ class Piwik_UserCountry extends Piwik_Plugin 'module' => 'UserCountry', 'action' => 'getCountry', 'dimension' => Piwik_Translate('UserCountry_Country'), - '' + 'order' => 5, ); $reports[] = array( @@ -92,6 +92,7 @@ class Piwik_UserCountry extends Piwik_Plugin 'module' => 'UserCountry', 'action' => 'getContinent', 'dimension' => Piwik_Translate('UserCountry_Continent'), + 'order' => 6, ); } diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 69e0578bf5..30977787b3 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -74,7 +74,12 @@ class Piwik_UserSettings extends Piwik_Plugin 'config_browser_version', '1.0, 8.0, etc.',), - + array( 'UserSettings_VisitorSettings', + 'UserSettings_WidgetBrowserFamilies', + 'UserSettings', + 'getBrowserType', + 'UserSettings_ColumnBrowserFamily'), + array( 'UserSettings_VisitorSettings', 'UserSettings_WidgetPlugins', 'UserSettings', @@ -88,12 +93,6 @@ class Piwik_UserSettings extends Piwik_Plugin 'UserSettings_ColumnTypeOfScreen'), array( 'UserSettings_VisitorSettings', - 'UserSettings_WidgetBrowserFamilies', - 'UserSettings', - 'getBrowserType', - 'UserSettings_ColumnBrowserFamily'), - - array( 'UserSettings_VisitorSettings', 'UserSettings_WidgetOperatingSystems', 'UserSettings', 'getOS', @@ -134,6 +133,7 @@ class Piwik_UserSettings extends Piwik_Plugin { $reports = &$notification->getNotificationObject(); + $i = 0; foreach($this->reportMetadata as $report) { list( $category, $name, $apiModule, $apiAction, $columnName ) = $report; @@ -145,6 +145,7 @@ class Piwik_UserSettings extends Piwik_Plugin 'module' => $apiModule, 'action' => $apiAction, 'dimension' => Piwik_Translate($columnName), + 'order' => $i++, ); // getPlugin returns only a subset of metrics diff --git a/plugins/VisitFrequency/VisitFrequency.php b/plugins/VisitFrequency/VisitFrequency.php index 90626fae4e..f13cd62738 100644 --- a/plugins/VisitFrequency/VisitFrequency.php +++ b/plugins/VisitFrequency/VisitFrequency.php @@ -61,6 +61,7 @@ class Piwik_VisitFrequency extends Piwik_Plugin // 'bounce_count_returning', ), 'processedMetrics' => false, + 'order' => 40 ); } diff --git a/plugins/VisitTime/VisitTime.php b/plugins/VisitTime/VisitTime.php index b65d060c8c..c47a03463d 100644 --- a/plugins/VisitTime/VisitTime.php +++ b/plugins/VisitTime/VisitTime.php @@ -50,6 +50,7 @@ class Piwik_VisitTime extends Piwik_Plugin 'module' => 'VisitTime', 'action' => 'getVisitInformationPerLocalTime', 'dimension' => Piwik_Translate('VisitTime_ColumnLocalTime'), + 'order' => 20 ); $reports[] = array( @@ -58,6 +59,7 @@ class Piwik_VisitTime extends Piwik_Plugin 'module' => 'VisitTime', 'action' => 'getVisitInformationPerServerTime', 'dimension' => Piwik_Translate('VisitTime_ColumnServerTime'), + 'order' => 15, ); } diff --git a/plugins/VisitorInterest/VisitorInterest.php b/plugins/VisitorInterest/VisitorInterest.php index 6e7484f656..84180533f2 100644 --- a/plugins/VisitorInterest/VisitorInterest.php +++ b/plugins/VisitorInterest/VisitorInterest.php @@ -51,6 +51,7 @@ class Piwik_VisitorInterest extends Piwik_Plugin 'dimension' => Piwik_Translate('VisitorInterest_ColumnVisitDuration'), 'metrics' => array( 'nb_visits' ), 'processedMetrics' => false, + 'order' => 15 ); $reports[] = array( @@ -61,6 +62,7 @@ class Piwik_VisitorInterest extends Piwik_Plugin 'dimension' => Piwik_Translate('VisitorInterest_ColumnPagesPerVisit'), 'metrics' => array( 'nb_visits' ), 'processedMetrics' => false, + 'order' => 20 ); } diff --git a/plugins/VisitsSummary/VisitsSummary.php b/plugins/VisitsSummary/VisitsSummary.php index acbfd2d2e6..9b4cd8939d 100644 --- a/plugins/VisitsSummary/VisitsSummary.php +++ b/plugins/VisitsSummary/VisitsSummary.php @@ -61,6 +61,7 @@ class Piwik_VisitsSummary extends Piwik_Plugin // 'nb_visits_converted', ), 'processedMetrics' => false, + 'order' => 1 ); } diff --git a/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml b/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml index 9e65e53020..b84a9e8a28 100644 --- a/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml +++ b/tests/integration/expected/test_apiGetReportMetadata__API.getReportMetadata.xml @@ -1,39 +1,83 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <category>Actions</category> - <name>Downloads</name> - <module>Actions</module> - <action>getDownloads</action> - <dimension>Download URL</dimension> + <category>Visits Summary</category> + <name>Visits Summary</name> + <module>VisitsSummary</module> + <action>get</action> <metrics> - <nb_hits>Pageviews</nb_hits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_visits>Visits</nb_visits> + <nb_actions>Actions</nb_actions> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <bounce_rate>Bounce Rate</bounce_rate> + <avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site> + <max_actions>Maximum actions in one visit</max_actions> </metrics> - <uniqueId>Actions_getDownloads</uniqueId> + <uniqueId>VisitsSummary_get</uniqueId> </row> <row> - <category>Actions</category> - <name>Outlinks</name> - <module>Actions</module> - <action>getOutlinks</action> - <dimension>Clicked URL</dimension> + <category>Visits Summary</category> + <name>Visits by server time</name> + <module>VisitTime</module> + <action>getVisitInformationPerServerTime</action> + <dimension>Server time</dimension> <metrics> - <nb_hits>Pageviews</nb_hits> <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> </metrics> - <uniqueId>Actions_getOutlinks</uniqueId> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + + </processedMetrics> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> + + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> + + </processedMetricsGoal> + <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> + + </row> + <row> + <category>Visits Summary</category> + <name>Visits by local time</name> + <module>VisitTime</module> + <action>getVisitInformationPerLocalTime</action> + <dimension>Local time</dimension> + <metrics> + <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> + + </metrics> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + + </processedMetrics> + <uniqueId>VisitTime_getVisitInformationPerLocalTime</uniqueId> </row> <row> <category>Actions</category> - <name>Page titles</name> + <name>Pages</name> <module>Actions</module> - <action>getPageTitles</action> - <dimension>Page Name</dimension> + <action>getPageUrls</action> + <dimension>Page URL</dimension> <metrics> <nb_visits>Unique Pageviews</nb_visits> <nb_hits>Pageviews</nb_hits> @@ -44,15 +88,15 @@ <exit_rate>Exit rate</exit_rate> </metrics> - <uniqueId>Actions_getPageTitles</uniqueId> + <uniqueId>Actions_getPageUrls</uniqueId> </row> <row> <category>Actions</category> - <name>Pages</name> + <name>Page titles</name> <module>Actions</module> - <action>getPageUrls</action> - <dimension>Page URL</dimension> + <action>getPageTitles</action> + <dimension>Page Name</dimension> <metrics> <nb_visits>Unique Pageviews</nb_visits> <nb_hits>Pageviews</nb_hits> @@ -63,29 +107,43 @@ <exit_rate>Exit rate</exit_rate> </metrics> - <uniqueId>Actions_getPageUrls</uniqueId> + <uniqueId>Actions_getPageTitles</uniqueId> </row> <row> - <category>Goals</category> - <name>Goals</name> - <module>Goals</module> - <action>get</action> + <category>Actions</category> + <name>Outlinks</name> + <module>Actions</module> + <action>getOutlinks</action> + <dimension>Clicked URL</dimension> <metrics> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> + <nb_hits>Pageviews</nb_hits> + <nb_visits>Visits</nb_visits> </metrics> - <uniqueId>Goals_get</uniqueId> + <uniqueId>Actions_getOutlinks</uniqueId> + + </row> + <row> + <category>Actions</category> + <name>Downloads</name> + <module>Actions</module> + <action>getDownloads</action> + <dimension>Download URL</dimension> + <metrics> + <nb_hits>Pageviews</nb_hits> + <nb_visits>Visits</nb_visits> + + </metrics> + <uniqueId>Actions_getDownloads</uniqueId> </row> <row> <category>Referrers</category> - <name>Campaigns</name> + <name>Referrer Type</name> <module>Referers</module> - <action>getCampaigns</action> - <dimension>Campaign</dimension> + <action>getRefererType</action> + <dimension>Referrer Type</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -109,7 +167,7 @@ <revenue_per_visit>Value per Visit</revenue_per_visit> </processedMetricsGoal> - <uniqueId>Referers_getCampaigns</uniqueId> + <uniqueId>Referers_getRefererType</uniqueId> </row> <row> @@ -146,10 +204,10 @@ </row> <row> <category>Referrers</category> - <name>Referrer Type</name> + <name>Websites</name> <module>Referers</module> - <action>getRefererType</action> - <dimension>Referrer Type</dimension> + <action>getWebsites</action> + <dimension>Website</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -173,7 +231,7 @@ <revenue_per_visit>Value per Visit</revenue_per_visit> </processedMetricsGoal> - <uniqueId>Referers_getRefererType</uniqueId> + <uniqueId>Referers_getWebsites</uniqueId> </row> <row> @@ -210,10 +268,10 @@ </row> <row> <category>Referrers</category> - <name>Websites</name> + <name>Campaigns</name> <module>Referers</module> - <action>getWebsites</action> - <dimension>Website</dimension> + <action>getCampaigns</action> + <dimension>Campaign</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -237,37 +295,29 @@ <revenue_per_visit>Value per Visit</revenue_per_visit> </processedMetricsGoal> - <uniqueId>Referers_getWebsites</uniqueId> + <uniqueId>Referers_getCampaigns</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Visitor browsers</name> - <module>UserSettings</module> - <action>getBrowser</action> - <dimension>Browser</dimension> + <category>Goals</category> + <name>Goals</name> + <module>Goals</module> + <action>get</action> <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - - </metrics> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> + <nb_conversions>Conversions</nb_conversions> <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> - </processedMetrics> - <uniqueId>UserSettings_getBrowser</uniqueId> + </metrics> + <uniqueId>Goals_get</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Browsers by family</name> - <module>UserSettings</module> - <action>getBrowserType</action> - <dimension>Browser family</dimension> + <category>Visitors</category> + <name>Country</name> + <module>UserCountry</module> + <action>getCountry</action> + <dimension>Country</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -281,15 +331,25 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>UserSettings_getBrowserType</uniqueId> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> + + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> + + </processedMetricsGoal> + <uniqueId>UserCountry_getCountry</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Global visitors configuration</name> - <module>UserSettings</module> - <action>getConfiguration</action> - <dimension>Configuration</dimension> + <category>Visitors</category> + <name>Continent</name> + <module>UserCountry</module> + <action>getContinent</action> + <dimension>Continent</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -303,15 +363,25 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>UserSettings_getConfiguration</uniqueId> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> + + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> + + </processedMetricsGoal> + <uniqueId>UserCountry_getContinent</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Operating systems</name> - <module>UserSettings</module> - <action>getOS</action> - <dimension>Operating system</dimension> + <category>Visitors</category> + <name>Custom Variables</name> + <module>CustomVariables</module> + <action>getCustomVariables</action> + <dimension>Custom Variable name</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -325,65 +395,43 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>UserSettings_getOS</uniqueId> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> - </row> - <row> - <category>Visitor Settings</category> - <name>List of Plugins</name> - <module>UserSettings</module> - <action>getPlugin</action> - <dimension>Plugin</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_visits_percentage>% Visits</nb_visits_percentage> + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> - </metrics> - <uniqueId>UserSettings_getPlugin</uniqueId> + </processedMetricsGoal> + <uniqueId>CustomVariables_getCustomVariables</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Screen resolutions</name> - <module>UserSettings</module> - <action>getResolution</action> - <dimension>Resolution</dimension> + <category>Visitors</category> + <name>Length of Visits</name> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerVisitDuration</action> + <dimension>Visit duration</dimension> <metrics> <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> </metrics> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - - </processedMetrics> - <uniqueId>UserSettings_getResolution</uniqueId> + <uniqueId>VisitorInterest_getNumberOfVisitsPerVisitDuration</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Normal / Widescreen</name> - <module>UserSettings</module> - <action>getWideScreen</action> - <dimension>Type of screen</dimension> + <category>Visitors</category> + <name>Pages per visit</name> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerPage</action> + <dimension>Pages per visit</dimension> <metrics> <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> </metrics> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - - </processedMetrics> - <uniqueId>UserSettings_getWideScreen</uniqueId> + <uniqueId>VisitorInterest_getNumberOfVisitsPerPage</uniqueId> </row> <row> @@ -404,10 +452,10 @@ </row> <row> <category>Visitors</category> - <name>Continent</name> - <module>UserCountry</module> - <action>getContinent</action> - <dimension>Continent</dimension> + <name>Provider</name> + <module>Provider</module> + <action>getProvider</action> + <dimension>Provider</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -421,25 +469,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>UserCountry_getContinent</uniqueId> + <uniqueId>Provider_getProvider</uniqueId> </row> <row> - <category>Visitors</category> - <name>Country</name> - <module>UserCountry</module> - <action>getCountry</action> - <dimension>Country</dimension> + <category>Visitor Settings</category> + <name>Screen resolutions</name> + <module>UserSettings</module> + <action>getResolution</action> + <dimension>Resolution</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -453,25 +491,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>UserCountry_getCountry</uniqueId> + <uniqueId>UserSettings_getResolution</uniqueId> </row> <row> - <category>Visitors</category> - <name>Custom Variables</name> - <module>CustomVariables</module> - <action>getCustomVariables</action> - <dimension>Custom Variable name</dimension> + <category>Visitor Settings</category> + <name>Visitor browsers</name> + <module>UserSettings</module> + <action>getBrowser</action> + <dimension>Browser</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -485,51 +513,51 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>CustomVariables_getCustomVariables</uniqueId> + <uniqueId>UserSettings_getBrowser</uniqueId> </row> <row> - <category>Visitors</category> - <name>Pages per visit</name> - <module>VisitorInterest</module> - <action>getNumberOfVisitsPerPage</action> - <dimension>Pages per visit</dimension> + <category>Visitor Settings</category> + <name>Browsers by family</name> + <module>UserSettings</module> + <action>getBrowserType</action> + <dimension>Browser family</dimension> <metrics> <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> </metrics> - <uniqueId>VisitorInterest_getNumberOfVisitsPerPage</uniqueId> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + + </processedMetrics> + <uniqueId>UserSettings_getBrowserType</uniqueId> </row> <row> - <category>Visitors</category> - <name>Length of Visits</name> - <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> - <dimension>Visit duration</dimension> + <category>Visitor Settings</category> + <name>List of Plugins</name> + <module>UserSettings</module> + <action>getPlugin</action> + <dimension>Plugin</dimension> <metrics> <nb_visits>Visits</nb_visits> + <nb_visits_percentage>% Visits</nb_visits_percentage> </metrics> - <uniqueId>VisitorInterest_getNumberOfVisitsPerVisitDuration</uniqueId> + <uniqueId>UserSettings_getPlugin</uniqueId> </row> <row> - <category>Visitors</category> - <name>Provider</name> - <module>Provider</module> - <action>getProvider</action> - <dimension>Provider</dimension> + <category>Visitor Settings</category> + <name>Normal / Widescreen</name> + <module>UserSettings</module> + <action>getWideScreen</action> + <dimension>Type of screen</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -543,33 +571,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>Provider_getProvider</uniqueId> - - </row> - <row> - <category>Visits Summary</category> - <name>Visits Summary</name> - <module>VisitsSummary</module> - <action>get</action> - <metrics> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_visits>Visits</nb_visits> - <nb_actions>Actions</nb_actions> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <bounce_rate>Bounce Rate</bounce_rate> - <avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site> - <max_actions>Maximum actions in one visit</max_actions> - - </metrics> - <uniqueId>VisitsSummary_get</uniqueId> + <uniqueId>UserSettings_getWideScreen</uniqueId> </row> <row> - <category>Visits Summary</category> - <name>Visits by local time</name> - <module>VisitTime</module> - <action>getVisitInformationPerLocalTime</action> - <dimension>Local time</dimension> + <category>Visitor Settings</category> + <name>Operating systems</name> + <module>UserSettings</module> + <action>getOS</action> + <dimension>Operating system</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -583,15 +593,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>VisitTime_getVisitInformationPerLocalTime</uniqueId> + <uniqueId>UserSettings_getOS</uniqueId> </row> <row> - <category>Visits Summary</category> - <name>Visits by server time</name> - <module>VisitTime</module> - <action>getVisitInformationPerServerTime</action> - <dimension>Server time</dimension> + <category>Visitor Settings</category> + <name>Global visitors configuration</name> + <module>UserSettings</module> + <action>getConfiguration</action> + <dimension>Configuration</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -605,17 +615,7 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> + <uniqueId>UserSettings_getConfiguration</uniqueId> </row> diff --git a/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml b/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml index 9e65e53020..b84a9e8a28 100644 --- a/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml +++ b/tests/integration/expected/test_apiGetReportMetadata_year__API.getReportMetadata.xml @@ -1,39 +1,83 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <category>Actions</category> - <name>Downloads</name> - <module>Actions</module> - <action>getDownloads</action> - <dimension>Download URL</dimension> + <category>Visits Summary</category> + <name>Visits Summary</name> + <module>VisitsSummary</module> + <action>get</action> <metrics> - <nb_hits>Pageviews</nb_hits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_visits>Visits</nb_visits> + <nb_actions>Actions</nb_actions> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <bounce_rate>Bounce Rate</bounce_rate> + <avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site> + <max_actions>Maximum actions in one visit</max_actions> </metrics> - <uniqueId>Actions_getDownloads</uniqueId> + <uniqueId>VisitsSummary_get</uniqueId> </row> <row> - <category>Actions</category> - <name>Outlinks</name> - <module>Actions</module> - <action>getOutlinks</action> - <dimension>Clicked URL</dimension> + <category>Visits Summary</category> + <name>Visits by server time</name> + <module>VisitTime</module> + <action>getVisitInformationPerServerTime</action> + <dimension>Server time</dimension> <metrics> - <nb_hits>Pageviews</nb_hits> <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> </metrics> - <uniqueId>Actions_getOutlinks</uniqueId> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + + </processedMetrics> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> + + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> + + </processedMetricsGoal> + <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> + + </row> + <row> + <category>Visits Summary</category> + <name>Visits by local time</name> + <module>VisitTime</module> + <action>getVisitInformationPerLocalTime</action> + <dimension>Local time</dimension> + <metrics> + <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> + + </metrics> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + + </processedMetrics> + <uniqueId>VisitTime_getVisitInformationPerLocalTime</uniqueId> </row> <row> <category>Actions</category> - <name>Page titles</name> + <name>Pages</name> <module>Actions</module> - <action>getPageTitles</action> - <dimension>Page Name</dimension> + <action>getPageUrls</action> + <dimension>Page URL</dimension> <metrics> <nb_visits>Unique Pageviews</nb_visits> <nb_hits>Pageviews</nb_hits> @@ -44,15 +88,15 @@ <exit_rate>Exit rate</exit_rate> </metrics> - <uniqueId>Actions_getPageTitles</uniqueId> + <uniqueId>Actions_getPageUrls</uniqueId> </row> <row> <category>Actions</category> - <name>Pages</name> + <name>Page titles</name> <module>Actions</module> - <action>getPageUrls</action> - <dimension>Page URL</dimension> + <action>getPageTitles</action> + <dimension>Page Name</dimension> <metrics> <nb_visits>Unique Pageviews</nb_visits> <nb_hits>Pageviews</nb_hits> @@ -63,29 +107,43 @@ <exit_rate>Exit rate</exit_rate> </metrics> - <uniqueId>Actions_getPageUrls</uniqueId> + <uniqueId>Actions_getPageTitles</uniqueId> </row> <row> - <category>Goals</category> - <name>Goals</name> - <module>Goals</module> - <action>get</action> + <category>Actions</category> + <name>Outlinks</name> + <module>Actions</module> + <action>getOutlinks</action> + <dimension>Clicked URL</dimension> <metrics> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> + <nb_hits>Pageviews</nb_hits> + <nb_visits>Visits</nb_visits> </metrics> - <uniqueId>Goals_get</uniqueId> + <uniqueId>Actions_getOutlinks</uniqueId> + + </row> + <row> + <category>Actions</category> + <name>Downloads</name> + <module>Actions</module> + <action>getDownloads</action> + <dimension>Download URL</dimension> + <metrics> + <nb_hits>Pageviews</nb_hits> + <nb_visits>Visits</nb_visits> + + </metrics> + <uniqueId>Actions_getDownloads</uniqueId> </row> <row> <category>Referrers</category> - <name>Campaigns</name> + <name>Referrer Type</name> <module>Referers</module> - <action>getCampaigns</action> - <dimension>Campaign</dimension> + <action>getRefererType</action> + <dimension>Referrer Type</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -109,7 +167,7 @@ <revenue_per_visit>Value per Visit</revenue_per_visit> </processedMetricsGoal> - <uniqueId>Referers_getCampaigns</uniqueId> + <uniqueId>Referers_getRefererType</uniqueId> </row> <row> @@ -146,10 +204,10 @@ </row> <row> <category>Referrers</category> - <name>Referrer Type</name> + <name>Websites</name> <module>Referers</module> - <action>getRefererType</action> - <dimension>Referrer Type</dimension> + <action>getWebsites</action> + <dimension>Website</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -173,7 +231,7 @@ <revenue_per_visit>Value per Visit</revenue_per_visit> </processedMetricsGoal> - <uniqueId>Referers_getRefererType</uniqueId> + <uniqueId>Referers_getWebsites</uniqueId> </row> <row> @@ -210,10 +268,10 @@ </row> <row> <category>Referrers</category> - <name>Websites</name> + <name>Campaigns</name> <module>Referers</module> - <action>getWebsites</action> - <dimension>Website</dimension> + <action>getCampaigns</action> + <dimension>Campaign</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -237,37 +295,29 @@ <revenue_per_visit>Value per Visit</revenue_per_visit> </processedMetricsGoal> - <uniqueId>Referers_getWebsites</uniqueId> + <uniqueId>Referers_getCampaigns</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Visitor browsers</name> - <module>UserSettings</module> - <action>getBrowser</action> - <dimension>Browser</dimension> + <category>Goals</category> + <name>Goals</name> + <module>Goals</module> + <action>get</action> <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - - </metrics> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> + <nb_conversions>Conversions</nb_conversions> <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> - </processedMetrics> - <uniqueId>UserSettings_getBrowser</uniqueId> + </metrics> + <uniqueId>Goals_get</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Browsers by family</name> - <module>UserSettings</module> - <action>getBrowserType</action> - <dimension>Browser family</dimension> + <category>Visitors</category> + <name>Country</name> + <module>UserCountry</module> + <action>getCountry</action> + <dimension>Country</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -281,15 +331,25 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>UserSettings_getBrowserType</uniqueId> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> + + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> + + </processedMetricsGoal> + <uniqueId>UserCountry_getCountry</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Global visitors configuration</name> - <module>UserSettings</module> - <action>getConfiguration</action> - <dimension>Configuration</dimension> + <category>Visitors</category> + <name>Continent</name> + <module>UserCountry</module> + <action>getContinent</action> + <dimension>Continent</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -303,15 +363,25 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>UserSettings_getConfiguration</uniqueId> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> + + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> + + </processedMetricsGoal> + <uniqueId>UserCountry_getContinent</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Operating systems</name> - <module>UserSettings</module> - <action>getOS</action> - <dimension>Operating system</dimension> + <category>Visitors</category> + <name>Custom Variables</name> + <module>CustomVariables</module> + <action>getCustomVariables</action> + <dimension>Custom Variable name</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -325,65 +395,43 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>UserSettings_getOS</uniqueId> + <metricsGoal> + <nb_conversions>Conversions</nb_conversions> + <conversion_rate>Conversion Rate</conversion_rate> + <revenue>Revenue</revenue> - </row> - <row> - <category>Visitor Settings</category> - <name>List of Plugins</name> - <module>UserSettings</module> - <action>getPlugin</action> - <dimension>Plugin</dimension> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_visits_percentage>% Visits</nb_visits_percentage> + </metricsGoal> + <processedMetricsGoal> + <revenue_per_visit>Value per Visit</revenue_per_visit> - </metrics> - <uniqueId>UserSettings_getPlugin</uniqueId> + </processedMetricsGoal> + <uniqueId>CustomVariables_getCustomVariables</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Screen resolutions</name> - <module>UserSettings</module> - <action>getResolution</action> - <dimension>Resolution</dimension> + <category>Visitors</category> + <name>Length of Visits</name> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerVisitDuration</action> + <dimension>Visit duration</dimension> <metrics> <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> </metrics> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - - </processedMetrics> - <uniqueId>UserSettings_getResolution</uniqueId> + <uniqueId>VisitorInterest_getNumberOfVisitsPerVisitDuration</uniqueId> </row> <row> - <category>Visitor Settings</category> - <name>Normal / Widescreen</name> - <module>UserSettings</module> - <action>getWideScreen</action> - <dimension>Type of screen</dimension> + <category>Visitors</category> + <name>Pages per visit</name> + <module>VisitorInterest</module> + <action>getNumberOfVisitsPerPage</action> + <dimension>Pages per visit</dimension> <metrics> <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> </metrics> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - - </processedMetrics> - <uniqueId>UserSettings_getWideScreen</uniqueId> + <uniqueId>VisitorInterest_getNumberOfVisitsPerPage</uniqueId> </row> <row> @@ -404,10 +452,10 @@ </row> <row> <category>Visitors</category> - <name>Continent</name> - <module>UserCountry</module> - <action>getContinent</action> - <dimension>Continent</dimension> + <name>Provider</name> + <module>Provider</module> + <action>getProvider</action> + <dimension>Provider</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -421,25 +469,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>UserCountry_getContinent</uniqueId> + <uniqueId>Provider_getProvider</uniqueId> </row> <row> - <category>Visitors</category> - <name>Country</name> - <module>UserCountry</module> - <action>getCountry</action> - <dimension>Country</dimension> + <category>Visitor Settings</category> + <name>Screen resolutions</name> + <module>UserSettings</module> + <action>getResolution</action> + <dimension>Resolution</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -453,25 +491,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>UserCountry_getCountry</uniqueId> + <uniqueId>UserSettings_getResolution</uniqueId> </row> <row> - <category>Visitors</category> - <name>Custom Variables</name> - <module>CustomVariables</module> - <action>getCustomVariables</action> - <dimension>Custom Variable name</dimension> + <category>Visitor Settings</category> + <name>Visitor browsers</name> + <module>UserSettings</module> + <action>getBrowser</action> + <dimension>Browser</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -485,51 +513,51 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>CustomVariables_getCustomVariables</uniqueId> + <uniqueId>UserSettings_getBrowser</uniqueId> </row> <row> - <category>Visitors</category> - <name>Pages per visit</name> - <module>VisitorInterest</module> - <action>getNumberOfVisitsPerPage</action> - <dimension>Pages per visit</dimension> + <category>Visitor Settings</category> + <name>Browsers by family</name> + <module>UserSettings</module> + <action>getBrowserType</action> + <dimension>Browser family</dimension> <metrics> <nb_visits>Visits</nb_visits> + <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> + <nb_actions>Actions</nb_actions> </metrics> - <uniqueId>VisitorInterest_getNumberOfVisitsPerPage</uniqueId> + <processedMetrics> + <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> + <avg_time_on_site>Avg. Time on Website</avg_time_on_site> + <bounce_rate>Bounce Rate</bounce_rate> + <conversion_rate>Conversion Rate</conversion_rate> + + </processedMetrics> + <uniqueId>UserSettings_getBrowserType</uniqueId> </row> <row> - <category>Visitors</category> - <name>Length of Visits</name> - <module>VisitorInterest</module> - <action>getNumberOfVisitsPerVisitDuration</action> - <dimension>Visit duration</dimension> + <category>Visitor Settings</category> + <name>List of Plugins</name> + <module>UserSettings</module> + <action>getPlugin</action> + <dimension>Plugin</dimension> <metrics> <nb_visits>Visits</nb_visits> + <nb_visits_percentage>% Visits</nb_visits_percentage> </metrics> - <uniqueId>VisitorInterest_getNumberOfVisitsPerVisitDuration</uniqueId> + <uniqueId>UserSettings_getPlugin</uniqueId> </row> <row> - <category>Visitors</category> - <name>Provider</name> - <module>Provider</module> - <action>getProvider</action> - <dimension>Provider</dimension> + <category>Visitor Settings</category> + <name>Normal / Widescreen</name> + <module>UserSettings</module> + <action>getWideScreen</action> + <dimension>Type of screen</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -543,33 +571,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>Provider_getProvider</uniqueId> - - </row> - <row> - <category>Visits Summary</category> - <name>Visits Summary</name> - <module>VisitsSummary</module> - <action>get</action> - <metrics> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_visits>Visits</nb_visits> - <nb_actions>Actions</nb_actions> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <bounce_rate>Bounce Rate</bounce_rate> - <avg_time_on_site>Avg. Visit Duration (in seconds)</avg_time_on_site> - <max_actions>Maximum actions in one visit</max_actions> - - </metrics> - <uniqueId>VisitsSummary_get</uniqueId> + <uniqueId>UserSettings_getWideScreen</uniqueId> </row> <row> - <category>Visits Summary</category> - <name>Visits by local time</name> - <module>VisitTime</module> - <action>getVisitInformationPerLocalTime</action> - <dimension>Local time</dimension> + <category>Visitor Settings</category> + <name>Operating systems</name> + <module>UserSettings</module> + <action>getOS</action> + <dimension>Operating system</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -583,15 +593,15 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <uniqueId>VisitTime_getVisitInformationPerLocalTime</uniqueId> + <uniqueId>UserSettings_getOS</uniqueId> </row> <row> - <category>Visits Summary</category> - <name>Visits by server time</name> - <module>VisitTime</module> - <action>getVisitInformationPerServerTime</action> - <dimension>Server time</dimension> + <category>Visitor Settings</category> + <name>Global visitors configuration</name> + <module>UserSettings</module> + <action>getConfiguration</action> + <dimension>Configuration</dimension> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -605,17 +615,7 @@ <conversion_rate>Conversion Rate</conversion_rate> </processedMetrics> - <metricsGoal> - <nb_conversions>Conversions</nb_conversions> - <conversion_rate>Conversion Rate</conversion_rate> - <revenue>Revenue</revenue> - - </metricsGoal> - <processedMetricsGoal> - <revenue_per_visit>Value per Visit</revenue_per_visit> - - </processedMetricsGoal> - <uniqueId>VisitTime_getVisitInformationPerServerTime</uniqueId> + <uniqueId>UserSettings_getConfiguration</uniqueId> </row> |