diff --git a/application/controllers/api/frontend/v1/lv/Setup.php b/application/controllers/api/frontend/v1/lv/Setup.php index 77ab0edda..fe8450f06 100644 --- a/application/controllers/api/frontend/v1/lv/Setup.php +++ b/application/controllers/api/frontend/v1/lv/Setup.php @@ -27,8 +27,8 @@ class Setup extends FHCAPI_Controller public function __construct() { parent::__construct([ - 'getTabs' => ['admin:r', 'assistenz:r'], - 'getTab' => ['admin:r', 'assistenz:r'], + 'getLETabs' => ['admin:r', 'assistenz:r'], + 'getLVTabs' => ['admin:r', 'assistenz:r'], 'getStudiensemester' => ['admin:r', 'assistenz:r'], 'getSprache' => ['admin:r', 'assistenz:r'], 'getRaumtyp' => ['admin:r', 'assistenz:r'], @@ -44,7 +44,7 @@ class Setup extends FHCAPI_Controller $this->_ci->load->library('VariableLib', ['uid' => $this->_uid]); } - public function getTabs() + public function getLETabs() { $tabs['details'] = array ( 'title' => 'Details', @@ -74,7 +74,7 @@ class Setup extends FHCAPI_Controller $this->terminateWithSuccess($tabs); } - public function getTab() + public function getLVTabs() { $tabs['termine'] = array ( 'title' => 'Termine', diff --git a/public/js/api/factory/studiensemester.js b/public/js/api/factory/studiensemester.js deleted file mode 100644 index 7e4bf7515..000000000 --- a/public/js/api/factory/studiensemester.js +++ /dev/null @@ -1,8 +0,0 @@ -export default { - getStudiensemester(){ - return { - method: 'get', - url: 'api/frontend/v1/stv/LvTermine/getStudiensemester/' - }; - }, -}; diff --git a/public/js/api/factory/stv/coursedates.js b/public/js/api/factory/stv/coursedates.js index 987e65750..dc047f815 100644 --- a/public/js/api/factory/stv/coursedates.js +++ b/public/js/api/factory/stv/coursedates.js @@ -30,4 +30,10 @@ export default { { return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'content/statistik/termine.xls.php?student_uid=' + encodeURIComponent(student_uid) + '&db_stpl_table='+encodeURIComponent(stundenplan); }, + getStudiensemester(){ + return { + method: 'get', + url: 'api/frontend/v1/stv/LvTermine/getStudiensemester/' + }; + }, } \ No newline at end of file diff --git a/public/js/api/lehrveranstaltung/letermine.js b/public/js/api/lehrveranstaltung/letermine.js index 8cdb51070..e5b3093f5 100644 --- a/public/js/api/lehrveranstaltung/letermine.js +++ b/public/js/api/lehrveranstaltung/letermine.js @@ -9,5 +9,11 @@ export default { exportCalendar(le_id, stundenplan) { return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'content/statistik/termine.xls.php?lehreinheit_id=' + encodeURIComponent(le_id) + '&db_stpl_table='+encodeURIComponent(stundenplan); - } + }, + getStudiensemester(){ + return { + method: 'get', + url: '/api/frontend/v1/lv/setup/getStudiensemester/' + }; + }, }; diff --git a/public/js/api/lehrveranstaltung/lvtermine.js b/public/js/api/lehrveranstaltung/lvtermine.js index f199ee4b0..35fdc5ca8 100644 --- a/public/js/api/lehrveranstaltung/lvtermine.js +++ b/public/js/api/lehrveranstaltung/lvtermine.js @@ -9,5 +9,11 @@ export default { exportCalendar(lv_id, stundenplan) { return FHC_JS_DATA_STORAGE_OBJECT.app_root + 'content/statistik/termine.xls.php?lehrveranstaltung_id=' + encodeURIComponent(lv_id) + '&db_stpl_table='+encodeURIComponent(stundenplan); - } + }, + getStudiensemester(){ + return { + method: 'get', + url: '/api/frontend/v1/lv/setup/getStudiensemester/' + }; + }, }; diff --git a/public/js/api/lehrveranstaltung/setup.js b/public/js/api/lehrveranstaltung/setup.js index e6b0cd645..dab1062a4 100644 --- a/public/js/api/lehrveranstaltung/setup.js +++ b/public/js/api/lehrveranstaltung/setup.js @@ -1,16 +1,16 @@ export default { - getTabs() + getLETabs() { return { method: 'get', - url: '/api/frontend/v1/lv/setup/getTabs/' + url: '/api/frontend/v1/lv/setup/getLETabs/' }; }, - getTab() + getLVTabs() { return { method: 'get', - url: '/api/frontend/v1/lv/setup/getTab/' + url: '/api/frontend/v1/lv/setup/getLVTabs/' }; }, } diff --git a/public/js/components/LVVerwaltung/Setup/Tabs.js b/public/js/components/LVVerwaltung/Setup/Tabs.js index 1a2c87f9d..fbb18bedf 100644 --- a/public/js/components/LVVerwaltung/Setup/Tabs.js +++ b/public/js/components/LVVerwaltung/Setup/Tabs.js @@ -8,8 +8,8 @@ export default { }, data() { return { + configLETabs: {}, configLVTabs: {}, - configLVTab: {}, }; }, props: { @@ -20,7 +20,7 @@ export default { if (!this.lv || !this.lv.length) return {}; - return this.configLVTabs; + return this.configLETabs; } }, methods: { @@ -32,15 +32,15 @@ export default { } }, created() { - this.$api.call(Setup.getTabs()) + this.$api.call(Setup.getLETabs()) .then(result => { - this.configLVTabs = result.data; + this.configLETabs = result.data; }) .catch(this.$fhcAlert.handleSystemError); - this.$api.call(Setup.getTab()) + this.$api.call(Setup.getLVTabs()) .then(result => { - this.configLVTab = result.data; + this.configLVTabs = result.data; }) .catch(this.$fhcAlert.handleSystemError); }, @@ -49,12 +49,12 @@ export default {
Bitte eine Lehreinheit auswählen!
-
+
@@ -62,7 +62,7 @@ export default { v-else-if="lv.length === 1" ref="tabs" :modelValue="lv[0]" - :config="configLVTab" + :config="configLVTabs" :default="$route.params.tab" @changed="reload" /> diff --git a/public/js/components/LVVerwaltung/Tabs/LVTermine.js b/public/js/components/LVVerwaltung/Tabs/LVTermine.js index b3ce8d2f6..e064dbae9 100644 --- a/public/js/components/LVVerwaltung/Tabs/LVTermine.js +++ b/public/js/components/LVVerwaltung/Tabs/LVTermine.js @@ -2,7 +2,7 @@ import TableLvList from "../../Stv/Studentenverwaltung/Details/Lehrveranstaltung import ApiLVTermine from "../../../api/lehrveranstaltung/lvtermine.js"; export default { - name: "TabCourseList", + name: "LVTabTermine", components: { TableLvList }, @@ -15,7 +15,7 @@ export default { }; }, template: ` -
+
` }; \ No newline at end of file diff --git a/public/js/components/LVVerwaltung/Tabs/Termine.js b/public/js/components/LVVerwaltung/Tabs/Termine.js index b262eabb6..8b005b6b4 100644 --- a/public/js/components/LVVerwaltung/Tabs/Termine.js +++ b/public/js/components/LVVerwaltung/Tabs/Termine.js @@ -2,7 +2,7 @@ import TableLvList from "../../Stv/Studentenverwaltung/Details/Lehrveranstaltung import ApiLETermine from "../../../api/lehrveranstaltung/letermine.js"; export default { - name: "TabCourseList", + name: "LETabTermine", components: { TableLvList }, @@ -15,7 +15,7 @@ export default { }; }, template: ` -
+
` }; \ No newline at end of file diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js index a41ce90bc..6eb324f27 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine.js @@ -1,7 +1,6 @@ import TableLvList from "./Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js"; import ApiStvCoursedates from "../../../../api/factory/stv/coursedates.js"; - export default { name: "TabCourseList", components: { diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js index bc3bf4bc7..67052460c 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Lehrveranstaltungstermine/ListLehrveranstaltungstermine.js @@ -2,8 +2,6 @@ import {CoreFilterCmpt} from "../../../../filter/Filter.js"; import FormInput from "../../../../Form/Input.js"; import FormForm from '../../../../Form/Form.js'; -import ApiStudiensemester from "../../../../../api/factory/studiensemester.js"; - export default { name: "TblCourseList", components: { @@ -146,7 +144,7 @@ export default { }, created(){ this.$api - .call(ApiStudiensemester.getStudiensemester()) + .call(this.endpoint.getStudiensemester()) .then(result => { this.listStudiensemester = result.data; this.getDatesOfSemester(this.currentSemester);