From 76afc73c492c7c17b04834ff9635cd577397b882 Mon Sep 17 00:00:00 2001 From: Cris Date: Tue, 31 Mar 2020 11:50:11 +0200 Subject: [PATCH] Fixed: Now Projektbetreuer are selectable again Before Projektbetreuer, that should be selectable in ordering process, were excluded from selection. This is fixed now. --- public/js/lehre/lehrauftrag/orderLehrauftrag.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/public/js/lehre/lehrauftrag/orderLehrauftrag.js b/public/js/lehre/lehrauftrag/orderLehrauftrag.js index e52a7599e..22d856d52 100644 --- a/public/js/lehre/lehrauftrag/orderLehrauftrag.js +++ b/public/js/lehre/lehrauftrag/orderLehrauftrag.js @@ -203,7 +203,7 @@ function func_rowFormatter(row){ // Formats row selectable/unselectable function func_selectableCheck(row){ - var is_dummy = row.getData().personalnummer <= 0; + var is_dummy = (row.getData().personalnummer <= 0 && row.getData().personalnummer != null); var is_mitarbeiter = row.getData().mitarbeiter_uid != null; var has_stunden = row.getData().stunden != 0 && row.getData().stunden != null; @@ -575,7 +575,10 @@ $(function() { $("#show-ordered").click(function(){ $('#tableWidgetTabulator').tabulator('setFilter', [ - {field: 'personalnummer', type: '>=', value: 0}, + [ + {field: 'personalnummer', type: '>', value: 0}, // not dummy lector + {field: 'personalnummer', type: '=', value: null} // include Projektbetreuer + ], {field: 'bestellt', type: '!=', value: null}, {field: 'erteilt', type: '=', value: null}, {field: 'akzeptiert', type: '=', value: null}