diff options
8 files changed, 121 insertions, 40 deletions
diff --git a/core/Twig.php b/core/Twig.php index b8b92f283e..afb6a1cdc2 100644 --- a/core/Twig.php +++ b/core/Twig.php @@ -198,6 +198,7 @@ class Twig $this->addTest_false(); $this->addTest_true(); $this->addTest_emptyString(); + $this->addTest_isNumeric(); $this->twig->addExtension(new PiwikTwigFilterExtension()); } @@ -575,4 +576,15 @@ class Twig }); $this->twig->addFilter($safelink); } + + private function addTest_isNumeric() + { + $test = new Twig_SimpleTest( + 'numeric', + function ($value) { + return is_numeric($value); + } + ); + $this->twig->addTest($test); + } } diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable.php b/plugins/CoreVisualizations/Visualizations/HtmlTable.php index 36467fa04d..21116fefb9 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable.php @@ -14,7 +14,9 @@ use Piwik\Common; use Piwik\DataTable\Row; use Piwik\Metrics; use Piwik\DataTable; +use Piwik\NumberFormatter; use Piwik\Period; +use Piwik\Piwik; use Piwik\Plugin\Visualization; /** @@ -81,31 +83,9 @@ class HtmlTable extends Visualization } } - // we do not want to get a datatable\map - $period = Common::getRequestVar('period', 'day', 'string'); - if (Period\Range::parseDateRange($period)) { - $period = 'range'; - } - if ($this->dataTable->getRowsCount()) { - $request = new ApiRequest(array( - 'method' => 'API.get', - 'module' => 'API', - 'action' => 'get', - 'format' => 'original', - 'filter_limit' => '-1', - 'disable_generic_filters' => 1, - 'expanded' => 0, - 'flat' => 0, - 'filter_offset' => 0, - 'period' => $period, - 'showColumns' => implode(',', $this->config->columns_to_display), - 'columns' => implode(',', $this->config->columns_to_display), - 'pivotBy' => '' - )); - - $dataTable = $request->process(); - $this->assignTemplateVar('siteSummary', $dataTable); + $siteTotalRow = $this->getSiteSummary() ? $this->getSiteSummary()->getFirstRow() : null; + $this->assignTemplateVar('siteTotalRow', $siteTotalRow); } if ($this->isPivoted()) { @@ -222,6 +202,55 @@ class HtmlTable extends Visualization } } + public function afterGenericFiltersAreAppliedToLoadedDataTable() + { + parent::afterGenericFiltersAreAppliedToLoadedDataTable(); + + $this->calculateTotalPercentages(); // this must be done before metrics are formatted + } + + private function calculateTotalPercentages() + { + if (empty($this->report)) { + return; + } + + $columnNamesToIndices = Metrics::getMappingFromNameToId(); + $formatter = NumberFormatter::getInstance(); + + $totals = $this->dataTable->getMetadata('totals'); + + $siteSummary = $this->getSiteSummary(); + $siteTotalRow = $siteSummary ? $siteSummary->getFirstRow() : null; + + foreach ($this->dataTable->getRows() as $row) { + foreach ($this->report->getMetrics() as $column => $translation) { + $indexColumn = $columnNamesToIndices[$column]; // TODO: This might fail for goal specific columns... + + $value = $row->getColumn($indexColumn) ?: $row->getColumn($column) ?: 0; + if ($column == 'label') { + continue; + } + + $reportTotal = isset($totals[$column]) ? $totals[$column] : 0; + + $percentageColumnName = $column . '_row_percentage'; + $rowPercentage = $formatter->formatPercent(Piwik::getPercentageSafe($value, $reportTotal, $precision = 1), $precision); + $row->setMetadata($percentageColumnName, $rowPercentage); + + if ($siteTotalRow) { + $siteTotal = $siteTotalRow->getColumn($column) ?: 0; + + $siteTotalPercentage = $column . '_site_total_percentage'; + if ($siteTotal && $siteTotal > $reportTotal) { + $rowPercentage = $formatter->formatPercent(Piwik::getPercentageSafe($value, $siteTotal, $precision = 1), $precision); + $row->setMetadata($siteTotalPercentage, $rowPercentage); + } + } + } + } + } + protected function isPivoted() { return $this->requestConfig->pivotBy || Common::getRequestVar('pivotBy', ''); @@ -248,4 +277,30 @@ class HtmlTable extends Visualization { return $this->requestConfig->flat || Common::getRequestVar('flat', ''); } + + private function getSiteSummary() + { + if (empty($this->siteSummary)) { + // we do not want to get a datatable\map + $period = Common::getRequestVar('period', 'day', 'string'); + if (Period\Range::parseDateRange($period)) { + $period = 'range'; + } + + $this->siteSummary = ApiRequest::processRequest('API.get', [ + 'module' => 'API', + 'action' => 'get', + 'filter_limit' => '-1', + 'disable_generic_filters' => 1, + 'filter_offset' => 0, + 'date' => Common::getRequestVar('date', null, 'string'), + 'idSite' => Common::getRequestVar('idSite', null, 'int'), + 'period' => $period, + 'showColumns' => implode(',', $this->config->columns_to_display), + 'columns' => implode(',', $this->config->columns_to_display), + ], $default = []); + } + + return $this->siteSummary; + } } diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig index 3ad571d9aa..b8f9356bc8 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_comparisons.twig @@ -67,7 +67,6 @@ 'totals': rowComparisonTotals, 'label': comparedRow.getColumn('label'), 'labelColumn': properties.columns_to_display|first, - 'changePercantage': columnChange, 'forceZero': true, 'tooltipSuffix': comparisonTooltipSuffix, 'translations': properties.translations, diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig index 8d14bb126d..a478c23bf8 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable_ratio.twig @@ -1,20 +1,35 @@ {% if column in properties.report_ratio_columns and (column in totals|keys or forceZero|default) -%} {% set reportTotal = totals[column]|default(0) %} - {% if siteTotalRow|default is not empty %} + + {% if siteTotalRow is defined and siteTotalRow is not empty %} {% set siteTotal = siteTotalRow.getColumn(column) %} - {% elseif siteSummary is defined and siteSummary is not empty and siteSummary.getFirstRow %} - {% set siteTotal = siteSummary.getFirstRow.getColumn(column) %} {% else %} {% set siteTotal = 0 %} {% endif %} - {% set rowPercentage = row.getColumn(column)|percentage(reportTotal, 1) %} + {% if rowPercentage|default is empty %} + {% if row.getMetadata(column ~ '_row_percentage') != false %} + {% set rowPercentage = row.getMetadata(column ~ '_row_percentage') %} + {% elseif row.getColumn(column)|default(0) is numeric and reportTotal is numeric %} + {% set rowPercentage = row.getColumn(column)|percentage(reportTotal, 1) %} + {% else %} + {% set rowPercentage = '' %} {# should not happen #} + {% endif %} + {% endif %} + {% set metricTitle = translations[column]|default(column) %} {% set reportRatioTooltip = 'General_ReportRatioTooltip'|translate(label, rowPercentage|e('html_attr'), reportTotal|e('html_attr'), metricTitle|e('html_attr'), '"' ~ segmentTitlePretty ~ '"', translations[labelColumn]|default(labelColumn)|e('html_attr')) %} - {% if siteTotal and siteTotal > reportTotal %} - {% set totalPercentage = row.getColumn(column)|percentage(siteTotal, 1) %} + {% if totalPercentage|default is empty %} + {% if row.getMetadata(column ~ '_site_total_percentage') != false %} + {% set totalPercentage = row.getMetadata(column ~ '_site_total_percentage') %} + {% elseif row.getColumn(column)|default(0) is numeric and siteTotal is numeric %} + {% set totalPercentage = row.getColumn(column)|percentage(siteTotal, 1) %} + {% endif %} + {% endif %} + + {% if totalPercentage|default is not empty %} {% set totalRatioTooltip = 'General_TotalRatioTooltip'|translate(totalPercentage, siteTotal|number(2,0), metricTitle, periodTitlePretty) %} {% else %} {% set totalRatioTooltip = '' %} @@ -22,5 +37,5 @@ <span class="ratio" title="{{ reportRatioTooltip|rawSafeDecoded|raw }} {{ totalRatioTooltip|rawSafeDecoded|e('html_attr') }}{% if tooltipSuffix|default is not empty %}<br/><br/> {{ tooltipSuffix|rawSafeDecoded|e('html_attr') }}{% endif %}" - > {{ rowPercentage }} {% if changePercantage|default is not empty %}({{ changePercentage }}){% endif %}</span> + > {{ rowPercentage }} {% if changePercentage|default is not empty %}({{ changePercentage }}){% endif %}</span> {%- endif %} diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png index e19c74f4d4..63a1624802 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_abandoned_carts.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1c12da1e7834e68f8028aeb580adad02bc5beff0a91f0202aee84663aa647480 -size 41571 +oid sha256:ef2a411199babceda9806b51ed8610ef0cc4afa3516e7119e0f7212338ac77e7 +size 41568 diff --git a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png index 9759f73c2f..1ea2378daa 100644 --- a/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png +++ b/tests/UI/expected-screenshots/GoalsTable_goals_table_ecommerce_view.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:480395ff18829784978b26b41fed308c1a7ec797e8f68eff2ea3ab153a74fe9c -size 39432 +oid sha256:08ca07f6306ebee2f3b849068330cb5c43d7e72e6652aacd131a49fe1f839814 +size 39429 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index e823805d27..aa4a451687 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1bed9a3c9f2e5c124a220c3152ccbad1ef49c5093ed6a394aa56793c0bd768b7 -size 1566862 +oid sha256:940bd0c6303cb7be7a4ebb5a9c6eb5b1ad76f7665f8d944f6b043b8f25a87b4e +size 1565674 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png index ea244b8862..d3fb37652b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_products.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1f47207e2d7a3f179867438293837658249eea1f323c52bab13516e9e21aefd7 -size 49575 +oid sha256:e4ca9e56aa44279ea815897f9ee75f41156bfe7bc86b64c1cfd4f9ad44ca5fb7 +size 49716 |
