diff --git a/application/controllers/components/stv/Kontakt.php b/application/controllers/components/stv/Kontakt.php index 62a28d7eb..85071c416 100644 --- a/application/controllers/components/stv/Kontakt.php +++ b/application/controllers/components/stv/Kontakt.php @@ -279,8 +279,12 @@ class Kontakt extends FHC_Controller { $this->load->model('person/Kontakt_model', 'KontaktModel'); $this->load->model('organisation/standort_model', 'StandortModel'); - - $this->KontaktModel->addSelect('*'); + $this->KontaktModel->addSelect("*, + TO_CHAR (CASE + WHEN public.tbl_kontakt.updateamum >= public.tbl_kontakt.insertamum + THEN public.tbl_kontakt.updateamum + ELSE public.tbl_kontakt.insertamum + END::timestamp, 'DD.MM.YYYY HH24:MI:SS') AS lastUpdate"); $this->StandortModel->addJoin('public.tbl_standort st', 'ON (public.tbl_kontakt.standort_id = st.standort_id)', 'LEFT'); $result = $this->KontaktModel->loadWhere( diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js index 5645dd519..d901fa7e1 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Kontakt/Contact.js @@ -31,7 +31,7 @@ export default{ {title:"Person_id", field:"person_id", visible:false}, {title:"Kontakt_id", field:"kontakt_id", visible:false}, {title:"Standort_id", field:"standort_id", visible:false}, - {title:"letzte Änderung", field:"updateamum", visible:false}, + {title:"letzte Änderung", field:"lastupdate", visible:false}, {title: 'Aktionen', field: 'actions', minWidth: 150, // Ensures Action-buttons will be always fully displayed formatter: (cell, formatterParams, onRendered) => { @@ -216,10 +216,10 @@ export default{ cm.getColumnByField('anmerkung').component.updateDefinition({ title: this.$p.t('global', 'anmerkung') }); - cm.getColumnByField('kurz_bz').component.updateDefinition({ + cm.getColumnByField('kurzbz').component.updateDefinition({ title: this.$p.t('person', 'firma') }); - cm.getColumnByField('updateamum').component.updateDefinition({ + cm.getColumnByField('lastupdate').component.updateDefinition({ title: this.$p.t('notiz', 'letzte_aenderung') }); }, diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 47fe8a4a4..2ff8f1489 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -22413,7 +22413,7 @@ array( ), array( 'sprache' => 'English', - 'text' => 'Bank account number', + 'text' => 'Address', 'description' => '', 'insertvon' => 'system' )