diff --git a/include/js/jstree/themes/default/style.css b/include/js/jstree/themes/default/style.css index 7ef6a0430..4780499ce 100755 --- a/include/js/jstree/themes/default/style.css +++ b/include/js/jstree/themes/default/style.css @@ -17,7 +17,7 @@ .jstree-default a .jstree-icon { background-position:-56px -19px; } .jstree-default a.jstree-loading .jstree-icon { background:url("throbber.gif") center center no-repeat !important; } -.jstree-default.jstree-focused { background:#ffffee; } +/*.jstree-default.jstree-focused { background:#ffffee; }*/ .jstree-default .jstree-no-dots li, .jstree-default .jstree-no-dots .jstree-leaf > ins { background:transparent; } @@ -71,4 +71,4 @@ .jstree-default .jstree-undetermined a .jstree-checkbox { _background-position:-20px -19px; } .jstree-default .jstree-checked a .jstree-checkbox { _background-position:-38px -19px; } .jstree-default .jstree-unchecked a .jstree-checkbox { _background-position:-2px -19px; } -/* IE6 END */ \ No newline at end of file +/* IE6 END */ diff --git a/include/lehrverband.class.php b/include/lehrverband.class.php index bc7b05116..0b0f77afc 100644 --- a/include/lehrverband.class.php +++ b/include/lehrverband.class.php @@ -73,7 +73,7 @@ class lehrverband extends basis_db } else { - $this->errormsg = 'Fehler bei Abfrage: '.$qry; + $this->errormsg = 'Fehler bei Abfrage'; return false; } } @@ -199,9 +199,13 @@ class lehrverband extends basis_db } } - public function getSemesterFromStudiengang($studiengang_kz, $where) + public function getSemesterFromStudiengang($studiengang_kz, $aktiv=false) { - $qry = 'SELECT semester, aktiv FROM public.tbl_lehrverband WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER)." AND verband=' ' ".$where; + $qry = 'SELECT semester, aktiv FROM public.tbl_lehrverband WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER)." AND verband=' ' "; + + if($aktiv) + $qry.= ' AND aktiv=true'; + $qry .= ' GROUP BY semester, aktiv ORDER BY semester;'; if($this->db_query($qry)) @@ -223,9 +227,11 @@ class lehrverband extends basis_db } } - public function getVerbandFromSemester($studiengang_kz, $semester, $where) + public function getVerbandFromSemester($studiengang_kz, $semester, $aktiv=false) { - $qry = 'SELECT verband, aktiv, bezeichnung FROM public.tbl_lehrverband WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER).' AND semester='.$this->db_add_param($semester, FHC_INTEGER)." AND gruppe=' ' ".$where; + $qry = 'SELECT verband, aktiv, bezeichnung FROM public.tbl_lehrverband WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER).' AND semester='.$this->db_add_param($semester, FHC_INTEGER)." AND gruppe=' ' "; + if($aktiv) + $qry.=' AND aktiv=true'; $qry .= ' GROUP BY verband, aktiv, bezeichnung ORDER BY verband;'; if($this->db_query($qry)) @@ -248,9 +254,13 @@ class lehrverband extends basis_db } } - public function getGruppeFromVerband($studiengang_kz, $semester, $verband, $where) + public function getGruppeFromVerband($studiengang_kz, $semester, $verband, $aktiv=false) { - $qry = 'SELECT gruppe, bezeichnung, aktiv FROM public.tbl_lehrverband WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER).' AND semester='.$this->db_add_param($semester, FHC_INTEGER).' AND verband='.$this->db_add_param($verband, FHC_STRING).$where; + $qry = 'SELECT gruppe, bezeichnung, aktiv FROM public.tbl_lehrverband WHERE studiengang_kz='.$this->db_add_param($studiengang_kz, FHC_INTEGER).' AND semester='.$this->db_add_param($semester, FHC_INTEGER).' AND verband='.$this->db_add_param($verband, FHC_STRING); + if($aktiv) + { + $qry.=' AND aktiv=true'; + } $qry .= ' GROUP BY gruppe, bezeichnung, aktiv ORDER BY gruppe;'; if($this->db_query($qry)) { diff --git a/vilesci/stammdaten/lvbgruppenverwaltung.js b/vilesci/stammdaten/lvbgruppenverwaltung.js index 162a3144e..487d0d03b 100755 --- a/vilesci/stammdaten/lvbgruppenverwaltung.js +++ b/vilesci/stammdaten/lvbgruppenverwaltung.js @@ -19,18 +19,11 @@ $(document).ready(function() { var stdkz = $('select[name=studiengang_kz]').val(); - if (admin) - { - var where = " "; - } - else - { - var where = " AND aktiv=true"; - } + $.ajax({ type: "POST", url: "lvbgruppenverwaltungTree.php", - data: {studiengang_kz: stdkz, where: where} + data: {studiengang_kz: stdkz} }).done(function(data) { if (data === "No Data available!") { @@ -239,4 +232,4 @@ function saveSpzGroup(studiengang_kz, kurzBz, type) { // stuff return false; }); -} \ No newline at end of file +} diff --git a/vilesci/stammdaten/lvbgruppenverwaltung.php b/vilesci/stammdaten/lvbgruppenverwaltung.php index 44c94a9f1..f7bf7052d 100644 --- a/vilesci/stammdaten/lvbgruppenverwaltung.php +++ b/vilesci/stammdaten/lvbgruppenverwaltung.php @@ -63,7 +63,7 @@ if (!$db = new basis_db()) .detailsDiv { background-color: #E0E0E0; position: fixed; - top: 10em; + top: 5em; float: left; } @@ -74,7 +74,7 @@ if (!$db = new basis_db()) -
+