diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php index 2e99d1cdd..1835296fe 100644 --- a/application/models/person/Notiz_model.php +++ b/application/models/person/Notiz_model.php @@ -154,8 +154,21 @@ class Notiz_model extends DB_Model public function getNotizWithDocEntries($id, $type) { $qry = " - SELECT - n.*, count(dms_id) as countDoc, z.notizzuordnung_id, + SELECT + n.*, + CASE + WHEN person_verfasser.vorname IS NOT NULL AND person_verfasser.vorname != '' + OR person_verfasser.nachname IS NOT NULL AND person_verfasser.nachname != '' + THEN CONCAT(person_verfasser.vorname, ' ', person_verfasser.nachname) + ELSE NULL + END AS verfasser, + CASE + WHEN person_bearbeiter.vorname IS NOT NULL AND person_bearbeiter.vorname != '' + OR person_bearbeiter.nachname IS NOT NULL AND person_bearbeiter.nachname != '' + THEN CONCAT(person_bearbeiter.vorname, ' ', person_bearbeiter.nachname) + ELSE NULL + END AS bearbeiter, + count(dms_id) as countDoc, z.notizzuordnung_id, (CASE WHEN n.updateamum >= n.insertamum THEN n.updateamum ELSE n.insertamum @@ -173,10 +186,20 @@ class Notiz_model extends DB_Model public.tbl_notiz_dokument dok USING (notiz_id) LEFT JOIN campus.tbl_dms_version USING (dms_id) + LEFT JOIN + public.tbl_benutzer p_verfasser ON (p_verfasser.uid = n.verfasser_uid) + LEFT JOIN + public.tbl_person person_verfasser ON (person_verfasser.person_id = p_verfasser.person_id) + LEFT JOIN + public.tbl_benutzer p_bearbeiter ON (p_bearbeiter.uid = n.bearbeiter_uid) + LEFT JOIN + public.tbl_person person_bearbeiter ON (person_bearbeiter.person_id = p_bearbeiter.person_id) WHERE z.$type = ? GROUP BY - notiz_id, z.notizzuordnung_id + notiz_id, z.notizzuordnung_id, + person_verfasser.vorname, person_verfasser.nachname, + person_bearbeiter.vorname, person_bearbeiter.nachname "; return $this->execQuery($qry, array($type, $id)); diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 13e969c50..2e516514f 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -95,8 +95,10 @@ export default { return el; }, }, - {title: "VerfasserIn", field: "verfasser_uid", width: 124, visible: false}, - {title: "BearbeiterIn", field: "bearbeiter_uid", width: 126, visible: false}, + {title: "VerfasserIn", field: "verfasser", width: 124}, + {title: "BearbeiterIn", field: "bearbeiter", width: 126}, + {title: "Verfasser UID", field: "verfasser_uid", width: 124, visible: false}, + {title: "Bearbeiter UID", field: "bearbeiter_uid", width: 126, visible: false}, {title: "Start", field: "start_format", width: 86, visible: false}, {title: "Ende", field: "ende_format", width: 86, visible: false}, {title: "Dokumente", field: "countdoc", width: 100, visible: false}, @@ -187,7 +189,7 @@ export default { let cm = this.$refs.table.tabulator.columnManager; - cm.getColumnByField('verfasser_uid').component.updateDefinition({ + cm.getColumnByField('verfasser').component.updateDefinition({ title: this.$p.t('notiz', 'verfasser'), visible: this.showVariables.showVerfasser }); @@ -199,7 +201,7 @@ export default { title: this.$p.t('global', 'text'), //visible: this.showVariables.showText }); - cm.getColumnByField('bearbeiter_uid').component.updateDefinition({ + cm.getColumnByField('bearbeiter').component.updateDefinition({ title: this.$p.t('notiz', 'bearbeiter'), visible: this.showVariables.showBearbeiter });