diff --git a/application/libraries/SearchBarLib.php b/application/libraries/SearchBarLib.php index 3ebe7c003..eb309a2d6 100644 --- a/application/libraries/SearchBarLib.php +++ b/application/libraries/SearchBarLib.php @@ -375,9 +375,11 @@ EOSC; p.vorname || \' \' || p.nachname AS name, CASE when s.student_uid = \''.getAuthUID().'\' then p.foto + when p.foto IS NULL then \''.$gesperrtes_foto.'\' when p.foto_sperre = false then p.foto else \''.$gesperrtes_foto.'\' - end as foto + end as foto, + b.aktiv FROM public.tbl_student s JOIN public.tbl_studiengang stg USING(studiengang_kz) JOIN public.tbl_benutzer b ON(b.uid = s.student_uid) @@ -392,7 +394,10 @@ EOSC; AND (b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\' OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\' OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\') - GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto, s.verband, s.semester, stg.bezeichnung, stg.kurzbzlang + GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, + email, p.foto, s.verband, s.semester, stg.bezeichnung, + stg.kurzbzlang, b.aktiv + ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC '); // If something has been found then return it @@ -416,7 +421,8 @@ EOSC; stg.bezeichnung AS studiengang, p.person_id AS person_id, p.vorname || \' \' || p.nachname AS name, - p.foto + p.foto, + b.aktiv FROM public.tbl_student s JOIN public.tbl_studiengang stg USING(studiengang_kz) JOIN public.tbl_benutzer b ON(b.uid = s.student_uid) @@ -430,7 +436,10 @@ EOSC; b.uid ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\' OR p.vorname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\' OR p.nachname ILIKE \'%'.$dbModel->escapeLike($searchstr).'%\' - GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, email, p.foto, s.verband, s.semester, stg.bezeichnung, stg.kurzbzlang + GROUP BY type, s.student_uid, s.matrikelnr, p.person_id, name, + email, p.foto, s.verband, s.semester, stg.bezeichnung, + stg.kurzbzlang, b.aktiv + ORDER BY b.aktiv DESC, p.nachname ASC, p.vorname ASC '); // If something has been found then return it diff --git a/public/css/components/searchbar/searchbar.css b/public/css/components/searchbar/searchbar.css index d519eb9b2..3250a20c7 100644 --- a/public/css/components/searchbar/searchbar.css +++ b/public/css/components/searchbar/searchbar.css @@ -110,3 +110,7 @@ -moz-user-select: none; /* Firefox */ -ms-user-select: none; /* IE/Edge */ } + +.searchbar_inaktiv { + opacity: .6; +} \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 7f663c159..8779e4bf1 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -70,7 +70,7 @@ export default { cssclass: "position-relative", calcheightonly: true, types: [ - "student", + "studentStv", "prestudent" ], actions: { diff --git a/public/js/components/searchbar/searchbar.js b/public/js/components/searchbar/searchbar.js index a25ada4fe..d6eb0439a 100644 --- a/public/js/components/searchbar/searchbar.js +++ b/public/js/components/searchbar/searchbar.js @@ -52,7 +52,7 @@ export default {