From 53e395aca4fa74e0b49d41d7bf9471f0b077765e Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 24 Jul 2025 14:40:48 +0200 Subject: [PATCH] =?UTF-8?q?Tab=20Notizen,=20Messages:=20use=20HTML-Entitie?= =?UTF-8?q?s=20Tab=20Abschlusspr=C3=BCfung,=20Prestudent,=20Pruefung,=20Do?= =?UTF-8?q?kument:=20Phrasen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Messages/Details/TableMessages.js | 2 +- public/js/components/Notiz/Notiz.js | 1 + .../Abschlusspruefung/Abschlusspruefung.js | 2 +- .../Details/Dokumente/List/Accepted.js | 2 +- .../Details/Dokumente/List/Unaccepted.js | 5 +- .../Studentenverwaltung/Details/Prestudent.js | 4 +- .../Details/Prestudent/History.js | 6 ++- .../Details/Pruefung/Pruefunglist.js | 5 +- system/phrasesupdate.php | 50 +++++++++++++++++-- 9 files changed, 63 insertions(+), 14 deletions(-) diff --git a/public/js/components/Messages/Details/TableMessages.js b/public/js/components/Messages/Details/TableMessages.js index d2dbdb7ce..a21073855 100644 --- a/public/js/components/Messages/Details/TableMessages.js +++ b/public/js/components/Messages/Details/TableMessages.js @@ -41,7 +41,7 @@ export default { ajaxResponse: (url, params, response) => this.buildTreemap(response), columns: [ {title: "subject", field: "subject"}, - {title: "body", field: "body", visible: false}, + {title: "body", field: "body", formatter: "html", visible: false}, {title: "message_id", field: "message_id", visible: false}, { title: "Datum", diff --git a/public/js/components/Notiz/Notiz.js b/public/js/components/Notiz/Notiz.js index 783987363..8b37cd6e3 100644 --- a/public/js/components/Notiz/Notiz.js +++ b/public/js/components/Notiz/Notiz.js @@ -81,6 +81,7 @@ export default { title: "Text", field: "text_stripped", width: 250, + formatter: "html", clipContents: true, tooltip:function(e, cell, onRendered){ var el = document.createElement("div"); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js index 5184de62d..26bea210d 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js @@ -225,7 +225,7 @@ export default { title: this.$p.t('global', 'typ') }); cm.getColumnByField('abschlusspruefung_id').component.updateDefinition({ - title: this.$p.t('ui', 'abschlusspruefung_id') + title: this.$p.t('abschlusspruefung', 'abschlusspruefung_id') }); /* cm.getColumnByField('actions').component.updateDefinition({ diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js index bca7e00fa..e07d1a45d 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Accepted.js @@ -66,7 +66,7 @@ export default { tickElement: '', crossElement: '' }}, - {title: "infotext", field: "infotext"}, + {title: "Infotext", field: "infotext"}, {title: "akte_id", field: "akte_id"}, {title: "dms_id", field: "dms_id", visible: false}, {title: "titel", field: "titel_intern", visible: false}, diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js index e1110ddf3..93b3a1b70 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Dokumente/List/Unaccepted.js @@ -77,7 +77,7 @@ export default { }, hozAlign: "center" }, - {title: "infotext", field: "infotext"}, + {title: "Infotext", field: "infotext"}, {title: "akte_id", field: "akte_id"}, {title: "titel_intern", field: "titel_intern"}, {title: "Anmerkung_intern", field: "anmerkung_intern", visible: false}, @@ -194,6 +194,9 @@ export default { cm.getColumnByField('vorhanden').component.updateDefinition({ title: this.$p.t('dokumente', 'vorhanden') }); + cm.getColumnByField('titel_intern').component.updateDefinition({ + title: this.$p.t('global', 'titel') + }); cm.getColumnByField('anmerkung_intern').component.updateDefinition({ title: this.$p.t('global', 'anmerkung') }); diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js index a8c0f985b..ef7eb141a 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Prestudent.js @@ -197,7 +197,7 @@ export default { { const rowData = row.getData(); @@ -58,6 +58,10 @@ export default{ cm.getColumnByField('bezeichnung').component.updateDefinition({ title: this.$p.t('lehre', 'studienplan') }); + + cm.getColumnByField('prestudent_id').component.updateDefinition({ + title: this.$p.t('ui', 'prestudent_id') + }); } } ] diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js index 6f0cb2e43..799578a70 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Pruefung/Pruefunglist.js @@ -92,7 +92,8 @@ export default{ layout: 'fitDataFill', layoutColumnsOnNewData: false, height: 'auto', - persistenceID:'stv-details-pruefung-pruefung-list' + index: 'pruefung_id', + persistenceID: 'stv-details-pruefung-list' }, tabulatorEvents: [ { @@ -123,7 +124,7 @@ export default{ title: this.$p.t('ui', 'pruefung_id') }); cm.getColumnByField('lehreinheit_id').component.updateDefinition({ - title: this.$p.t('ui', 'lehreinheit_id') + title: this.$p.t('global', 'lehreinheit_id') }); cm.getColumnByField('mitarbeiter_uid').component.updateDefinition({ title: this.$p.t('ui', 'mitarbeiter_uid') diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 36f5f7dcc..355ed7186 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -40096,7 +40096,7 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Abschlusspruefung ID', + 'text' => 'Abschlussprüfung ID', 'description' => '', 'insertvon' => 'system' ), @@ -40660,13 +40660,13 @@ array( 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Firma Id', + 'text' => 'Firma ID', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Company Id', + 'text' => 'Company ID', 'description' => '', 'insertvon' => 'system' ) @@ -43209,13 +43209,13 @@ and represent the current state of research on the topic. The prescribed citatio 'phrases' => array( array( 'sprache' => 'German', - 'text' => 'Dms ID', + 'text' => 'DMS ID', 'description' => '', 'insertvon' => 'system' ), array( 'sprache' => 'English', - 'text' => 'Dms ID', + 'text' => 'DMS ID', 'description' => '', 'insertvon' => 'system' ) @@ -44537,6 +44537,46 @@ and represent the current state of research on the topic. The prescribed citatio ) ) ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'mitarbeiter_uid', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Mitarbeiter UID', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Employee UID', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'ui', + 'phrase' => 'pruefung_id', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Prüfung ID', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Examination ID', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // FHC-4 Finetuning END );