diff --git a/application/controllers/components/stv/Student.php b/application/controllers/components/stv/Student.php
index 2aaf00c9c..afb052861 100644
--- a/application/controllers/components/stv/Student.php
+++ b/application/controllers/components/stv/Student.php
@@ -26,6 +26,10 @@ class Student extends FHC_Controller
$this->StudentModel->addSelect('v.gruppe');
$this->StudentModel->addSelect('b.alias');
+ if (defined('ACTIVE_ADDONS') && strpos(ACTIVE_ADDONS, 'bewerbung') !== false) {
+ $this->StudentModel->addSelect("(SELECT kontakt FROM public.tbl_kontakt WHERE kontakttyp='email' AND person_id=p.person_id AND zustellung ORDER BY kontakt_id LIMIT 1) AS email_privat", false);
+ }
+
$this->StudentModel->addJoin('public.tbl_benutzer b', 'student_uid = uid');
$this->StudentModel->addJoin('public.tbl_studentlehrverband v', 'b.uid = v.student_uid AND v.studiensemester_kurzbz = ' . $this->StudentModel->escape($studiensemester_kurzbz), 'LEFT');
$this->StudentModel->addJoin('public.tbl_person p', 'person_id');
diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php
index ff6f5bfae..e9977851d 100644
--- a/application/views/Studentenverwaltung.php
+++ b/application/views/Studentenverwaltung.php
@@ -22,7 +22,7 @@
?>
-
+
load->view('templates/FHC-Footer', $includesArray); ?>
diff --git a/public/js/components/Stv/Studentenverwaltung.js b/public/js/components/Stv/Studentenverwaltung.js
index d28672f17..7e48e2218 100644
--- a/public/js/components/Stv/Studentenverwaltung.js
+++ b/public/js/components/Stv/Studentenverwaltung.js
@@ -30,6 +30,16 @@ export default {
StvDetails,
VerticalSplit
},
+ props: {
+ cisRoot: String,
+ activeAddons: String // semicolon separated list of active addons
+ },
+ provide() {
+ return {
+ cisRoot: this.cisRoot,
+ activeAddonBewerbung: this.activeAddons.split(';').includes('bewerbung')
+ }
+ },
data() {
return {
selected: [],
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Details.js b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
index 87cf9ac6e..25446d499 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Details.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Details.js
@@ -7,6 +7,15 @@ export default {
VueDatePicker,
FormUploadImage
},
+ inject: {
+ showZugangscode: {
+ from: 'activeAddonBewerbung',
+ default: false
+ },
+ cisRoot: {
+ from: 'cisRoot'
+ }
+ },
props: {
student: Object
},
@@ -89,7 +98,9 @@ export default {
this.updateStudent(this.student);
},
//TODO(chris): Felder student_uid, person_id sperren, Personenkz
- //TODO(chris): Logik Feld Zugangscode
+ /**
+ * BPK: isBerechtigt 'student/bpk'
+ */
template: `