blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-27 00:49:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

Browse Source
This commit is contained in:
kindlm
2016-07-08 17:53:25 +02:00
parent a5c29fa2f7 5de98911ec
commit 0950eebca6
6 changed files with 43 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/functions.inc.php
+1 -1
View File
@@ -366,7 +366,7 @@ function getStudiensemesterFromDatum($datum, $naechstes=true)
$qry = "SELECT studiensemester_kurzbz FROM public.tbl_studiensemester WHERE";
if($naechstes)
$qry.= " ende>".$db->db_add_param($datum)." ORDER BY ende ASC ";
$qry.= " ende>=".$db->db_add_param($datum)." ORDER BY ende ASC ";
else
$qry.= " start<".$db->db_add_param($datum)." ORDER BY ende DESC ";
include/studienplan.class.php
+1 -1
View File
@@ -861,7 +861,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)