mirror of
https://github.com/FH-Complete/FHC-Core.git
synced 2026-07-25 08:34:29 +00:00
- Changed the routes used to call the controllers, now accept also
capital names - Now method getStudiengangBewerbung of controller Studiengang returns also data relative to the table lehre.tbl_akadgrad - Fixes and enhancements of method loadTree of DB_Model.
This commit is contained in:
@@ -141,6 +141,8 @@ class Studiengang_model extends DB_Model
|
||||
{
|
||||
// Join table public.tbl_studiengang with table lehre.tbl_studienordnung on column studiengang_kz
|
||||
$this->addJoin('lehre.tbl_studienordnung', 'studiengang_kz');
|
||||
// Join table lehre.tbl_studienordnung with table lehre.tbl_akadgrad on column akadgrad_id
|
||||
$this->addJoin('lehre.tbl_akadgrad', 'akadgrad_id', 'LEFT');
|
||||
// Then join with table lehre.tbl_studienplan on column studienordnung_id
|
||||
$this->addJoin('lehre.tbl_studienplan', 'studienordnung_id');
|
||||
// Then join with table lehre.tbl_studienplan_semester on column studienplan_id
|
||||
@@ -158,7 +160,8 @@ class Studiengang_model extends DB_Model
|
||||
$result = $this->loadTree(
|
||||
'tbl_studiengang',
|
||||
array(
|
||||
'tbl_studienplan'
|
||||
'tbl_studienplan',
|
||||
'tbl_akadgrad'
|
||||
),
|
||||
'public.tbl_studiengang.aktiv = TRUE
|
||||
AND public.tbl_studiengang.onlinebewerbung = TRUE
|
||||
@@ -168,7 +171,8 @@ class Studiengang_model extends DB_Model
|
||||
AND lehre.tbl_studienplan.aktiv = TRUE'
|
||||
,
|
||||
array(
|
||||
'studienplaene'
|
||||
'studienplaene',
|
||||
'akadgrad'
|
||||
)
|
||||
);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user