diff --git a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt index 0fb52b9a2e00dfff51f7800fac30c2237e98f2ad..24ddcb4c3af45a83d20a7a3fa3af22eb6d8fb55a 100644 --- a/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/Integration/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -10,64 +10,64 @@ try 'php archive.php -- url=http://your.piwik/path' ------------------------------------------------------- -INFO CoreConsole[2014-09-08 10:11:16] --------------------------- -INFO CoreConsole[2014-09-08 10:11:16] INIT -INFO CoreConsole[2014-09-08 10:11:16] Piwik is installed at: http://localhost/tests/PHPUnit/proxy/index.php -INFO CoreConsole[2014-09-08 10:11:16] Running Piwik 2.7.0-b2 as Super User -DEBUG CoreConsole[2014-09-08 10:11:16] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.getDefaultMetricTranslations&format=original&serialize=1&trigger=archivephp&testmode=1&pid=befab244e6f3cc80b7e465e88d554e7c154a658776718f513526202bdd22aef90b8d2eee562876366a672b40b4d0261326fa0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/befab244e6f3cc80b7e465e88d554e7c154a658776718f513526202bdd22aef90b8d2eee562876366a672b40b4d0261326fa0.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:16] --------------------------- -INFO CoreConsole[2014-09-08 10:11:16] NOTES -INFO CoreConsole[2014-09-08 10:11:16] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO CoreConsole[2014-09-08 10:11:16] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO CoreConsole[2014-09-08 10:11:16] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO CoreConsole[2014-09-08 10:11:16] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO CoreConsole[2014-09-08 10:11:16] - Will process 0 websites with new visits since 7 days 0 hours -INFO CoreConsole[2014-09-08 10:11:16] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2 -INFO CoreConsole[2014-09-08 10:11:16] --------------------------- -INFO CoreConsole[2014-09-08 10:11:16] START -INFO CoreConsole[2014-09-08 10:11:16] Starting Piwik reports archiving... -DEBUG CoreConsole[2014-09-08 10:11:16] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=4f717b5229ee28eed7f2157476a18508b55dbfaec585406d1cf8a91d2e3c388d50404e70b341014808096af972d35aea85a10' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/4f717b5229ee28eed7f2157476a18508b55dbfaec585406d1cf8a91d2e3c388d50404e70b341014808096af972d35aea85a10.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:18] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-08 10:11:18] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=0df669db73d86ccfa1222e4454b440e6f2447bfb7929f4bc909657cbf1f54032ba025cad91481b4d13a6c38cb037c965c7640' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/0df669db73d86ccfa1222e4454b440e6f2447bfb7929f4bc909657cbf1f54032ba025cad91481b4d13a6c38cb037c965c7640.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:20] Archived website id = 1, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 3.920s -INFO CoreConsole[2014-09-08 10:11:20] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-08 10:11:20] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=475019970712539135b8f86eec2fd75a2e0be3fda57ebfb36b77f8f873eaa9702a7dd68c41fd7e76e1e9891c434a9f547a4c0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/475019970712539135b8f86eec2fd75a2e0be3fda57ebfb36b77f8f873eaa9702a7dd68c41fd7e76e1e9891c434a9f547a4c0.output 2>&1 & -DEBUG CoreConsole[2014-09-08 10:11:20] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=375b57f22bebcc6f237d6d27d2641a0204225b221f591ef8a9357a8d3fc6b0549b58570d2abde720baeba5785a4e28fe3d841' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/375b57f22bebcc6f237d6d27d2641a0204225b221f591ef8a9357a8d3fc6b0549b58570d2abde720baeba5785a4e28fe3d841.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:41] Archived website id = 1, period = week, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 20.670s -INFO CoreConsole[2014-09-08 10:11:41] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-08 10:11:41] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=b4d42068668d1dc5a7800bebc16cd56839936a2704ed2122d0a35d25b2664c4ed51fc7f255b5cde2a6ee63cd15d3cb9199e50' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/b4d42068668d1dc5a7800bebc16cd56839936a2704ed2122d0a35d25b2664c4ed51fc7f255b5cde2a6ee63cd15d3cb9199e50.output 2>&1 & -DEBUG CoreConsole[2014-09-08 10:11:41] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=b1cee1b87984a8181427fa4401f016c84a60ff36b6927afd4c28bbfb2fc4fc52a9515225b1e98eaf2b04ab48c3c5834112431' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/b1cee1b87984a8181427fa4401f016c84a60ff36b6927afd4c28bbfb2fc4fc52a9515225b1e98eaf2b04ab48c3c5834112431.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:53] Archived website id = 1, period = month, 40 visits in last last52 months, 0 visits this month, Time elapsed: 12.021s -INFO CoreConsole[2014-09-08 10:11:53] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE -DEBUG CoreConsole[2014-09-08 10:11:53] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=dc08326e1c0eaa7264522da77c900f51f708f1a8e7879675d06944c18d1a1804f42e6f776ca71f02bdefa107297d509470b20' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/dc08326e1c0eaa7264522da77c900f51f708f1a8e7879675d06944c18d1a1804f42e6f776ca71f02bdefa107297d509470b20.output 2>&1 & -DEBUG CoreConsole[2014-09-08 10:11:53] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=2d5b5f87916f5ed6f1291831bba4015388d43c43bf28b0b66d2305e46c6d3fe0b8381b587813f0b6972af35fc1cc3ca36b281' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/2d5b5f87916f5ed6f1291831bba4015388d43c43bf28b0b66d2305e46c6d3fe0b8381b587813f0b6972af35fc1cc3ca36b281.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:55] Archived website id = 1, period = year, 40 visits in last last7 years, 12 visits this year, Time elapsed: 2.499s -INFO CoreConsole[2014-09-08 10:11:55] Archived website id = 1, 8 API requests, Time elapsed: 39.114s [1/2 done] -DEBUG CoreConsole[2014-09-08 10:11:56] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=662cf604c1022075445290617c1b2693fa0a6e25b74d94e57d55922f6db4f827f8667f86288aae689e4d09d95f229e6645390' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/662cf604c1022075445290617c1b2693fa0a6e25b74d94e57d55922f6db4f827f8667f86288aae689e4d09d95f229e6645390.output 2>&1 & -INFO CoreConsole[2014-09-08 10:11:57] Archived website id = 2, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 1.797s -DEBUG CoreConsole[2014-09-08 10:11:57] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=da63c66b20e8c547e7e4222a55c62e102471b5723d562b33e426dcc6c4770d997eb3c34fdaee6c65fb0ee58cd58a291225bf0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/da63c66b20e8c547e7e4222a55c62e102471b5723d562b33e426dcc6c4770d997eb3c34fdaee6c65fb0ee58cd58a291225bf0.output 2>&1 & -INFO CoreConsole[2014-09-08 10:12:13] Archived website id = 2, period = week, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 15.724s -DEBUG CoreConsole[2014-09-08 10:12:13] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=c2faa989d59284d6e99219264716d99e2ec24e30b6d3e2125217b17f4d8f016992b4f1c407060a4ff755f4b295d688d5c7960' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/c2faa989d59284d6e99219264716d99e2ec24e30b6d3e2125217b17f4d8f016992b4f1c407060a4ff755f4b295d688d5c7960.output 2>&1 & -INFO CoreConsole[2014-09-08 10:12:20] Archived website id = 2, period = month, 1 visits in last last52 months, 0 visits this month, Time elapsed: 7.493s -DEBUG CoreConsole[2014-09-08 10:12:21] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=be473e1b942da8733503ecbba68c8ff20014bf90767b652febd3b50d508460e768413e122e3f92a8fcfe23815dc5079ab59e0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/be473e1b942da8733503ecbba68c8ff20014bf90767b652febd3b50d508460e768413e122e3f92a8fcfe23815dc5079ab59e0.output 2>&1 & -INFO CoreConsole[2014-09-08 10:12:22] Archived website id = 2, period = year, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.802s -INFO CoreConsole[2014-09-08 10:12:22] Archived website id = 2, 4 API requests, Time elapsed: 26.822s [2/2 done] -INFO CoreConsole[2014-09-08 10:12:22] Done archiving! -INFO CoreConsole[2014-09-08 10:12:22] --------------------------- -INFO CoreConsole[2014-09-08 10:12:22] SUMMARY -INFO CoreConsole[2014-09-08 10:12:22] Total visits for today across archived websites: 0 -INFO CoreConsole[2014-09-08 10:12:22] Archived today's reports for 2 websites -INFO CoreConsole[2014-09-08 10:12:22] Archived week/month/year for 2 websites -INFO CoreConsole[2014-09-08 10:12:22] Skipped 0 websites: no new visit since the last script execution -INFO CoreConsole[2014-09-08 10:12:22] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old -INFO CoreConsole[2014-09-08 10:12:22] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old -INFO CoreConsole[2014-09-08 10:12:22] Total API requests: 12 -INFO CoreConsole[2014-09-08 10:12:22] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 12 req, 66066 ms, no error -INFO CoreConsole[2014-09-08 10:12:22] Time elapsed: 66.067s -INFO CoreConsole[2014-09-08 10:12:22] --------------------------- -INFO CoreConsole[2014-09-08 10:12:22] SCHEDULED TASKS -INFO CoreConsole[2014-09-08 10:12:22] Starting Scheduled tasks... -DEBUG CoreConsole[2014-09-08 10:12:22] /home/travis/.phpenv/versions/5.4.32/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=CoreAdminHome.runScheduledTasks&format=csv&convertToUnicode=0&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=4ae30b537782e7338b1288b447fcd7d3a423da1d46fdd9bf87a7113a656380740028d62fa0797199eae213bbf716f2f7ea5e0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/4ae30b537782e7338b1288b447fcd7d3a423da1d46fdd9bf87a7113a656380740028d62fa0797199eae213bbf716f2f7ea5e0.output 2>&1 & -INFO CoreConsole[2014-09-08 10:12:23] No task to run -INFO CoreConsole[2014-09-08 10:12:23] done -INFO CoreConsole[2014-09-08 10:12:23] --------------------------- \ No newline at end of file +INFO CoreConsole[2014-09-08 11:21:08] --------------------------- +INFO CoreConsole[2014-09-08 11:21:08] INIT +INFO CoreConsole[2014-09-08 11:21:08] Piwik is installed at: http://localhost/tests/PHPUnit/proxy/index.php +INFO CoreConsole[2014-09-08 11:21:08] Running Piwik 2.7.0-b2 as Super User +DEBUG CoreConsole[2014-09-08 11:21:08] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.getDefaultMetricTranslations&format=original&serialize=1&trigger=archivephp&testmode=1&pid=97b19acb3bc053e39dd6debb4286f11ecb4be7863cb316fcfc00a9bace6883bdbfe5bd1c6f8a6ddda6db57b0cea047be64c80' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/97b19acb3bc053e39dd6debb4286f11ecb4be7863cb316fcfc00a9bace6883bdbfe5bd1c6f8a6ddda6db57b0cea047be64c80.output 2>&1 & +INFO CoreConsole[2014-09-08 11:21:09] --------------------------- +INFO CoreConsole[2014-09-08 11:21:09] NOTES +INFO CoreConsole[2014-09-08 11:21:09] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. +INFO CoreConsole[2014-09-08 11:21:09] See the doc at: http://piwik.org/docs/setup-auto-archiving/ +INFO CoreConsole[2014-09-08 11:21:09] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. +INFO CoreConsole[2014-09-08 11:21:09] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO CoreConsole[2014-09-08 11:21:09] - Will process 0 websites with new visits since 7 days 0 hours +INFO CoreConsole[2014-09-08 11:21:09] - Will process 2 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2 +INFO CoreConsole[2014-09-08 11:21:09] --------------------------- +INFO CoreConsole[2014-09-08 11:21:09] START +INFO CoreConsole[2014-09-08 11:21:09] Starting Piwik reports archiving... +DEBUG CoreConsole[2014-09-08 11:21:09] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=9f600a37498c52414b1339579351565b26073106a1dec88f1ffff7557169b7b77a6fb2855c184b863003b4cf3656b56d175f0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/9f600a37498c52414b1339579351565b26073106a1dec88f1ffff7557169b7b77a6fb2855c184b863003b4cf3656b56d175f0.output 2>&1 & +INFO CoreConsole[2014-09-08 11:21:11] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-08 11:21:11] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=2fbbd31b21faca46dbd7832fa5e4a02053a197b9e4373b512c4a238cd5054240e37c46c7189ef6cc530d446e49a3852d74520' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/2fbbd31b21faca46dbd7832fa5e4a02053a197b9e4373b512c4a238cd5054240e37c46c7189ef6cc530d446e49a3852d74520.output 2>&1 & +INFO CoreConsole[2014-09-08 11:21:14] Archived website id = 1, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 4.618s +INFO CoreConsole[2014-09-08 11:21:14] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-08 11:21:14] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=78db1e25a305bb7d97f04d9e999c73b4886c50ba50eaa115f637758aa4546c0a0c3d4ee72199baf2e347c79deb10298b584a0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/78db1e25a305bb7d97f04d9e999c73b4886c50ba50eaa115f637758aa4546c0a0c3d4ee72199baf2e347c79deb10298b584a0.output 2>&1 & +DEBUG CoreConsole[2014-09-08 11:21:14] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=790667cd2afea5e1098137fc938212e384b69d28e93d7cf6a09f43b1acfeec88ec6767e255d9e3ebbfe9b5236bda4562f2431' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/790667cd2afea5e1098137fc938212e384b69d28e93d7cf6a09f43b1acfeec88ec6767e255d9e3ebbfe9b5236bda4562f2431.output 2>&1 & +INFO CoreConsole[2014-09-08 11:21:43] Archived website id = 1, period = week, 40 visits in last last260 weeks, 0 visits this week, Time elapsed: 28.957s +INFO CoreConsole[2014-09-08 11:21:43] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-08 11:21:43] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=f8736fd461595cecb68c4262ac5c7ac3377c4f73f8fe3ec8441cb555578b33c21ed77d8d84948fc6d57083e3b07058a51d260' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/f8736fd461595cecb68c4262ac5c7ac3377c4f73f8fe3ec8441cb555578b33c21ed77d8d84948fc6d57083e3b07058a51d260.output 2>&1 & +DEBUG CoreConsole[2014-09-08 11:21:43] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=23aff1463e7714bce29f6d0f6e7a3137e67c641d990cd9465f1826ccd391dbecfb9aa11317d6cf452e48afd206965ee14f341' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/23aff1463e7714bce29f6d0f6e7a3137e67c641d990cd9465f1826ccd391dbecfb9aa11317d6cf452e48afd206965ee14f341.output 2>&1 & +INFO CoreConsole[2014-09-08 11:21:59] Archived website id = 1, period = month, 40 visits in last last52 months, 0 visits this month, Time elapsed: 15.871s +INFO CoreConsole[2014-09-08 11:21:59] Will pre-process the following 1 Segments for this website (id = 1): browserCode==IE +DEBUG CoreConsole[2014-09-08 11:21:59] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=e3ae03e457f34069ffcd8ab8332c443f6dcbcfa63a9d7a350377d830cd80b66da486845bc8024956cd15469b52e03c432c570' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/e3ae03e457f34069ffcd8ab8332c443f6dcbcfa63a9d7a350377d830cd80b66da486845bc8024956cd15469b52e03c432c570.output 2>&1 & +DEBUG CoreConsole[2014-09-08 11:21:59] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=1&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&segment=browserCode%3D%3DIE&testmode=1&pid=13757a258179702b6d540ab605238462ea5fba6c126d50dbb9f608c0c60bdbd211f38032743c091ceea0667d45190996ba501' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/13757a258179702b6d540ab605238462ea5fba6c126d50dbb9f608c0c60bdbd211f38032743c091ceea0667d45190996ba501.output 2>&1 & +INFO CoreConsole[2014-09-08 11:22:02] Archived website id = 1, period = year, 40 visits in last last7 years, 12 visits this year, Time elapsed: 3.037s +INFO CoreConsole[2014-09-08 11:22:02] Archived website id = 1, 8 API requests, Time elapsed: 52.487s [1/2 done] +DEBUG CoreConsole[2014-09-08 11:22:02] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=day&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=bc9e22fcff3cd440b24ba6a89691897d0949bcd15fc481dd361e7013314b6127835e47d26ddad697102d8f2a24f05f30d78a0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/bc9e22fcff3cd440b24ba6a89691897d0949bcd15fc481dd361e7013314b6127835e47d26ddad697102d8f2a24f05f30d78a0.output 2>&1 & +INFO CoreConsole[2014-09-08 11:22:09] Archived website id = 2, period = day, 0 visits in last last52 days, 0 visits today, Time elapsed: 7.396s +DEBUG CoreConsole[2014-09-08 11:22:09] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=week&date=last260&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=56b24815f6302123b68aff54e11ab21347062e81c8cd43169a6c4031d2a009c4ffbe788a6dfb9f742e7b03be75d33ae377f90' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/56b24815f6302123b68aff54e11ab21347062e81c8cd43169a6c4031d2a009c4ffbe788a6dfb9f742e7b03be75d33ae377f90.output 2>&1 & +INFO CoreConsole[2014-09-08 11:22:26] Archived website id = 2, period = week, 1 visits in last last260 weeks, 0 visits this week, Time elapsed: 16.945s +DEBUG CoreConsole[2014-09-08 11:22:26] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=month&date=last52&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=9592e55f6c8070dac7b2395300f379556a25f93a8352c3ea749dc8257b2298bda5b30ab709eab225468c191d426034495b7c0' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/9592e55f6c8070dac7b2395300f379556a25f93a8352c3ea749dc8257b2298bda5b30ab709eab225468c191d426034495b7c0.output 2>&1 & +INFO CoreConsole[2014-09-08 11:22:39] Archived website id = 2, period = month, 1 visits in last last52 months, 0 visits this month, Time elapsed: 13.256s +DEBUG CoreConsole[2014-09-08 11:22:39] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=API.get&idSite=2&period=year&date=last7&format=php&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=df94fd1284f957ab416270e7c8a8885a29ba3debb315b71628c2f79b18fca518dc643d00cdeec0773aff5f7c4fb3c00840580' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/df94fd1284f957ab416270e7c8a8885a29ba3debb315b71628c2f79b18fca518dc643d00cdeec0773aff5f7c4fb3c00840580.output 2>&1 & +INFO CoreConsole[2014-09-08 11:22:41] Archived website id = 2, period = year, 1 visits in last last7 years, 0 visits this year, Time elapsed: 1.775s +INFO CoreConsole[2014-09-08 11:22:41] Archived website id = 2, 4 API requests, Time elapsed: 39.378s [2/2 done] +INFO CoreConsole[2014-09-08 11:22:41] Done archiving! +INFO CoreConsole[2014-09-08 11:22:41] --------------------------- +INFO CoreConsole[2014-09-08 11:22:41] SUMMARY +INFO CoreConsole[2014-09-08 11:22:41] Total visits for today across archived websites: 0 +INFO CoreConsole[2014-09-08 11:22:41] Archived today's reports for 2 websites +INFO CoreConsole[2014-09-08 11:22:41] Archived week/month/year for 2 websites +INFO CoreConsole[2014-09-08 11:22:41] Skipped 0 websites: no new visit since the last script execution +INFO CoreConsole[2014-09-08 11:22:41] Skipped 0 websites day archiving: existing daily reports are less than 150 seconds old +INFO CoreConsole[2014-09-08 11:22:41] Skipped 0 websites week/month/year archiving: existing periods reports are less than 3600 seconds old +INFO CoreConsole[2014-09-08 11:22:41] Total API requests: 12 +INFO CoreConsole[2014-09-08 11:22:41] done: 2/2 100%, 0 vtoday, 2 wtoday, 2 wperiods, 12 req, 92024 ms, no error +INFO CoreConsole[2014-09-08 11:22:41] Time elapsed: 92.024s +INFO CoreConsole[2014-09-08 11:22:41] --------------------------- +INFO CoreConsole[2014-09-08 11:22:41] SCHEDULED TASKS +INFO CoreConsole[2014-09-08 11:22:41] Starting Scheduled tasks... +DEBUG CoreConsole[2014-09-08 11:22:41] /home/travis/.phpenv/versions/5.5.16/bin/php -q /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//console climulti:request --piwik-domain='localhost' 'module=API&method=CoreAdminHome.runScheduledTasks&format=csv&convertToUnicode=0&token_auth=9ad1de7f8b329ab919d854c556f860c1&trigger=archivephp&testmode=1&pid=29ce028b03dde4ee5e4d658f6d54365af3c9e5666334e6593a2a21ee0623cd27ddc86b47b36abb11b2b8b2947455c74c51120' > /home/travis/build/piwik/piwik/tests/PHPUnit/proxy/../../..//tmp/climulti/29ce028b03dde4ee5e4d658f6d54365af3c9e5666334e6593a2a21ee0623cd27ddc86b47b36abb11b2b8b2947455c74c51120.output 2>&1 & +INFO CoreConsole[2014-09-08 11:22:42] No task to run +INFO CoreConsole[2014-09-08 11:22:42] done +INFO CoreConsole[2014-09-08 11:22:42] --------------------------- \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml index 5d94de9b293124741992aca8609e2370623fc6b5..d2777a6618ca70dcfc83e04faea1a7d1991f1761 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__CustomVariables.getCustomVariables_month.xml @@ -40,7 +40,6 @@ <label>Not-Bot</label> <nb_visits>7</nb_visits> <nb_actions>10</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>5</bounce_count> @@ -54,12 +53,12 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <subtable> <row> <label>Mozilla/5.0 (Macintosh; Intel Mac OS X 10_6_7) AppleWebKit/534.24 (KHTML, like Gecko) RockMelt/0.9.58.494 Chrome/11.0.696.71 Safari/534.24</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>2</bounce_count> @@ -73,23 +72,23 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Apache-HttpClient/4.2.1 (java 1.5)</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Mozilla/5.0 (compatible; MSIE 10.6; Windows NT 6.1; Trident/5.0; InfoPath.2; SLCC1; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729; .NET CLR 2.0.50727) 3gpp-gba UNTRUSTED/1.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -103,12 +102,12 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Mozilla/5.0 (Linux; U; Android 2.3.5; en-us; HTC Vision Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -122,6 +121,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -129,7 +129,6 @@ <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -143,12 +142,12 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Googlebot/2.1 ( http://www.googlebot.com/bot.html)</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -162,6 +161,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -169,7 +169,6 @@ <label>Forum status</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -183,12 +182,12 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Anonymous</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -202,6 +201,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -209,7 +209,6 @@ <label>VisitorType</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -223,12 +222,12 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>NewLoggedOut</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -242,6 +241,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml index 2cfac4146d6e05b8a64224a96a1b9c492081d2e1..4900d9f74261040ea9cb5722f5cd8dfc534a27c0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrand_month.xml @@ -4,24 +4,24 @@ <label>Unknown</label> <nb_visits>25</nb_visits> <nb_actions>28</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>23</bounce_count> <nb_visits_converted>23</nb_visits_converted> <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/Unknown.ico</logo> </row> <row> <label>HTC</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/brand/HTC.ico</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 4142896cffae49f27cedd29a6f04d619a8642d7a..736a970a106397a275e9bdb550175aa82b24273e 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -4,60 +4,60 @@ <label>Internet Explorer</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> <label>Chrome</label> <nb_visits>10</nb_visits> <nb_actions>13</nb_actions> - <nb_users>6</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>6</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> <label>Firefox</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 6fa2b83e645a07f6924a4e4daf67c81a3891afb2..82839291880676fd8bb111fb5e9a8d8356a242f8 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -4,120 +4,120 @@ <label>Epiphany 2.30</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> <label>RockMelt 0.9</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Android Browser</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> <label>Chrome 19.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Chrome 20.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Firefox 6.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> <label>Chrome 11.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Internet Explorer 6.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml index 1104eded7284800093b7e96e26c7fb0fccdbf80a..4f81f5481bea9aeeb2e98a36379243df16f93fdb 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getModel_month.xml @@ -4,22 +4,22 @@ <label>Unknown</label> <nb_visits>25</nb_visits> <nb_actions>28</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>23</bounce_count> <nb_visits_converted>23</nb_visits_converted> <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> </row> <row> <label>Vision</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 32a6df28621881bf38831756f7a9d4308563465f..e529cdbeb21b71ed2a99d1f81ed7d250c14d3534 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -4,72 +4,72 @@ <label>GNU/Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> <label>Windows</label> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>9</bounce_count> <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> <label>Mac</label> <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> <label>Android</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index de30897292178d6a71e41dd67c83906afb0212e2..39cb245795557bafc81c22e1a6b9cb6e606e90cc 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -4,96 +4,96 @@ <label>GNU/Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> <label>Windows 7</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> <label>Mac 10.6</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> <label>Android 2.3</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> <row> <label>Mac 10.8</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml index d0adffa933c1e7df0931d869042824c78ee37632..75403098201cb3ed1952027390bb1460fcae9f45 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getType_month.xml @@ -4,36 +4,36 @@ <label>Desktop</label> <nb_visits>23</nb_visits> <nb_actions>26</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>21</bounce_count> <nb_visits_converted>22</nb_visits_converted> <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/normal.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/unknown.gif</logo> </row> <row> <label>Smartphone</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/DevicesDetection/images/screens/smartphone.png</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml index af760a40aaf066c1eb8abd8d83c9bd86752c1e4c..c4cf4f317983d4f5b08d7a534741a274c116312b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Provider.getProvider_month.xml @@ -4,12 +4,12 @@ <label>Unknown</label> <nb_visits>27</nb_visits> <nb_actions>30</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>25</bounce_count> <nb_visits_converted>25</nb_visits_converted> <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <url>http://piwik.org/faq/general/#faq_52</url> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml index c53420ae581a85f9c5b6730e8424fabda0be6c6e..1c43453213145239d5bcabe1eba4b439babd2ba3 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getAll_month.xml @@ -4,7 +4,6 @@ <label>sn110w.snt110.mail.live.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -18,13 +17,13 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <referer_type>3</referer_type> </row> <row> <label>piwik.org</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -38,6 +37,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <referer_type>3</referer_type> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml index fb9a7a4e0b26b06e20bff4549142eae998fbb6e0..8579d3283a6de5745b9e4208776e371d4876178c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getReferrerType_month.xml @@ -4,7 +4,6 @@ <label>Direct Entry</label> <nb_visits>25</nb_visits> <nb_actions>28</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>23</bounce_count> @@ -18,12 +17,12 @@ <nb_conversions>23</nb_conversions> <revenue>115</revenue> <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>Websites</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> @@ -37,12 +36,12 @@ <nb_conversions>2</nb_conversions> <revenue>10</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>piwik.org</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -56,12 +55,12 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>sn110w.snt110.mail.live.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -75,6 +74,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml index 317df50b054f65962e0f58182f54b03f513cf9a9..74a22451ad379ef8693bf957e726f05e29b8a92c 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__Referrers.getWebsites_month.xml @@ -4,7 +4,6 @@ <label>piwik.org</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -18,17 +17,18 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://piwik.org/contribute%</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -36,7 +36,6 @@ <label>sn110w.snt110.mail.live.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -50,17 +49,18 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml index 57de06a91f5a505244644ef9ad200b44b57ad87f..9567fc2f237aa665391d54e083af2f1511cab3a2 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCity_month.xml @@ -4,7 +4,6 @@ <label>Unknown</label> <nb_visits>22</nb_visits> <nb_actions>25</nb_actions> - <nb_users>9</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>20</bounce_count> @@ -18,6 +17,7 @@ <nb_conversions>20</nb_conversions> <revenue>100</revenue> <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> @@ -30,7 +30,6 @@ <label>Ashburn, Virginia, United States</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -44,6 +43,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>39.044</lat> <long>-77.488</long> <city_name>Ashburn</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml index a4c9aa816f38fac86f2779b6ca4c9ab51c41347f..ff0a9a67d6f3b286bc136ff8b82be3dead7dee67 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getContinent_month.xml @@ -4,7 +4,6 @@ <label>Asia</label> <nb_visits>11</nb_visits> <nb_actions>14</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>9</bounce_count> @@ -18,13 +17,13 @@ <nb_conversions>10</nb_conversions> <revenue>50</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>Asia</code> </row> <row> <label>Unknown</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> @@ -38,13 +37,13 @@ <nb_conversions>7</nb_conversions> <revenue>35</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <code>Unknown</code> </row> <row> <label>North America</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -58,13 +57,13 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>North America</code> </row> <row> <label>South America</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -78,18 +77,19 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>South America</code> </row> <row> <label>Oceania</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>Oceania</code> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml index 9e64424f4d1d61b5a91af2530bdd563cf2f4df74..9e0087debc9afa8f8944488b303efe1e6b50998a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getCountry_month.xml @@ -4,7 +4,6 @@ <label>Japan</label> <nb_visits>11</nb_visits> <nb_actions>14</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>9</bounce_count> @@ -18,6 +17,7 @@ <nb_conversions>10</nb_conversions> <revenue>50</revenue> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>jp</code> <logo>plugins/UserCountry/images/flags/jp.png</logo> <logoWidth>16</logoWidth> @@ -27,7 +27,6 @@ <label>Unknown</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> @@ -41,6 +40,7 @@ <nb_conversions>7</nb_conversions> <revenue>35</revenue> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <code>xx</code> <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> @@ -50,7 +50,6 @@ <label>United States</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -64,6 +63,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>us</code> <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> @@ -73,7 +73,6 @@ <label>Brazil</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> @@ -87,6 +86,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>br</code> <logo>plugins/UserCountry/images/flags/br.png</logo> <logoWidth>16</logoWidth> @@ -96,12 +96,12 @@ <label>Australia</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>au</code> <logo>plugins/UserCountry/images/flags/au.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml index 9cac051435e00ed97915e5edb71edc9e57ee9e82..a6ac17fd67c1c9ba741243fe4b07caba0760285e 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserCountry.getRegion_month.xml @@ -4,7 +4,6 @@ <label>Unknown</label> <nb_visits>22</nb_visits> <nb_actions>25</nb_actions> - <nb_users>9</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>20</bounce_count> @@ -18,6 +17,7 @@ <nb_conversions>20</nb_conversions> <revenue>100</revenue> <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> @@ -28,7 +28,6 @@ <label>Virginia, United States</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> @@ -42,6 +41,7 @@ <nb_conversions>5</nb_conversions> <revenue>25</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>VA</region> <country>us</country> <country_name>United States</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml index 0caaa2e0a4cee3498ea6bfbb66b555b49ffc4cc3..f3ad2531895429d64f2a5d7c293e94163b9a22e2 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserType_month.xml @@ -4,48 +4,48 @@ <label>WebKit (Safari, Chrome)</label> <nb_visits>10</nb_visits> <nb_actions>10</nb_actions> - <nb_users>7</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>10</bounce_count> <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>7</sum_daily_nb_users> <shortLabel>Webkit</shortLabel> </row> <row> <label>Unknown</label> <nb_visits>9</nb_visits> <nb_actions>12</nb_actions> - <nb_users>5</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>5</sum_daily_nb_users> <shortLabel>Unknown</shortLabel> </row> <row> <label>Trident (IE)</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <shortLabel>Ie</shortLabel> </row> <row> <label>Gecko (Firefox)</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <shortLabel>Gecko</shortLabel> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml index 769fcdba9112041381ca4427bf0214186d533d0c..6e001181910976c186ce2bf07f5a3d572b6a5eca 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowserVersion_month.xml @@ -4,12 +4,12 @@ <label>Epiphany 2.30</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> <shortLabel>Epiphany 2.30</shortLabel> </row> @@ -17,12 +17,12 @@ <label>Internet Explorer 9.0</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> <shortLabel>Internet Explorer 9.0</shortLabel> </row> @@ -30,12 +30,12 @@ <label>RockMelt 0.9</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>RockMelt 0.9</shortLabel> </row> @@ -43,12 +43,12 @@ <label>Android Browser </label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> <shortLabel>Android Browser </shortLabel> </row> @@ -56,12 +56,12 @@ <label>Chrome 19.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> <shortLabel>Chrome 19.0</shortLabel> </row> @@ -69,12 +69,12 @@ <label>Chrome 20.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> <shortLabel>Chrome 20.0</shortLabel> </row> @@ -82,12 +82,12 @@ <label>Firefox 6.0</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> <shortLabel>Firefox 6.0</shortLabel> </row> @@ -95,12 +95,12 @@ <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> <shortLabel>Unknown</shortLabel> </row> @@ -108,12 +108,12 @@ <label>Chrome 11.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> <shortLabel>Chrome 11.0</shortLabel> </row> @@ -121,12 +121,12 @@ <label>Internet Explorer 6.0</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> <shortLabel>Internet Explorer 6.0</shortLabel> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml index 215c256f2add62668561719fb8d01540c59e9295..81101cc38158a7e500c3f4727a9416078103e5b8 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getBrowser_month.xml @@ -4,84 +4,84 @@ <label>Epiphany</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/IE.gif</logo> </row> <row> <label>RockMelt</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> <row> <label>Android Browser </label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/AN.gif</logo> </row> <row> <label>Chrome</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/CH.gif</logo> </row> <row> <label>Firefox</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/FF.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index f8bf22dc7aed4e5107b5280cf706a8c830750d9e..f9654c1a34a2dac59b724a241951c146bd1439e0 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -4,132 +4,132 @@ <label>Linux / Epiphany / unknown</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>Mac OS / RockMelt / unknown</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>Windows 7 / Internet Explorer / unknown</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>Linux / Firefox / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Windows 7 / Chrome / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>Bot / Unknown / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Linux / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Mac OS / Chrome / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Unknown / Unknown / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Windows XP / Chrome / 1280x800</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>Windows XP / Internet Explorer / 1024x768</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml index a1b782b97f774808310af2af63d7992c3d735797..e08122bf126681b069d827e0ff998f5e4b50ac7a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getLanguage_month.xml @@ -4,11 +4,11 @@ <label>Unknown</label> <nb_visits>27</nb_visits> <nb_actions>30</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>25</bounce_count> <nb_visits_converted>25</nb_visits_converted> <sum_daily_nb_uniq_visitors>27</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index 9304390ff34d96aff62270fbcb20ff9730122187..493d6eb7dbfb3a457c77e361ccda9a58a529fd88 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -4,36 +4,36 @@ <label>Desktop</label> <nb_visits>23</nb_visits> <nb_actions>26</nb_actions> - <nb_users>9</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>21</bounce_count> <nb_visits_converted>22</nb_visits_converted> <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/normal.gif</logo> </row> <row> <label>Mobile</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/mobile.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index bebfc3f228a7758e0f4d36dc9021042cd46f720d..8f4652178c7a5ac717783deba6d18e1a3b76d1f1 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -4,60 +4,60 @@ <label>Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> <label>Windows</label> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> - <nb_users>4</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>9</bounce_count> <nb_visits_converted>9</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> <label>Mac</label> <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> <label>Android</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml index 8bb56a9f2fb9e21a1bf6cc970ce44d9f3a179f30..d64c5f8f98d9707e3219904d7b574d9065024e19 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -4,12 +4,12 @@ <label>Linux</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/LIN.gif</logo> <shortLabel>Linux</shortLabel> </row> @@ -17,12 +17,12 @@ <label>Windows 7</label> <nb_visits>7</nb_visits> <nb_actions>7</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WI7.gif</logo> <shortLabel>Win 7</shortLabel> </row> @@ -30,12 +30,12 @@ <label>Mac OS</label> <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/MAC.gif</logo> <shortLabel>Mac OS</shortLabel> </row> @@ -43,12 +43,12 @@ <label>Android</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/AND.gif</logo> <shortLabel>Android</shortLabel> </row> @@ -56,12 +56,12 @@ <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/WXP.gif</logo> <shortLabel>Win XP</shortLabel> </row> @@ -69,12 +69,12 @@ <label>Bot</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> <shortLabel>BOT</shortLabel> </row> @@ -82,12 +82,12 @@ <label>Unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/os/UNK.gif</logo> <shortLabel>Unknown</shortLabel> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml index df348f5a9851aab46142db8ba7bbd33aca935b5b..ffd5d0c1621fb24a8bb0b90423d97f5ca193f9a5 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getResolution_month.xml @@ -4,33 +4,33 @@ <label>unknown</label> <nb_visits>25</nb_visits> <nb_actions>28</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>23</bounce_count> <nb_visits_converted>23</nb_visits_converted> <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>1024x768</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>1280x800</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml index e49923e8e2ab1e325343ff1f855d6b86124e8b05..23755c4486939d3c0f3497a2b83966522292b21b 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getWideScreen_month.xml @@ -4,36 +4,36 @@ <label>Unknown</label> <nb_visits>25</nb_visits> <nb_actions>28</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> <bounce_count>23</bounce_count> <nb_visits_converted>23</nb_visits_converted> <sum_daily_nb_uniq_visitors>25</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/unknown.gif</logo> </row> <row> <label>Normal</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/normal.gif</logo> </row> <row> <label>Wide</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <logo>plugins/UserSettings/images/screens/wide.gif</logo> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml index 549e5bcdfdc33e30b65641a755d0f6f894ee0eab..580a24928fe2fdc4d3c739a189fc12de2aeb0895 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerLocalTime_month.xml @@ -4,264 +4,264 @@ <label>0h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>1h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>2h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>3h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>4h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>5h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>6h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>7h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>8h</label> <nb_visits>5</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>9h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>10h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>11h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>12h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>13h</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>4</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>14h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>15h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>16h</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>17h</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>18h</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>123</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>19h</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>2</nb_users> <max_actions>2</max_actions> <sum_visit_length>182</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> <row> <label>20h</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> <nb_visits_converted>6</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>21h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>22h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>23h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml index 2af29d3a364abad0ea19b7878f60d2fff5b6cb8b..5bc568ab817cac6cb482f5e258f984edb411828a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__VisitTime.getVisitInformationPerServerTime_month.xml @@ -4,56 +4,56 @@ <label>0h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>1h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>2h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>3h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>4h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -68,34 +68,34 @@ <label>5h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>6h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>7h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -110,7 +110,6 @@ <label>8h</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -124,57 +123,57 @@ <nb_conversions>4</nb_conversions> <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>9h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>10h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>11h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>12h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>13h</label> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>4</bounce_count> @@ -188,29 +187,30 @@ <nb_conversions>4</nb_conversions> <revenue>20</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>14h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>15h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -225,12 +225,12 @@ <label>16h</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -245,12 +245,12 @@ <label>17h</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -265,12 +265,12 @@ <label>18h</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>123</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>1</nb_conversions> @@ -285,12 +285,12 @@ <label>19h</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>2</nb_users> <max_actions>2</max_actions> <sum_visit_length>182</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <goals> <row idgoal='1'> <nb_conversions>2</nb_conversions> @@ -305,7 +305,6 @@ <label>20h</label> <nb_visits>6</nb_visits> <nb_actions>6</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>6</bounce_count> @@ -319,13 +318,13 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>21h</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -339,28 +338,29 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <nb_visits_converted>0</nb_visits_converted> </row> <row> <label>22h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>23h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml index 1d9d66a7cc1da30d1b171c44b5a19b143ba667c4..7a27573cee62b04aeedd121c2aa90b36411ac346 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCity_month.xml @@ -4,7 +4,6 @@ <label>Unknown</label> <nb_visits>8</nb_visits> <nb_actions>15</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>5044</sum_visit_length> <bounce_count>4</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>12</nb_conversions> <revenue>60</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <city_name>Unknown</city_name> <city>xx</city> <region>xx</region> @@ -35,7 +35,6 @@ <label>Vancouver, British Columbia, Canada</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -54,6 +53,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> <city_name>Vancouver</city_name> @@ -67,7 +67,6 @@ <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -86,6 +85,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> <city_name>Stratford-upon-Avon</city_name> @@ -99,7 +99,6 @@ <label>Besançon, Franche-Comte, France</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -118,6 +117,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <lat>47.249</lat> <long>6.018</long> <city_name>Besançon</city_name> @@ -131,7 +131,6 @@ <label>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -150,6 +149,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Hluboká nad Vltavou</city_name> <region>66</region> <country>ru</country> @@ -161,7 +161,6 @@ <label>Lhasa, Unknown, Tibet</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -180,6 +179,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <lat>29.65</lat> <long>91.1</long> <city_name>Lhasa</city_name> @@ -193,7 +193,6 @@ <label>London, London, City of, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -212,6 +211,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>London</city_name> <region>H9</region> <country>gb</country> @@ -223,7 +223,6 @@ <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -242,6 +241,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> @@ -253,7 +253,6 @@ <label>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -272,6 +271,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>mk</country> @@ -283,7 +283,6 @@ <label>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -302,6 +301,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Stratford-upon-Avon</city_name> <region>66</region> <country>ru</country> @@ -313,7 +313,6 @@ <label>Stratford-upon-Avon, Kent, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -332,6 +331,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Stratford-upon-Avon</city_name> <region>G5</region> <country>gb</country> @@ -343,7 +343,6 @@ <label>not a city, California, United States</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -357,6 +356,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <lat>1</lat> <long>2</long> <city_name>not a city</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml index 0cacc728affd036cd5af898865cf136a41cbd3e0..ff0c032056c330cf0f1c6b4a7057cf429f4e3a96 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getContinent_month.xml @@ -4,7 +4,6 @@ <label>Europe</label> <nb_visits>20</nb_visits> <nb_actions>36</nb_actions> - <nb_users>10</nb_users> <max_actions>3</max_actions> <sum_visit_length>12610</sum_visit_length> <bounce_count>10</bounce_count> @@ -23,13 +22,13 @@ <nb_conversions>30</nb_conversions> <revenue>150</revenue> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>10</sum_daily_nb_users> <code>Europe</code> </row> <row> <label>North America</label> <nb_visits>7</nb_visits> <nb_actions>11</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>4</bounce_count> @@ -48,13 +47,13 @@ <nb_conversions>10</nb_conversions> <revenue>50</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>North America</code> </row> <row> <label>Unknown</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -73,13 +72,13 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>Unknown</code> </row> <row> <label>Asia</label> <nb_visits>4</nb_visits> <nb_actions>6</nb_actions> - <nb_users>2</nb_users> <max_actions>2</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -98,6 +97,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>Asia</code> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml index eb613ef50ae6b838551d96336ec334c38263ae66..7a4e15a2ce0b8afa4a794f2ea5cdb880b3cf90ab 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getCountry_month.xml @@ -4,7 +4,6 @@ <label>United Kingdom</label> <nb_visits>10</nb_visits> <nb_actions>18</nb_actions> - <nb_users>5</nb_users> <max_actions>3</max_actions> <sum_visit_length>6305</sum_visit_length> <bounce_count>5</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>15</nb_conversions> <revenue>75</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>5</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> @@ -32,7 +32,6 @@ <label>Canada</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -51,6 +50,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ca</code> <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> @@ -60,7 +60,6 @@ <label>Russian Federation</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -79,6 +78,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ru</code> <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> @@ -88,7 +88,6 @@ <label>Unknown</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -107,6 +106,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>xx</code> <logo>plugins/UserCountry/images/flags/xx.png</logo> <logoWidth>16</logoWidth> @@ -116,7 +116,6 @@ <label>France</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -135,6 +134,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> @@ -144,7 +144,6 @@ <label>Indonesia</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -163,6 +162,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>id</code> <logo>plugins/UserCountry/images/flags/id.png</logo> <logoWidth>16</logoWidth> @@ -172,7 +172,6 @@ <label>Italy</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -191,6 +190,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>it</code> <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> @@ -200,7 +200,6 @@ <label>Macedonia, the Former Yugoslav Republic of</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -219,6 +218,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>mk</code> <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> @@ -228,7 +228,6 @@ <label>Tibet</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -247,6 +246,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>ti</code> <logo>plugins/UserCountry/images/flags/ti.png</logo> <logoWidth>16</logoWidth> @@ -256,7 +256,6 @@ <label>United States</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -270,6 +269,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>us</code> <logo>plugins/UserCountry/images/flags/us.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml index 5eb07151c68f561dc8160c871adbea5bf431da38..b0ff278d859d111c772d37f94e0f0aaf54afb5b7 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__UserCountry.getRegion_month.xml @@ -4,7 +4,6 @@ <label>Unknown</label> <nb_visits>8</nb_visits> <nb_actions>15</nb_actions> - <nb_users>4</nb_users> <max_actions>3</max_actions> <sum_visit_length>5044</sum_visit_length> <bounce_count>4</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>12</nb_conversions> <revenue>60</revenue> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <region>xx</region> <country>xx</country> <country_name>Unknown</country_name> @@ -33,7 +33,6 @@ <label>British Columbia, Canada</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -52,6 +51,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> @@ -62,7 +62,6 @@ <label>Warwickshire, United Kingdom</label> <nb_visits>6</nb_visits> <nb_actions>11</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -81,6 +80,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -91,7 +91,6 @@ <label>Saint Petersburg City, Russian Federation</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -110,6 +109,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>66</region> <country>ru</country> <country_name>Russian Federation</country_name> @@ -120,7 +120,6 @@ <label>Unknown, Tibet</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -139,6 +138,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>1</region> <country>ti</country> <country_name>Tibet</country_name> @@ -149,7 +149,6 @@ <label>Miravci, Macedonia, the Former Yugoslav Republic of</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -168,6 +167,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>66</region> <country>mk</country> <country_name>Macedonia, the Former Yugoslav Republic of</country_name> @@ -178,7 +178,6 @@ <label>Franche-Comte, France</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -197,6 +196,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>A6</region> <country>fr</country> <country_name>France</country_name> @@ -207,7 +207,6 @@ <label>Kent, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -226,6 +225,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>G5</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -236,7 +236,6 @@ <label>London, City of, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -255,6 +254,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>H9</region> <country>gb</country> <country_name>United Kingdom</country_name> @@ -265,7 +265,6 @@ <label>California, United States</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> @@ -279,6 +278,7 @@ <nb_conversions>1</nb_conversions> <revenue>5</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <region>CA</region> <country>us</country> <country_name>United States</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml index 6531da897a9e6254b657e551a2d4d9568acd697e..0e4bd32e997a5d059b8ca938022abe792fa4f986 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCity_month.xml @@ -4,7 +4,6 @@ <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> <city_name>Stratford-upon-Avon</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml index f6aeef8755f0fcf43af0672d3630bba6a81deab4..8c500c205d121bc85674ee71785e28a878f0dd64 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getContinent_month.xml @@ -4,7 +4,6 @@ <label>Europe</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>Europe</code> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml index af99300c76f50fe1c315f1694119eef845ea4fd3..64a6c81f5abaae2e2e155b7386b105f70c43561b 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getCountry_month.xml @@ -4,7 +4,6 @@ <label>United Kingdom</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml index 2eac2c6b73cc468b06b3d629648eceb642367360..7a5f4e14d5a821520b8064f3eb3960e4aac4e2a9 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_city__UserCountry.getRegion_month.xml @@ -4,7 +4,6 @@ <label>Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml index 9d1172e5b7c9bd4d2fc8ff5cf8d97f06f1aeb2d4..58c9998d630a5add8688ba6b1a07c864c2d6d174 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_continent__UserCountry.getCountry_month.xml @@ -4,7 +4,6 @@ <label>United Kingdom</label> <nb_visits>10</nb_visits> <nb_actions>18</nb_actions> - <nb_users>5</nb_users> <max_actions>3</max_actions> <sum_visit_length>6305</sum_visit_length> <bounce_count>5</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>15</nb_conversions> <revenue>75</revenue> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>5</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> @@ -32,7 +32,6 @@ <label>Russian Federation</label> <nb_visits>4</nb_visits> <nb_actions>7</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -51,6 +50,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ru</code> <logo>plugins/UserCountry/images/flags/ru.png</logo> <logoWidth>16</logoWidth> @@ -60,7 +60,6 @@ <label>France</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -79,6 +78,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> @@ -88,7 +88,6 @@ <label>Italy</label> <nb_visits>2</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -107,6 +106,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>it</code> <logo>plugins/UserCountry/images/flags/it.png</logo> <logoWidth>16</logoWidth> @@ -116,7 +116,6 @@ <label>Macedonia, the Former Yugoslav Republic of</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -135,6 +134,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <code>mk</code> <logo>plugins/UserCountry/images/flags/mk.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml index c2d2b97a3135454951a8381656ea12127e949c15..cd90855e1fbee969a1da530758cb7200943e1cfe 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCity_month.xml @@ -4,7 +4,6 @@ <label>Vancouver, British Columbia, Canada</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>49.25</lat> <long>-123.133</long> <city_name>Vancouver</city_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml index 8dabd75d53d9d2e99b28dbb452ead157554523ab..d94f907eaf56b1b5bbdb3d463d8a6ca3be0edbb4 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getContinent_month.xml @@ -4,7 +4,6 @@ <label>North America</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>North America</code> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml index ef32077f9a2250e46803f25e23c34c5eb924cce5..a0f1d322a8ca5f6f8f4c4e1e0b00395c9dad8d2c 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getCountry_month.xml @@ -4,7 +4,6 @@ <label>Canada</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <code>ca</code> <logo>plugins/UserCountry/images/flags/ca.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml index 9949fd7a69002fc8b05747c37f4aa1a795e08a39..629e6593971f5454e466c338647e995e343e3b71 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_lat_long__UserCountry.getRegion_month.xml @@ -4,7 +4,6 @@ <label>British Columbia, Canada</label> <nb_visits>6</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <region>BC</region> <country>ca</country> <country_name>Canada</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml index 7be434b44bf2828a8756e66c1d22548ca1192b92..5f4e93831d752683e7c9616099e3c29f977c5275 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCity_month.xml @@ -4,7 +4,6 @@ <label>Stratford-upon-Avon, Warwickshire, United Kingdom</label> <nb_visits>4</nb_visits> <nb_actions>8</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>2522</sum_visit_length> <bounce_count>2</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>6</nb_conversions> <revenue>30</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <lat>124.456</lat> <long>22.231</long> <city_name>Stratford-upon-Avon</city_name> @@ -36,7 +36,6 @@ <label>Nuneaton and Bedworth, Warwickshire, United Kingdom</label> <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>1261</sum_visit_length> <bounce_count>1</bounce_count> @@ -55,6 +54,7 @@ <nb_conversions>3</nb_conversions> <revenue>15</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <city_name>Nuneaton and Bedworth</city_name> <region>P3</region> <country>gb</country> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml index 07000e76069d26e8b707c753a9a47e9aa1c1c957..4e05e6e6cb5d0e6759b2c4421680fd66f48ac99b 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getContinent_month.xml @@ -4,7 +4,6 @@ <label>Europe</label> <nb_visits>6</nb_visits> <nb_actions>11</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>Europe</code> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml index e65d6b8d8ac350a81e4966df624d17a742dad208..02920d53d37b444c6a3feee1928e62e44163779a 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getCountry_month.xml @@ -4,7 +4,6 @@ <label>United Kingdom</label> <nb_visits>6</nb_visits> <nb_actions>11</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <code>gb</code> <logo>plugins/UserCountry/images/flags/gb.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml index 785496cb93fe667006b0ec211fe662e0e73c78d5..43b33f1cb5d55f322d852d8c966fa7e5f164deaa 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_segment_region__UserCountry.getRegion_month.xml @@ -4,7 +4,6 @@ <label>Warwickshire, United Kingdom</label> <nb_visits>6</nb_visits> <nb_actions>11</nb_actions> - <nb_users>3</nb_users> <max_actions>3</max_actions> <sum_visit_length>3783</sum_visit_length> <bounce_count>3</bounce_count> @@ -23,6 +22,7 @@ <nb_conversions>9</nb_conversions> <revenue>45</revenue> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <region>P3</region> <country>gb</country> <country_name>United Kingdom</country_name> diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index 70a94cb5a59eb7e188457895369cabf035f17f45..5386b282321f60f9d37ccf7e4ebc40ef3cf0b5da 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -13,13 +13,11 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -42,7 +40,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -54,7 +51,6 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>12</nb_actions> - <nb_users>1</nb_users> <revenue>$ 40</revenue> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>00:21:01</avg_time_on_site> @@ -65,7 +61,6 @@ <nb_uniq_visitors>4</nb_uniq_visitors> <nb_visits>4</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <revenue>$ 20</revenue> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> @@ -76,7 +71,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -87,7 +81,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -98,7 +91,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -109,7 +101,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -120,7 +111,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -131,7 +121,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -142,7 +131,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -153,7 +141,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -164,7 +151,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -175,7 +161,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -186,7 +171,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -197,7 +181,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -208,7 +191,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -219,7 +201,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -230,7 +211,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -241,7 +221,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -252,7 +231,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -263,7 +241,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -274,7 +251,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -285,7 +261,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -296,7 +271,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -307,7 +281,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml new file mode 100644 index 0000000000000000000000000000000000000000..606fbb524182170284d7f1baad7fce4697d9b8b3 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__VisitsSummary.getUsers_day.xml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result>1</result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml index 7295efb5180c2033a4ad7e8c922a050cb14140cb..fe991619f501ee507cb54f9adf6e5091d93734ce 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharactersHierarchical__API.getRowEvolution_day.xml @@ -266,7 +266,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml index b0534b1fd12ab626883aaeac33cd2c8229ba28b6..222e0547340a258ffb42f35953c475d4ef965c2b 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_LabelReservedCharacters__API.getRowEvolution_day.xml @@ -196,7 +196,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml index 6b337e454238ddc9a6ebe2254e4a72fac751723f..be6412244a2f7a4cf7518a9cf8f3396c815b7dc8 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_flatFilters__Referrers.getSearchEngines_month.xml @@ -4,12 +4,12 @@ <label>Google - free > proprietary</label> <nb_visits>9</nb_visits> <nb_actions>9</nb_actions> - <nb_users>9</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>9</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <url>http://google.com/search?q=free+%3E+proprietary</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> @@ -17,12 +17,12 @@ <label>Google - justice )(&^#%$ not corruption!</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_users>8</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> <url>http://google.com/search?q=justice+%29%28%26%5E%23%25%24+not+corruption%21</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> @@ -30,12 +30,12 @@ <label>Google - peace "," not war</label> <nb_visits>8</nb_visits> <nb_actions>8</nb_actions> - <nb_users>8</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>8</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> <url>http://google.com/search?q=peace+%22%2C%22+not+war</url> <logo>plugins/Referrers/images/searchEngines/google.com.png</logo> </row> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml index 86026aff84e64112d35835a4f4f2802c57b4e023..b9a56dc03a5fe9d38df3680e4a280dd0f7ca25b4 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_mobileDesktop__API.getRowEvolution_day.xml @@ -56,7 +56,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml index 29f0426935d04b8af8901e893b147202db8cf2c5..5f45a83e5cab55d440e5f2b8034d04252cb52f97 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithFilterLimit__API.getRowEvolution_day.xml @@ -69,7 +69,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml index 9a1a1b9d3518a1c0bab4ce1a72ab2f1f5bc44120..0409b96f37dc6109717a1b7973be86e73f313c7b 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_multiWithNoData__API.getRowEvolution_day.xml @@ -17,7 +17,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml index ab942b52b975ef86f69714d3bc5dabfe46770795..ff4f69a79d7bc6f3319581d11b8ef99541b1a825 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_multipleDates_lastNoData__API.getRowEvolution_month.xml @@ -49,7 +49,6 @@ <columns> <nb_visits>Visits</nb_visits> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index 68837cb7a6458e9ffb9aff18df9a8295729aa974..7b26cb04217ebc0b6be46832c9f6ed8376c73101 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -69,7 +69,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml index 0e60dac3c40cb3efa4e8235d7e8f8c00ff3a3e50..799dedec2a7aa349f9c1ecfd39706052496af038 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer1__API.getRowEvolution_day.xml @@ -8,7 +8,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -23,7 +22,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -38,7 +36,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -53,7 +50,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -68,7 +64,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -83,7 +78,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -109,11 +103,6 @@ <min>0</min> <max>1</max> </nb_actions> - <nb_users> - <name>Users</name> - <min>0</min> - <max>1</max> - </nb_users> <nb_actions_per_visit> <name>Actions per Visit</name> <min>0</min> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml index 8251015ac633687d3189a8f86fb9c51c723d0a26..0667e62efb4e939a35ecd843d89c9280d8f719e0 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrer2__API.getRowEvolution_day.xml @@ -10,7 +10,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -30,7 +29,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -50,7 +48,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>365</avg_time_on_site> <bounce_rate>100%</bounce_rate> @@ -79,11 +76,6 @@ <min>0</min> <max>1</max> </nb_actions> - <nb_users> - <name>Users</name> - <min>0</min> - <max>1</max> - </nb_users> <nb_actions_per_visit> <name>Actions per Visit</name> <min>0</min> diff --git a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml index 01184a360d8938644de80d4edbc71c83692c3750..334c6c2da51b2b30a98aa743196fe5b55ac33510 100644 --- a/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/Integration/expected/test_RowEvolution_referrerMulti1__API.getRowEvolution_day.xml @@ -195,7 +195,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml index 59005b56ae16758d0c06b0ab4fddfe8f9c9b3af7..ba5b1f793b3f91cb91477c2885505a6c82c63063 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_AllSites__CustomVariables.getCustomVariables_month.xml @@ -106,23 +106,23 @@ <label>test cvar name</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>541</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>test cvar value</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>541</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index 349f30ef0e4d123ca1215fd64fad6cc3af95457c..1e7e2b8d0c475de69fee908e9505f4b32f641034 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -13,13 +13,11 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -43,7 +41,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -59,7 +56,6 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> <row> @@ -70,7 +66,6 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> </result> @@ -83,7 +78,6 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> <row> @@ -94,7 +88,6 @@ <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> <nb_uniq_visitors>0</nb_uniq_visitors> - <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index eb69dca4c6f0adfab9c477875755f2cd56759283..a34a4ccc8f8de21bf2b3442ed82d50dd905b3445 100644 --- a/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/Integration/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -12,13 +12,11 @@ <metrics> <nb_visits>Visits</nb_visits> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -41,7 +39,6 @@ <label>Custom Variable name</label> <nb_visits>Visits</nb_visits> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -56,7 +53,6 @@ <nb_actions_per_visit>1.29</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> - <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> <row> @@ -66,7 +62,6 @@ <nb_actions_per_visit>1.25</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> - <nb_users>0</nb_users> <revenue>$ 0</revenue> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index 7b96eea503f39e660a9085de18701a9f892a301c..59aea854d49d09ae638e9a6afcc681d109893e6f 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -13,13 +13,11 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -43,7 +41,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -57,7 +54,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>2</nb_actions_per_visit> <avg_time_on_site>00:06:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -70,7 +66,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -83,7 +78,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -96,7 +90,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -109,7 +102,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -122,7 +114,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> - <nb_users>1</nb_users> <nb_actions_per_visit>5</nb_actions_per_visit> <avg_time_on_site>00:15:01</avg_time_on_site> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml index 17e491539a1a258a0d1d4cc97bdaa4de85b8faad..302e91d40ae39e9abe57307f6f36dc0d847b8def 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_month.xml @@ -6,34 +6,34 @@ <label>referrer.com</label> <nb_visits>9</nb_visits> <nb_actions>42</nb_actions> - <nb_users>9</nb_users> <max_actions>5</max_actions> <sum_visit_length>7569</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>8</nb_visits> <nb_actions>40</nb_actions> - <nb_users>8</nb_users> <max_actions>5</max_actions> <sum_visit_length>7208</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -51,23 +51,23 @@ <label>only-homepage-referrer.com</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://only-homepage-referrer.com/</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml index 7013a0bcce0bbd0f61d66fff5823136ae696d720..9c516cffbeb226ae20042395c0a983d86c8cd914 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_week.xml @@ -7,34 +7,34 @@ <label>referrer.com</label> <nb_visits>7</nb_visits> <nb_actions>32</nb_actions> - <nb_users>7</nb_users> <max_actions>5</max_actions> <sum_visit_length>5767</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>7</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>6</nb_visits> <nb_actions>30</nb_actions> - <nb_users>6</nb_users> <max_actions>5</max_actions> <sum_visit_length>5406</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>6</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -44,23 +44,23 @@ <label>referrer.com</label> <nb_visits>2</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>5</max_actions> <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>2</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>5</max_actions> <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </subtable> </row> @@ -77,23 +77,23 @@ <label>only-homepage-referrer.com</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://only-homepage-referrer.com/</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml index 748a8b69fe4ce78267b65a18c3638129199ad2a0..9af23aaf763596745a453553c9ae5dbd8f80f3ee 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays__Referrers.getWebsites_year.xml @@ -6,34 +6,34 @@ <label>referrer.com</label> <nb_visits>9</nb_visits> <nb_actions>42</nb_actions> - <nb_users>9</nb_users> <max_actions>5</max_actions> <sum_visit_length>7569</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>8</nb_visits> <nb_actions>40</nb_actions> - <nb_users>8</nb_users> <max_actions>5</max_actions> <sum_visit_length>7208</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -51,23 +51,23 @@ <label>only-homepage-referrer.com</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>http://only-homepage-referrer.com/</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>1</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml index 975c8ac67384cfd574369ea29bb471357cb5eb11..b52e454e88d5fd340ce5657e39d524025c71ad24 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_month.xml @@ -5,34 +5,34 @@ <label>referrer.com</label> <nb_visits>9</nb_visits> <nb_actions>42</nb_actions> - <nb_users>9</nb_users> <max_actions>5</max_actions> <sum_visit_length>7569</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>8</nb_visits> <nb_actions>40</nb_actions> - <nb_users>8</nb_users> <max_actions>5</max_actions> <sum_visit_length>7208</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml index 4cda88f335271f364b876faf40801fc4c02db8f4..3d650861ff85203c6e1a85030a1b32ad99017c1d 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_week.xml @@ -6,34 +6,34 @@ <label>referrer.com</label> <nb_visits>7</nb_visits> <nb_actions>32</nb_actions> - <nb_users>7</nb_users> <max_actions>5</max_actions> <sum_visit_length>5767</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>7</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>6</nb_visits> <nb_actions>30</nb_actions> - <nb_users>6</nb_users> <max_actions>5</max_actions> <sum_visit_length>5406</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>6</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -43,23 +43,23 @@ <label>referrer.com</label> <nb_visits>2</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>5</max_actions> <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>2</nb_visits> <nb_actions>10</nb_actions> - <nb_users>2</nb_users> <max_actions>5</max_actions> <sum_visit_length>1802</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml index 5050af5988a168a57d4bebc44c9fb6a0fb20da2a..c5f8e144d31f6206d1a6921dba08e4631973ce86 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_idSiteOne___Referrers.getWebsites_year.xml @@ -5,34 +5,34 @@ <label>referrer.com</label> <nb_visits>9</nb_visits> <nb_actions>42</nb_actions> - <nb_users>9</nb_users> <max_actions>5</max_actions> <sum_visit_length>7569</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>9</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>9</sum_daily_nb_users> <subtable> <row> <label>http://referrer.com/Other_Page.htm</label> <nb_visits>8</nb_visits> <nb_actions>40</nb_actions> - <nb_users>8</nb_users> <max_actions>5</max_actions> <sum_visit_length>7208</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>8</sum_daily_nb_users> </row> <row> <label>http://referrer.com/page.htm?param=valuewith some spaces</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv index 0086f1c1c77ab442fd8b0e067f4cd1d783dfc3f6..aa57a0552ebf483c7908f8b6d5067465bfb31951 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv @@ -8,91 +8,91 @@ nb_uniq_visitors,nb_visits,nb_actions,nb_users,max_actions,bounce_rate,nb_action 2,10,43,1,5,10%,4.3,00:12:37 Visits by Server Time -label,nb_visits,nb_actions,nb_users,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -0h,1,2,1,2,00:06:01,0%,$ 0 -1h,0,0,0,0,00:00:00,0%,$ 0 -2h,0,0,0,0,00:00:00,0%,$ 0 -3h,0,0,0,0,00:00:00,0%,$ 0 -4h,0,0,0,0,00:00:00,0%,$ 0 -5h,0,0,0,0,00:00:00,0%,$ 0 -6h,0,0,0,0,00:00:00,0%,$ 0 -7h,0,0,0,0,00:00:00,0%,$ 0 -8h,0,0,0,0,00:00:00,0%,$ 0 -9h,0,0,0,0,00:00:00,0%,$ 0 -10h,0,0,0,0,00:00:00,0%,$ 0 -11h,8,40,8,5,00:15:01,0%,$ 0 -12h,1,1,1,1,00:00:00,100%,$ 0 -13h,0,0,0,0,00:00:00,0%,$ 0 -14h,0,0,0,0,00:00:00,0%,$ 0 -15h,0,0,0,0,00:00:00,0%,$ 0 -16h,0,0,0,0,00:00:00,0%,$ 0 -17h,0,0,0,0,00:00:00,0%,$ 0 -18h,0,0,0,0,00:00:00,0%,$ 0 -19h,0,0,0,0,00:00:00,0%,$ 0 -20h,0,0,0,0,00:00:00,0%,$ 0 -21h,0,0,0,0,00:00:00,0%,$ 0 -22h,0,0,0,0,00:00:00,0%,$ 0 -23h,0,0,0,0,00:00:00,0%,$ 0 +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +0h,1,2,2,00:06:01,0%,$ 0 +1h,0,0,0,00:00:00,0%,$ 0 +2h,0,0,0,00:00:00,0%,$ 0 +3h,0,0,0,00:00:00,0%,$ 0 +4h,0,0,0,00:00:00,0%,$ 0 +5h,0,0,0,00:00:00,0%,$ 0 +6h,0,0,0,00:00:00,0%,$ 0 +7h,0,0,0,00:00:00,0%,$ 0 +8h,0,0,0,00:00:00,0%,$ 0 +9h,0,0,0,00:00:00,0%,$ 0 +10h,0,0,0,00:00:00,0%,$ 0 +11h,8,40,5,00:15:01,0%,$ 0 +12h,1,1,1,00:00:00,100%,$ 0 +13h,0,0,0,00:00:00,0%,$ 0 +14h,0,0,0,00:00:00,0%,$ 0 +15h,0,0,0,00:00:00,0%,$ 0 +16h,0,0,0,00:00:00,0%,$ 0 +17h,0,0,0,00:00:00,0%,$ 0 +18h,0,0,0,00:00:00,0%,$ 0 +19h,0,0,0,00:00:00,0%,$ 0 +20h,0,0,0,00:00:00,0%,$ 0 +21h,0,0,0,00:00:00,0%,$ 0 +22h,0,0,0,00:00:00,0%,$ 0 +23h,0,0,0,00:00:00,0%,$ 0 Visits by Local Time -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -0h,0,0,0,0%,0,00:00:00,0% -1h,0,0,0,0%,0,00:00:00,0% -2h,0,0,0,0%,0,00:00:00,0% -3h,0,0,0,0%,0,00:00:00,0% -4h,0,0,0,0%,0,00:00:00,0% -5h,0,0,0,0%,0,00:00:00,0% -6h,0,0,0,0%,0,00:00:00,0% -7h,0,0,0,0%,0,00:00:00,0% -8h,0,0,0,0%,0,00:00:00,0% -9h,0,0,0,0%,0,00:00:00,0% -10h,0,0,0,0%,0,00:00:00,0% -11h,0,0,0,0%,0,00:00:00,0% -12h,10,43,10,0%,4.3,00:12:37,10% -13h,0,0,0,0%,0,00:00:00,0% -14h,0,0,0,0%,0,00:00:00,0% -15h,0,0,0,0%,0,00:00:00,0% -16h,0,0,0,0%,0,00:00:00,0% -17h,0,0,0,0%,0,00:00:00,0% -18h,0,0,0,0%,0,00:00:00,0% -19h,0,0,0,0%,0,00:00:00,0% -20h,0,0,0,0%,0,00:00:00,0% -21h,0,0,0,0%,0,00:00:00,0% -22h,0,0,0,0%,0,00:00:00,0% -23h,0,0,0,0%,0,00:00:00,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +0h,0,0,0%,0,00:00:00,0% +1h,0,0,0%,0,00:00:00,0% +2h,0,0,0%,0,00:00:00,0% +3h,0,0,0%,0,00:00:00,0% +4h,0,0,0%,0,00:00:00,0% +5h,0,0,0%,0,00:00:00,0% +6h,0,0,0%,0,00:00:00,0% +7h,0,0,0%,0,00:00:00,0% +8h,0,0,0%,0,00:00:00,0% +9h,0,0,0%,0,00:00:00,0% +10h,0,0,0%,0,00:00:00,0% +11h,0,0,0%,0,00:00:00,0% +12h,10,43,0%,4.3,00:12:37,10% +13h,0,0,0%,0,00:00:00,0% +14h,0,0,0%,0,00:00:00,0% +15h,0,0,0%,0,00:00:00,0% +16h,0,0,0%,0,00:00:00,0% +17h,0,0,0%,0,00:00:00,0% +18h,0,0,0%,0,00:00:00,0% +19h,0,0,0%,0,00:00:00,0% +20h,0,0,0%,0,00:00:00,0% +21h,0,0,0%,0,00:00:00,0% +22h,0,0,0%,0,00:00:00,0% +23h,0,0,0%,0,00:00:00,0% Visits by Day of Week -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Monday,2,7,2,0%,3.5,00:10:31,0% -Tuesday,2,10,2,0%,5,00:15:01,0% -Wednesday,1,5,1,0%,5,00:15:01,0% -Thursday,1,5,1,0%,5,00:15:01,0% -Friday,1,5,1,0%,5,00:15:01,0% -Saturday,1,5,1,0%,5,00:15:01,0% -Sunday,2,6,2,0%,3,00:07:31,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Monday,2,7,0%,3.5,00:10:31,0% +Tuesday,2,10,0%,5,00:15:01,0% +Wednesday,1,5,0%,5,00:15:01,0% +Thursday,1,5,0%,5,00:15:01,0% +Friday,1,5,0%,5,00:15:01,0% +Saturday,1,5,0%,5,00:15:01,0% +Sunday,2,6,0%,3,00:07:31,50% Screen Resolution -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -800x300,9,41,9,0%,4.56,00:13:21,11.11% -1024x768,1,2,1,0%,2,00:06:01,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +800x300,9,41,0%,4.56,00:13:21,11.11% +1024x768,1,2,0%,2,00:06:01,0% Visitor Browser -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Firefox,1,2,1,0%,2,00:06:01,0% -Opera,1,1,1,0%,1,00:00:00,100% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Firefox,1,2,0%,2,00:06:01,0% +Opera,1,1,0%,1,00:00:00,100% Browser Version -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Firefox 3.6,1,2,1,0%,2,00:06:01,0% -Opera 9.63,1,1,1,0%,1,00:00:00,100% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Firefox 3.6,1,2,0%,2,00:06:01,0% +Opera 9.63,1,1,0%,1,00:00:00,100% Browser Family -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Gecko (Firefox),1,2,1,0%,2,00:06:01,0% -Presto (Opera),1,1,1,0%,1,00:00:00,100% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Gecko (Firefox),1,2,0%,2,00:06:01,0% +Presto (Opera),1,1,0%,1,00:00:00,100% Browser Plugins label,nb_visits,nb_visits_percentage @@ -108,36 +108,36 @@ Silverlight,0,0% Windowsmedia,0,0% Normal / Widescreen -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Dual,9,41,9,0%,4.56,00:13:21,11.11% -Normal,1,2,1,0%,2,00:06:01,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Dual,9,41,0%,4.56,00:13:21,11.11% +Normal,1,2,0%,2,00:06:01,0% Operating System -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Windows XP,2,3,2,0%,1.5,00:03:01,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Windows XP,2,3,0%,1.5,00:03:01,50% Visitor Configuration -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown / Unknown / 800x300,8,40,8,0%,5,00:15:01,0% -Windows XP / Firefox / 1024x768,1,2,1,0%,2,00:06:01,0% -Windows XP / Opera / 800x300,1,1,1,0%,1,00:00:00,100% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown / Unknown / 800x300,8,40,0%,5,00:15:01,0% +Windows XP / Firefox / 1024x768,1,2,0%,2,00:06:01,0% +Windows XP / Opera / 800x300,1,1,0%,1,00:00:00,100% Operating system family -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Windows,2,3,2,0%,1.5,00:03:01,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Windows,2,3,0%,1.5,00:03:01,50% Mobile vs Desktop -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Desktop,2,3,2,0%,1.5,00:03:01,50% -Mobile,0,0,0,0%,0,00:00:00,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Desktop,2,3,0%,1.5,00:03:01,50% +Mobile,0,0,0%,0,00:00:00,0% Browser language -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -French,2,3,2,0%,1.5,00:03:01,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +French,2,3,0%,1.5,00:03:01,50% Actions - Main metrics nb_pageviews,nb_uniq_pageviews,nb_downloads,nb_uniq_downloads,nb_outlinks,nb_uniq_outlinks,nb_searches,nb_keywords,avg_time_generation @@ -193,20 +193,20 @@ Event Names No data available Referrer Type -label,nb_visits,nb_actions,nb_users,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -Websites,9,42,9,4.67,00:14:01,0%,$ 0 -Direct Entry,1,1,1,1,00:00:00,100%,$ 0 +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +Websites,9,42,4.67,00:14:01,0%,$ 0 +Direct Entry,1,1,1,00:00:00,100%,$ 0 All Referrers -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -referrer.com,9,42,9,0%,4.67,00:14:01,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +referrer.com,9,42,0%,4.67,00:14:01,0% Keywords No data available Websites -label,nb_visits,nb_actions,nb_users,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue -referrer.com,9,42,9,4.67,00:14:01,0%,$ 0 +label,nb_visits,nb_actions,nb_actions_per_visit,avg_time_on_site,bounce_rate,revenue +referrer.com,9,42,4.67,00:14:01,0%,$ 0 Search Engines No data available @@ -314,41 +314,41 @@ nb_uniq_visitors_returning,nb_visits_returning,nb_actions_returning,bounce_rate_ 1,8,40,0%,5,00:15:01 Provider -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,10,43,10,0%,4.3,00:12:37,10% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,10,43,0%,4.3,00:12:37,10% Device type -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Desktop,2,3,2,0%,1.5,00:03:01,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Desktop,2,3,0%,1.5,00:03:01,50% Device brand -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,10,43,10,0%,4.3,00:12:37,10% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,10,43,0%,4.3,00:12:37,10% Device model -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,10,43,10,0%,4.3,00:12:37,10% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,10,43,0%,4.3,00:12:37,10% Operating System families -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Windows,2,3,2,0%,1.5,00:03:01,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Windows,2,3,0%,1.5,00:03:01,50% Operating System versions -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Windows XP,2,3,2,0%,1.5,00:03:01,50% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Windows XP,2,3,0%,1.5,00:03:01,50% Browser families -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Firefox,1,2,1,0%,2,00:06:01,0% -Opera,1,1,1,0%,1,00:00:00,100% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Firefox,1,2,0%,2,00:06:01,0% +Opera,1,1,0%,1,00:00:00,100% Browser versions -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,8,40,8,0%,5,00:15:01,0% -Firefox 3.6,1,2,1,0%,2,00:06:01,0% -Opera 9.63,1,1,1,0%,1,00:00:00,100% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,8,40,0%,5,00:15:01,0% +Firefox 3.6,1,2,0%,2,00:06:01,0% +Opera 9.63,1,1,0%,1,00:00:00,100% diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 0937779d8e5b5b083540c461b0a08f10a4192361..2eb3fc831f75b40a108723fd907d8ea0c49508e4 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -494,9 +494,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -522,9 +519,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -551,9 +545,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -577,9 +568,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -603,9 +591,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -629,9 +614,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -655,9 +637,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -681,9 +660,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -707,9 +683,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -733,9 +706,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -759,9 +729,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -785,9 +752,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -808,9 +772,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -837,9 +798,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -863,9 +821,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -889,9 +844,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -915,9 +867,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -941,9 +890,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -967,9 +913,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -993,9 +936,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1019,9 +959,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1045,9 +982,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1071,9 +1005,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1097,9 +1028,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1123,9 +1051,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1158,9 +1083,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -1189,9 +1111,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1215,9 +1134,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1241,9 +1157,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1267,9 +1180,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1293,9 +1203,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1319,9 +1226,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1345,9 +1249,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1371,9 +1272,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1397,9 +1295,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1423,9 +1318,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1449,9 +1341,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1475,9 +1364,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1498,9 +1384,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 43 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.3 </td> @@ -1527,9 +1410,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1553,9 +1433,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1579,9 +1456,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1605,9 +1479,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1631,9 +1502,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1657,9 +1525,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1683,9 +1548,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1709,9 +1571,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1735,9 +1594,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1761,9 +1617,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1787,9 +1640,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1822,9 +1672,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -1850,9 +1697,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 7 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.5 </td> @@ -1876,9 +1720,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 10 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -1902,9 +1743,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -1928,9 +1766,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -1954,9 +1789,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -1980,9 +1812,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -2006,9 +1835,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 6 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> @@ -2044,9 +1870,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2072,9 +1895,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 41 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.56 </td> @@ -2098,9 +1918,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -2136,9 +1953,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2166,9 +1980,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -2194,9 +2005,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -2225,9 +2033,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2260,9 +2065,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2290,9 +2092,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -2318,9 +2117,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -2349,9 +2145,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2384,9 +2177,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2412,9 +2202,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -2438,9 +2225,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -2467,9 +2251,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2657,9 +2438,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2687,9 +2465,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 41 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.56 </td> @@ -2715,9 +2490,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -2753,9 +2525,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2783,9 +2552,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -2811,9 +2577,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -2849,9 +2612,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2877,9 +2637,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -2903,9 +2660,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -2932,9 +2686,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2967,9 +2718,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2997,9 +2745,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -3025,9 +2770,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -3063,9 +2805,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -3093,9 +2832,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -3121,9 +2857,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -3152,9 +2885,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -3187,9 +2917,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -3215,9 +2942,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -3241,9 +2965,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -3896,9 +3617,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -3924,9 +3642,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 42 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.67 </td> @@ -3953,9 +3668,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -3988,9 +3700,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -4016,9 +3725,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 42 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.67 </td> @@ -4059,9 +3765,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -4087,9 +3790,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 42 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 9 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.67 </td> @@ -5098,9 +4798,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5128,9 +4825,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 43 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.3 </td> @@ -5166,9 +4860,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5196,9 +4887,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -5224,9 +4912,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -5262,9 +4947,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5292,9 +4974,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 43 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.3 </td> @@ -5330,9 +5009,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5358,9 +5034,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 43 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 10 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.3 </td> @@ -5396,9 +5069,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5426,9 +5096,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -5454,9 +5121,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -5492,9 +5156,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5522,9 +5183,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -5550,9 +5208,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -5588,9 +5243,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5618,9 +5270,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -5646,9 +5295,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -5677,9 +5323,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -5712,9 +5355,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5742,9 +5382,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 40 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 8 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 5 </td> @@ -5770,9 +5407,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 2 </td> @@ -5801,9 +5435,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml index 960470df27e39d634957dfa6942469b3cb8fcbfd..4f332086750e2aef9823107756daa2d4bc9fa2a8 100644 --- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite1_OldReportsShouldAppear__VisitsSummary.get_month.xml @@ -4,6 +4,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> + <nb_users>1</nb_users> <nb_visits_converted>0</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>1</sum_visit_length> @@ -17,6 +18,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> + <nb_users>1</nb_users> <nb_visits_converted>0</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>1</sum_visit_length> diff --git a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml index caa4caae0595407f401cfb91214586e4bc265394..414e79d715ab21da6fd41e357de95ccf8e9ce05b 100644 --- a/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml +++ b/tests/PHPUnit/Integration/expected/test_VisitsInPast_InvalidateOldReportsWebsite2_OldReportsShouldAppear__VisitsSummary.get_month.xml @@ -4,6 +4,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>5</nb_actions> + <nb_users>1</nb_users> <nb_visits_converted>0</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>361</sum_visit_length> @@ -18,6 +19,7 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> + <nb_users>1</nb_users> <nb_visits_converted>0</nb_visits_converted> <bounce_count>0</bounce_count> <sum_visit_length>1</sum_visit_length> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 1dba3831aa87212bd7f321e8abb08b59bce16a25..ac5b25e598312cf8027a0f4c2d5887a458ca9987 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -203,32 +203,6 @@ <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> <uniqueId>UserSettings_getResolution</uniqueId> </row> - <row> - <category>Visitor Settings</category> - <name>ZenModeName</name> - <module>ZenMode</module> - <action>getZenMode</action> - <documentation>ZenModeDocumentation</documentation> - <metrics> - <nb_visits>Visits</nb_visits> - <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> - <nb_actions>Actions</nb_actions> - </metrics> - <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - </metricsDocumentation> - <processedMetrics> - <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> - <avg_time_on_site>Avg. Time on Website</avg_time_on_site> - <bounce_rate>Bounce Rate</bounce_rate> - <conversion_rate>Conversion Rate</conversion_rate> - </processedMetrics> - <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=ZenMode&apiAction=getZenMode&period=day&date=2008-12-06,2009-01-04</imageGraphUrl> - <imageGraphEvolutionUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=ZenMode&apiAction=getZenMode&period=day&date=2008-12-06,2009-01-04</imageGraphEvolutionUrl> - <uniqueId>ZenMode_getZenMode</uniqueId> - </row> <row> <category>Visitor Settings</category> <name>Visitor Browser</name> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index fc0c7b8b98c35d312dffe8b84c6224938fe744a7..12740b0394de1f3b8e13d8dadae9af2d5a76da33 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -13,13 +13,11 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -42,7 +40,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -54,7 +51,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <revenue>$ 10</revenue> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>00:12:01</avg_time_on_site> @@ -65,7 +61,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -76,7 +71,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>6</nb_actions> - <nb_users>1</nb_users> <revenue>$ 3111</revenue> <nb_actions_per_visit>6</nb_actions_per_visit> <avg_time_on_site>01:06:01</avg_time_on_site> @@ -87,7 +81,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -98,7 +91,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -109,7 +101,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -120,7 +111,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -131,7 +121,6 @@ <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <revenue>$ 0</revenue> <nb_actions_per_visit>3</nb_actions_per_visit> <avg_time_on_site>00:12:01</avg_time_on_site> @@ -142,7 +131,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -153,7 +141,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -164,7 +151,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -175,7 +161,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -186,7 +171,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -197,7 +181,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -208,7 +191,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -219,7 +201,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -230,7 +211,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -241,7 +221,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -252,7 +231,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -263,7 +241,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -274,7 +251,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -285,7 +261,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -296,7 +271,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> @@ -307,7 +281,6 @@ <nb_uniq_visitors>0</nb_uniq_visitors> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <nb_actions_per_visit>0</nb_actions_per_visit> <avg_time_on_site>00:00:00</avg_time_on_site> <bounce_rate>0%</bounce_rate> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv index c5ce8567f79b2bc0ed6bb696f756c9d6d9867c90..add454d071b9b2241a18714928215411e9f7a6c8 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv @@ -8,84 +8,84 @@ nb_uniq_visitors,nb_visits,nb_actions,nb_users,max_actions,bounce_rate,nb_action 1,5,16,1,6,20%,3.2,00:22:49 Visits by Server Time -label,nb_visits,nb_actions,nb_users,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -0h,1,4,1,$ 10,4,00:12:01,0% -1h,0,0,0,$ 0,0,00:00:00,0% -2h,2,9,2,$ 3111.11,4.5,00:42:01,0% -3h,0,0,0,$ 0,0,00:00:00,0% -4h,0,0,0,$ 0,0,00:00:00,0% -5h,0,0,0,$ 0,0,00:00:00,0% -6h,1,0,1,$ 10240,0,00:06:03,100% -7h,1,3,1,$ 0,3,00:12:01,0% -8h,0,0,0,$ 0,0,00:00:00,0% -9h,0,0,0,$ 0,0,00:00:00,0% -10h,0,0,0,$ 0,0,00:00:00,0% -11h,0,0,0,$ 0,0,00:00:00,0% -12h,0,0,0,$ 0,0,00:00:00,0% -13h,0,0,0,$ 0,0,00:00:00,0% -14h,0,0,0,$ 0,0,00:00:00,0% -15h,0,0,0,$ 0,0,00:00:00,0% -16h,0,0,0,$ 0,0,00:00:00,0% -17h,0,0,0,$ 0,0,00:00:00,0% -18h,0,0,0,$ 0,0,00:00:00,0% -19h,0,0,0,$ 0,0,00:00:00,0% -20h,0,0,0,$ 0,0,00:00:00,0% -21h,0,0,0,$ 0,0,00:00:00,0% -22h,0,0,0,$ 0,0,00:00:00,0% -23h,0,0,0,$ 0,0,00:00:00,0% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +0h,1,4,$ 10,4,00:12:01,0% +1h,0,0,$ 0,0,00:00:00,0% +2h,2,9,$ 3111.11,4.5,00:42:01,0% +3h,0,0,$ 0,0,00:00:00,0% +4h,0,0,$ 0,0,00:00:00,0% +5h,0,0,$ 0,0,00:00:00,0% +6h,1,0,$ 10240,0,00:06:03,100% +7h,1,3,$ 0,3,00:12:01,0% +8h,0,0,$ 0,0,00:00:00,0% +9h,0,0,$ 0,0,00:00:00,0% +10h,0,0,$ 0,0,00:00:00,0% +11h,0,0,$ 0,0,00:00:00,0% +12h,0,0,$ 0,0,00:00:00,0% +13h,0,0,$ 0,0,00:00:00,0% +14h,0,0,$ 0,0,00:00:00,0% +15h,0,0,$ 0,0,00:00:00,0% +16h,0,0,$ 0,0,00:00:00,0% +17h,0,0,$ 0,0,00:00:00,0% +18h,0,0,$ 0,0,00:00:00,0% +19h,0,0,$ 0,0,00:00:00,0% +20h,0,0,$ 0,0,00:00:00,0% +21h,0,0,$ 0,0,00:00:00,0% +22h,0,0,$ 0,0,00:00:00,0% +23h,0,0,$ 0,0,00:00:00,0% Visits by Local Time -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -0h,0,0,0,0%,0,00:00:00,0% -1h,0,0,0,0%,0,00:00:00,0% -2h,0,0,0,0%,0,00:00:00,0% -3h,0,0,0,0%,0,00:00:00,0% -4h,0,0,0,0%,0,00:00:00,0% -5h,0,0,0,0%,0,00:00:00,0% -6h,0,0,0,0%,0,00:00:00,0% -7h,0,0,0,0%,0,00:00:00,0% -8h,0,0,0,0%,0,00:00:00,0% -9h,0,0,0,0%,0,00:00:00,0% -10h,0,0,0,0%,0,00:00:00,0% -11h,0,0,0,0%,0,00:00:00,0% -12h,5,16,2,80%,3.2,00:22:49,20% -13h,0,0,0,0%,0,00:00:00,0% -14h,0,0,0,0%,0,00:00:00,0% -15h,0,0,0,0%,0,00:00:00,0% -16h,0,0,0,0%,0,00:00:00,0% -17h,0,0,0,0%,0,00:00:00,0% -18h,0,0,0,0%,0,00:00:00,0% -19h,0,0,0,0%,0,00:00:00,0% -20h,0,0,0,0%,0,00:00:00,0% -21h,0,0,0,0%,0,00:00:00,0% -22h,0,0,0,0%,0,00:00:00,0% -23h,0,0,0,0%,0,00:00:00,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +0h,0,0,0%,0,00:00:00,0% +1h,0,0,0%,0,00:00:00,0% +2h,0,0,0%,0,00:00:00,0% +3h,0,0,0%,0,00:00:00,0% +4h,0,0,0%,0,00:00:00,0% +5h,0,0,0%,0,00:00:00,0% +6h,0,0,0%,0,00:00:00,0% +7h,0,0,0%,0,00:00:00,0% +8h,0,0,0%,0,00:00:00,0% +9h,0,0,0%,0,00:00:00,0% +10h,0,0,0%,0,00:00:00,0% +11h,0,0,0%,0,00:00:00,0% +12h,5,16,80%,3.2,00:22:49,20% +13h,0,0,0%,0,00:00:00,0% +14h,0,0,0%,0,00:00:00,0% +15h,0,0,0%,0,00:00:00,0% +16h,0,0,0%,0,00:00:00,0% +17h,0,0,0%,0,00:00:00,0% +18h,0,0,0%,0,00:00:00,0% +19h,0,0,0%,0,00:00:00,0% +20h,0,0,0%,0,00:00:00,0% +21h,0,0,0%,0,00:00:00,0% +22h,0,0,0%,0,00:00:00,0% +23h,0,0,0%,0,00:00:00,0% Visits by Day of Week -label,nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,nb_actions,nb_users -Monday,0,0%,0,00:00:00,0%,0,0 -Tuesday,3,66.67%,4.33,00:30:01,0%,13,1 -Wednesday,2,100%,1.5,00:12:02,50%,3,1 -Thursday,0,0%,0,00:00:00,0%,0,0 -Friday,0,0%,0,00:00:00,0%,0,0 -Saturday,0,0%,0,00:00:00,0%,0,0 -Sunday,0,0%,0,00:00:00,0%,0,0 +label,nb_visits,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate,nb_actions +Monday,0,0%,0,00:00:00,0%,0 +Tuesday,3,66.67%,4.33,00:30:01,0%,13 +Wednesday,2,100%,1.5,00:12:02,50%,3 +Thursday,0,0%,0,00:00:00,0%,0 +Friday,0,0%,0,00:00:00,0%,0 +Saturday,0,0%,0,00:00:00,0%,0 +Sunday,0,0%,0,00:00:00,0%,0 Screen Resolution -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -1024x768,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +1024x768,5,16,80%,3.2,00:22:49,20% Visitor Browser -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox,5,16,80%,3.2,00:22:49,20% Browser Version -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox 3.6,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox 3.6,5,16,80%,3.2,00:22:49,20% Browser Family -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Gecko (Firefox),5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Gecko (Firefox),5,16,80%,3.2,00:22:49,20% Browser Plugins label,nb_visits,nb_visits_percentage @@ -101,30 +101,30 @@ Silverlight,0,0% Windowsmedia,0,0% Normal / Widescreen -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Normal,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Normal,5,16,80%,3.2,00:22:49,20% Operating System -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows XP,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Windows XP,5,16,80%,3.2,00:22:49,20% Visitor Configuration -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows XP / Firefox / 1024x768,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Windows XP / Firefox / 1024x768,5,16,80%,3.2,00:22:49,20% Operating system family -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Windows,5,16,80%,3.2,00:22:49,20% Mobile vs Desktop -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,2,80%,3.2,00:22:49,20% -Mobile,0,0,0,0%,0,00:00:00,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Desktop,5,16,80%,3.2,00:22:49,20% +Mobile,0,0,0%,0,00:00:00,0% Browser language -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Polish,4,12,2,75%,3,00:25:32,25% -French,1,4,1,100%,4,00:12:01,0% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Polish,4,12,75%,3,00:25:32,25% +French,1,4,100%,4,00:12:01,0% Ecommerce Orders nb_conversions,nb_visits_converted,conversion_rate,revenue,revenue_subtotal,revenue_tax,revenue_shipping,revenue_discount,items,avg_order_revenue @@ -282,8 +282,8 @@ Event Names No data available Referrer Type -label,nb_visits,nb_actions,nb_users,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -Direct Entry,5,16,2,$ 13361.11,3.2,00:22:49,20% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +Direct Entry,5,16,$ 13361.11,3.2,00:22:49,20% All Referrers No data available @@ -395,10 +395,10 @@ label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_ Unknown,5,16,$ 13361.11,3.2,00:22:49,20% Custom Variables -label,nb_visits,nb_actions,nb_users,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate -ValueIsZero,5,16,2,$ 13361.11,3.2,00:22:49,20% -VisitorType,5,16,2,$ 13361.11,3.2,00:22:49,20% -VisitorName,4,12,2,$ 13351.11,3,00:25:32,25% +label,nb_visits,nb_actions,revenue,nb_actions_per_visit,avg_time_on_site,bounce_rate +ValueIsZero,5,16,$ 13361.11,3.2,00:22:49,20% +VisitorType,5,16,$ 13361.11,3.2,00:22:49,20% +VisitorName,4,12,$ 13351.11,3,00:25:32,25% Length of Visits label,nb_visits @@ -466,34 +466,34 @@ nb_uniq_visitors_returning,nb_visits_returning,nb_actions_returning,bounce_rate_ 1,4,12,25%,3,00:25:32 Provider -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,80%,3.2,00:22:49,20% Device type -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Desktop,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Desktop,5,16,80%,3.2,00:22:49,20% Device brand -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,80%,3.2,00:22:49,20% Device model -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Unknown,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Unknown,5,16,80%,3.2,00:22:49,20% Operating System families -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Windows,5,16,80%,3.2,00:22:49,20% Operating System versions -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Windows XP,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Windows XP,5,16,80%,3.2,00:22:49,20% Browser families -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox,5,16,80%,3.2,00:22:49,20% Browser versions -label,nb_visits,nb_actions,nb_users,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate -Firefox 3.6,5,16,2,80%,3.2,00:22:49,20% +label,nb_visits,nb_actions,conversion_rate,nb_actions_per_visit,avg_time_on_site,bounce_rate +Firefox 3.6,5,16,80%,3.2,00:22:49,20% diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 8eedbb8ba85da2a289bdaa7508a6c4773b1d5325..11b42c16b1623841f4498a9024f4f86224b13e17 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -554,9 +554,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -582,9 +579,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4 </td> @@ -611,9 +605,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -634,9 +625,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 9 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.5 </td> @@ -663,9 +651,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -689,9 +674,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -715,9 +697,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -738,9 +717,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> @@ -764,9 +740,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> @@ -793,9 +766,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -819,9 +789,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -845,9 +812,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -871,9 +835,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -897,9 +858,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -923,9 +881,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -949,9 +904,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -975,9 +927,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1001,9 +950,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1027,9 +973,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1053,9 +996,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1079,9 +1019,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1105,9 +1042,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1131,9 +1065,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1157,9 +1088,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1183,9 +1111,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1218,9 +1143,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -1249,9 +1171,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1275,9 +1194,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1301,9 +1217,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1327,9 +1240,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1353,9 +1263,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1379,9 +1286,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1405,9 +1309,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1431,9 +1332,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1457,9 +1355,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1483,9 +1378,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1509,9 +1401,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1535,9 +1424,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1558,9 +1444,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -1587,9 +1470,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1613,9 +1493,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1639,9 +1516,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1665,9 +1539,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1691,9 +1562,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1717,9 +1585,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1743,9 +1608,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1769,9 +1631,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1795,9 +1654,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1821,9 +1677,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1847,9 +1700,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1882,9 +1732,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -1913,9 +1760,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -1936,9 +1780,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 13 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4.33 </td> @@ -1962,9 +1803,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 1.5 </td> @@ -1991,9 +1829,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2017,9 +1852,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2043,9 +1875,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2069,9 +1898,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2104,9 +1930,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2132,9 +1955,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2170,9 +1990,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2200,9 +2017,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2238,9 +2052,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2268,9 +2079,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2306,9 +2114,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2334,9 +2139,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2527,9 +2329,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2557,9 +2356,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2595,9 +2391,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2625,9 +2418,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2663,9 +2453,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2691,9 +2478,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2729,9 +2513,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2759,9 +2540,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2797,9 +2575,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2827,9 +2602,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -2858,9 +2630,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 0 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 0 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 00:00:00 </td> @@ -2893,9 +2662,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -2921,9 +2687,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 12 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> @@ -2947,9 +2710,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 1 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 4 </td> @@ -4858,9 +4618,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -4886,9 +4643,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -5940,9 +5694,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -5968,9 +5719,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -5994,9 +5742,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -6020,9 +5765,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 12 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3 </td> @@ -6653,9 +6395,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -6683,9 +6422,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -6721,9 +6457,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -6751,9 +6484,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -6789,9 +6519,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -6819,9 +6546,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -6857,9 +6581,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -6885,9 +6606,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -6923,9 +6641,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -6953,9 +6668,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -6991,9 +6703,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -7021,9 +6730,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -7059,9 +6765,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -7089,9 +6792,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> @@ -7127,9 +6827,6 @@ </th> <th style="padding: 6px 0;"> Actions - </th> - <th style="padding: 6px 0;"> - Users </th> <th style="padding: 6px 0;"> Actions per Visit @@ -7157,9 +6854,6 @@ <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 16 </td> - <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - 2 - </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> 3.2 </td> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml index 21074351a69ecdc5697675e014e2dadf577b5b4c..0bbeb47f2d286d9cf7f0158eef54523fe2b8a593 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getSocials_range.xml @@ -5,12 +5,12 @@ <label>Facebook</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> - <nb_users>3</nb_users> <max_actions>2</max_actions> <sum_visit_length>722</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <url>facebook.com</url> <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> @@ -18,12 +18,12 @@ <label>Mixi</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>mixi.jp</url> <logo>plugins/Referrers/images/socials/mixi.jp.png</logo> </row> @@ -31,12 +31,12 @@ <label>Skyrock</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>skyrock.com</url> <logo>plugins/Referrers/images/socials/skyrock.com.png</logo> </row> @@ -44,12 +44,12 @@ <label>Twitter</label> <nb_visits>3</nb_visits> <nb_actions>4</nb_actions> - <nb_users>3</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> <url>twitter.com</url> <logo>plugins/Referrers/images/socials/twitter.com.png</logo> </row> @@ -57,12 +57,12 @@ <label>Flickr</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>flickr.com</url> <logo>plugins/Referrers/images/socials/flickr.com.png</logo> </row> @@ -70,12 +70,12 @@ <label>Xanga</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>xanga.com</url> <logo>plugins/Referrers/images/socials/xanga.com.png</logo> </row> @@ -85,12 +85,12 @@ <label>Twitter</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>twitter.com</url> <logo>plugins/Referrers/images/socials/twitter.com.png</logo> </row> @@ -98,12 +98,12 @@ <label>Facebook</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>facebook.com</url> <logo>plugins/Referrers/images/socials/facebook.com.png</logo> </row> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml index 5f97dfd1e9530afef8101d2f3ae7cb9308986e52..db9224b872a26f53e31bb66991c3843d3215e08b 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Referrers.getUrlsForSocial_range.xml @@ -4,36 +4,36 @@ <label>facebook.com/whatever</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://facebook.com/whatever</url> </row> <row> <label>fb.me/?q=sdlfjs&n=slfjsd</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> </row> <row> <label>www.facebook.com/another/path</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml index 3529a3bf1a5878a20cf7931e0bbadbc4a83b68c0..de63f6e83ac67bbfa722bb0682be0ac11998676f 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserCountry.getCountry_range.xml @@ -4,12 +4,12 @@ <label>France</label> <nb_visits>8</nb_visits> <nb_actions>12</nb_actions> - <nb_users>4</nb_users> <max_actions>2</max_actions> <sum_visit_length>1444</sum_visit_length> <bounce_count>4</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>4</sum_daily_nb_users> <code>fr</code> <logo>plugins/UserCountry/images/flags/fr.png</logo> <logoWidth>16</logoWidth> diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml index e820dd8d956252103966644d28b0eae370a98922..97c6ffce80df89d1f46dc8452abf1a2319ac3797 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml @@ -4,11 +4,11 @@ <label>1024x768</label> <nb_visits>6</nb_visits> <nb_actions>9</nb_actions> - <nb_users>3</nb_users> <max_actions>2</max_actions> <sum_visit_length>1083</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml index 645825ce6434930f077de389b5796368c782391e..f29f60a7481480dc84e853ade24bebd7ad6b4948 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__VisitTime.getVisitInformationPerServerTime_range.xml @@ -4,264 +4,264 @@ <label>0h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>1h</label> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> - <nb_users>3</nb_users> <max_actions>2</max_actions> <sum_visit_length>1083</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>2h</label> <nb_visits>3</nb_visits> <nb_actions>3</nb_actions> - <nb_users>3</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>3</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>3</sum_daily_nb_users> </row> <row> <label>3h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>4h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>5h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>6h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>7h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>8h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>9h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>10h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>11h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>12h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>13h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>14h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>15h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>16h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>17h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>18h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>19h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>20h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>21h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>22h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> <row> <label>23h</label> <nb_visits>0</nb_visits> <nb_actions>0</nb_actions> - <nb_users>0</nb_users> <max_actions>0</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>0</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>0</sum_daily_nb_users> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml index 9a129164b2c05e62a2c503a71642dd2596923820..e36d8673a4b15107dc0b0ee10d3c7d7b14a8e15a 100644 --- a/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml +++ b/tests/PHPUnit/Integration/expected/test_oneVisitor_oneWebsite_severalDays_DateRange_noIdSubtable__Referrers.getUrlsForSocial_range.xml @@ -5,120 +5,120 @@ <label>facebook.com/whatever</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://facebook.com/whatever</url> </row> <row> <label>fb.me/?q=sdlfjs&n=slfjsd</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://fb.me/?q=sdlfjs&n=slfjsd</url> </row> <row> <label>mixi.jp</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://mixi.jp</url> </row> <row> <label>skyrock.com</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://skyrock.com</url> </row> <row> <label>t.co/id/?y=dsfs</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://t.co/id/?y=dsfs</url> </row> <row> <label>twitter.com/whatever2</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://twitter.com/whatever2</url> </row> <row> <label>www.facebook.com/another/path</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> </row> <row> <label>www.flickr.com</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.flickr.com</url> </row> <row> <label>www.twitter.com/index?a=2334</label> <nb_visits>1</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>2</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.twitter.com/index?a=2334</url> </row> <row> <label>xanga.com</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://xanga.com</url> </row> </result> @@ -127,36 +127,36 @@ <label>t.co/id/?y=dsfs</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://t.co/id/?y=dsfs</url> </row> <row> <label>twitter.com/whatever2</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://twitter.com/whatever2</url> </row> <row> <label>www.facebook.com/another/path</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <url>http://www.facebook.com/another/path</url> </row> </result> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml index a36553c5eb0002cbad97b2e61d15b169c7d435be..e8bbd9822cf986e19771b8a820b01bbb3ce10df1 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml @@ -4,7 +4,6 @@ <label>VisitorType</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>725</sum_visit_length> <bounce_count>2</bounce_count> @@ -23,12 +22,12 @@ <nb_conversions>3</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -42,12 +41,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -66,6 +65,7 @@ <nb_conversions>2</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -73,7 +73,6 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -87,12 +86,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -106,6 +105,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -131,7 +131,6 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -145,12 +144,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -164,6 +163,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -171,7 +171,6 @@ <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -185,12 +184,12 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -204,6 +203,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml index 93a78b6036112a381df29aa80c4e4df0c91eaa5d..dd5070e6a6093665df17c15e1fc42e9de1c6cc01 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Referrers.getKeywords_range.xml @@ -4,23 +4,23 @@ <label>this keyword should be ranked</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Google</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml index 5570478e60e9b9adf489a3b0a1ef189f22b9a043..793827ccbb673dbdb48697bac6f91b680e5d81a2 100644 --- a/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml +++ b/tests/PHPUnit/Integration/expected/test_reportLimiting_rankingQueryDisabled__Provider.getProvider_month.xml @@ -4,36 +4,36 @@ <label>Comcast</label> <nb_visits>52</nb_visits> <nb_actions>52</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>52</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>20</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://www.comcast.net/</url> </row> <row> <label>Awesomeisp</label> <nb_visits>26</nb_visits> <nb_actions>26</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>26</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://www.awesomeisp.com/</url> </row> <row> <label>Unknown</label> <nb_visits>22</nb_visits> <nb_actions>22</nb_actions> - <nb_users>2</nb_users> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>22</bounce_count> <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <url>http://piwik.org/faq/general/#faq_52</url> </row> </result> \ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml index 5ad30147057b6658f14e25082739e3896247b21e..e30a2e382d03bc43fa072e0390fdc94f33c6a07b 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__CustomVariables.getCustomVariables_week.xml @@ -6,7 +6,6 @@ <label>VisitorType</label> <nb_visits>3</nb_visits> <nb_actions>6</nb_actions> - <nb_users>2</nb_users> <max_actions>4</max_actions> <sum_visit_length>722</sum_visit_length> <bounce_count>2</bounce_count> @@ -25,12 +24,12 @@ <nb_conversions>3</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -44,12 +43,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -68,6 +67,7 @@ <nb_conversions>2</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -75,7 +75,6 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -89,12 +88,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -108,6 +107,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -115,7 +115,6 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -129,12 +128,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <max_actions>4</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>0</bounce_count> @@ -148,6 +147,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -173,7 +173,6 @@ <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -187,12 +186,12 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -206,6 +205,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 6ec09ca8b4623d86a7e92b36ab737e68b46d18e8..9b072bf91ef20565448c409a55b78714986d1885 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -14,13 +14,11 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> </metrics> <metricsDocumentation> <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> - <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> </metricsDocumentation> <processedMetrics> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> @@ -37,7 +35,6 @@ <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> <nb_actions>Actions</nb_actions> - <nb_users>Users</nb_users> <nb_actions_per_visit>Actions per Visit</nb_actions_per_visit> <avg_time_on_site>Avg. Time on Website</avg_time_on_site> <bounce_rate>Bounce Rate</bounce_rate> @@ -48,7 +45,6 @@ <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <nb_users>1</nb_users> <conversion_rate>0%</conversion_rate> <nb_actions_per_visit>4</nb_actions_per_visit> <avg_time_on_site>00:06:01</avg_time_on_site> @@ -59,7 +55,6 @@ <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <conversion_rate>0%</conversion_rate> <nb_actions_per_visit>1</nb_actions_per_visit> <avg_time_on_site>00:03:01</avg_time_on_site> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml index 76c8b63741ba977f1429344e660a612aded86da5..b60c08c4068365bd79cd37b0aefaa9dc122c106b 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml @@ -6,7 +6,6 @@ <label>VisitorType</label> <nb_visits>3</nb_visits> <nb_actions>5</nb_actions> - <nb_users>2</nb_users> <max_actions>3</max_actions> <sum_visit_length>725</sum_visit_length> <bounce_count>2</bounce_count> @@ -25,12 +24,12 @@ <nb_conversions>3</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>2</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -44,12 +43,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -68,6 +67,7 @@ <nb_conversions>2</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -75,7 +75,6 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -89,12 +88,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -108,6 +107,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -133,7 +133,6 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -147,12 +146,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -166,6 +165,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -173,7 +173,6 @@ <label>Othercustom value which should be truncated abcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -187,12 +186,12 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyzabcdefghijklmnopqrstuvwxyz</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> - <nb_users>1</nb_users> <max_actions>1</max_actions> <sum_visit_length>361</sum_visit_length> <bounce_count>2</bounce_count> @@ -206,6 +205,7 @@ <nb_conversions>1</nb_conversions> <revenue>1000</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml index ff56aa823b2a128effc7578833263b8db2aaf003..02da1ef089709172fcf6e9bb1f93ba37f6c6a1cc 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml @@ -6,7 +6,6 @@ <label>SET WITH EMPTY VALUE</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -20,12 +19,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Value not defined</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -39,6 +38,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -64,7 +64,6 @@ <label>Value will be VERY long and truncated</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -78,12 +77,12 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrstuvwxyz----abcdefghijklmnopqrst</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -97,6 +96,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row> @@ -104,7 +104,6 @@ <label>VisitorType</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -123,12 +122,12 @@ <nb_conversions>2</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>LoggedIn</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> @@ -142,6 +141,7 @@ <nb_conversions>1</nb_conversions> <revenue>0</revenue> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> <row> <label>LoggedOut</label> diff --git a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml index 8128d408cc649c78a0600a4a2e1173e209e808e5..c591eb3deb9bd5c9bc63d915bc337589745bd8a3 100644 --- a/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml +++ b/tests/PHPUnit/Integration/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__Referrers.getKeywords_week.xml @@ -6,23 +6,23 @@ <label>this keyword should be ranked</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> <subtable> <row> <label>Google</label> <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <nb_users>1</nb_users> <max_actions>3</max_actions> <sum_visit_length>364</sum_visit_length> <bounce_count>0</bounce_count> <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <sum_daily_nb_users>1</sum_daily_nb_users> </row> </subtable> </row>