diff options
3 files changed, 17 insertions, 44 deletions
diff --git a/plugins/VisitFrequency/Reports/Get.php b/plugins/VisitFrequency/Reports/Get.php index 124c7b4e8b..58f5e7b923 100644 --- a/plugins/VisitFrequency/Reports/Get.php +++ b/plugins/VisitFrequency/Reports/Get.php @@ -1,4 +1,5 @@ <?php + /** * Matomo - free/libre analytics platform * @@ -6,10 +7,9 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ + namespace Piwik\Plugins\VisitFrequency\Reports; -use Piwik\DataTable; -use Piwik\NumberFormatter; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; use Piwik\Plugins\CoreHome\Columns\Metrics\ActionsPerVisit; @@ -30,15 +30,15 @@ class Get extends \Piwik\Plugin\Report $this->categoryId = 'General_Actions'; $this->name = Piwik::translate('VisitFrequency_ColumnReturningVisits'); $this->documentation = Piwik::translate('VisitFrequency_VisitFrequencyReportDocumentation'); - $this->processedMetrics = array( + $this->processedMetrics = [ new ReturningMetric(new AverageTimeOnSite(), API::RETURNING_COLUMN_SUFFIX), new ReturningMetric(new ActionsPerVisit(), API::RETURNING_COLUMN_SUFFIX), new ReturningMetric(new BounceRate(), API::RETURNING_COLUMN_SUFFIX), new ReturningMetric(new AverageTimeOnSite(), API::NEW_COLUMN_SUFFIX), new ReturningMetric(new ActionsPerVisit(), API::NEW_COLUMN_SUFFIX), new ReturningMetric(new BounceRate(), API::NEW_COLUMN_SUFFIX) - ); - $this->metrics = array( + ]; + $this->metrics = [ 'nb_visits_returning', 'nb_actions_returning', 'nb_uniq_visitors_returning', @@ -50,7 +50,7 @@ class Get extends \Piwik\Plugin\Report 'nb_uniq_visitors_new', 'nb_users_new', 'max_actions_new', - ); + ]; $this->order = 40; $this->subcategoryId = 'VisitorInterest_Engagement'; } @@ -79,50 +79,24 @@ class Get extends \Piwik\Plugin\Report $view->requestConfig->apiMethodToRequestDataTable = 'VisitFrequency.get'; $this->addSparklineColumns($view); $view->config->addTranslations($this->getSparklineTranslations()); - - $numberFormatter = NumberFormatter::getInstance(); - $view->config->filters[] = function (DataTable $table) use ($numberFormatter) { - $firstRow = $table->getFirstRow(); - if ($firstRow) { - $value = $firstRow->getColumn('nb_visits_returning'); - if (false !== $value) { - $firstRow->setColumn('nb_visits_returning', $numberFormatter->formatNumber($value)); - } - - $value = $firstRow->getColumn('nb_actions_returning'); - if (false !== $value) { - $firstRow->setColumn('nb_actions_returning', $numberFormatter->formatNumber($value)); - } - - $value = $firstRow->getColumn('nb_actions_per_visit_returning'); - if (false !== $value) { - $firstRow->setColumn('nb_actions_per_visit_returning', $numberFormatter->formatNumber($value, 1)); - } - - $value = $firstRow->getColumn('bounce_rate_returning'); - if (false !== $value) { - $firstRow->setColumn('bounce_rate_returning', $numberFormatter->formatNumber($value, $precision = 1)); - } - } - }; } } private function getSparklineTranslations() { - $translations = array( + $translations = [ 'nb_visits_returning' => 'ReturnVisits', 'nb_actions_returning' => 'ReturnActions', 'nb_actions_per_visit_returning' => 'ReturnAvgActions', 'avg_time_on_site_returning' => 'ReturnAverageVisitDuration', 'bounce_rate_returning' => 'ReturnBounceRate', - + 'nb_visits_new' => 'NewVisits', 'nb_actions_new' => 'NewActions', 'nb_actions_per_visit_new' => 'NewAvgActions', 'avg_time_on_site_new' => 'NewAverageVisitDuration', 'bounce_rate_new' => 'NewBounceRate', - ); + ]; foreach ($translations as $metric => $key) { $translations[$metric] = Piwik::translate('VisitFrequency_' . $key); @@ -133,20 +107,19 @@ class Get extends \Piwik\Plugin\Report private function addSparklineColumns(Sparklines $view) { - $metrics = array( + $metrics = [ 'nb_visits', 'avg_time_on_site', 'nb_actions_per_visit', 'bounce_rate', 'nb_actions' - ); + ]; $i = 1; foreach ($metrics as $metric) { - foreach (array('_returning', '_new') as $suffix) { - $view->config->addSparklineMetric(array($metric . $suffix), $i++); + foreach (['_returning', '_new'] as $suffix) { + $view->config->addSparklineMetric([$metric . $suffix], $i++); } } - } } diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png index 1908787128..4ab4465953 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard4.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0835a8b5d1c816dbbec188401ee02d1a6d6b60fbdbf3dcbb913402e1aae0629a -size 362471 +oid sha256:747a1248d446467bb736e314d0b4c41c0dbdb67254c1ca60012ee1dc4c0838d8 +size 362524 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png index 2d6b3772ad..a53c48aeeb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_engagement.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fc118e390966c687cbbaa61c9fea73b8629403e4873a9bdd954f01795ff1dde2 -size 164567 +oid sha256:d0d73e7a0b8fa18d2fc9c6af54f3043f2a776495980b45ff0ddeaf43374e5abc +size 165068 |
