blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-10-12 06:54:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature-82683/lvverwaltung_zusaetzliche_spalten_bei_lehrenden'

Browse Source
This commit is contained in:
Andreas Österreicher
2026-09-17 14:00:07 +02:00
parent c53040ed5c c90f7a31bb
commit 0a00caa1e4
2 changed files with 57 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Lehreinheitmitarbeiter_model.php
+10 -1
View File
@@ -85,9 +85,18 @@ class Lehreinheitmitarbeiter_model extends DB_Model
public function getLektorenByLe($lehreinheit_id)
{
$this->addSelect('vorname, nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant');
$this->addSelect('tbl_person.vorname, tbl_person.nachname, tbl_lehreinheitmitarbeiter.*, stundenplan.verplant,
COALESCE(insertvonperson.vorname || \' \' || insertvonperson.nachname, tbl_lehreinheitmitarbeiter.insertvon) as insertvon,
COALESCE(updatevonperson.vorname || \' \' || updatevonperson.nachname, tbl_lehreinheitmitarbeiter.updatevon) as updatevon');
$this->addJoin('tbl_benutzer', 'uid = mitarbeiter_uid');
$this->addJoin('tbl_person', 'person_id');
$this->addJoin('tbl_benutzer insertvonbenutzer', 'insertvonbenutzer.uid = tbl_lehreinheitmitarbeiter.insertvon', 'LEFT');
$this->addJoin('tbl_person insertvonperson', 'insertvonperson.person_id = insertvonbenutzer.person_id', 'LEFT');
$this->addJoin('tbl_benutzer updatevonbenutzer', 'updatevonbenutzer.uid = tbl_lehreinheitmitarbeiter.updatevon', 'LEFT');
$this->addJoin('tbl_person updatevonperson', 'updatevonperson.person_id = updatevonbenutzer.person_id', 'LEFT');
$this->addJoin('(
SELECT 1 as verplant, lehreinheit_id, mitarbeiter_uid
public/js/components/LVVerwaltung/Lektor/Table.js
+47 -1
View File
@@ -49,6 +49,52 @@ export default{
{title: this.$p.t('person', 'nachname'), field:"nachname"},
{title: this.$p.t('person', 'vorname'), field:"vorname"},
{title: this.$p.t('person', 'uid'), field:"mitarbeiter_uid"},
{title: this.$p.t('global/insertvon'), field: 'insertvon', visible: false},
{
title: this.$p.t('global/insertamum'),
field: "insertamum",
visible: false,
formatter: function (cell) {
const dateStr = cell.getValue();
if (!dateStr) return "";
const date = new Date(dateStr);
return date.toLocaleString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
hour12: false
});
}
},
{title: this.$p.t('global/updatevon'), field: 'updatevon', visible: false},
{
title: this.$p.t('global/updateamum'),
field: "updateamum",
visible: false,
formatter: function (cell) {
const dateStr = cell.getValue();
if (!dateStr) return "";
const date = new Date(dateStr);
return date.toLocaleString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
hour: "2-digit",
minute: "2-digit",
second: "2-digit",
hour12: false
});
}
},
{title: this.$p.t('lehre', 'lehreinheit_id'), field:"lehreinheit_id"},
{
title: this.$p.t('lehre', 'verplant'),
@@ -102,7 +148,7 @@ export default{
selectable: true,
selectableRangeMode: 'click',
selectableRows:1,
persistenceID: 'lehrveranstaltungen_lektor_table_2025_05_27_v1',
persistenceID: 'lehrveranstaltungen_lektor_table_2026_09_11_v1',
}},
},
mounted(){