From 56a665fb9bbaf6d3d3d94c3ee0f5092fbe8e0c31 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Tue, 4 Dec 2018 15:15:46 +0100 Subject: [PATCH] Infocenter: - Corrected Reihungstest angemeldet Column - Changed Date Format and boolean Columns to German --- .../infocenter/infocenterFreigegebenData.php | 10 +++++----- .../infocenterReihungstestAbsolviertData.php | 14 +++++++------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php index d8744dad8..f3ac6e757 100644 --- a/application/views/system/infocenter/infocenterFreigegebenData.php +++ b/application/views/system/infocenter/infocenterFreigegebenData.php @@ -112,7 +112,7 @@ LIMIT 1 ) AS "ReihungstestAngetreten", ( - SELECT CASE WHEN(pss.prestudent_id IS NULL) THEN FALSE ELSE TRUE END + SELECT CASE WHEN(rtp.person_id IS NULL) THEN FALSE ELSE TRUE END FROM public.tbl_prestudentstatus pss JOIN public.tbl_prestudent ps USING(prestudent_id) LEFT JOIN ( @@ -240,20 +240,20 @@ if ($datasetRaw->{'ReihungstestAngetreten'} == 'true') { - $datasetRaw->{'ReihungstestAngetreten'} = 'Yes'; + $datasetRaw->{'ReihungstestAngetreten'} = 'Ja'; } else { - $datasetRaw->{'ReihungstestAngetreten'} = 'No'; + $datasetRaw->{'ReihungstestAngetreten'} = 'Nein'; } if ($datasetRaw->{'ReihungstestApplied'} == 'true') { - $datasetRaw->{'ReihungstestApplied'} = 'Yes'; + $datasetRaw->{'ReihungstestApplied'} = 'Ja'; } else { - $datasetRaw->{'ReihungstestApplied'} = 'No'; + $datasetRaw->{'ReihungstestApplied'} = 'Nein'; } return $datasetRaw; diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php index 6b38f6de3..09ee2a0ee 100644 --- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php +++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php @@ -112,7 +112,7 @@ LIMIT 1 ) AS "ReihungstestAngetreten", ( - SELECT CASE WHEN(pss.prestudent_id IS NULL) THEN FALSE ELSE TRUE END + SELECT CASE WHEN(rtp.person_id IS NULL) THEN FALSE ELSE TRUE END FROM public.tbl_prestudentstatus pss JOIN public.tbl_prestudent ps USING(prestudent_id) LEFT JOIN ( @@ -200,7 +200,7 @@ 'Statusgrund', 'Reihungstest angetreten', 'Reihungstest angemeldet', - 'Reihungstest datum' + 'Reihungstest Datum' ), 'formatRow' => function($datasetRaw) { @@ -259,20 +259,20 @@ if ($datasetRaw->{'ReihungstestAngetreten'} == 'true') { - $datasetRaw->{'ReihungstestAngetreten'} = 'Yes'; + $datasetRaw->{'ReihungstestAngetreten'} = 'Ja'; } else { - $datasetRaw->{'ReihungstestAngetreten'} = 'No'; + $datasetRaw->{'ReihungstestAngetreten'} = 'Nein'; } if ($datasetRaw->{'ReihungstestApplied'} == 'true') { - $datasetRaw->{'ReihungstestApplied'} = 'Yes'; + $datasetRaw->{'ReihungstestApplied'} = 'Ja'; } else { - $datasetRaw->{'ReihungstestApplied'} = 'No'; + $datasetRaw->{'ReihungstestApplied'} = 'Nein'; } if ($datasetRaw->{'ReihungstestDatum'} == null) @@ -281,7 +281,7 @@ } else { - $datasetRaw->{'ReihungstestDatum'} = date_format(date_create($datasetRaw->{'ReihungstestDatum'}),'Y-m-d H:i'); + $datasetRaw->{'ReihungstestDatum'} = date_format(date_create($datasetRaw->{'ReihungstestDatum'}),'d.m.Y'); } return $datasetRaw;