blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-28 17:39:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

neue message Zusaetzlicher Reihungstest

Browse Source
This commit is contained in:
ma0048
2025-11-24 15:15:02 +01:00
parent 2f2c7d0d92
commit 83418188ff
2 changed files with 56 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterFreigegebenData.php
+42 -3
View File
@@ -277,7 +277,25 @@ $query = '
WHERE konto.person_id = p.person_id
AND konto.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
AND konto.buchungstyp_kurzbz = '. $KAUTION_DRITT_STAAT .'
) AS "Kaution"
) AS "Kaution",
(
SELECT
array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
FROM public.tbl_rueckstellung
JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
WHERE tbl_rueckstellung.person_id = p.person_id
ORDER BY person_id, datum_bis DESC, rueckstellung_id DESC
LIMIT 1
) AS "Rueckstellgrund",
(
SELECT
datum_bis
FROM public.tbl_rueckstellung
JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
WHERE tbl_rueckstellung.person_id = p.person_id
ORDER BY person_id, datum_bis DESC, rueckstellung_id DESC
LIMIT 1
) AS "Rueckstelldatum"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -351,7 +369,9 @@ $query = '
'ZGV Nation MA',
'InfoCenter Mitarbeiter',
'Identitätsnachweis',
ucfirst($this->p->t('infocenter', 'kaution'))
ucfirst($this->p->t('infocenter', 'kaution')),
ucfirst($this->p->t('infocenter', 'rueckstellgrund')),
ucfirst($this->p->t('infocenter', 'rueckstelldatum'))
),
'formatRow' => function($datasetRaw) {
@@ -480,14 +500,33 @@ $query = '
$datasetRaw->{'Kaution'} = 'Offen';
}
if ($datasetRaw->{'Rueckstellgrund'} === null)
{
$datasetRaw->{'Rueckstellgrund'} = '-';
}
if ($datasetRaw->{'Rueckstelldatum'} === null)
{
$datasetRaw->{'Rueckstelldatum'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
$mark = '';
if ($datasetRaw->LockDate != null)
{
return FilterWidget::DEFAULT_MARK_ROW_CLASS;
$mark = FilterWidget::DEFAULT_MARK_ROW_CLASS;
}
if ($datasetRaw->Rueckstellgrund != null && $datasetRaw->Rueckstellgrund !== 'Parken')
$mark = "onhold";
if ($datasetRaw->Rueckstellgrund === 'Parken')
$mark = "text-info";
return $mark;
}
);