From 8a03ccab5d04ed071d2589e59c5c554e94ee9cc0 Mon Sep 17 00:00:00 2001 From: Cris Date: Thu, 21 Jan 2021 11:19:11 +0100 Subject: [PATCH] Visibly greyed rows that are unselectable (at start and on update) Signed-off-by: cris-technikum --- .../approveAnrechnungUebersichtData.php | 3 +++ .../anrechnung/approveAnrechnungUebersicht.js | 22 +++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php index f1836d77c..33a9ee2d0 100644 --- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php +++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php @@ -84,6 +84,9 @@ $filterWidgetArray = array( }, selectableCheck: function(row){ return func_selectableCheck(row); + }, + rowFormatter:function(row){ + func_rowFormatter(row); }, rowUpdated:function(row){ func_rowUpdated(row); diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js index 454ef9549..f45f209f3 100644 --- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js +++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js @@ -7,6 +7,8 @@ const ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR = 'inProgressLektor'; const ANRECHNUNGSTATUS_APPROVED = 'approved'; const ANRECHNUNGSTATUS_REJECTED = 'rejected'; +const COLOR_LIGHTGREY = "#f5f5f5"; + // TABULATOR FUNCTIONS // --------------------------------------------------------------------------------------------------------------------- // Returns relative height (depending on screen size) @@ -33,6 +35,18 @@ function func_tableBuilt(table) { ); } +// Formats the rows +function func_rowFormatter(row){ + let status_kurzbz = row.getData().status_kurzbz; + + row.getCells().forEach(function(cell){ + if (status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_STGL) + { + row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default + } + }); +} + // Formats row selectable/unselectable function func_selectableCheck(row){ let status_kurzbz = row.getData().status_kurzbz; @@ -46,8 +60,12 @@ function func_selectableCheck(row){ // Performes after row was updated function func_rowUpdated(row){ - row.deselect(); - row.getElement().style["pointerEvents"] = "none"; + // Refresh row formatters + row.reformat(); + + // Deselect and disable new selection of updated rows + row.deselect(); + row.getElement().style["pointerEvents"] = "none"; } // Formats empfehlung_anrechnung