diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php index f815f26f8..9514d5b6b 100644 --- a/application/controllers/Cis/MyLv.php +++ b/application/controllers/Cis/MyLv.php @@ -13,7 +13,8 @@ class MyLv extends Auth_Controller public function __construct() { parent::__construct([ - 'index' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions? + 'index' => ['student/anrechnung_beantragen:r','user:r'], // TODO(chris): permissions? + 'Info' => ['student/anrechnung_beantragen:r','user:r'] // TODO(chris): permissions? ]); } @@ -27,4 +28,9 @@ class MyLv extends Auth_Controller { $this->load->view('Cis/MyLv'); } + + public function Info($studien_semester,$lvid) + { + $this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]); + } } diff --git a/application/core/CI3_Events.php b/application/core/CI3_Events.php index 7e7e471b1..37f6c3f21 100644 --- a/application/core/CI3_Events.php +++ b/application/core/CI3_Events.php @@ -47,10 +47,19 @@ class CI3_Events */ require_once(APPPATH.'config/Events.php'); +$active_addons_array = explode(";", ACTIVE_ADDONS); + foreach (scandir(APPPATH.'config/extensions') as $dir) if ($dir[0] != '.' && file_exists(APPPATH.'config/extensions/'.$dir.'/Events.php')) require_once APPPATH.'config/extensions/'.$dir.'/Events.php'; foreach (scandir(FHCPATH.'addons') as $dir) if ($dir[0] != '.' && file_exists(FHCPATH.'addons/'.$dir.'/Events.php')) - require_once FHCPATH.'addons/'.$dir.'/Events.php'; + { + // only includes the Events of the addon if the addon is one of the active addons in the cis config + if(in_array($dir,$active_addons_array)) + { + require_once FHCPATH . 'addons/' . $dir . '/Events.php'; + } + } + diff --git a/application/views/Cis/LvInfo.php b/application/views/Cis/LvInfo.php new file mode 100644 index 000000000..49a7b7a85 --- /dev/null +++ b/application/views/Cis/LvInfo.php @@ -0,0 +1,15 @@ + 'LvInfo', + 'customJSModules' => ['public/js/apps/Cis/LvInfo.js'] +); + +$this->load->view('templates/CISVUE-Header', $includesArray); +?> + +
| {{p.t('lehre/lehrveranstaltung')}} | +{{$p.t('lehre/lehrveranstaltung')}} | {{bezeichnung}} |
|---|---|---|
| {{p.t('lehre/studiengang')}} | +{{$p.t('lehre/studiengang')}} | {{studiengang_kuerzel}} |
| {{p.t('lehre/semester')}} | +{{$p.t('lehre/semester')}} | {{semester}} |
| {{p.t('lehre/studiensemester')}} | +{{$p.t('lehre/studiensemester')}} | {{studien_semester}} |
| {{p.t('lehre/organisationsform')}} | +{{$p.t('lehre/organisationsform')}} | {{orgform_kurzbz}} |
| {{p.t('lehre/lehrbeauftragter')}} | +{{$p.t('lehre/lehrbeauftragter')}} |
|
| {{p.t('lehre/lvleitung')}} | +{{$p.t('lehre/lvleitung')}} |
|
| {{p.t('global/sprache')}} | +{{$p.t('global/sprache')}} | {{sprache}} |
| {{p.t('lehre/ects')}} | +{{$p.t('lehre/ects')}} | {{ects}} |
| {{p.t('lehre/incomingplaetze')}} | +{{$p.t('lehre/incomingplaetze')}} | {{incoming}} |
| {{p.t('lehre/organisationseinheit')}} | +{{$p.t('lehre/organisationseinheit')}} |
{{oe}} ( - {{p.t('global/leitung')}}: {{oeLeitung.join(', ')}} + {{$p.t('global/leitung')}}: {{oeLeitung.join(', ')}} - {{p.t('global/koordination')}}: {{koordinator.join(', ')}} + {{$p.t('global/koordination')}}: {{koordinator.join(', ')}} ) |