diff options
Diffstat (limited to 'lib/models')
| -rw-r--r-- | lib/models/Institute.php | 5 | ||||
| -rw-r--r-- | lib/models/Modulteil.php | 4 | ||||
| -rw-r--r-- | lib/models/StgteilVersion.php | 8 | ||||
| -rw-r--r-- | lib/models/Studiengang.php | 6 |
4 files changed, 18 insertions, 5 deletions
diff --git a/lib/models/Institute.php b/lib/models/Institute.php index 5ecdcef..e87a408 100644 --- a/lib/models/Institute.php +++ b/lib/models/Institute.php @@ -129,6 +129,11 @@ class Institute extends SimpleORMap implements Range 'order_by' => 'ORDER BY position', 'on_delete' => 'delete', ]; + $config['has_many']['courses_of_study'] = [ + 'class_name' => Studiengang::class, + 'assoc_foreign_key' => 'institut_id', + 'order_by' => 'ORDER BY name ASC', + ]; $config['additional_fields']['all_status_groups']['get'] = function ($institute) { return Statusgruppen::findAllByRangeId($institute->id, true); }; diff --git a/lib/models/Modulteil.php b/lib/models/Modulteil.php index 397fc18..3b8f146 100644 --- a/lib/models/Modulteil.php +++ b/lib/models/Modulteil.php @@ -379,11 +379,11 @@ class Modulteil extends ModuleManagementModelTreeItem /** * Retrieves all courses this Modulteil is assigned by its LV-Gruppen. * Filtered by a given semester considering the global visibility or the - * the visibility for a given user. + * visibility for a given user. * * @param string $semester_id The id of a semester. * @param mixed $only_visible Boolean true retrieves only visible courses, false - * retrieves all courses. If $only_visible is an user id it depends on the users + * retrieves all courses. If $only_visible is a user id it depends on the users * status which courses will be retrieved. * @return array An array of course data. */ diff --git a/lib/models/StgteilVersion.php b/lib/models/StgteilVersion.php index 5add60b..113875c 100644 --- a/lib/models/StgteilVersion.php +++ b/lib/models/StgteilVersion.php @@ -67,6 +67,14 @@ class StgteilVersion extends ModuleManagementModelTreeItem 'on_delete' => 'delete', 'on_store' => 'store' ]; + $config['belongs_to']['start_semester'] = [ + 'class_name' => Semester::class, + 'foreign_key' => 'start_sem', + ]; + $config['belongs_to']['end_semester'] = [ + 'class_name' => Semester::class, + 'foreign_key' => 'end_sem', + ]; $config['additional_fields']['count_abschnitte']['get'] = function($version) { return $version->count_abschnitte; }; diff --git a/lib/models/Studiengang.php b/lib/models/Studiengang.php index ee89abd..3c8a10f 100644 --- a/lib/models/Studiengang.php +++ b/lib/models/Studiengang.php @@ -171,7 +171,7 @@ class Studiengang extends ModuleManagementModelTreeItem $config['i18n_fields']['name_kurz'] = true; $config['i18n_fields']['beschreibung'] = true; - $config['default_values']['enroll'] = $GLOBALS['MVV_STUDIENGANG']['ENROLL']['default']; + $config['default_values']['enroll'] = Config::get()->MVV_STUDIENGANG['ENROLL']['default']; parent::configure($config); } @@ -648,7 +648,7 @@ class Studiengang extends ModuleManagementModelTreeItem $result = []; foreach ($stmt->fetchAll(PDO::FETCH_ASSOC) as $status) { $result[$status['stat']] = [ - 'name' => $GLOBALS['MVV_STUDIENGANG']['STATUS']['values'][$status['stat']]['name'] ?? _('Undefinierter Status'), + 'name' => Config::get()->MVV_STUDIENGANG['STATUS']['values'][$status['stat']]['name'] ?? _('Undefinierter Status'), 'count_objects' => $status['count_objects'] ]; } @@ -845,7 +845,7 @@ class Studiengang extends ModuleManagementModelTreeItem { $assigned_languages = array(); $languages_flipped = array_flip($languages); - foreach ($GLOBALS['MVV_STUDIENGANG']['SPRACHE']['values'] as $key => $language) { + foreach (Config::get()->MVV_STUDIENGANG['SPRACHE']['values'] as $key => $language) { if (isset($languages_flipped[$key])) { $language = StudycourseLanguage::find([$this->id, $key]); if (!$language) { |