diff --git a/plugins/API/ProcessedReport.php b/plugins/API/ProcessedReport.php
index 9be937dd6ee82f7b5475946ce9a91d8d9f2f3194..662a13600010f5e8e3ec32c631b53944469b5c11 100644
--- a/plugins/API/ProcessedReport.php
+++ b/plugins/API/ProcessedReport.php
@@ -499,29 +499,29 @@ class ProcessedReport
array('label' => $reportMetadata['dimension']),
$columns
);
+ }
- if (isset($reportMetadata['processedMetrics']) && is_array($reportMetadata['processedMetrics'])) {
- $processedMetricsAdded = Metrics::getDefaultProcessedMetrics();
- foreach ($reportMetadata['processedMetrics'] as $processedMetricId => $processedMetricTranslation) {
- // this processed metric can be displayed for this report
+ if (isset($reportMetadata['processedMetrics']) && is_array($reportMetadata['processedMetrics'])) {
+ $processedMetricsAdded = Metrics::getDefaultProcessedMetrics();
+ foreach ($reportMetadata['processedMetrics'] as $processedMetricId => $processedMetricTranslation) {
+ // this processed metric can be displayed for this report
- if ($processedMetricTranslation && $processedMetricId !== $processedMetricTranslation) {
- $columns[$processedMetricId] = $processedMetricTranslation;
- } elseif (isset($processedMetricsAdded[$processedMetricId])) {
- // for instance in case 'nb_visits' => 'nb_visits' we will translate it
- $columns[$processedMetricId] = $processedMetricsAdded[$processedMetricId];
- }
+ if ($processedMetricTranslation && $processedMetricId !== $processedMetricTranslation) {
+ $columns[$processedMetricId] = $processedMetricTranslation;
+ } elseif (isset($processedMetricsAdded[$processedMetricId])) {
+ // for instance in case 'nb_visits' => 'nb_visits' we will translate it
+ $columns[$processedMetricId] = $processedMetricsAdded[$processedMetricId];
}
}
-echo print_r($columns, true);
- // Display the global Goal metrics
- if (isset($reportMetadata['metricsGoal'])) {
- $metricsGoalDisplay = array('revenue');
- // Add processed metrics to be displayed for this report
- foreach ($metricsGoalDisplay as $goalMetricId) {
- if (isset($reportMetadata['metricsGoal'][$goalMetricId])) {
- $columns[$goalMetricId] = $reportMetadata['metricsGoal'][$goalMetricId];
- }
+ }
+
+ // Display the global Goal metrics
+ if (isset($reportMetadata['metricsGoal'])) {
+ $metricsGoalDisplay = array('revenue');
+ // Add processed metrics to be displayed for this report
+ foreach ($metricsGoalDisplay as $goalMetricId) {
+ if (isset($reportMetadata['metricsGoal'][$goalMetricId])) {
+ $columns[$goalMetricId] = $reportMetadata['metricsGoal'][$goalMetricId];
}
}
}
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
index 0baa4a287e2d94985be9d2d09220785c52510afc..4dedca65a2be36c830c35ef3cd9a7d514353487c 100755
--- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
+++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysTest.php
@@ -68,7 +68,7 @@ return array(
'date' => $dateTime,
'periods' => array('day'),
'setDateLastN' => true,
- 'apiModule' => 'VisitsSummary',
+ 'apiModule' => 'VisitFrequency',
'apiAction' => 'get',
'testSuffix' => '_' . 'VisitsSummary.get' . '_firstSite_lastN')
)
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
index 0e48ca569f77e07680af2e2aeae58af00b078eb8..7b47edc0480dddc64dda4995ab03e19492568475 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml
@@ -13,7 +13,6 @@
<nb_users>Users</nb_users>
<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>
@@ -23,9 +22,11 @@
<nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users>
<nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions>
<nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit>
- <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate>
<avg_time_on_site>The average duration of a visit.</avg_time_on_site>
</metricsDocumentation>
+ <processedMetrics>
+ <bounce_rate>Bounce Rate</bounce_rate>
+ </processedMetrics>
<imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitsSummary&apiAction=get&period=day&date=2010-01-03,2010-01-09</imageGraphUrl>
<imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitsSummary&apiAction=get&period=day&date=2010-01-03,2010-01-09</imageGraphEvolutionUrl>
<uniqueId>VisitsSummary_get</uniqueId>
@@ -36,9 +37,9 @@
<nb_users>Users</nb_users>
<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>
+ <bounce_rate>Bounce Rate</bounce_rate>
</columns>
<reportData>
<result prettyDate="Sunday 3 January 2010">
@@ -47,9 +48,9 @@
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
<max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>00:00:00</avg_time_on_site>
+ <bounce_rate>1%</bounce_rate>
</result>
<result prettyDate="Monday 4 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -57,9 +58,9 @@
<nb_visits>1</nb_visits>
<nb_actions>2</nb_actions>
<max_actions>2</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>2</nb_actions_per_visit>
<avg_time_on_site>00:06:01</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result prettyDate="Tuesday 5 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -67,9 +68,9 @@
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>00:15:01</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result prettyDate="Wednesday 6 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -77,9 +78,9 @@
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>00:15:01</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result prettyDate="Thursday 7 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -87,9 +88,9 @@
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>00:15:01</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result prettyDate="Friday 8 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -97,9 +98,9 @@
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>00:15:01</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result prettyDate="Saturday 9 January 2010">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -107,9 +108,9 @@
<nb_visits>1</nb_visits>
<nb_actions>5</nb_actions>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>00:15:01</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
</reportData>
<reportMetadata>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
index d60436c3c9d70620cf143adae1e0fb2dc9915198..90a542d961cb3a5ffa38c60fa5a2c675a35a9852 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_month.xml
@@ -10,9 +10,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
<avg_time_on_site>757</avg_time_on_site>
+ <bounce_rate>10%</bounce_rate>
</result>
<result date="2010-02" />
<result date="2010-03" />
@@ -31,9 +31,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
<avg_time_on_site>1</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
index f754acd1779fe7bfe0b62241245bf5fc2098073f..0833ac441c2c5cc707bcdb0e29786b241185b61d 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays__VisitsSummary.get_week.xml
@@ -10,9 +10,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>0</avg_time_on_site>
+ <bounce_rate>100%</bounce_rate>
</result>
<result date="From 2010-01-04 to 2010-01-10">
<nb_uniq_visitors>2</nb_uniq_visitors>
@@ -23,9 +23,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>5767</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.6</nb_actions_per_visit>
<avg_time_on_site>824</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="From 2010-01-11 to 2010-01-17">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -36,9 +36,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>1802</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="From 2010-01-18 to 2010-01-24" />
<result date="From 2010-01-25 to 2010-01-31" />
@@ -56,9 +56,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>1</sum_visit_length>
<max_actions>3</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>3</nb_actions_per_visit>
<avg_time_on_site>1</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="From 2010-01-11 to 2010-01-17" />
<result date="From 2010-01-18 to 2010-01-24" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
index 30c69614b13626d4532f0cedfe6b84d2bc22a604..8f7c31dd1b1c2944fcec529e8ba3963552b5dd2c 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_month.xml
@@ -9,9 +9,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>7569</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>10%</bounce_rate>
<nb_actions_per_visit>4.3</nb_actions_per_visit>
<avg_time_on_site>757</avg_time_on_site>
+ <bounce_rate>10%</bounce_rate>
</result>
<result date="2010-02" />
<result date="2010-03" />
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
index bb7f2a55099ba316203659df62843c035955fda0..0031a3b1f41845bc4a157e34bf7e485be846c45f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___VisitsSummary.get_week.xml
@@ -9,9 +9,9 @@
<bounce_count>1</bounce_count>
<sum_visit_length>0</sum_visit_length>
<max_actions>1</max_actions>
- <bounce_rate>100%</bounce_rate>
<nb_actions_per_visit>1</nb_actions_per_visit>
<avg_time_on_site>0</avg_time_on_site>
+ <bounce_rate>100%</bounce_rate>
</result>
<result date="From 2010-01-04 to 2010-01-10">
<nb_uniq_visitors>2</nb_uniq_visitors>
@@ -22,9 +22,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>5767</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>4.6</nb_actions_per_visit>
<avg_time_on_site>824</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="From 2010-01-11 to 2010-01-17">
<nb_uniq_visitors>1</nb_uniq_visitors>
@@ -35,9 +35,9 @@
<bounce_count>0</bounce_count>
<sum_visit_length>1802</sum_visit_length>
<max_actions>5</max_actions>
- <bounce_rate>0%</bounce_rate>
<nb_actions_per_visit>5</nb_actions_per_visit>
<avg_time_on_site>901</avg_time_on_site>
+ <bounce_rate>0%</bounce_rate>
</result>
<result date="From 2010-01-18 to 2010-01-24" />
<result date="From 2010-01-25 to 2010-01-31" />
diff --git a/tests/PHPUnit/TestingEnvironment.php b/tests/PHPUnit/TestingEnvironment.php
index c52556fa7d2d28273b91d6c50296cf7600ca46e1..e763c91934fb57ce415bae9faf247c86691846a9 100644
--- a/tests/PHPUnit/TestingEnvironment.php
+++ b/tests/PHPUnit/TestingEnvironment.php
@@ -278,4 +278,4 @@ class Piwik_TestingEnvironment
{
Piwik::postEvent("TestingEnvironment.addHooks", array($this), $pending = true);
}
-}
\ No newline at end of file
+}