diff --git a/application/core/Tag_Controller.php b/application/core/Tag_Controller.php index b321bac92..09f42922c 100644 --- a/application/core/Tag_Controller.php +++ b/application/core/Tag_Controller.php @@ -19,7 +19,6 @@ class Tag_Controller extends FHCAPI_Controller 'doneTag' => self::BERECHTIGUNG_KURZBZ, 'deleteTag' => self::BERECHTIGUNG_KURZBZ, 'getAllTags' => self::BERECHTIGUNG_KURZBZ, - 'getSemDates' => self::BERECHTIGUNG_KURZBZ, 'getAllStartAndEndAutomatedTags' => self::BERECHTIGUNG_KURZBZ, 'rebuildTagsForTypeId' => self::BERECHTIGUNG_KURZBZ, ]; @@ -352,18 +351,6 @@ class Tag_Controller extends FHCAPI_Controller $this->terminateWithSuccess($result); } - public function getSemDates() - { - $studiensemester_kurzbz = $this->input->get('semester'); - $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - $result = $this->StudiensemesterModel->loadWhere(array('studiensemester_kurzbz' => $studiensemester_kurzbz)); - if (isError($result)) - return error('Error occurred during retrieving studiensemester'); - $data = getData($result); - $this->terminateWithSuccess(current($data)); - - } - public function getAllStartAndEndAutomatedTags() { $this->NotizModel->addSelect('notiz_id as id'); diff --git a/public/js/api/factory/stv/tag.js b/public/js/api/factory/stv/tag.js index 3a3f78167..522dfa3ff 100644 --- a/public/js/api/factory/stv/tag.js +++ b/public/js/api/factory/stv/tag.js @@ -61,14 +61,6 @@ export default { }; }, - getSemDates(studiensemester_kurzbz){ - return { - method: 'get', - url: 'api/frontend/v1/stv/Tags/getSemDates', - params: studiensemester_kurzbz - }; - }, - getAllStartAndEndAutomatedTags(){ return { method: 'get', diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index 076b7db56..486f363d9 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -53,6 +53,10 @@ export default { from: 'currentSemester', required: true }, + lists: { + from: 'lists', + required: true + }, }, computed: { appRoot() { @@ -81,6 +85,9 @@ export default { return [this.headerData[0].prestudent_id]; } }, + semesterDates(){ + return this.lists.studiensemester?.find(item => item.studiensemester_kurzbz === this.currentSemester) || {}; + } }, created(){ if (this.typeHeader === 'student') { @@ -89,7 +96,6 @@ export default { } if(this.tagsEnabled) { - this.getSemesterDates(this.currentSemester); this.loadTagsAndRender(this.headerData[0].prestudent_id); } @@ -119,14 +125,6 @@ export default { }, deep: true, }, - currentSemester: { - handler(newVal) { - if (newVal) { - this.getSemesterDates(newVal); - } - }, - deep: true, - } }, data(){ return{ @@ -137,7 +135,6 @@ export default { tagEndpoint: ApiTag, tagData: null, rebuildData: null, - semDates: {} }; }, methods: { @@ -234,8 +231,8 @@ export default { this.tagData, this.$refs.tagComponent, 'prestudent_id', - this.semDates.start, - this.semDates.ende + this.semesterDates.start, + this.semesterDates.ende ); this.$refs.tagWrapper.innerHTML = ''; @@ -277,17 +274,6 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - getSemesterDates(semester){ - const params = { - studiensemester_kurzbz: semester - }; - return this.$api - .call(ApiTag.getSemDates({semester})) - .then(result => { - this.semDates = result.data; - }) - .catch(this.$fhcAlert.handleSystemError); - } }, template: `