diff --git a/application/controllers/api/frontend/v1/stv/Students.php b/application/controllers/api/frontend/v1/stv/Students.php index 5fb7b592c..b2044a6d5 100644 --- a/application/controllers/api/frontend/v1/stv/Students.php +++ b/application/controllers/api/frontend/v1/stv/Students.php @@ -622,6 +622,8 @@ class Students extends FHCAPI_Controller $this->PrestudentModel->addSelect('ersatzkennzeichen'); $this->PrestudentModel->addSelect('gebdatum'); $this->PrestudentModel->addSelect('geschlecht'); + $this->PrestudentModel->addSelect('foto'); + $this->PrestudentModel->addSelect('foto_sperre'); // semester // verband @@ -629,6 +631,7 @@ class Students extends FHCAPI_Controller $this->PrestudentModel->addSelect('UPPER(stg.typ || stg.kurzbz) AS studiengang'); $this->PrestudentModel->addSelect('tbl_prestudent.studiengang_kz'); + $this->PrestudentModel->addSelect('stg.bezeichnung AS stg_bezeichnung'); $this->PrestudentModel->addSelect("s.matrikelnr"); $this->PrestudentModel->addSelect('p.person_id'); $this->PrestudentModel->addSelect('pls.status_kurzbz AS status'); @@ -640,7 +643,7 @@ class Students extends FHCAPI_Controller ); $this->PrestudentModel->addSelect(" CASE WHEN b.uid IS NOT NULL AND b.uid<>'' - THEN b.uid || " . $this->PrestudentModel->escape(DOMAIN) . " + THEN CONCAT(b.uid, '@', " . $this->PrestudentModel->escape(DOMAIN) . ") ELSE '' END AS mail_intern", false); $this->PrestudentModel->addSelect('p.anmerkung AS anmerkungen'); $this->PrestudentModel->addSelect('tbl_prestudent.anmerkung'); diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index 49cbfbad8..a50b39e8c 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -29,19 +29,27 @@ export default { getVorgesetzer(){}, }, template: ` -
+
Profilbild - {{person.uid}} + + + {{person.uid}}
@@ -53,17 +61,19 @@ export default {
- Studiengang - {{headerData[0].studiengang}} - | Semester + Person ID + {{headerData[0].person_id}} + | {{$p.t('lehre', 'studiengang')}} + {{headerData[0].stg_bezeichnung}} ({{headerData[0].studiengang}}) + | {{$p.t('lehre', 'semester')}} {{headerData[0].semester}} - | Verband + | {{$p.t('lehre', 'verband')}} {{headerData[0].verband}} - | Gruppe + | {{$p.t('lehre', 'gruppe')}} {{headerData[0].gruppe}}
- Team + Team / {{$p.t('lehre', 'kompetenzfeld')}} {{headerData[0].studiengang}} | Vorgesetzte*r {{headerData[0].semester}} @@ -76,19 +86,15 @@ export default { | Status {{headerData[0].status}} - | MatrNr + | {{$p.t('person', 'matrikelnummer')}} {{headerData[0].matr_nr}} - | UID - {{headerData[0].uid}} - | Person ID - {{headerData[0].person_id}}
Email {{headerData[0].mail_intern}} - | Durchwahl + | {{$p.t('kvp', 'op.label.phone')}} {{headerData[0].status}}