diff options
author | Stefan Giehl <stefan@matomo.org> | 2020-02-21 14:02:09 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-21 14:02:09 +0300 |
commit | 12a81307986ea5763a8f5c61e08bf114b0849604 (patch) | |
tree | 1f88cab6e162087535d5dd31d6c9ab6a84af52cb /plugins | |
parent | a3ccdede6f6d6fed000a6de92a7284ba38e14b7f (diff) |
Fix VisitorFrequency.get API for idsites=all (#15605)
* Fix VisitorFrequency.get API for idsites=all
* fix console test
* updates some UI files
* fix console test
Diffstat (limited to 'plugins')
9 files changed, 85 insertions, 8 deletions
diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml index 2ae3a02ea7..846d5cc107 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_noOptions__VisitFrequency.get_month.xml @@ -1,6 +1,17 @@ <?xml version="1.0" encoding="utf-8" ?> <results> <result idSite="1"> + <nb_uniq_visitors_new>32</nb_uniq_visitors_new> + <nb_users_new>1</nb_users_new> + <nb_visits_new>32</nb_visits_new> + <nb_actions_new>35</nb_actions_new> + <nb_visits_converted_new>30</nb_visits_converted_new> + <bounce_count_new>30</bounce_count_new> + <sum_visit_length_new>305</sum_visit_length_new> + <max_actions_new>3</max_actions_new> + <bounce_rate_new>94%</bounce_rate_new> + <nb_actions_per_visit_new>1.1</nb_actions_per_visit_new> + <avg_time_on_site_new>10</avg_time_on_site_new> <nb_uniq_visitors_returning>1</nb_uniq_visitors_returning> <nb_users_returning>0</nb_users_returning> <nb_visits_returning>1</nb_visits_returning> @@ -13,8 +24,31 @@ <nb_actions_per_visit_returning>1</nb_actions_per_visit_returning> <avg_time_on_site_returning>0</avg_time_on_site_returning> </result> - <result idSite="2" /> + <result idSite="2"> + <nb_uniq_visitors_new>1</nb_uniq_visitors_new> + <nb_users_new>0</nb_users_new> + <nb_visits_new>1</nb_visits_new> + <nb_actions_new>1</nb_actions_new> + <nb_visits_converted_new>0</nb_visits_converted_new> + <bounce_count_new>1</bounce_count_new> + <sum_visit_length_new>0</sum_visit_length_new> + <max_actions_new>1</max_actions_new> + <bounce_rate_new>100%</bounce_rate_new> + <nb_actions_per_visit_new>1</nb_actions_per_visit_new> + <avg_time_on_site_new>0</avg_time_on_site_new> + </result> <result idSite="3"> + <nb_uniq_visitors_new>1</nb_uniq_visitors_new> + <nb_users_new>0</nb_users_new> + <nb_visits_new>1</nb_visits_new> + <nb_actions_new>3</nb_actions_new> + <nb_visits_converted_new>0</nb_visits_converted_new> + <bounce_count_new>0</bounce_count_new> + <sum_visit_length_new>1</sum_visit_length_new> + <max_actions_new>3</max_actions_new> + <bounce_rate_new>0%</bounce_rate_new> + <nb_actions_per_visit_new>3</nb_actions_per_visit_new> + <avg_time_on_site_new>1</avg_time_on_site_new> <nb_uniq_visitors_returning>2</nb_uniq_visitors_returning> <nb_users_returning>0</nb_users_returning> <nb_visits_returning>2</nb_visits_returning> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml index c415099916..1d3a02a716 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_day.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8" ?> <result> + <nb_uniq_visitors_new>11</nb_uniq_visitors_new> + <nb_users_new>0</nb_users_new> + <nb_visits_new>11</nb_visits_new> + <nb_actions_new>11</nb_actions_new> + <nb_visits_converted_new>11</nb_visits_converted_new> + <bounce_count_new>11</bounce_count_new> + <sum_visit_length_new>0</sum_visit_length_new> + <max_actions_new>1</max_actions_new> + <bounce_rate_new>100%</bounce_rate_new> + <nb_actions_per_visit_new>1</nb_actions_per_visit_new> + <avg_time_on_site_new>0</avg_time_on_site_new> <nb_uniq_visitors_returning>0</nb_uniq_visitors_returning> <nb_users_returning>0</nb_users_returning> <nb_visits_returning>0</nb_visits_returning> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml index 05d0ce3953..8cb0cb910a 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment0_noOptions__VisitFrequency.get_year.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> + <nb_visits_new>33</nb_visits_new> + <nb_actions_new>45</nb_actions_new> + <nb_visits_converted_new>31</nb_visits_converted_new> + <bounce_count_new>30</bounce_count_new> + <sum_visit_length_new>359</sum_visit_length_new> + <max_actions_new>10</max_actions_new> + <bounce_rate_new>91%</bounce_rate_new> + <nb_actions_per_visit_new>1.4</nb_actions_per_visit_new> + <avg_time_on_site_new>11</avg_time_on_site_new> <nb_visits_returning>1</nb_visits_returning> <nb_actions_returning>1</nb_actions_returning> <nb_visits_converted_returning>1</nb_visits_converted_returning> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml index c415099916..1d3a02a716 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_day.xml @@ -1,5 +1,16 @@ <?xml version="1.0" encoding="utf-8" ?> <result> + <nb_uniq_visitors_new>11</nb_uniq_visitors_new> + <nb_users_new>0</nb_users_new> + <nb_visits_new>11</nb_visits_new> + <nb_actions_new>11</nb_actions_new> + <nb_visits_converted_new>11</nb_visits_converted_new> + <bounce_count_new>11</bounce_count_new> + <sum_visit_length_new>0</sum_visit_length_new> + <max_actions_new>1</max_actions_new> + <bounce_rate_new>100%</bounce_rate_new> + <nb_actions_per_visit_new>1</nb_actions_per_visit_new> + <avg_time_on_site_new>0</avg_time_on_site_new> <nb_uniq_visitors_returning>0</nb_uniq_visitors_returning> <nb_users_returning>0</nb_users_returning> <nb_visits_returning>0</nb_visits_returning> diff --git a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml index dafefc726a..3e02d8891a 100644 --- a/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml +++ b/plugins/CoreConsole/tests/System/expected/test_ArchiveCronTest_preArchivedSegment1_noOptions__VisitFrequency.get_year.xml @@ -1,5 +1,14 @@ <?xml version="1.0" encoding="utf-8" ?> <result> + <nb_visits_new>33</nb_visits_new> + <nb_actions_new>45</nb_actions_new> + <nb_visits_converted_new>31</nb_visits_converted_new> + <bounce_count_new>30</bounce_count_new> + <sum_visit_length_new>359</sum_visit_length_new> + <max_actions_new>10</max_actions_new> + <bounce_rate_new>91%</bounce_rate_new> + <nb_actions_per_visit_new>1.4</nb_actions_per_visit_new> + <avg_time_on_site_new>11</avg_time_on_site_new> <nb_visits_returning>0</nb_visits_returning> <nb_actions_returning>0</nb_actions_returning> <nb_visits_converted_returning>0</nb_visits_converted_returning> diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png index c0b7bafab0..36250a8d93 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b871c223094f36ae5ee5da6adc41999b807f886edc13fd5223ec37deb1dbc333 -size 470758 +oid sha256:e5f6d25962b75a03fe35d7e5c0e9cc840ce93ba2b46de51d7dd001e0418d2383 +size 470775 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png index ad69c63025..055759ea40 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cefc57e418fb76121e0e0f9629716f864ebf1de7eabfbccda875bf608651679 -size 715109 +oid sha256:31a23459a9221a91239db4447642cd67e15ea5a9c0fda060df976b1070e48a48 +size 715122 diff --git a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png index ad69c63025..055759ea40 100644 --- a/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/plugins/Dashboard/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2cefc57e418fb76121e0e0f9629716f864ebf1de7eabfbccda875bf608651679 -size 715109 +oid sha256:31a23459a9221a91239db4447642cd67e15ea5a9c0fda060df976b1070e48a48 +size 715122 diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php index 854b0de5f5..afc93fe636 100644 --- a/plugins/VisitFrequency/API.php +++ b/plugins/VisitFrequency/API.php @@ -49,7 +49,10 @@ class API extends \Piwik\Plugin\API $columns = Piwik::getArrayFromApiParameter($columns); /** @var \Piwik\DataTable\DataTableInterface $resultSet */ - if (Period::isMultiplePeriod($date, $period)) { + if ($idSite === 'all') { + $resultSet = new DataTable\Map(); + $resultSet->setKeyName('idSite'); + } else if (Period::isMultiplePeriod($date, $period)) { $resultSet = new DataTable\Map(); $resultSet->setKeyName('period'); } else { |