diff --git a/application/models/education/Lehrveranstaltung_model.php b/application/models/education/Lehrveranstaltung_model.php index 266496b33..c55ce8e10 100644 --- a/application/models/education/Lehrveranstaltung_model.php +++ b/application/models/education/Lehrveranstaltung_model.php @@ -23,7 +23,7 @@ class Lehrveranstaltung_model extends DB_Model public function getLehrveranstaltungGroupNames($studiensemester_kurzbz, $ausbildungssemester = null, $studiengang_kz = null, $lehrveranstaltung_ids = null) { $this->load->model('system/studiensemester_model', 'StudiensemesterModel'); - $this->load->model('organisation/studienplan_model', 'StudiengangModel'); + $this->load->model('organisation/studiengang_model', 'StudiengangModel'); $studiengang_kz_arr = array(); $ausbildungssemester_arr = array(); diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php index 71b4d3738..300e13805 100644 --- a/application/models/organisation/Studiensemester_model.php +++ b/application/models/organisation/Studiensemester_model.php @@ -36,7 +36,7 @@ class Studiensemester_model extends DB_Model * getNextOrAktSemester * 62 days - in july and august, semester after summer is returned */ - public function getNextOrAktSemester($days = 62) + public function getAktOrNextSemester($days = 62) { if (!is_numeric($days)) { @@ -45,7 +45,7 @@ class Studiensemester_model extends DB_Model $query = 'SELECT studiensemester_kurzbz FROM public.tbl_studiensemester - WHERE start < (NOW() + \'' . $days . ' DAYS\':: INTERVAL) + WHERE start < NOW() + \'' . $days . ' DAYS\':: INTERVAL ORDER BY start DESC LIMIT 1';