From bb8a2a97a5104a381c18a090b34d25ad66421ef7 Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 2 Aug 2022 15:25:06 +0200 Subject: [PATCH] Fixed: Unclickable URLs after approving Anrechnung are clickable now --- .../approveAnrechnungUebersichtData.php | 3 -- .../anrechnung/approveAnrechnungUebersicht.js | 32 ++++++++----------- 2 files changed, 13 insertions(+), 22 deletions(-) diff --git a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php index e78bf4059..3d518c7db 100644 --- a/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php +++ b/application/views/lehre/anrechnung/approveAnrechnungUebersichtData.php @@ -191,9 +191,6 @@ $filterWidgetArray = array( rowSelectionChanged:function(data, rows){ func_rowSelectionChanged(data, rows); }, - rowUpdated:function(row){ - func_rowUpdated(row); - }, tooltips: function(cell){ return func_tooltips(cell); } diff --git a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js index 4386a103e..6223362ae 100644 --- a/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js +++ b/public/js/lehre/anrechnung/approveAnrechnungUebersicht.js @@ -141,8 +141,17 @@ var format_ectsSumBisherUndNeu = function(cell, formatterParams, onRendered){ function func_rowFormatter(row){ let status_kurzbz = row.getData().status_kurzbz; + // If status is anything else then 'Bearbeitet von STGL-Leitung' if (status_kurzbz != ANRECHNUNGSTATUS_PROGRESSED_BY_STGL) { + // Disable new selection of updated rows + row.getElement().style["pointerEvents"] = "none"; + + // ...but leave url links selectable + row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto"; + row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto"; + + // Color background grey row.getElement().style["background-color"] = COLOR_LIGHTGREY; // default } } @@ -177,24 +186,6 @@ function func_rowSelectionChanged(data, rows){ approveAnrechnung.showNumberSelectedRows(rows); } -// Performes after row was updated -function func_rowUpdated(row){ - var status_kurzbz = row.getData().status_kurzbz; - if ((row.getCells().length > 0) && - (status_kurzbz == ANRECHNUNGSTATUS_APPROVED || - status_kurzbz == ANRECHNUNGSTATUS_REJECTED || - status_kurzbz == ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR) - ) - { - // Deselect and disable new selection of updated rows - row.getElement().style["pointerEvents"] = "none"; - - // ...but leave url links selectable - row.getCell('dokument_bezeichnung').getElement().firstChild.style["pointerEvents"] = "auto"; - row.getCell('details').getElement().firstChild.style["pointerEvents"] = "auto"; - } -} - // Returns tooltip function func_tooltips(cell) { // Return tooltip if row is unselectable @@ -431,8 +422,11 @@ $(function(){ // Update row - row.update(updateData); + row.update(updateData); + + // Reformat row row.reformat(); + }) // Deselect rows