diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php index 7ec99b5bf..ea8e59ebd 100644 --- a/application/models/organisation/Studiengang_model.php +++ b/application/models/organisation/Studiengang_model.php @@ -573,6 +573,7 @@ class Studiengang_model extends DB_Model ); $this->addJoin('bis.tbl_orgform o', $this->dbTable . '.orgform_kurzbz=o.orgform_kurzbz'); $this->addJoin('public.tbl_person pers', 'person_id'); + $this->addJoin('public.tbl_student stud', 'p.prestudent_id=stud.prestudent_id', 'LEFT'); $this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs); $this->db->where_in('ps.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist')); diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js index 01ca0c1ed..8cbfdd9d7 100644 --- a/public/js/components/Studierendenantrag/Leitung/Table.js +++ b/public/js/components/Studierendenantrag/Leitung/Table.js @@ -147,6 +147,19 @@ export default { valuesLookup: true, clearable: true, autocomplete: true, + }, + formatter: (cell, formatterParams, onRendered) => { + let link = document.createElement('a'); + link.href = "#"; + link.innerHTML = cell.getValue(); + link.addEventListener('click', e => { + e.preventDefault(); + this.lastHistoryClickedId = cell.getData().studierendenantrag_id; + this.$refs.historyLoader.fetchData(); + this.$refs.history.show(); + }); + + return link; } }, { field: 'matrikelnr', @@ -338,13 +351,6 @@ export default { this.table.on("rowSelectionChanged", data => { this.$emit('update:selectedData', data); }); - this.table.on("cellClick", (e, cell) => { - if (cell.getColumn().getField() == 'statustyp') { - this.lastHistoryClickedId = cell.getData().studierendenantrag_id; - this.$refs.historyLoader.fetchData(); - this.$refs.history.show(); - } - }); }, template: `