diff options
| author | Thomas Steur <tsteur@users.noreply.github.com> | 2018-12-07 05:28:25 +0300 |
|---|---|---|
| committer | diosmosis <diosmosis@users.noreply.github.com> | 2018-12-07 05:28:25 +0300 |
| commit | 53c4d95a4b60ee099400db8c36ac64a68ffa37a3 (patch) | |
| tree | 1a6918e045fb9d5a6fe35531854be98faafeb86f /plugins/CoreHome/javascripts | |
| parent | 6eb10a35e6388c62b88d77edc5055daa519de32d (diff) | |
Some work on report totals (#13555)
* some work on totals
* fix graphs
* tweak rendering of totals row
* disable evolution for totals row
* let plugins configure totals row visibility
* remove metadata
* more tweaks and make it configurable
* improve code and performance
* fix some tests
* lots of improvements
* support bandwidth and other plugins
* fix tests
* add screenshot test
* also fix existing test
* add new method supportsTotalRow
* various fixes
* Updating some expected test files.
Diffstat (limited to 'plugins/CoreHome/javascripts')
| -rw-r--r-- | plugins/CoreHome/javascripts/dataTable.js | 8 | ||||
| -rw-r--r-- | plugins/CoreHome/javascripts/dataTable_rowactions.js | 2 |
2 files changed, 9 insertions, 1 deletions
diff --git a/plugins/CoreHome/javascripts/dataTable.js b/plugins/CoreHome/javascripts/dataTable.js index 2570e24987..71852530a5 100644 --- a/plugins/CoreHome/javascripts/dataTable.js +++ b/plugins/CoreHome/javascripts/dataTable.js @@ -1294,6 +1294,13 @@ $.extend(DataTable.prototype, UIControl.prototype, { }) .click(generateClickCallback('flat')); + // handle flatten + $('.dataTableShowTotalsRow', domElem) + .each(function () { + setText(this, 'keep_totals_row', 'CoreHome_RemoveTotalsRowDataTable', 'CoreHome_AddTotalsRowDataTable'); + }) + .click(generateClickCallback('keep_totals_row')); + $('.dataTableIncludeAggregateRows', domElem) .each(function () { setText(this, 'include_aggregate_rows', 'CoreHome_DataTableExcludeAggregateRows', @@ -1975,6 +1982,7 @@ DataTable.registerFooterIconHandler('ecommerceAbandonedCart', switchToEcommerceV DataTable.switchToGraph = function (dataTable, viewDataTable) { var filters = dataTable.resetAllFilters(); dataTable.param.flat = filters.flat; + dataTable.param.keep_totals_row = filters.keep_totals_row; dataTable.param.columns = filters.columns; dataTable.param.viewDataTable = viewDataTable; diff --git a/plugins/CoreHome/javascripts/dataTable_rowactions.js b/plugins/CoreHome/javascripts/dataTable_rowactions.js index b937979cdf..7354f8ad1b 100644 --- a/plugins/CoreHome/javascripts/dataTable_rowactions.js +++ b/plugins/CoreHome/javascripts/dataTable_rowactions.js @@ -104,7 +104,7 @@ DataTable_RowActions_Registry.register({ }, isAvailableOnRow: function (dataTableParams, tr) { - return true; + return !tr.hasClass('totalsRow'); } }); |