diff --git a/application/controllers/api/frontend/v1/stv/Student.php b/application/controllers/api/frontend/v1/stv/Student.php index 2fb354f0c..4711836db 100644 --- a/application/controllers/api/frontend/v1/stv/Student.php +++ b/application/controllers/api/frontend/v1/stv/Student.php @@ -140,6 +140,7 @@ class Student extends FHCAPI_Controller . $this->PrestudentModel->escape($studiensemester_kurzbz) . ") AS statusofsemester" ); + $this->PrestudentModel->addSelect($this->PrestudentModel->escape($studiensemester_kurzbz) . ' as query_studiensemester_kurzbz'); $this->PrestudentModel->addJoin('public.tbl_student s', 'prestudent_id', 'LEFT'); $this->PrestudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid', 'LEFT'); diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index 3e7187d27..b414f07ea 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -145,7 +145,6 @@ getSemesterStati(prestudent_id){ .call(ApiDetailHeader.getSemesterStati(prestudent_id)) .then(result => { this.semesterStati = result.data; - //console.log("getSemesterStati loaded for prestudent_id " + prestudent_id); }) .catch(this.$fhcAlert.handleSystemError); } diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js index e62ccfe7d..a7d97d4fc 100644 --- a/public/js/components/Stv/Studentenverwaltung.js +++ b/public/js/components/Stv/Studentenverwaltung.js @@ -422,22 +422,6 @@ export default { this.$refs.searchbar.abort(); this.$refs.searchbar.hideresult(); }, - handleReloadStudent_DEPR(students){ - // @reload-students="handleReloadStudent" - //TODO(Manu) delete - this.$refs.details.reload(); //reload simply without updateUrl - //this.selected = students; - - //analoge to url_studiensemester_kurzbz -/* this.$refs.stvList.updateUrl( - ApiStv.students.uid(students[0].uid,'CURRENT_SEMESTER'), - true - );*/ -/* this.$refs.stvList.updateUrl( - ApiStv.students.uid(students[0].uid,'CURRENT_SEMESTER'), - true - );*/ - } }, created() { if (!this.url_studiensemester_kurzbz) { diff --git a/public/js/components/Stv/Studentenverwaltung/Details.js b/public/js/components/Stv/Studentenverwaltung/Details.js index 95d791ef9..8312097af 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details.js +++ b/public/js/components/Stv/Studentenverwaltung/Details.js @@ -46,10 +46,6 @@ export default { return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid)); } return Object.fromEntries(Object.entries(this.configStudents).filter(([ , value ]) => !value.showOnlyWithUid && !value.showOnlyWithUid)); - }, - //for reloading component if data changes - headerKey() { - return this.students?.[0]?.uid || this.localStudent?.[0]?.uid || "empty"; } }, watch: { @@ -57,21 +53,21 @@ export default { if (n !== o && o !== undefined) this.loadConfig(); }, - //ohne zusätzlichen Watcher reload header und details currentSemester(newVal) { if ( - this.students && - this.students.length > 0 && + Array.isArray(this.students) && + this.students.length === 1 && newVal !== this.students[0].query_studiensemester_kurzbz ) { - console.log("studiensemester_kurzbz " + this.students[0].query_studiensemester_kurzbz + " vs " + newVal); this.reloadDataStudent(); } + else { + this.localStudent = null; + } }, - headerKey(newVal){ - this.reloadDataStudent(); + students() { + this.localStudent = null; } - }, methods: { loadConfig() { @@ -114,9 +110,6 @@ export default { created() { this.loadConfig(); }, - /* //TODO(remove) - * {{headerKey}} {{localStudent?.[0]?.uid}}
{{ students?.[0]?.uid }} - * */ template: `
@@ -124,16 +117,15 @@ export default {