From 0a457c4bac9d2f4dfd52eca41a8dbb1cbe6d8bfb Mon Sep 17 00:00:00 2001 From: cgfhtw Date: Mon, 15 Jul 2024 15:13:41 +0200 Subject: [PATCH] use "getStudiensemester" from dedicated Lists Controller --- .../api/frontend/v1/stv/Prestudent.php | 15 --------------- public/js/components/Stv/Studentenverwaltung.js | 1 + .../Details/Prestudent/MultiStatus.js | 13 ++++--------- 3 files changed, 5 insertions(+), 24 deletions(-) diff --git a/application/controllers/api/frontend/v1/stv/Prestudent.php b/application/controllers/api/frontend/v1/stv/Prestudent.php index 7c8cf5cfb..8e9e0bf0b 100644 --- a/application/controllers/api/frontend/v1/stv/Prestudent.php +++ b/application/controllers/api/frontend/v1/stv/Prestudent.php @@ -19,7 +19,6 @@ class Prestudent extends FHCAPI_Controller 'getAufmerksamdurch' => self::PERM_LOGGED, 'getBerufstaetigkeit' => self::PERM_LOGGED, 'getTypenStg' => self::PERM_LOGGED, - 'getStudiensemester' => self::PERM_LOGGED, 'getStudienplaene' => self::PERM_LOGGED ]); @@ -265,20 +264,6 @@ class Prestudent extends FHCAPI_Controller return $this->terminateWithSuccess(getData($result) ?: []); } - public function getStudiensemester() - { - $this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel'); - - $this->StudiensemesterModel->addOrder('start', 'DESC'); - $this->StudiensemesterModel->addLimit(20); - - $result = $this->StudiensemesterModel->load(); - if (isError($result)) { - $this->terminateWithError(getError($result), self::ERROR_TYPE_GENERAL); - } - return $this->terminateWithSuccess(getData($result) ?: []); - } - public function getStudienplaene($prestudent_ids) { $prestudent_ids = urldecode($prestudent_ids); diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index 80c24fed4..dc1efbb34 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -164,6 +164,7 @@ export default { .get('api/frontend/v1/stv/lists/getStudiensemester') .then(result => { this.lists.studiensemester = result.data; + this.lists.studiensemester_desc = result.data.toReversed(); }) .catch(this.$fhcAlert.handleSystemError); }, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js index 4806584f2..a160c173d 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent/MultiStatus.js @@ -42,6 +42,9 @@ export default{ from: 'hasPermissionRtAufsicht', default: false }, + lists: { + from: 'lists' + }, $reloadList: { from: '$reloadList', required: true @@ -259,7 +262,6 @@ export default{ } ], statusData: {}, - listStudiensemester: [], maxSem: Array.from({ length: 11 }, (_, index) => index), listStudienplaene: [], aufnahmestufen: {1: 1, 2: 2, 3: 3}, @@ -847,13 +849,6 @@ export default{ } }, created(){ - this.$fhcApi - .get('api/frontend/v1/stv/prestudent/getStudiensemester') - .then(result => result.data) - .then(result => { - this.listStudiensemester = result; - }) - .catch(this.$fhcAlert.handleSystemError); this.$fhcApi .get('api/frontend/v1/stv/prestudent/getStudienplaene/' + encodeURIComponent(this.paramIds)) .then(result => result.data) @@ -925,7 +920,7 @@ export default{ v-model="statusData['studiensemester_kurzbz']" :disabled="statusData.datum < dataMeldestichtag" > - +