diff --git a/application/controllers/api/frontend/v1/stv/Mobility.php b/application/controllers/api/frontend/v1/stv/Mobility.php index 7abe84138..9007521ff 100644 --- a/application/controllers/api/frontend/v1/stv/Mobility.php +++ b/application/controllers/api/frontend/v1/stv/Mobility.php @@ -45,8 +45,6 @@ class Mobility extends FHCAPI_Controller public function getMobilitaeten($student_uid) { $this->BisioModel->addSelect("*"); - $this->BisioModel->addSelect("TO_CHAR( tbl_bisio.von::timestamp, 'DD.MM.YYYY') AS format_von"); - $this->BisioModel->addSelect("TO_CHAR( tbl_bisio.bis::timestamp, 'DD.MM.YYYY') AS format_bis"); $this->BisioModel->addJoin('bis.tbl_mobilitaetsprogramm mp', 'ON (mp.mobilitaetsprogramm_code = bis.tbl_bisio.mobilitaetsprogramm_code)', 'LEFT'); $result = $this->BisioModel->loadWhere( diff --git a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js index 0cd30ec42..a05a03131 100644 --- a/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js +++ b/public/js/components/Stv/Studentenverwaltung/Details/Mobility/Mobility.js @@ -44,8 +44,36 @@ export default { columns: [ {title: "Kurzbz", field: "kurzbz"}, {title: "Nation", field: "nation_code"}, - {title: "Von", field: "format_von"}, - {title: "Bis", field: "format_bis"}, + { + title: "Von", + field: "von", + formatter: function (cell) { + const dateStr = cell.getValue(); + if (!dateStr) return ""; + + const date = new Date(dateStr); + return date.toLocaleString("de-DE", { + day: "2-digit", + month: "2-digit", + year: "numeric", + }); + } + }, + { + title: "Bis", + field: "bis", + formatter: function (cell) { + const dateStr = cell.getValue(); + if (!dateStr) return ""; + + const date = new Date(dateStr); + return date.toLocaleString("de-DE", { + day: "2-digit", + month: "2-digit", + year: "numeric", + }); + } + }, {title: "bisio_id", field: "bisio_id"}, { title: 'Aktionen', field: 'actions', @@ -106,10 +134,10 @@ export default { cm.getColumnByField('nation_code').component.updateDefinition({ title: this.$p.t('mobility', 'gastnation') }); - cm.getColumnByField('format_von').component.updateDefinition({ + cm.getColumnByField('von').component.updateDefinition({ title: this.$p.t('ui', 'von') }); - cm.getColumnByField('format_bis').component.updateDefinition({ + cm.getColumnByField('bis').component.updateDefinition({ title: this.$p.t('global', 'bis') }); cm.getColumnByField('bisio_id').component.updateDefinition({