diff --git a/application/controllers/api/frontend/v1/Lehrveranstaltung.php b/application/controllers/api/frontend/v1/Lehrveranstaltung.php index 80e299f3c..481a12841 100644 --- a/application/controllers/api/frontend/v1/Lehrveranstaltung.php +++ b/application/controllers/api/frontend/v1/Lehrveranstaltung.php @@ -106,6 +106,31 @@ class Lehrveranstaltung extends FHCAPI_Controller $lehrveranstaltungen = $this->_ci->LehreinheitModel->getLvsById($lehrveranstaltung_id, $studiensemester_kurzbz); $lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen); + if (!hasData($lehrveranstaltungen_data)) + { + + $this->_ci->LehrveranstaltungModel->addSelect(' + kurzbz as lv_kurzbz, + lehrveranstaltung_id, + lehrtyp_kurzbz, + studiengang_kz as lv_studiengang_kz, + semester as lv_semester, + bezeichnung as lv_bezeichnung, + ects as lv_ects, + lehreverzeichnis as lv_lehreverzeichnis, + planfaktor as lv_planfaktor, + planlektoren as lv_planlektoren, + planpersonalkosten as lv_planpersonalkosten, + plankostenprolektor as lv_plankostenprolektor, + orgform_kurzbz as lv_orgform_kurzbz, + lehrform_kurzbz as lv_lehrform_kurzbz, + bezeichnung_english as lv_bezeichnung_english, + semesterstunden as lv_semesterstunden, + '); + $lehrveranstaltungen = $this->_ci->LehrveranstaltungModel->load($lehrveranstaltung_id); + $lehrveranstaltungen_data = $this->getDataOrTerminateWithError($lehrveranstaltungen); + } + foreach ($lehrveranstaltungen_data as $lehrveranstaltung) { $lehreinheiten = $this->_ci->LehreinheitModel->getByLvidStudiensemester($lehrveranstaltung->lehrveranstaltung_id, $studiensemester_kurzbz); diff --git a/public/js/components/LVVerwaltung/Setup/Table.js b/public/js/components/LVVerwaltung/Setup/Table.js index 64ed487b0..76811fc1f 100644 --- a/public/js/components/LVVerwaltung/Setup/Table.js +++ b/public/js/components/LVVerwaltung/Setup/Table.js @@ -242,31 +242,31 @@ export default { return []; return [ { - label: "LV-Teil kopieren", + label: this.$p.t('lehre', 'lvteilkopieren'), menu: [ { - label: "Alles", + label: this.$p.t('lehre', 'alles'), action: (e, row) => { this.copyLehreinheit(row, "alle"); }, }, { - label: "Nur LV-Teil", + label: this.$p.t('lehre', 'nurlvteil'), action: (e, row) => { this.copyLehreinheit(row, "lvteil"); }, }, { - label: "Nur mit Gruppen", + label: this.$p.t('lehre', 'nurmitgruppen'), action: (e, row) => { this.copyLehreinheit(row, "gruppen"); }, }, { - label: "Nur mit Lehrenden", + label: this.$p.t('lehre', 'nurmitlehrende'), action: (e, row) => { this.copyLehreinheit(row, "lektoren"); @@ -275,13 +275,13 @@ export default { ], }, { - label: "Zur LV Springen", + label: this.$p.t('lehre', 'zurlvspringen'), action: (e, row) => { this.openLV(row) }, }, { - label: "Link kopieren", + label: this.$p.t('lehre', 'lvteillinkkopieren'), action: (e, row) => { let rowData = row.getData(); let link = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/LVVerwaltung/stdsem/' + rowData.studiensemester_kurzbz.toLowerCase() + '/le/' + rowData.lehreinheit_id; @@ -289,7 +289,7 @@ export default { }, }, { - label: "Entfernen", + label: this.$p.t('ui', 'entfernen'), action: (e, row) => { this.deleteLehreinheit(row) }, diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index f5105a28c..6ad1ff39c 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -53232,6 +53232,146 @@ and represent the current state of research on the topic. The prescribed citatio ) ) ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'lvteilkopieren', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'LV-Teil kopieren', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Copy teaching unit', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'nurlvteil', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Nur LV-Teil', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Teaching unit only', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'nurmitgruppen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Nur mit Gruppen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'With groups only', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'nurmitlehrende', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Nur mit Lehrenden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'With lecturers only', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'zurlvspringen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Zur LV Springen', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Go to teaching unit', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'lvteillinkkopieren', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Link zu diesem LV-Teil kopieren', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Copy link to this teaching unit', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'lehre', + 'phrase' => 'alles', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Alles', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Everything', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'lehre',