From eac5a58130665b5689ef7d2bb4ddc4367368b47f Mon Sep 17 00:00:00 2001 From: alexkuk Date: Tue, 19 Apr 2016 05:26:51 +0300 Subject: Implements #9389 - UserId module, that adds a new Users report (#9883) * Implement the UserId module, that adds a new Users report showing all unique user IDs and some aggregated data. Includes reindexing of raw visitors log into aggregated user ids table * Update UserId module: add total_actions, total_events and total_searches columns; format dates * Use an injected model instead of creating a new object * Rework the UserId plugin to use core archiver instead of custom indexer * Users report small changes: - remove logger injection - change archive record name - add low population filter - add all columns visualization - add datatable_archiving_maximum_rows_userid_users configuration, default value is 50000 * Remove unused method parameter * Users report: remove custom visualizations and add data-row-metadata attribute for every row --- plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/CoreVisualizations') diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index 1fbbf6517f..eb237b93b9 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -33,6 +33,7 @@ {% for column in properties.columns_to_display %} -- cgit v1.2.3 From a1cf31cf9a71b3cf49c06dcf05e1d21161112295 Mon Sep 17 00:00:00 2001 From: Stefan Weil Date: Thu, 12 May 2016 22:58:14 +0200 Subject: plugins: Fix typos (found by codespell) Signed-off-by: Stefan Weil --- plugins/CoreVisualizations/javascripts/jqplot.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/CoreVisualizations') diff --git a/plugins/CoreVisualizations/javascripts/jqplot.js b/plugins/CoreVisualizations/javascripts/jqplot.js index 6e5d2135d1..1c9191bc3e 100644 --- a/plugins/CoreVisualizations/javascripts/jqplot.js +++ b/plugins/CoreVisualizations/javascripts/jqplot.js @@ -280,7 +280,7 @@ * creating span elements with ticks and adding their width. * Rendered ticks have to be visible to get their real width. But it * is too fast for user to notice it. If total ticks width is bigger - * than container width then half of ticks is beeing cut out and their + * than container width then half of ticks is being cut out and their * width is tested again. Until their total width is smaller than chart * div. There is a failsafe so check will be performed no more than 20 * times, which is I think more than enough. Each tick have its own -- cgit v1.2.3 From 0323adabf29f1eff8b308596881e90496675b861 Mon Sep 17 00:00:00 2001 From: mattab Date: Thu, 14 Jul 2016 14:02:03 +1200 Subject: Fixes https://github.com/piwik/piwik/issues/10117 --- plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'plugins/CoreVisualizations') diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 959aa0d57b..90066a187a 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -67,7 +67,8 @@ class AllColumns extends HtmlTable public function beforeLoadDataTable() { - $this->requestConfig->request_parameters_to_modify['pivotBy'] = null; // always unset pivotBy + unset($this->requestConfig->request_parameters_to_modify['pivotBy']); + unset($this->requestConfig->request_parameters_to_modify['pivotByColumn']); } protected function isPivoted() -- cgit v1.2.3 From 319f519555f523291fa678fbe05c0d1a2b22dec9 Mon Sep 17 00:00:00 2001 From: Matthieu Aubry Date: Fri, 15 Jul 2016 14:10:45 +1200 Subject: Searching recursively in sub-tables should work as expected (#10303) * When a datatable is manipulated in memory, the correct id subtable is stored in metadata and must be fetched from there. --- plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins/CoreVisualizations') diff --git a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig index eb237b93b9..a85ee66852 100644 --- a/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig +++ b/plugins/CoreVisualizations/templates/_dataTableViz_htmlTable.twig @@ -20,6 +20,7 @@ {% else %} {%- for rowId, row in dataTable.getRows() -%} {%- set rowHasSubtable = not subtablesAreDisabled and row.getIdSubDataTable() and properties.subtable_controller_action is not null -%} + {%- set rowSubtableId = row.getMetadata('idsubdatatable_in_db')|default(row.getIdSubDataTable()) -%} {%- set isSummaryRow = rowId == constant('Piwik\\DataTable::ID_SUMMARY_ROW') -%} {%- set shouldHighlightRow = isSummaryRow and properties.highlight_summary_row -%} @@ -30,7 +31,7 @@ or not properties.replace_row_with_subtable|default(false) -%} {% if showRow %} - Date: Sun, 28 Aug 2016 18:33:55 +1200 Subject: Split piwik.js into multiple files and provide a merged one (#10441) refs #6106 --- plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php | 3 ++- plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) (limited to 'plugins/CoreVisualizations') diff --git a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php index 90066a187a..ca699274c0 100644 --- a/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php +++ b/plugins/CoreVisualizations/Visualizations/HtmlTable/AllColumns.php @@ -26,7 +26,6 @@ class AllColumns extends HtmlTable public function beforeRender() { $this->config->show_extra_columns = true; - $this->config->datatable_css_class = 'dataTableVizAllColumns'; $this->config->show_exclude_low_population = true; parent::beforeRender(); @@ -34,6 +33,8 @@ class AllColumns extends HtmlTable public function beforeGenericFiltersAreAppliedToLoadedDataTable() { + $this->config->datatable_css_class = 'dataTableVizAllColumns'; + $this->dataTable->filter('AddColumnsProcessedMetrics'); $properties = $this->config; diff --git a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php index 121cfdc315..84b53bae88 100644 --- a/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php +++ b/plugins/CoreVisualizations/Visualizations/JqplotGraph/Bar.php @@ -20,10 +20,10 @@ class Bar extends JqplotGraph const ID = 'graphVerticalBar'; const FOOTER_ICON = 'plugins/Morpheus/images/chart_bar.png'; const FOOTER_ICON_TITLE = 'General_VBarGraph'; - - public function beforeRender() + + public function beforeLoadDataTable() { - parent::beforeRender(); + parent::beforeLoadDataTable(); $this->config->datatable_js_type = 'JqplotBarGraphDataTable'; } -- cgit v1.2.3