From 3db367b2553c2ac14013e89601bb660561c6c89d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 7 Feb 2025 09:34:07 +0100
Subject: [PATCH] bugfix Uhrzeit, datumsformat for tab abschlusspruefung

---
 .../education/Abschlusspruefung_model.php     |  9 ++--
 .../Abschlusspruefung/Abschlusspruefung.js    | 51 ++++++++++++++++---
 2 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/application/models/education/Abschlusspruefung_model.php b/application/models/education/Abschlusspruefung_model.php
index 2a547a3fe..0ba8fd55c 100644
--- a/application/models/education/Abschlusspruefung_model.php
+++ b/application/models/education/Abschlusspruefung_model.php
@@ -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));
diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
index fdebacaec..82e6c5631 100644
--- a/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
+++ b/public/js/components/Stv/Studentenverwaltung/Details/Abschlusspruefung/Abschlusspruefung.js
@@ -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({