blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-16 22:42:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into HEAD

Browse Source 
Conflicts:
	include/dokument_export.class.php
	include/studiengang.class.php
	vilesci/stammdaten/reihungstestverwaltung.php
This commit is contained in:
Paolo
2016-08-18 16:23:11 +02:00
parent 64aa1cfd4f da3409cf1d
commit 40a2b53858
116 changed files with 10682 additions and 5335 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/studienplan.class.php
+3 -3
View File
@@ -155,6 +155,7 @@ class studienplan extends basis_db
if(!is_null($orgform_kurzbz))
$qry.=" AND orgform_kurzbz=".$this->db_add_param($orgform_kurzbz);
$qry.=" ORDER BY bezeichnung";
if($this->db_query($qry))
{
@@ -754,7 +755,6 @@ class studienplan extends basis_db
$qry.=" AND orgform_kurzbz=".$this->db_add_param($orgform_kurzbz);
}
$res = array();
if($result = $this->db_query($qry))
@@ -893,7 +893,7 @@ class studienplan extends basis_db
WHERE
tbl_studienplan_lehrveranstaltung.lehrveranstaltung_id=".$this->db_add_param($lehrveranstaltung_id, FHC_INTEGER)."
AND EXISTS (
SELECT 1 FROM lehre.tbl_studienordnung_semester
SELECT 1 FROM lehre.tbl_studienplan_semester
WHERE studienordnung_id=tbl_studienplan.studienordnung_id
AND studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
AND semester = tbl_studienplan_lehrveranstaltung.semester)
@@ -1192,4 +1192,4 @@ class studienplan extends basis_db
}
}
}
?>
?>