diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php index f87e527e0..34db64751 100644 --- a/application/controllers/api/frontend/v1/stv/Students.php +++ b/application/controllers/api/frontend/v1/stv/Students.php @@ -953,6 +953,13 @@ class Students extends FHCAPI_Controller $this->PrestudentModel->addSelect('pls.status_kurzbz AS status'); $this->PrestudentModel->addSelect('pls.datum AS status_datum'); $this->PrestudentModel->addSelect('pls.bestaetigtam AS status_bestaetigung'); + $this->PrestudentModel->addSelect(" + CASE + WHEN pls.status_kurzbz = 'Interessent' + THEN pls.ausbildungssemester + ELSE s.semester + END AS semester_berechnet + "); $this->PrestudentModel->addSelect( "(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung LIMIT 1) AS mail_privat", false diff --git a/public/js/components/Stv/Studentenverwaltung/List.js b/public/js/components/Stv/Studentenverwaltung/List.js index db72bbbcf..fcf03a5d4 100644 --- a/public/js/components/Stv/Studentenverwaltung/List.js +++ b/public/js/components/Stv/Studentenverwaltung/List.js @@ -93,7 +93,7 @@ export default { } }, {title:"Geschlecht", field:"geschlecht", headerFilter: "list", headerFilterParams: {values:{'m':'männlich','w':'weiblich','x':'divers','u':'unbekannt'}, listOnEmpty:true, autocomplete:true}}, - {title:"Sem.", field:"semester", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}}, + {title:"Sem.", field:"semester_berechnet", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}}, {title:"Verb.", field:"verband", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}}, {title:"Grp.", field:"gruppe", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}}, {title:"Studiengang", field:"studiengang", headerFilter: "list", headerFilterParams: {valuesLookup:true, listOnEmpty:true, autocomplete:true, sort:"asc"}}, @@ -171,7 +171,7 @@ export default { selectableRows: true, selectableRowsRangeMode: 'click', index: 'prestudent_id', - persistenceID: 'stv-list', + persistenceID: 'stv-list-20260223_01' }, tabulatorEvents: [ { @@ -355,7 +355,7 @@ export default { ersatzkennzeichen: capitalize(this.$p.t('person/ersatzkennzeichen')), gebdatum: capitalize(this.$p.t('person/geburtsdatum')), geschlecht: capitalize(this.$p.t('person/geschlecht')), - semester: capitalize(this.$p.t('lehre/sem')), + semester_berechnet: capitalize(this.$p.t('lehre/sem')), verband: capitalize(this.$p.t('lehre/verb')), gruppe: capitalize(this.$p.t('lehre/grp')), studiengang: capitalize(this.$p.t('lehre/studiengang')),