diff --git a/application/models/ressource/Mitarbeiter_model.php b/application/models/ressource/Mitarbeiter_model.php index 24709caf4..3150d2031 100644 --- a/application/models/ressource/Mitarbeiter_model.php +++ b/application/models/ressource/Mitarbeiter_model.php @@ -209,7 +209,7 @@ class Mitarbeiter_model extends DB_Model { $qry = " SELECT - titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe + titelpre, vorname, nachname, titelpost, foto, foto_sperre, person_id, alias, telefonklappe, personalnummer, mitarbeiter_uid FROM public.tbl_person JOIN public.tbl_benutzer b USING(person_id) diff --git a/application/views/Studentenverwaltung.php b/application/views/Studentenverwaltung.php index 01e611657..10fe268c3 100644 --- a/application/views/Studentenverwaltung.php +++ b/application/views/Studentenverwaltung.php @@ -19,7 +19,8 @@ 'public/css/components/vue-datepicker.css', 'public/css/components/primevue.css', 'public/css/Studentenverwaltung.css', - 'public/css/components/function.css' + 'public/css/components/function.css', + 'public/css/components/Detailheader.css' ], 'customJSs' => [ 'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js' diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php index db7701f0f..7738a8d4a 100644 --- a/application/views/Vertragsverwaltung.php +++ b/application/views/Vertragsverwaltung.php @@ -18,6 +18,7 @@ $includesArray = array( 'public/css/components/vue-datepicker.css', 'public/css/components/primevue.css', 'public/css/Vertragsverwaltung.css', + 'public/css/components/Detailheader.css' ], 'customJSs' => [ #'vendor/npm-asset/primevue/tree/tree.min.js', diff --git a/public/css/Studentenverwaltung.css b/public/css/Studentenverwaltung.css index 05b28d314..bb2588926 100644 --- a/public/css/Studentenverwaltung.css +++ b/public/css/Studentenverwaltung.css @@ -158,8 +158,4 @@ html { .tiny-90 div.tox.tox-tinymce { height: 90% !important; -} - -.foto-container:hover .fotoedit { - opacity: 1 !important; } \ No newline at end of file diff --git a/public/css/Vertragsverwaltung.css b/public/css/Vertragsverwaltung.css index 300ee5d55..7b2d71481 100644 --- a/public/css/Vertragsverwaltung.css +++ b/public/css/Vertragsverwaltung.css @@ -18,7 +18,3 @@ html { .vv { margin-left: 0 !important; } - -.foto-container:hover .fotoedit { - opacity: 1 !important; -} diff --git a/public/css/components/Detailheader.css b/public/css/components/Detailheader.css new file mode 100644 index 000000000..dde2756f1 --- /dev/null +++ b/public/css/components/Detailheader.css @@ -0,0 +1,3 @@ +.foto-container:hover .fotoedit { + opacity: 1 !important; +} \ No newline at end of file diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index b821620e1..ba88eb31f 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -7,12 +7,12 @@ export default { components: { ModalUploadFoto }, - inject: { +/* inject: { domain: { from: 'configDomain', default: 'fhcomplete.info' }, - }, + },*/ props: { headerData: { type: Object, @@ -31,6 +31,10 @@ export default { required: false, default: false }, + domain: { + type: String, + required: true + }, typeHeader: { type: String, default: 'student', @@ -54,14 +58,14 @@ export default { }, created(){ if(this.person_id) { - this.loadHeaderData(); + this.loadHeaderData(this.person_id, this.mitarbeiter_uid); } }, watch: { person_id: { handler(newVal) { if (newVal) { - this.loadHeaderData(); + this.loadHeaderData(newVal, this.mitarbeiter_uid); } }, deep: true, @@ -76,9 +80,9 @@ export default { }; }, methods: { - loadHeaderData(){ - this.getHeader(this.person_id); - this.loadDepartmentData(this.mitarbeiter_uid) + loadHeaderData(person_id, mitarbeiter_uid){ + this.getHeader(person_id); + this.loadDepartmentData(mitarbeiter_uid) .then(() => { // Call getLeitungOrg only after departmentData is loaded this.getLeitungOrg(this.departmentData.oe_kurzbz); @@ -112,11 +116,8 @@ export default { }) .catch(this.$fhcAlert.handleSystemError); }, - redirectToLeitung(){ - this.$emit('redirectToLeitung', { - person_id: this.leitungData.person_id, - uid: this.leitungData.uid - }); + async goToLeitung() { + this.loadHeaderData(this.leitungData.person_id, this.leitungData.uid); }, showModal(person_id){ this.$refs.modalFoto.open(person_id); @@ -143,11 +144,11 @@ export default { }, reload() { if(this.person_id) { - this.loadHeaderData(); + this.loadHeaderData(this.person_id, this.mitarbeiter_uid); } - else { +/* else { this.$emit('reload'); - } + }*/ }, }, template: ` @@ -282,7 +283,7 @@ export default { {{departmentData.bezeichnung}} | Vorgesetzte*r - + {{leitungData.titelpre}} {{leitungData.vorname}} {{leitungData.nachname}}
@@ -297,25 +298,24 @@ export default { | DW {{headerDataMa?.telefonklappe}}
+