From 9e4489093c4e10e9b57da51e2b55a7e3e003f99a Mon Sep 17 00:00:00 2001 From: Cris Date: Wed, 29 Mar 2023 10:29:06 +0200 Subject: [PATCH] Adapted & updated Tabulator default options (PersistenceID now changeable / Updates for options in Tabulator 4.9) . Adapted .. PersistenceID now changeable .. check: only set default option if not set in tabulator . Updates in version 4.9: .. persistentLayout => persistence .. getVisibility() => isVisible() --- .../anrechnung/approveAnrechnungUebersichtData.php | 4 +--- public/js/TableWidget.js | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php index 1eade50d2..d0230ceb6 100644 --- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php +++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php @@ -167,9 +167,7 @@ $filterWidgetArray = array( 'datasetRepOptions' => '{ height: func_height(this), layout: "fitColumns", // fit columns to width of table - persistentLayout:true, - persistentSort:true, - persistentFilter:true, + persistenceID: "approveAnrechnungUebersicht_V1", autoResize: false, // prevent auto resizing of table (false to allow adapting table size when cols are (de-)activated headerFilterPlaceholder: " ", index: "anrechnung_id", // assign specific column as unique id (important for row indexing) diff --git a/public/js/TableWidget.js b/public/js/TableWidget.js index 6df20066e..9ae1b836c 100644 --- a/public/js/TableWidget.js +++ b/public/js/TableWidget.js @@ -544,13 +544,10 @@ var FHC_TableWidget = { options.columns = arrayTabulatorColumns; options.data = data.dataset; - if (typeof options.tableWidgetHeader == 'undefined') - { - options.persistentLayout = true; // enables persistence (default store in localStorage if available, else in cookie) - options.persistenceID = data.tableUniqueId; // TableWidget unique id to store persistence data seperately for multiple tables - } - options.movableColumns = true; // allows changing column order - options.tooltipsHeader = true; // set header tooltip with column title + options.persistence = (typeof options.persistence == 'undefined') ? true : options.persistence; // enables persistence (default store in localStorage if available, else in cookie) + options.persistenceID = (typeof options.persistenceID == 'undefined') ? data.tableUniqueId : options.persistenceID; // persistenceID to store persistence data seperately for multiple tables + options.movableColumns = (typeof options.movableColumns == 'undefined') ? true : options.movableColumns; // allows changing column order + options.tooltipsHeader = (typeof options.tooltipsHeader == 'undefined') ? true : options.tooltipsHeader; // set header tooltip with column title options.placeholder = _func_placeholder(); // display text when table is empty if (typeof options.rowSelectionChanged == 'undefined') @@ -827,7 +824,7 @@ function _renderTabulatorHeaderCollapseHTML(tableWidgetDiv){ { var field = column.getField(); var title = column.getDefinition().title; - var btn_select_col_selected = column.getVisibility() ? 'btn-select-col-selected' : ''; + var btn_select_col_selected = column.isVisible() ? 'btn-select-col-selected' : ''; // If certain columns should be excluded from the column picker (define them in a blacklist array) if (typeof tableWidgetBlacklistArray_columnUnselectable != 'undefined' &&