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

zgvmaster spalte hinzugefuegt

Browse Source
This commit is contained in:
ma0048
2021-06-10 11:49:48 +02:00
parent 36f52cf3cc
commit 3ba88b43dd
4 changed files with 58 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterData.php
+18 -5
View File
@@ -3,7 +3,7 @@
$APP = '\'infocenter\'';
$REJECTED_STATUS = '\'Abgewiesener\'';
$INTERESSENT_STATUS = '\'Interessent\'';
$STUDIENGANG_TYP = '\'b\'';
$STUDIENGANG_TYP = '\'m\'';
$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\', \'Interessent rejected\'';
$LOGDATA_NAME_PARKED = '\'Parked\'';
@@ -208,12 +208,19 @@
LIMIT 1
) AS "StgAktiv",
(
SELECT CONCAT(COALESCE(ps.zgvnation, \'-\'), \' / \' , COALESCE(ps.zgvmanation, \'-\'))
SELECT ps.zgvnation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvnation, ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVNation"
) AS "ZGVNation",
(
SELECT ps.zgvmanation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVMNation"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -298,7 +305,8 @@
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'gesendet').')',
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'nichtGesendet').')',
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
'ZGV Nation'
'ZGV Nation',
'ZGV Master Nation'
),
'formatRow' => function($datasetRaw) {
@@ -380,6 +388,11 @@
$datasetRaw->{'ZGVNation'} = '-';
}
if ($datasetRaw->{'ZGVMNation'} == null)
{
$datasetRaw->{'ZGVMNation'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
application/views/system/infocenter/infocenterFreigegebenData.php
+17 -4
View File
@@ -205,12 +205,19 @@
LIMIT 1
) AS "ReihungstestDate",
(
SELECT CONCAT(COALESCE(ps.zgvnation, \'-\'), \' / \' , COALESCE(ps.zgvmanation, \'-\'))
SELECT ps.zgvnation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvnation, ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVNation"
) AS "ZGVNation",
(
SELECT ps.zgvmanation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVMNation"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -278,7 +285,8 @@
'Reihungstest angetreten',
'Reihungstest angemeldet',
'Reihungstest date',
'ZGV Nation'
'ZGV Nation',
'ZGV Master Nation'
),
'formatRow' => function($datasetRaw) {
@@ -371,6 +379,11 @@
{
$datasetRaw->{'ZGVNation'} = '-';
}
if ($datasetRaw->{'ZGVMNation'} == null)
{
$datasetRaw->{'ZGVMNation'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+17 -4
View File
@@ -161,12 +161,19 @@
LIMIT 1
) AS "ReihungstestDatum",
(
SELECT CONCAT(COALESCE(ps.zgvnation, \'-\'), \' / \' , COALESCE(ps.zgvmanation, \'-\'))
SELECT ps.zgvnation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvnation, ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVNation"
) AS "ZGVNation",
(
SELECT ps.zgvmanation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvmanation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVMNation"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -225,7 +232,8 @@
'Reihungstest angetreten',
'Reihungstest angemeldet',
'Reihungstest Datum',
'ZGV Nation'
'ZGV Nation',
'ZGV Master Nation'
),
'formatRow' => function($datasetRaw) {
@@ -313,6 +321,11 @@
{
$datasetRaw->{'ZGVNation'} = '-';
}
if ($datasetRaw->{'ZGVMNation'} == null)
{
$datasetRaw->{'ZGVMNation'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
system/filtersupdate.php
+6
View File
@@ -33,6 +33,7 @@ $filters = array(
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "StgAbgeschickt"},
{"name": "Studiensemester"},
{"name": "LastAction"},
@@ -66,6 +67,7 @@ $filters = array(
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "StgAbgeschickt"},
{"name": "Studiensemester"},
{"name": "LastAction"},
@@ -105,6 +107,7 @@ $filters = array(
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "LastAction"},
{"name": "LastActionType"},
{"name": "User/Operator"},
@@ -140,6 +143,7 @@ $filters = array(
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "LastAction"},
{"name": "User/Operator"},
{"name": "LockUser"},
@@ -180,6 +184,7 @@ $filters = array(
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "StgAbgeschickt"},
{"name": "Studiensemester"},
{"name": "LastAction"},
@@ -218,6 +223,7 @@ $filters = array(
{"name": "Vorname"},
{"name": "Nachname"},
{"name": "ZGVNation"},
{"name": "ZGVMNation"},
{"name": "LastAction"},
{"name": "User/Operator"},
{"name": "LockUser"},