diff options
author | Ben Burgess <88810029+bx80@users.noreply.github.com> | 2021-11-15 23:08:08 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-11-15 23:08:08 +0300 |
commit | 556aada80e48f200a10c8dc4673f32e42494b9fe (patch) | |
tree | 1688120ee74c3c2f37698640fd42bc930ffc34b4 /tests/PHPUnit/System | |
parent | 271125792563913513b1ec281624ef1122504420 (diff) |
Proportional evolution comparison for incomplete periods (#18099)
* Multisite evolution metrics changed to calculate proportionally to percent of the current period which is complete
* Use piwik date class, use report generated date if available, added unit test, added tooltip
* Improved tooltip detail
* Updated unit tested, added tests for evolution metric getRatio(), changes to allow row metadata to be preserved during datatable merges
* Additional API test fixes
* More test fixes
* More test fixes
* Remove ts_archived row metadata from final API output
* Test fix reversions, added deleteRowsMetadata() method to DataTableInterface
* More test fix reversions
* Fixed integration test
* Trigger Build
* Update core/DataTable/Map.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update core/DataTable.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update core/Archive/DataCollection.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update core/DataTable.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update core/DataTable.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update plugins/CoreHome/Columns/Metrics/EvolutionMetric.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Improved tooltips for translation, use NumberFormatter for percents, moved additional constructor param to end, null checks
* Update plugins/CoreHome/Columns/Metrics/EvolutionMetric.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Update plugins/CoreHome/Columns/Metrics/EvolutionMetric.php
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Use localized period string, remove unnecessary tooltip percent digits
* Formatting fixes
* Fix for an issue where evolution values > 999% would be displayed incorrectly
* Added data table processor option to provide raw copy of formatted metrics
* Update plugins/MultiSites/API.php
Fix for row metadata removed too early
Co-authored-by: Stefan Giehl <stefan@matomo.org>
* Replace evolution metrics 'add raw copy' api parameter with _trend column
* ensure to use correct metric to check if lower value is better
* updates expected test files
* fix some more tests
* update test file
Co-authored-by: Stefan Giehl <stefan@matomo.org>
Diffstat (limited to 'tests/PHPUnit/System')
25 files changed, 996 insertions, 4 deletions
diff --git a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php index 8d357aa2b3..4708ba7013 100644 --- a/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php +++ b/tests/PHPUnit/System/TwoVisitorsTwoWebsitesDifferentDaysConversionsTest.php @@ -132,6 +132,10 @@ class TwoVisitorsTwoWebsitesDifferentDaysConversionsTest extends SystemTestCase $archive = Archive::build($idSite1, 'range', $dateTimeRange); $result = $archive->getNumeric($columns); + if (isset($result['_metadata'])) { + unset($result['_metadata']); + } + $this->assertEquals( array( 'nb_visits' => 5, diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml index 5218ad3961..98eba63273 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__MultiSites.getAll_day.xml @@ -7,10 +7,22 @@ <nb_pageviews>4</nb_pageviews> <revenue>43</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Mar 5</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://site.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml index 39ab78c6e9..41dc8b695a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getAll_month.xml @@ -7,10 +7,22 @@ <nb_pageviews>45</nb_pageviews> <revenue>195</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -21,10 +33,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -35,10 +59,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://example-site-two.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml index ca2db76ca1..885016c4ca 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__MultiSites.getOne_month.xml @@ -3,9 +3,13 @@ <nb_visits>43</nb_visits> <nb_actions>51</nb_actions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <nb_pageviews>45</nb_pageviews> <revenue>195</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml index 1a70f3db7c..d61ce4a54f 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_withEnhancedAndLast7__MultiSites.getAll_month.xml @@ -9,11 +9,25 @@ <revenue>195</revenue> <nb_conversions>39</nb_conversions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <nb_conversions_evolution>100%</nb_conversions_evolution> + <nb_conversions_evolution_trend>1</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -25,11 +39,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -41,11 +69,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jul 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -59,11 +101,25 @@ <revenue>5</revenue> <nb_conversions>1</nb_conversions> <visits_evolution>-97.7%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-80.4%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-77.8%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-97.4%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <nb_conversions_evolution>-97.4%</nb_conversions_evolution> + <nb_conversions_evolution_trend>-1</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>43</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Aug 2012</previousRange> + <previous_nb_actions>51</previous_nb_actions> + <previous_Actions_nb_pageviews>45</previous_Actions_nb_pageviews> + <previous_Goal_revenue>195</previous_Goal_revenue> + <previous_Goal_nb_conversions>39</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -75,11 +131,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>-100%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-100%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-100%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Aug 2012</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -91,11 +161,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>-100%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-100%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-100%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>3</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Aug 2012</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -109,11 +193,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>-100%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-100%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-100%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-100%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <nb_conversions_evolution>-100%</nb_conversions_evolution> + <nb_conversions_evolution_trend>-1</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Sep 2012</previousRange> + <previous_nb_actions>10</previous_nb_actions> + <previous_Actions_nb_pageviews>10</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> + <previous_Goal_nb_conversions>1</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -125,11 +223,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Sep 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -141,11 +253,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Sep 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -159,11 +285,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Oct 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -175,11 +315,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Oct 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -191,11 +345,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Oct 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -209,11 +377,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Nov 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -225,11 +407,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Nov 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -241,11 +437,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Nov 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -259,11 +469,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -275,11 +499,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -291,11 +529,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2012</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> @@ -309,11 +561,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jan 2013</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://piwik.net</main_url> </row> @@ -325,11 +591,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jan 2013</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-two.com</main_url> </row> @@ -341,11 +621,25 @@ <revenue>0</revenue> <nb_conversions>0</nb_conversions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_conversions_evolution>0%</nb_conversions_evolution> + <nb_conversions_evolution_trend>0</nb_conversions_evolution_trend> <idsite>3</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Jan 2013</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> + <previous_Goal_nb_conversions>0</previous_Goal_nb_conversions> <group /> <main_url>http://example-site-three.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml index 5218ad3961..32dc2a24b3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getAll_day.xml @@ -7,10 +7,22 @@ <nb_pageviews>4</nb_pageviews> <revenue>43</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Mar 5</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://site.com</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml index b76e6ee906..a0cd571ea6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__MultiSites.getOne_day.xml @@ -3,9 +3,13 @@ <nb_visits>2</nb_visits> <nb_actions>8</nb_actions> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <nb_pageviews>4</nb_pageviews> <revenue>43</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index 109e6fb23b..225e76eef7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -209,6 +209,14 @@ <result prettyDate="Sunday, January 3, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sat, Jan 2</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -216,11 +224,27 @@ <result prettyDate="Monday, January 4, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> <row> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -228,6 +252,14 @@ <result prettyDate="Tuesday, January 5, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Jan 4</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -235,6 +267,14 @@ <result prettyDate="Wednesday, January 6, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Jan 5</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -242,6 +282,14 @@ <result prettyDate="Thursday, January 7, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Wed, Jan 6</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -249,6 +297,14 @@ <result prettyDate="Friday, January 8, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Thu, Jan 7</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -256,15 +312,19 @@ <result prettyDate="Saturday, January 9, 2010"> <row> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 8</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> </result> </reportMetadata> <reportTotal> - <nb_visits>9</nb_visits> - <nb_actions>31</nb_actions> - <nb_pageviews>31</nb_pageviews> - <revenue>35</revenue> </reportTotal> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml index 2efd1eaab3..f974de9b54 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_day.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sat, Jan 2</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>-50%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-50%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-50%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-100%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>400%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>400%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Jan 4</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -70,10 +118,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Jan 5</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -86,10 +146,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Wed, Jan 6</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -102,10 +174,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Thu, Jan 7</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -118,10 +202,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 8</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml index a06b60b001..3fa8c0993e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_month.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml index 290e4f6217..5e0cf2cca7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_week.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 21 – 27, 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>31</nb_pageviews> <revenue>30</revenue> <visits_evolution>250%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>1,450%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>1,450%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>200%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>10</nb_pageviews> <revenue>10</revenue> <visits_evolution>-71.4%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-67.7%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-67.7%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-66.7%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>7</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Jan 4 – 10, 2010</previousRange> + <previous_nb_actions>31</previous_nb_actions> + <previous_Actions_nb_pageviews>31</previous_Actions_nb_pageviews> + <previous_Goal_revenue>30</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml index aad34392f8..e682f253e1 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions__MultiSites.getAll_year.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml index 2efd1eaab3..f974de9b54 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_day.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sat, Jan 2</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>-50%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-50%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-50%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-100%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Sun, Jan 3</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>400%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>400%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Mon, Jan 4</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -70,10 +118,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Jan 5</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -86,10 +146,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Wed, Jan 6</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -102,10 +174,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Thu, Jan 7</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -118,10 +202,22 @@ <nb_pageviews>5</nb_pageviews> <revenue>5</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 8</previousRange> + <previous_nb_actions>5</previous_nb_actions> + <previous_Actions_nb_pageviews>5</previous_Actions_nb_pageviews> + <previous_Goal_revenue>5</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml index a06b60b001..3fa8c0993e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_month.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>month</periodName> + <previousRange>Dec 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml index 290e4f6217..5e0cf2cca7 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_week.xml @@ -8,10 +8,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>10</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 21 – 27, 2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -24,10 +36,22 @@ <nb_pageviews>31</nb_pageviews> <revenue>30</revenue> <visits_evolution>250%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>1,450%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>1,450%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>200%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>2</previous_nb_actions> + <previous_Actions_nb_pageviews>2</previous_Actions_nb_pageviews> + <previous_Goal_revenue>10</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -38,10 +62,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Dec 28, 2009 – Jan 3, 2010</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -54,10 +90,22 @@ <nb_pageviews>10</nb_pageviews> <revenue>10</revenue> <visits_evolution>-71.4%</visits_evolution> + <visits_evolution_trend>-1</visits_evolution_trend> <actions_evolution>-67.7%</actions_evolution> + <actions_evolution_trend>-1</actions_evolution_trend> <pageviews_evolution>-67.7%</pageviews_evolution> + <pageviews_evolution_trend>-1</pageviews_evolution_trend> <revenue_evolution>-66.7%</revenue_evolution> + <revenue_evolution_trend>-1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>7</previous_nb_visits> + <periodName>week</periodName> + <previousRange>Jan 4 – 10, 2010</previousRange> + <previous_nb_actions>31</previous_nb_actions> + <previous_Actions_nb_pageviews>31</previous_Actions_nb_pageviews> + <previous_Goal_revenue>30</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml index aad34392f8..e682f253e1 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_idSiteOne___MultiSites.getAll_year.xml @@ -8,10 +8,22 @@ <nb_pageviews>43</nb_pageviews> <revenue>50</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>100%</revenue_evolution> + <revenue_evolution_trend>1</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>year</periodName> + <previousRange>2009</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml index b34eb3e56b..5c94021bfc 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_day.xml @@ -4,9 +4,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -14,9 +18,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -24,9 +32,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -34,9 +46,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -44,9 +60,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -54,9 +74,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -64,9 +88,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml index aca453e363..72ef126616 100644 --- a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__MultiSites.getOne_week.xml @@ -4,9 +4,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -14,9 +18,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -24,9 +32,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -34,9 +46,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -44,9 +60,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -54,9 +74,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> @@ -64,9 +88,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result> diff --git a/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml index 2c523aeb3e..f0a62bc625 100644 --- a/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml +++ b/tests/PHPUnit/System/expected/test_noVisit__MultiSites.getOne_day.xml @@ -3,9 +3,13 @@ <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>0</nb_pageviews> <revenue>0</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml index a1c7e55b5f..8d6cd9b0b9 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_IndexedByDate__MultiSites.getAll_day.xml @@ -7,10 +7,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> + <previous_nb_actions>3</previous_nb_actions> + <previous_Actions_nb_pageviews>3</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml index f714cc123d..0ade0fabd6 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_MultipleDatesNotSupported__MultiSites.getAll_day.xml @@ -8,10 +8,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> + <previous_nb_actions>3</previous_nb_actions> + <previous_Actions_nb_pageviews>3</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -22,10 +34,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>0%</visits_evolution> + <visits_evolution_trend>0</visits_evolution_trend> <actions_evolution>0%</actions_evolution> + <actions_evolution_trend>0</actions_evolution_trend> <pageviews_evolution>0%</pageviews_evolution> + <pageviews_evolution_trend>0</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -47,10 +71,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Dec 24</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -61,10 +97,22 @@ <nb_pageviews>1</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Dec 24</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -97,10 +145,22 @@ <nb_pageviews>3</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Fri, Jan 14</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml index 0f13a8fa50..e43a4f4166 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_Truncated__MultiSites.getAll_range.xml @@ -7,8 +7,20 @@ <nb_pageviews>11</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> + <ratio>1</ratio> + <currencySymbol>USD</currencySymbol> + <previous_nb_visits>0</previous_nb_visits> + <periodName>range</periodName> + <previousRange>Nov 13 – Dec 14, 2010</previousRange> + <previous_nb_actions>0</previous_nb_actions> + <previous_Actions_nb_pageviews>0</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml index 22ff810189..ea06868187 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getAll_range.xml @@ -7,10 +7,22 @@ <nb_pageviews>9</nb_pageviews> <revenue>0</revenue> <visits_evolution>200%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>200%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>200%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>range</periodName> + <previousRange>Nov 13 – Dec 14, 2010</previousRange> + <previous_nb_actions>3</previous_nb_actions> + <previous_Actions_nb_pageviews>3</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> @@ -21,10 +33,22 @@ <nb_pageviews>2</nb_pageviews> <revenue>0</revenue> <visits_evolution>100%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>100%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>100%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>range</periodName> + <previousRange>Nov 13 – Dec 14, 2010</previousRange> + <previous_nb_actions>1</previous_nb_actions> + <previous_Actions_nb_pageviews>1</previous_Actions_nb_pageviews> + <previous_Goal_revenue>0</previous_Goal_revenue> <group /> <main_url>http://piwik.net</main_url> </row> diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml index e9115ba10c..1925b7a67c 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__MultiSites.getOne_range.xml @@ -3,9 +3,13 @@ <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> <visits_evolution>200%</visits_evolution> + <visits_evolution_trend>1</visits_evolution_trend> <actions_evolution>200%</actions_evolution> + <actions_evolution_trend>1</actions_evolution_trend> <pageviews_evolution>200%</pageviews_evolution> + <pageviews_evolution_trend>1</pageviews_evolution_trend> <revenue_evolution>0%</revenue_evolution> + <revenue_evolution_trend>0</revenue_evolution_trend> <nb_pageviews>9</nb_pageviews> <revenue>0</revenue> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml index 1639884498..ae23cd01c0 100644 --- a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml +++ b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_showColumns__MultiSites.getAll_day.xml @@ -5,6 +5,11 @@ <nb_visits>2</nb_visits> <visits_evolution>0%</visits_evolution> <idsite>1</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>2</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> <group /> <main_url>http://piwik.net</main_url> </row> @@ -13,6 +18,11 @@ <nb_visits>1</nb_visits> <visits_evolution>0%</visits_evolution> <idsite>2</idsite> + <ratio>1</ratio> + <currencySymbol>$</currencySymbol> + <previous_nb_visits>1</previous_nb_visits> + <periodName>day</periodName> + <previousRange>Tue, Dec 14</previousRange> <group /> <main_url>http://piwik.net</main_url> </row> |