From 811c0a23b316c4a5e2a6b19033922d32fd02c002 Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Sun, 30 Oct 2016 15:44:10 +0100 Subject: [PATCH] =?UTF-8?q?module=20in=20der=20studienplan=C3=BCbericht=20?= =?UTF-8?q?im=20cis=20ausblendbar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/lehrveranstaltung.class.php | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/include/lehrveranstaltung.class.php b/include/lehrveranstaltung.class.php index 0879bada4..f2937f3ff 100755 --- a/include/lehrveranstaltung.class.php +++ b/include/lehrveranstaltung.class.php @@ -1188,7 +1188,8 @@ class lehrveranstaltung extends basis_db JOIN lehre.tbl_studienplan_lehrveranstaltung USING(lehrveranstaltung_id) WHERE tbl_studienplan_lehrveranstaltung.studienplan_id=" . $this->db_add_param($studienplan_id, FHC_INTEGER); - + if (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") && ("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN" === true)) + $qry .= " AND tbl_lehrveranstaltung.lehrtyp_kurzbz != 'modul'"; if (!is_null($semester)) { $qry.=" AND tbl_studienplan_lehrveranstaltung.semester=" . $this->db_add_param($semester, FHC_INTEGER); @@ -1286,7 +1287,9 @@ class lehrveranstaltung extends basis_db $tree = array(); foreach ($this->lehrveranstaltungen as $row) { - if ($row->studienplan_lehrveranstaltung_id_parent == '') + if ($row->studienplan_lehrveranstaltung_id_parent == '' + || (defined("CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN") + && "CIS_PROFIL_STUDIENPLAN_MODULE_AUSBLENDEN" === true)) { $tree[$row->studienplan_lehrveranstaltung_id] = $row; $tree[$row->studienplan_lehrveranstaltung_id]->childs = $this->getLehrveranstaltungTreeChilds($row->studienplan_lehrveranstaltung_id);