blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-19 16:02:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

bugfix Uhrzeit, datumsformat for tab abschlusspruefung

Browse Source
This commit is contained in:
ma0068
2025-02-07 09:34:07 +01:00
parent 6ac91dc016
commit 3db367b255
2 changed files with 50 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/education/Abschlusspruefung_model.php
+5 -4
View File
@@ -144,9 +144,10 @@ class Abschlusspruefung_model extends DB_Model
person_vorsitzender.vorname,
COALESCE(' ' || person_vorsitzender.titelpre)
) AS person_vorsitzender,
TO_CHAR(datum::timestamp, 'DD.MM.YYYY') AS format_datum,
TO_CHAR(freigabedatum::timestamp, 'DD.MM.YYYY') AS format_freigabedatum,
TO_CHAR(sponsion::timestamp, 'DD.MM.YYYY') AS format_sponsion,
datum,
freigabedatum,
sponsion,
uhrzeit,
person_pruefer1.nachname as p1_nachname,
person_pruefer2.nachname as p2_nachname,
person_pruefer3.nachname as p3_nachname,
@@ -164,7 +165,7 @@ class Abschlusspruefung_model extends DB_Model
LEFT JOIN lehre.tbl_abschlussbeurteilung beurteilung USING (abschlussbeurteilung_kurzbz)
LEFT JOIN lehre.tbl_abschlusspruefung_antritt antritt USING (pruefungsantritt_kurzbz)
WHERE student_uid = ?
ORDER BY datum DESC
ORDER BY exam.datum DESC
";
return $this->execQuery($qry, array('student_uid' => $student_uid));
public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+45 -6
View File
@@ -74,11 +74,50 @@ export default {
{title: "prueferIn1", field: "p1_nachname", visible: false},
{title: "prueferIn2", field: "p2_nachname", visible: false},
{title: "prueferIn3", field: "p3_nachname", visible: false},
{title: "datum", field: "format_datum"},
{
title: "datum",
field: "datum",
formatter: function (cell) {
const dateStr = cell.getValue();
const date = new Date(dateStr);
return date.toLocaleString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
hour12: false
});
}
},
{title: "uhrzeit", field: "uhrzeit"},
{title: "freigabe", field: "format_freigabedatum"},
{
title: "freigabe",
field: "freigabedatum",
formatter: function (cell) {
const dateStr = cell.getValue();
const date = new Date(dateStr);
return date.toLocaleString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
hour12: false
});
}
},
{title: "pruefungsantritt", field: "antritt_bezeichnung"},
{title: "sponsion", field: "format_sponsion"},
{
title: "sponsion",
field: "sponsion",
formatter: function (cell) {
const dateStr = cell.getValue();
const date = new Date(dateStr);
return date.toLocaleString("de-DE", {
day: "2-digit",
month: "2-digit",
year: "numeric",
hour12: false
});
}
},
{title: "anmerkung", field: "anmerkung"},
{title: "abschlusspruefung_id", field: "abschlusspruefung_id", visible: false},
{title: "typ", field: "pruefungstyp_kurzbz", visible: false},
@@ -154,19 +193,19 @@ export default {
cm.getColumnByField('p3_nachname').component.updateDefinition({
title: this.$p.t('abschlusspruefung', 'pruefer3')
});
cm.getColumnByField('format_datum').component.updateDefinition({
cm.getColumnByField('datum').component.updateDefinition({
title: this.$p.t('global', 'datum')
});
cm.getColumnByField('uhrzeit').component.updateDefinition({
title: this.$p.t('global', 'uhrzeit')
});
cm.getColumnByField('format_freigabedatum').component.updateDefinition({
cm.getColumnByField('freigabedatum').component.updateDefinition({
title: this.$p.t('abschlusspruefung', 'freigabe')
});
cm.getColumnByField('antritt_bezeichnung').component.updateDefinition({
title: this.$p.t('abschlusspruefung', 'pruefungsantritt')
});
cm.getColumnByField('format_sponsion').component.updateDefinition({
cm.getColumnByField('sponsion').component.updateDefinition({
title: this.$p.t('abschlusspruefung', 'sponsion')
});
cm.getColumnByField('anmerkung').component.updateDefinition({