From b847e3bb2a92c27a27b392f4d1db68d4263e653c Mon Sep 17 00:00:00 2001
From: Matthieu Aubry <mattab@users.noreply.github.com>
Date: Fri, 2 Dec 2016 00:23:45 +1300
Subject: [PATCH] Processed metrics processed when reports are flattened
(#10933)
---
core/API/DataTableManipulator/Flattener.php | 4 -
...ction_flat__API.getProcessedReport_day.xml | 36 +--
...attenReports__Actions.getPageUrls_week.xml | 30 +-
...CustomVariables.getCustomVariables_day.xml | 70 ++---
...ithAggregate__Actions.getPageUrls_week.xml | 266 +++++++++---------
...dReports.generateReport_month.original.csv | 20 +-
...Reports.generateReport_month.original.html | 132 +++++----
...CustomVariables.getCustomVariables_day.csv | Bin 3468 -> 3468 bytes
...edReports.generateReport_week.original.csv | 42 +--
...dReports.generateReport_week.original.html | 42 +--
...ports.generateReport_week.original.sms.txt | 2 +-
...ports.generateReport_week.original.sms.txt | 2 +-
...ng_flattened__Actions.getDownloads_day.xml | 22 +-
...ing_flattened__Actions.getOutlinks_day.xml | 22 +-
...g_flattened__Actions.getPageTitles_day.xml | 38 +--
...ing_flattened__Actions.getPageUrls_day.xml | 38 +--
...CustomVariables.getCustomVariables_day.xml | 8 +-
...g_flattened__Referrers.getKeywords_day.xml | 22 +-
...attened__Referrers.getReferrerType_day.xml | 20 +-
...ttened__Referrers.getSearchEngines_day.xml | 26 +-
...g_flattened__Referrers.getWebsites_day.xml | 22 +-
21 files changed, 434 insertions(+), 430 deletions(-)
diff --git a/core/API/DataTableManipulator/Flattener.php b/core/API/DataTableManipulator/Flattener.php
index 7aaef6bf27..4663355b85 100644
--- a/core/API/DataTableManipulator/Flattener.php
+++ b/core/API/DataTableManipulator/Flattener.php
@@ -67,10 +67,6 @@ class Flattener extends DataTableManipulator
$this->flattenRow($row, $rowId, $newDataTable);
}
- $queuedFiltersEnabled = Common::getRequestVar('disable_queued_filters', 0, 'int', $this->request) == 0;
- if ($queuedFiltersEnabled) {
- $newDataTable->applyQueuedFilters();
- }
return $newDataTable;
}
diff --git a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
index 3cfabafb6c..9cc9faa5e0 100644
--- a/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
+++ b/tests/PHPUnit/System/expected/test_CustomEvents_Events.getAction_flat__API.getProcessedReport_day.xml
@@ -178,15 +178,6 @@
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
- <row>
- <label>Purchase</label>
- <nb_events>2</nb_events>
- <nb_events_with_value>0</nb_events_with_value>
- <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 - La fiancée de l'eau</label>
<nb_events>4</nb_events>
@@ -214,6 +205,15 @@
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
+ <row>
+ <label>Purchase</label>
+ <nb_events>2</nb_events>
+ <nb_events_with_value>0</nb_events_with_value>
+ <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>This is an event without a URL</label>
<nb_events>1</nb_events>
@@ -360,15 +360,6 @@
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
- <row>
- <label>Purchase</label>
- <nb_events>1</nb_events>
- <nb_events_with_value>0</nb_events_with_value>
- <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 - La fiancée de l'eau</label>
<nb_events>2</nb_events>
@@ -396,6 +387,15 @@
<max_event_value>0</max_event_value>
<avg_event_value>0</avg_event_value>
</row>
+ <row>
+ <label>Purchase</label>
+ <nb_events>1</nb_events>
+ <nb_events_with_value>0</nb_events_with_value>
+ <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="Tuesday, January 5, 2010" />
<result prettyDate="Wednesday, January 6, 2010" />
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
index 3ba555ab1a..e98af60cdc 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__Actions.getPageUrls_week.xml
@@ -211,7 +211,7 @@
<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment>
</row>
<row>
- <label>page1.html</label>
+ <label>sub/dir/dir1/page1.html</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
@@ -222,19 +222,22 @@
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
<max_bandwidth />
- <exit_nb_visits>1</exit_nb_visits>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
+ <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
<avg_bandwidth>0</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
+ <exit_rate>0%</exit_rate>
<avg_time_generation>0</avg_time_generation>
- <url>http://example.org/page1.html</url>
- <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
+ <url>http://example.org/sub/dir/dir1/page1.html</url>
+ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment>
</row>
<row>
- <label>sub/dir/dir1/page1.html</label>
+ <label>page1.html</label>
<nb_visits>1</nb_visits>
<nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
@@ -245,18 +248,15 @@
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
<max_bandwidth />
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
- <entry_sum_visit_length>1</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>1</exit_nb_visits>
<sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_entry_nb_uniq_visitors>1</sum_daily_entry_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<avg_bandwidth>0</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
+ <exit_rate>100%</exit_rate>
<avg_time_generation>0</avg_time_generation>
- <url>http://example.org/sub/dir/dir1/page1.html</url>
- <segment>pageUrl==http%3A%2F%2Fexample.org%2Fsub%2Fdir%2Fdir1%2Fpage1.html</segment>
+ <url>http://example.org/page1.html</url>
+ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
</row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
index 6d6e6128de..a26e381adb 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
@@ -29,6 +29,24 @@
</slots>
<is_aggregate>1</is_aggregate>
</row>
+ <row>
+ <label>CustomVarPage - CustomVarValue0</label>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
+ <is_aggregate>0</is_aggregate>
+ </row>
+ <row>
+ <label>CustomVarPage - CustomVarValue1</label>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
+ <is_aggregate>0</is_aggregate>
+ </row>
+ <row>
+ <label>CustomVarPage - CustomVarValue2</label>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
+ <is_aggregate>0</is_aggregate>
+ </row>
<row>
<label>CustomVarVisit - CustomVarValue1</label>
<nb_visits>3</nb_visits>
@@ -51,24 +69,6 @@
<nb_visits_converted>0</nb_visits_converted>
<is_aggregate>0</is_aggregate>
</row>
- <row>
- <label>CustomVarPage - CustomVarValue0</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
- <is_aggregate>0</is_aggregate>
- </row>
- <row>
- <label>CustomVarPage - CustomVarValue1</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
- <is_aggregate>0</is_aggregate>
- </row>
- <row>
- <label>CustomVarPage - CustomVarValue2</label>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
- <is_aggregate>0</is_aggregate>
- </row>
</result>
<result date="2010-03-06">
<row>
@@ -88,23 +88,6 @@
</slots>
<is_aggregate>1</is_aggregate>
</row>
- <row>
- <label>CustomVarVisit - CustomVarValue1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>2</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>2</max_actions>
- <sum_visit_length>1</sum_visit_length>
- <bounce_count>0</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <is_aggregate>0</is_aggregate>
- </row>
- <row>
- <label>CustomVarPage - CustomVarValue1</label>
- <nb_visits>1</nb_visits>
- <nb_actions>1</nb_actions>
- <is_aggregate>0</is_aggregate>
- </row>
<row>
<label>CustomVarPage</label>
<nb_actions>1</nb_actions>
@@ -116,6 +99,23 @@
</slots>
<is_aggregate>1</is_aggregate>
</row>
+ <row>
+ <label>CustomVarPage - CustomVarValue1</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>1</nb_actions>
+ <is_aggregate>0</is_aggregate>
+ </row>
+ <row>
+ <label>CustomVarVisit - CustomVarValue1</label>
+ <nb_visits>1</nb_visits>
+ <nb_actions>2</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>2</max_actions>
+ <sum_visit_length>1</sum_visit_length>
+ <bounce_count>0</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <is_aggregate>0</is_aggregate>
+ </row>
</result>
<result date="2010-03-07" />
<result date="2010-03-08" />
diff --git a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
index 155db4a5b8..760c5bb869 100644
--- a/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
+++ b/tests/PHPUnit/System/expected/test_FlattenReports_withAggregate__Actions.getPageUrls_week.xml
@@ -24,54 +24,6 @@
<avg_time_generation>0.3</avg_time_generation>
<is_aggregate>1</is_aggregate>
</row>
- <row>
- <label>dir1/sub</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.1</min_time_generation>
- <max_time_generation>0.6</max_time_generation>
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
- <entry_sum_visit_length>2</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <avg_bandwidth>0</avg_bandwidth>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>33%</exit_rate>
- <avg_time_generation>0.3</avg_time_generation>
- <is_aggregate>1</is_aggregate>
- </row>
- <row>
- <label>dir1/sub/dir</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.1</min_time_generation>
- <max_time_generation>0.6</max_time_generation>
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
- <entry_sum_visit_length>2</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
- <avg_bandwidth>0</avg_bandwidth>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>33%</exit_rate>
- <avg_time_generation>0.3</avg_time_generation>
- <is_aggregate>1</is_aggregate>
- </row>
<row>
<label>dir2</label>
<nb_visits>6</nb_visits>
@@ -97,13 +49,13 @@
<is_aggregate>1</is_aggregate>
</row>
<row>
- <label>dir2/sub</label>
+ <label>dir3</label>
<nb_visits>6</nb_visits>
<nb_hits>6</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.2</min_time_generation>
- <max_time_generation>1.2</max_time_generation>
+ <min_time_generation>0.3</min_time_generation>
+ <max_time_generation>1.8</max_time_generation>
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
@@ -117,65 +69,64 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
- <avg_time_generation>0.6</avg_time_generation>
+ <avg_time_generation>0.9</avg_time_generation>
<is_aggregate>1</is_aggregate>
</row>
<row>
- <label>dir2/sub/dir</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
+ <label>page1.html</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.2</min_time_generation>
- <max_time_generation>1.2</max_time_generation>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation />
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
<max_bandwidth />
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
- <entry_sum_visit_length>2</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
+ <exit_nb_visits>1</exit_nb_visits>
+ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
+ <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
<avg_bandwidth>0</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>33%</exit_rate>
- <avg_time_generation>0.6</avg_time_generation>
- <is_aggregate>1</is_aggregate>
+ <exit_rate>100%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
+ <url>http://example.org/page1.html</url>
+ <is_aggregate>0</is_aggregate>
+ <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
</row>
<row>
- <label>dir3</label>
- <nb_visits>6</nb_visits>
- <nb_hits>6</nb_hits>
+ <label>sub</label>
+ <nb_visits>1</nb_visits>
+ <nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.3</min_time_generation>
- <max_time_generation>1.8</max_time_generation>
+ <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
+ <min_time_generation />
+ <max_time_generation>0</max_time_generation>
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
<max_bandwidth />
- <entry_nb_visits>2</entry_nb_visits>
- <entry_nb_actions>6</entry_nb_actions>
- <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>2</entry_nb_actions>
+ <entry_sum_visit_length>1</entry_sum_visit_length>
<entry_bounce_count>0</entry_bounce_count>
- <exit_nb_visits>2</exit_nb_visits>
<avg_bandwidth>0</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
- <exit_rate>33%</exit_rate>
- <avg_time_generation>0.9</avg_time_generation>
+ <exit_rate>0%</exit_rate>
+ <avg_time_generation>0</avg_time_generation>
<is_aggregate>1</is_aggregate>
</row>
<row>
- <label>dir3/sub</label>
+ <label>dir1/sub</label>
<nb_visits>6</nb_visits>
<nb_hits>6</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.3</min_time_generation>
- <max_time_generation>1.8</max_time_generation>
+ <min_time_generation>0.1</min_time_generation>
+ <max_time_generation>0.6</max_time_generation>
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
@@ -189,17 +140,17 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
- <avg_time_generation>0.9</avg_time_generation>
+ <avg_time_generation>0.3</avg_time_generation>
<is_aggregate>1</is_aggregate>
</row>
<row>
- <label>dir3/sub/dir</label>
+ <label>dir1/sub/dir</label>
<nb_visits>6</nb_visits>
<nb_hits>6</nb_hits>
<sum_time_spent>0</sum_time_spent>
<nb_hits_with_time_generation>6</nb_hits_with_time_generation>
- <min_time_generation>0.3</min_time_generation>
- <max_time_generation>1.8</max_time_generation>
+ <min_time_generation>0.1</min_time_generation>
+ <max_time_generation>0.6</max_time_generation>
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
@@ -213,7 +164,7 @@
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>0%</bounce_rate>
<exit_rate>33%</exit_rate>
- <avg_time_generation>0.9</avg_time_generation>
+ <avg_time_generation>0.3</avg_time_generation>
<is_aggregate>1</is_aggregate>
</row>
<row>
@@ -289,6 +240,54 @@
<is_aggregate>0</is_aggregate>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir1%2Fsub%2Fdir%2Fpage2.html</segment>
</row>
+ <row>
+ <label>dir2/sub</label>
+ <nb_visits>6</nb_visits>
+ <nb_hits>6</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+ <min_time_generation>0.2</min_time_generation>
+ <max_time_generation>1.2</max_time_generation>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>6</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_bandwidth>0</avg_bandwidth>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>33%</exit_rate>
+ <avg_time_generation>0.6</avg_time_generation>
+ <is_aggregate>1</is_aggregate>
+ </row>
+ <row>
+ <label>dir2/sub/dir</label>
+ <nb_visits>6</nb_visits>
+ <nb_hits>6</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+ <min_time_generation>0.2</min_time_generation>
+ <max_time_generation>1.2</max_time_generation>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>6</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_bandwidth>0</avg_bandwidth>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>33%</exit_rate>
+ <avg_time_generation>0.6</avg_time_generation>
+ <is_aggregate>1</is_aggregate>
+ </row>
<row>
<label>dir2/sub/dir/page0.html</label>
<nb_visits>2</nb_visits>
@@ -362,6 +361,54 @@
<is_aggregate>0</is_aggregate>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir2%2Fsub%2Fdir%2Fpage2.html</segment>
</row>
+ <row>
+ <label>dir3/sub</label>
+ <nb_visits>6</nb_visits>
+ <nb_hits>6</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+ <min_time_generation>0.3</min_time_generation>
+ <max_time_generation>1.8</max_time_generation>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>6</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_bandwidth>0</avg_bandwidth>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>33%</exit_rate>
+ <avg_time_generation>0.9</avg_time_generation>
+ <is_aggregate>1</is_aggregate>
+ </row>
+ <row>
+ <label>dir3/sub/dir</label>
+ <nb_visits>6</nb_visits>
+ <nb_hits>6</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <nb_hits_with_time_generation>6</nb_hits_with_time_generation>
+ <min_time_generation>0.3</min_time_generation>
+ <max_time_generation>1.8</max_time_generation>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <entry_nb_visits>2</entry_nb_visits>
+ <entry_nb_actions>6</entry_nb_actions>
+ <entry_sum_visit_length>2</entry_sum_visit_length>
+ <entry_bounce_count>0</entry_bounce_count>
+ <exit_nb_visits>2</exit_nb_visits>
+ <avg_bandwidth>0</avg_bandwidth>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>0%</bounce_rate>
+ <exit_rate>33%</exit_rate>
+ <avg_time_generation>0.9</avg_time_generation>
+ <is_aggregate>1</is_aggregate>
+ </row>
<row>
<label>dir3/sub/dir/page0.html</label>
<nb_visits>2</nb_visits>
@@ -435,53 +482,6 @@
<is_aggregate>0</is_aggregate>
<segment>pageUrl==http%3A%2F%2Fexample.org%2Fdir3%2Fsub%2Fdir%2Fpage2.html</segment>
</row>
- <row>
- <label>page1.html</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
- <min_time_generation />
- <max_time_generation />
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <exit_nb_visits>1</exit_nb_visits>
- <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors>
- <sum_daily_exit_nb_uniq_visitors>1</sum_daily_exit_nb_uniq_visitors>
- <avg_bandwidth>0</avg_bandwidth>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>100%</exit_rate>
- <avg_time_generation>0</avg_time_generation>
- <url>http://example.org/page1.html</url>
- <is_aggregate>0</is_aggregate>
- <segment>pageUrl==http%3A%2F%2Fexample.org%2Fpage1.html</segment>
- </row>
- <row>
- <label>sub</label>
- <nb_visits>1</nb_visits>
- <nb_hits>1</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <nb_hits_with_time_generation>0</nb_hits_with_time_generation>
- <min_time_generation />
- <max_time_generation>0</max_time_generation>
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>2</entry_nb_actions>
- <entry_sum_visit_length>1</entry_sum_visit_length>
- <entry_bounce_count>0</entry_bounce_count>
- <avg_bandwidth>0</avg_bandwidth>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>0%</bounce_rate>
- <exit_rate>0%</exit_rate>
- <avg_time_generation>0</avg_time_generation>
- <is_aggregate>1</is_aggregate>
- </row>
<row>
<label>sub/dir</label>
<nb_visits>1</nb_visits>
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
index e4c23a51af..893c2dbf6f 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
@@ -1,7 +1,7 @@
All Websites dashboard
-label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,nb_conversions_evolution,revenue_evolution,orders_evolution,ecommerce_revenue_evolution
-Site 1,11,43,43,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0
-Site 2,1,3,3,$ 0,0,0,$ 0,100%,100%,0%,0%,0,0,0
+label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders,ecommerce_revenue,orders_evolution,ecommerce_revenue_evolution
+Site 1,11,43,43,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0
+Site 2,1,3,3,$ 0,0,100%,100%,100%,0%,0%,0,$ 0,0,0
Visits Summary
nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -236,8 +236,8 @@ Saturday,1,5,0%,5,00:15:01,0%
Sunday,3,7,0%,2.3,00:05:00,67%
Actions - Main metrics
-nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords
-43,27,0,0,0,0,0,0
+nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation
+43,27,0,0,0,0,0,0,0.3s
Bandwidth - Main metrics
nb_total_overall_bandwidth,nb_total_pageview_bandwidth,nb_total_download_bandwidth
@@ -257,8 +257,8 @@ products,1,1,100%,0.15s
Entry page titles
label,entry_nb_visits,entry_bounce_count,bounce_rate,avg_time_generation
-second visitor/two days later/a new visit,8,0,0%,0.32s
first page view,2,2,100%,0.14s
+second visitor/two days later/a new visit,8,0,0%,0.32s
Exit pages
label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
@@ -268,16 +268,16 @@ products,1,1,100%,0.15s
Exit page titles
label,nb_visits,exit_nb_visits,exit_rate,avg_time_generation
-Checkout/Purchasing...,8,8,100%,0.45s
first page view,2,2,100%,0.14s
+Checkout/Purchasing...,8,8,100%,0.45s
Page titles
label,nb_visits,nb_hits,bounce_rate,avg_time_on_page,exit_rate,avg_time_generation
+first page view,2,2,100%,00:00:00,100%,0.14s
+Page Name not defined,1,1,0%,00:00:00,0%,0.22s
Checkout/Purchasing...,8,8,0%,00:00:00,100%,0.45s
second visitor/two days later/a new visit,8,8,0%,00:06:00,0%,0.32s
second visitor/two days later/second page view,8,8,0%,00:09:00,0%,0.17s
-first page view,2,2,100%,00:00:00,100%,0.14s
-Page Name not defined,1,1,0%,00:00:00,0%,0.22s
Site Search Keywords
No data available
@@ -317,9 +317,9 @@ No data available
Referrer Type
label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue
+Direct Entry,1,1,1,00:00:00,100%,$ 0
Websites,6,22,3.7,00:10:01,33%,$ 0
Campaigns,4,20,5,00:15:01,0%,$ 0
-Direct Entry,1,1,1,00:00:00,100%,$ 0
All Referrers
label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate
diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
index cfb582a686..06bf981720 100644
--- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
+++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
@@ -4099,6 +4099,14 @@
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0
</td>
+ </tr>
+
+ <tr style="background-color: rgb(242,242,242);line-height: 22px;">
+ <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ Avg. generation time </td>
+ <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
+ 0.3s
+ </td>
</tr>
</tbody>
</table>
@@ -4386,35 +4394,35 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- second visitor/two days later/a new visit </td>
+ first page view </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0
+ 2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.32s
+ 0.14s
</td>
</tr>
<tr style=";line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- first page view </td>
+ second visitor/two days later/a new visit </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 100%
+ 0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.14s
+ 0.32s
</td>
</tr>
</tbody>
@@ -4539,35 +4547,35 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Checkout/Purchasing... </td>
+ first page view </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.45s
+ 0.14s
</td>
</tr>
<tr style=";line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- first page view </td>
+ Checkout/Purchasing... </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.14s
+ 0.45s
</td>
</tr>
</tbody>
@@ -4610,38 +4618,38 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Checkout/Purchasing... </td>
+ first page view </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
00:00:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.45s
+ 0.14s
</td>
</tr>
<tr style=";line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- second visitor/two days later/a new visit </td>
+ Page Name not defined </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 8
+ 1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:06:00
+ 00:00:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
@@ -4650,13 +4658,13 @@
0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.32s
+ 0.22s
</td>
</tr>
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- second visitor/two days later/second page view </td>
+ Checkout/Purchasing... </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
8
</td>
@@ -4664,53 +4672,53 @@
8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:09:00
+ 00:00:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.17s
+ 0.45s
</td>
</tr>
<tr style=";line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- first page view </td>
+ second visitor/two days later/a new visit </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 2
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:00:00
+ 00:06:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 100%
+ 0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 100%
+ 0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.14s
+ 0.32s
</td>
</tr>
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Page Name not defined </td>
+ second visitor/two days later/second page view </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 8
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:00:00
+ 00:09:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
0%
@@ -4719,7 +4727,7 @@
0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0.22s
+ 0.17s
</td>
</tr>
</tbody>
@@ -4822,21 +4830,21 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Websites </td>
+ Direct Entry </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 6
+ 1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 22
+ 1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 3.7
+ 1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:10:01
+ 00:00:00
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 33%
+ 100%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
$ 0
@@ -4845,21 +4853,21 @@
<tr style=";line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Campaigns </td>
+ Websites </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 4
+ 6
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 20
+ 22
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 5
+ 3.7
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:15:01
+ 00:10:01
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 33%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
$ 0
@@ -4868,21 +4876,21 @@
<tr style="background-color: rgb(242,242,242);line-height: 22px;">
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- Direct Entry </td>
+ Campaigns </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 4
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 20
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 5
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 00:00:00
+ 00:15:01
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 100%
+ 0%
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
$ 0
diff --git a/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv b/tests/PHPUnit/System/expected/test_csvExport_xp1_inner1_trans-de__CustomVariables.getCustomVariables_day.csv
index 489da992770fc30e127f8c6866696de2498d0a53..09cdb8f060b76df2b268d1618844362355fed37c 100644
GIT binary patch
delta 51
zcmV-30L=f48;l#UlmnCQ1WJ>#1U$2H2Mz&~_zaY@qzY65vw#Sy0h8tmDwDng^s_hx
JIs%g_3VH{l6HfpD
delta 62
zcmV-E0Kxx^8;l#UlmnA611OW?3HFoT13Z(I14^^l3OWLl(gqfjFa-FMR0NE(oCqEP
Uld23TlR6Djv%CdV0+T2Ol=4Cr)c^nh
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
index 93047397fd..78902751cb 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
@@ -1,7 +1,7 @@
All Websites dashboard
label,nb_visits,nb_actions,nb_pageviews,revenue,nb_conversions,orders,ecommerce_revenue,visits_evolution,actions_evolution,pageviews_evolution,revenue_evolution,nb_conversions_evolution,orders_evolution,ecommerce_revenue_evolution
-Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,0%,0%,0%,0%,0%
-Piwik test,2,1,1,$ 250,1,1,$ 250,100%,100%,0%,0,0%,0,0
+Piwik test,5,16,16,$ 13361.11,5,4,$ 13351.11,100%,100%,100%,100%,100%,100%,100%
+Piwik test,2,1,1,$ 250,1,0,$ 0,100%,100%,100%,100%,100%,0,0
Visits Summary
nb_uniq_visitors,nb_visits,nb_actions,max_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate
@@ -327,7 +327,7 @@ No data available
Ecommerce Orders
nb_conversions,nb_visits_converted,revenue,revenue_subtotal,revenue_tax,revenue_shipping,revenue_discount,items,avg_order_revenue,conversion_rate
-4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,0%
+4,2,$ 13351.11,$ 2700,$ 531,$ 120.11,$ 686,12,$ 3337.78,40%
Ecommerce Orders - Visits to Conversion
label,nb_conversions
@@ -364,7 +364,7 @@ label,nb_conversions
Abandoned Carts
nb_conversions,revenue,items,avg_order_revenue,conversion_rate
-3,$ 7530.33,12,$ 2510.11,0%
+3,$ 7530.33,12,$ 2510.11,60%
Abandoned Carts - Visits to Conversion
label,nb_conversions
@@ -401,35 +401,35 @@ label,nb_conversions
Product SKU
label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate
-SKU2,$ 1500,1,1,1,$ 0,1,100%
-SKU VERY nice indeed,$ 1011.22,3,2,4,$ 0,1.5,50%
-ANOTHER SKU HERE,$ 600,6,1,0,$ 0,6,0%
-TRIPOD SKU,$ 200,2,1,0,$ 0,2,0%
+SKU2,$ 1500,1,1,1,$ 1500,1,100%
+SKU VERY nice indeed,$ 1011.22,3,2,4,$ 255.61,1.5,50%
+ANOTHER SKU HERE,$ 600,6,1,0,$ 100,6,0%
+TRIPOD SKU,$ 200,2,1,0,$ 100,2,0%
SKU IN ABANDONED CART TWO,$ 0,0,0,3,$ 0,0,0%
Product Name
label,revenue,quantity,orders,avg_price,avg_quantity,conversion_rate,nb_visits
-Canon SLR,$ 1500,1,1,$ 0,1,0%,0
-PRODUCT name,$ 1011.22,3,2,$ 0,1.5,100%,2
-PRODUCT name BIS,$ 600,6,1,$ 0,6,0%,0
-TRIPOD - bought day after,$ 200,2,1,$ 0,2,0%,0
+Canon SLR,$ 1500,1,1,$ 1500,1,0%,0
+PRODUCT name,$ 1011.22,3,2,$ 255.61,1.5,100%,2
+PRODUCT name BIS,$ 600,6,1,$ 100,6,0%,0
+TRIPOD - bought day after,$ 200,2,1,$ 100,2,0%,0
PRODUCT TWO LEFT in cart,$ 0,0,0,$ 0,0,0%,3
PRODUCT THREE LEFT in cart,$ 0,0,0,$ 1332,0,0%,3
Product Category
label,revenue,quantity,orders,nb_visits,avg_price,avg_quantity,conversion_rate
-Electronics & Cameras,$ 2500,3,2,3,$ 0,1.5,66.67%
-Multiple Category 1,$ 1000,2,1,1,$ 0,2,100%
-Multiple Category 2,$ 1000,2,1,1,$ 0,2,100%
-Multiple Category 4,$ 1000,2,1,1,$ 0,2,100%
-Multiple Category 5,$ 1000,2,1,1,$ 0,2,100%
-Product Category not defined,$ 611.22,7,2,4,$ 0,3.5,50%
-Tools,$ 200,2,1,0,$ 0,2,0%
+Electronics & Cameras,$ 2500,3,2,3,$ 1000,1.5,66.67%
+Multiple Category 1,$ 1000,2,1,1,$ 500,2,100%
+Multiple Category 2,$ 1000,2,1,1,$ 500,2,100%
+Multiple Category 4,$ 1000,2,1,1,$ 500,2,100%
+Multiple Category 5,$ 1000,2,1,1,$ 500,2,100%
+Product Category not defined,$ 611.22,7,2,4,$ 55.61,3.5,50%
+Tools,$ 200,2,1,0,$ 100,2,0%
Category TWO LEFT in cart,$ 0,0,0,3,$ 0,0,0%
Goals
nb_conversions,nb_visits_converted,revenue,conversion_rate
-5,4,$ 13361.11,0%
+5,4,$ 13361.11,80%
Visits to Conversion
label,nb_conversions,revenue
@@ -466,7 +466,7 @@ label,nb_conversions,revenue
Goal title match triggered ONCE
nb_conversions,nb_visits_converted,revenue,conversion_rate
-1,1,$ 10,0%
+1,1,$ 10,20%
title match triggered ONCE - Visits to Conversion
label,nb_conversions
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
index ee4fef630a..bce9dd677d 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
@@ -476,10 +476,10 @@
1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 1
+ 0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 250
+ $ 0
</td>
</tr>
</tbody>
@@ -4707,7 +4707,7 @@
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
Conversion Rate </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 40%
</td>
</tr>
</tbody>
@@ -5029,7 +5029,7 @@
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
Conversion Rate </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 60%
</td>
</tr>
</tbody>
@@ -5349,7 +5349,7 @@
1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 1500
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
1
@@ -5375,7 +5375,7 @@
4
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 255.61
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
1.5
@@ -5401,7 +5401,7 @@
0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 100
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
6
@@ -5427,7 +5427,7 @@
0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 100
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5519,7 +5519,7 @@
0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 1500
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
1
@@ -5545,7 +5545,7 @@
2
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 255.61
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
1.5
@@ -5571,7 +5571,7 @@
0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 100
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
6
@@ -5597,7 +5597,7 @@
0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 100
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5715,7 +5715,7 @@
3
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 1000
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
1.5
@@ -5741,7 +5741,7 @@
1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 500
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5767,7 +5767,7 @@
1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 500
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5793,7 +5793,7 @@
1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 500
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5819,7 +5819,7 @@
1
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 500
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5845,7 +5845,7 @@
4
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 55.61
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
3.5
@@ -5871,7 +5871,7 @@
0
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- $ 0
+ $ 100
</td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
2
@@ -5957,7 +5957,7 @@
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
Conversion Rate </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 80%
</td>
</tr>
</tbody>
@@ -6358,7 +6358,7 @@
<td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
Conversion Rate </td>
<td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;">
- 0%
+ 20%
</td>
</tr>
</tbody>
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
index a55d80361a..645d7467c3 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_all_sites__ScheduledReports.generateReport_week.original.sms.txt
@@ -1 +1 @@
-week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders. Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250, 1 Goal conversions
\ No newline at end of file
+week April 4 – 10, 2011. Piwik test: 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%). Piwik test: 2 Visits (+100%), 1 Actions (+100%), Revenue: $ 250 (+100%), 1 Goal conversions (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
index 4dd544955f..f36a23fa6e 100644
--- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
+++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_via_sms_one_site__ScheduledReports.generateReport_week.original.sms.txt
@@ -1 +1 @@
-week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361, 5 Goal conversions, Product Revenue: $ 13351, 4 Ecommerce Orders
\ No newline at end of file
+week April 4 – 10, 2011. 5 Visits (+100%), 16 Actions (+100%), Revenue: $ 13361 (+100%), 5 Goal conversions (+100%), Product Revenue: $ 13351 (+100%), 4 Ecommerce Orders (+100%)
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
index b7c89b2689..e644338458 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getDownloads_day.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_visits>10</nb_visits>
- <nb_hits>10</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <avg_bandwidth>0</avg_bandwidth>
- </row>
<row>
<label>cloudsite5.com/-1</label>
<nb_visits>4</nb_visits>
@@ -86,4 +75,15 @@
<url>http://cloudsite7.com/28/download</url>
<segment>downloadUrl==http%3A%2F%2Fcloudsite7.com%2F28%2Fdownload</segment>
</row>
+ <row>
+ <label>Others</label>
+ <nb_visits>10</nb_visits>
+ <nb_hits>10</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <avg_bandwidth>0</avg_bandwidth>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
index 4e8c18db0c..8d32b11f1f 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getOutlinks_day.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_visits>10</nb_visits>
- <nb_hits>10</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <avg_bandwidth>0</avg_bandwidth>
- </row>
<row>
<label>othersite10.com/-1</label>
<nb_visits>4</nb_visits>
@@ -86,4 +75,15 @@
<url>http://othersite12.com/</url>
<segment>outlinkUrl==http%3A%2F%2Fothersite12.com%2F</segment>
</row>
+ <row>
+ <label>Others</label>
+ <nb_visits>10</nb_visits>
+ <nb_hits>10</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <avg_bandwidth>0</avg_bandwidth>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml
index 3e92585444..4a1db81ca0 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageTitles_day.xml
@@ -20,26 +20,29 @@
<exit_rate>100%</exit_rate>
</row>
<row>
- <label>title_0/-1</label>
- <nb_visits>3</nb_visits>
- <nb_hits>3</nb_hits>
+ <label>title_0</label>
+ <nb_visits>1</nb_visits>
+ <nb_uniq_visitors>1</nb_uniq_visitors>
+ <nb_hits>1</nb_hits>
<sum_time_spent>0</sum_time_spent>
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
<max_bandwidth />
- <entry_nb_visits>3</entry_nb_visits>
- <entry_nb_actions>3</entry_nb_actions>
+ <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
+ <entry_nb_visits>1</entry_nb_visits>
+ <entry_nb_actions>1</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>3</entry_bounce_count>
- <exit_nb_visits>3</exit_nb_visits>
+ <entry_bounce_count>1</entry_bounce_count>
+ <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
+ <exit_nb_visits>1</exit_nb_visits>
<avg_bandwidth>0</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
<row>
- <label>title_0</label>
+ <label>title_1</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
@@ -61,29 +64,26 @@
<exit_rate>100%</exit_rate>
</row>
<row>
- <label>title_0/title_0</label>
- <nb_visits>1</nb_visits>
- <nb_uniq_visitors>1</nb_uniq_visitors>
- <nb_hits>1</nb_hits>
+ <label>title_0/-1</label>
+ <nb_visits>3</nb_visits>
+ <nb_hits>3</nb_hits>
<sum_time_spent>0</sum_time_spent>
<sum_bandwidth>0</sum_bandwidth>
<nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
<min_bandwidth />
<max_bandwidth />
- <entry_nb_uniq_visitors>1</entry_nb_uniq_visitors>
- <entry_nb_visits>1</entry_nb_visits>
- <entry_nb_actions>1</entry_nb_actions>
+ <entry_nb_visits>3</entry_nb_visits>
+ <entry_nb_actions>3</entry_nb_actions>
<entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>1</entry_bounce_count>
- <exit_nb_uniq_visitors>1</exit_nb_uniq_visitors>
- <exit_nb_visits>1</exit_nb_visits>
+ <entry_bounce_count>3</entry_bounce_count>
+ <exit_nb_visits>3</exit_nb_visits>
<avg_bandwidth>0</avg_bandwidth>
<avg_time_on_page>0</avg_time_on_page>
<bounce_rate>100%</bounce_rate>
<exit_rate>100%</exit_rate>
</row>
<row>
- <label>title_1</label>
+ <label>title_0/title_0</label>
<nb_visits>1</nb_visits>
<nb_uniq_visitors>1</nb_uniq_visitors>
<nb_hits>1</nb_hits>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml
index 8deb614c29..d39ac9e449 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Actions.getPageUrls_day.xml
@@ -1,24 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_visits>10</nb_visits>
- <nb_hits>10</nb_hits>
- <sum_time_spent>0</sum_time_spent>
- <sum_bandwidth>0</sum_bandwidth>
- <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
- <min_bandwidth />
- <max_bandwidth />
- <entry_nb_visits>10</entry_nb_visits>
- <entry_nb_actions>10</entry_nb_actions>
- <entry_sum_visit_length>0</entry_sum_visit_length>
- <entry_bounce_count>10</entry_bounce_count>
- <exit_nb_visits>10</exit_nb_visits>
- <avg_bandwidth>0</avg_bandwidth>
- <avg_time_on_page>0</avg_time_on_page>
- <bounce_rate>100%</bounce_rate>
- <exit_rate>100%</exit_rate>
- </row>
<row>
<label>0/-1</label>
<nb_visits>4</nb_visits>
@@ -148,4 +129,23 @@
<url>http://piwik.net/2/</url>
<segment>pageUrl==http%3A%2F%2Fpiwik.net%2F2%2F</segment>
</row>
+ <row>
+ <label>Others</label>
+ <nb_visits>10</nb_visits>
+ <nb_hits>10</nb_hits>
+ <sum_time_spent>0</sum_time_spent>
+ <sum_bandwidth>0</sum_bandwidth>
+ <nb_hits_with_bandwidth>0</nb_hits_with_bandwidth>
+ <min_bandwidth />
+ <max_bandwidth />
+ <entry_nb_visits>10</entry_nb_visits>
+ <entry_nb_actions>10</entry_nb_actions>
+ <entry_sum_visit_length>0</entry_sum_visit_length>
+ <entry_bounce_count>10</entry_bounce_count>
+ <exit_nb_visits>10</exit_nb_visits>
+ <avg_bandwidth>0</avg_bandwidth>
+ <avg_time_on_page>0</avg_time_on_page>
+ <bounce_rate>100%</bounce_rate>
+ <exit_rate>100%</exit_rate>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml
index 0723c8e315..cf77bb6858 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__CustomVariables.getCustomVariables_day.xml
@@ -1,9 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_actions>60</nb_actions>
- </row>
<row>
<label>name - -1</label>
<nb_visits>19</nb_visits>
@@ -24,4 +20,8 @@
<nb_visits>1</nb_visits>
<nb_actions>1</nb_actions>
</row>
+ <row>
+ <label>Others</label>
+ <nb_actions>60</nb_actions>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
index d2781e791c..8ef2222610 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getKeywords_day.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_uniq_visitors>7</nb_uniq_visitors>
- <nb_visits>7</nb_visits>
- <nb_actions>7</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>7</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
<row>
<label>this search term - -1</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
@@ -62,4 +51,15 @@
<url>http://ask.com/web?q=this+search+term</url>
<logo>plugins/Referrers/images/searchEngines/ask.com.png</logo>
</row>
+ <row>
+ <label>Others</label>
+ <nb_uniq_visitors>7</nb_uniq_visitors>
+ <nb_visits>7</nb_visits>
+ <nb_actions>7</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>7</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
index 2f781c0adb..f5e9832ea3 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getReferrerType_day.xml
@@ -24,14 +24,14 @@
<nb_visits_converted>0</nb_visits_converted>
</row>
<row>
- <label>Websites</label>
- <nb_uniq_visitors>3</nb_uniq_visitors>
- <nb_visits>4</nb_visits>
- <nb_actions>4</nb_actions>
+ <label>Search Engines</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
<nb_users>0</nb_users>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>4</bounce_count>
+ <bounce_count>2</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row>
@@ -46,7 +46,7 @@
<nb_visits_converted>0</nb_visits_converted>
</row>
<row>
- <label>Search Engines</label>
+ <label>Websites</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
<nb_visits>2</nb_visits>
<nb_actions>2</nb_actions>
@@ -58,13 +58,13 @@
</row>
<row>
<label>Websites</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
+ <nb_uniq_visitors>3</nb_uniq_visitors>
+ <nb_visits>4</nb_visits>
+ <nb_actions>4</nb_actions>
<nb_users>0</nb_users>
<max_actions>1</max_actions>
<sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
+ <bounce_count>4</bounce_count>
<nb_visits_converted>0</nb_visits_converted>
</row>
<row>
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
index 8d45a58e39..9f5ebfea1e 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getSearchEngines_day.xml
@@ -1,18 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_uniq_visitors>6</nb_uniq_visitors>
- <nb_visits>6</nb_visits>
- <nb_actions>6</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>6</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- <url>URL unknown!</url>
- <logo>plugins/Referrers/images/searchEngines/xx.png</logo>
- </row>
<row>
<label>Google - -1</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
@@ -63,4 +50,17 @@
<url>http://search.yahoo.com/search?p=search+term+4</url>
<logo>plugins/Referrers/images/searchEngines/search.yahoo.com.png</logo>
</row>
+ <row>
+ <label>Others</label>
+ <nb_uniq_visitors>6</nb_uniq_visitors>
+ <nb_visits>6</nb_visits>
+ <nb_actions>6</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>6</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ <url>URL unknown!</url>
+ <logo>plugins/Referrers/images/searchEngines/xx.png</logo>
+ </row>
</result>
\ No newline at end of file
diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
index 07e82ed210..e751fafcc6 100644
--- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
+++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__Referrers.getWebsites_day.xml
@@ -1,16 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<result>
- <row>
- <label>Others</label>
- <nb_uniq_visitors>2</nb_uniq_visitors>
- <nb_visits>2</nb_visits>
- <nb_actions>2</nb_actions>
- <nb_users>0</nb_users>
- <max_actions>1</max_actions>
- <sum_visit_length>0</sum_visit_length>
- <bounce_count>2</bounce_count>
- <nb_visits_converted>0</nb_visits_converted>
- </row>
<row>
<label>whatever0.com/-1</label>
<nb_uniq_visitors>2</nb_uniq_visitors>
@@ -59,4 +48,15 @@
<nb_visits_converted>0</nb_visits_converted>
<url>http://whatever1.com/0</url>
</row>
+ <row>
+ <label>Others</label>
+ <nb_uniq_visitors>2</nb_uniq_visitors>
+ <nb_visits>2</nb_visits>
+ <nb_actions>2</nb_actions>
+ <nb_users>0</nb_users>
+ <max_actions>1</max_actions>
+ <sum_visit_length>0</sum_visit_length>
+ <bounce_count>2</bounce_count>
+ <nb_visits_converted>0</nb_visits_converted>
+ </row>
</result>
\ No newline at end of file
--
GitLab