diff --git a/application/controllers/api/frontend/v1/LvMenu.php b/application/controllers/api/frontend/v1/LvMenu.php index 3954a8a62..45936d9f5 100644 --- a/application/controllers/api/frontend/v1/LvMenu.php +++ b/application/controllers/api/frontend/v1/LvMenu.php @@ -333,6 +333,7 @@ class LvMenu extends FHCAPI_Controller 'id'=>'core_menu_lvinfo', 'position'=>'10', 'name'=>$this->p->t('lehre', 'lehrveranstaltungsinformation'), + 'phrase' => 'lehre/lehrveranstaltungsinformation', 'icon'=>'../../../skin/images/button_lvinfo.png', 'link'=>'', 'c4_icon'=> base_url('skin/images/button_lvinfo.png'), @@ -351,6 +352,7 @@ class LvMenu extends FHCAPI_Controller 'id'=>'core_menu_feedback', 'position'=>'60', 'name'=>$this->p->t('lehre', 'feedback'), + 'phrase' => 'lehre/feedback', 'c4_icon'=> base_url('skin/images/button_feedback.png'), 'c4_link'=> base_url('feedback.php?lvid='.$lvid), ); @@ -368,6 +370,7 @@ class LvMenu extends FHCAPI_Controller 'id'=>'core_menu_gesamtnote', 'position'=>'80', 'name'=>$this->p->t('lehre', 'gesamtnote'), + 'phrase' => 'lehre/gesamtnote', 'c4_icon'=> base_url('skin/images/button_endnote.png'), 'c4_link'=> base_url('cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)) //'c4_link'=> base_url('benotungstool/lvgesamtnoteverwalten.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)) @@ -380,6 +383,7 @@ class LvMenu extends FHCAPI_Controller 'id'=>'core_menu_gesamtnote', 'position'=>'80', 'name'=>$this->p->t('lehre', 'gesamtnote'), + 'phrase'=>'lehre/gesamtnote', 'c4_icon'=>base_url('skin/images/button_endnote.png'), 'c4_link'=>'#', 'c4_linkList'=>[[$this->p->t('lehre', 'noteneingabedeaktiviert'),'#']], @@ -477,6 +481,7 @@ class LvMenu extends FHCAPI_Controller 'id'=>'core_menu_abmeldung', 'position'=>'120', 'name'=>$this->p->t('lehre', 'abmelden'), + 'phrase'=>'lehre/abmelden', 'c4_icon'=>base_url('skin/images/button_studiupload.png'), 'c4_link'=>base_url('abmeldung.php?lvid='.urlencode($lvid).'&stsem='.urlencode($angezeigtes_stsem)), ); @@ -511,6 +516,7 @@ class LvMenu extends FHCAPI_Controller 'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse', 'position' => '128', 'name' => $this->p->t('lehre', 'anrechnung'), + 'phrase' => 'lehre/anrechnung', 'c4_icon' => base_url('skin/images/button_listen.png'), 'c4_icon2' => 'fa-regular fa-folder-open', 'c4_link' => base_url('cis.php/lehre/anrechnung/RequestAnrechnung?studiensemester='.urlencode($angezeigtes_stsem).'&lv_id='.urlencode($lvid)) @@ -528,6 +534,7 @@ class LvMenu extends FHCAPI_Controller 'id' => 'core_menu_anerkennungNachgewiesenerKenntnisse_empfehlen', 'position' => '128', 'name' => $this->p->t('lehre', 'anrechnungen'), + 'phrase' => 'lehre/anrechnung', 'c4_icon'=> base_url('skin/images/button_listen.png'), 'c4_icon2' => 'fa-regular fa-folder-open', 'c4_link' => base_url('cis.php/lehre/anrechnung/ReviewAnrechnungUebersicht?studiensemester='.urlencode($angezeigtes_stsem)) diff --git a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js index 5aed3902f..3fd5e6900 100644 --- a/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js +++ b/public/js/components/Cis/Mylv/Semester/Studiengang/Lv.js @@ -19,6 +19,7 @@ export default { props: { lehrveranstaltung_id: Number, bezeichnung: String, + bezeichnung_eng: String, module: String, farbe: String, lvinfo: Boolean, diff --git a/public/js/components/Cis/Raumsuche/Raumsuche.js b/public/js/components/Cis/Raumsuche/Raumsuche.js index f45c8c61f..365da4911 100644 --- a/public/js/components/Cis/Raumsuche/Raumsuche.js +++ b/public/js/components/Cis/Raumsuche/Raumsuche.js @@ -13,6 +13,8 @@ export const Raumsuche = { }, data() { return { + phrasenPromise: null, + phrasenResolved: false, tabulatorUuid: Vue.ref(0), tableBuiltResolve: null, tableBuiltPromise: null, @@ -157,6 +159,7 @@ export const Raumsuche = { return `${hours}:${minutes}`; }, async setupMounted() { + this.tableBuiltPromise = new Promise(this.tableResolve) await this.tableBuiltPromise @@ -172,18 +175,6 @@ export const Raumsuche = { if(this.$refs.raumsucheTable) { this.$refs.raumsucheTable.$refs.table.style.setProperty('height', h+'px') } - - const cols = this.$refs.raumsucheTable.tabulator.getColumns() - - // phrasen race condition bandaid - this.raumsucheTableOptions.columns[0].title = await this.$p.t('rauminfo/raum_kurzbz') - this.raumsucheTableOptions.columns[1].title = await this.$p.t('global/bezeichnung') - this.raumsucheTableOptions.columns[2].title = await this.$p.t('rauminfo/raumnummer') - this.raumsucheTableOptions.columns[3].title = await this.$p.t('rauminfo/personcap') - this.raumsucheTableOptions.columns[4].title = await this.$p.t('rauminfo/rauminfo') - this.raumsucheTableOptions.columns[5].title = await this.$p.t('rauminfo/roomReservations') - - this.$refs.raumsucheTable.tabulator.setColumns(cols) } }, @@ -193,7 +184,8 @@ export const Raumsuche = { } }, created() { - + this.phrasenPromise = this.$p.loadCategory(['rauminfo', 'global']) + this.phrasenPromise.then(()=> {this.phrasenResolved = true}) }, mounted() { this.setupMounted() @@ -264,6 +256,7 @@ export const Raumsuche = {