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

Infocenter: Added Column ZGVNation to FilterPages

Browse Source
This commit is contained in:
Andreas Österreicher
2018-12-04 15:45:51 +01:00
parent 56a665fb9b
commit d5b1c9c643
4 changed files with 46 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/system/infocenter/InfoCenter.php
+3 -3
View File
@@ -859,7 +859,7 @@ class InfoCenter extends Auth_Controller
$this->navigationlib->setSessionMenu(
array(
'freigegeben' => $this->navigationlib->oneLevel(
'Freigegeben', // description
'zum RT Freigegeben', // description
$freigegebenLink, // link
null, // children
'thumbs-up', // icon
@@ -871,10 +871,10 @@ class InfoCenter extends Auth_Controller
1 // sort
),
'reihungstestAbsolviert' => $this->navigationlib->oneLevel(
'Reihungstest Absolviert', // description
'Reihungstest absolviert', // description
$reihungstestAbsolviertLink, // link
null, // children
'', // icon
'check', // icon
null, // subscriptDescription
false, // expand
null, // subscriptLinkClass
application/views/system/infocenter/infocenterData.php
+15 -2
View File
@@ -162,7 +162,14 @@
AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
)
LIMIT 1
) AS "StgAktiv"
) AS "StgAktiv",
(
SELECT ps.zgvnation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVNation"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -232,7 +239,8 @@
ucfirst($this->p->t('global', 'abgeschickt')).' ('.$this->p->t('global', 'anzahl').')',
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').')'
ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
'ZGV Nation'
),
'formatRow' => function($datasetRaw) {
@@ -304,6 +312,11 @@
$datasetRaw->{'Nation'} = '-';
}
if ($datasetRaw->{'ZGVNation'} == null)
{
$datasetRaw->{'ZGVNation'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
application/views/system/infocenter/infocenterFreigegebenData.php
+14 -2
View File
@@ -127,7 +127,14 @@
AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
LIMIT 1
) AS "ReihungstestApplied"
) AS "ReihungstestApplied",
(
SELECT ps.zgvnation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVNation"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -181,7 +188,8 @@
'Studiengänge',
'Statusgrund',
'Reihungstest angetreten',
'Reihungstest angemeldet'
'Reihungstest angemeldet',
'ZGV Nation'
),
'formatRow' => function($datasetRaw) {
@@ -256,6 +264,10 @@
$datasetRaw->{'ReihungstestApplied'} = 'Nein';
}
if ($datasetRaw->{'ZGVNation'} == null)
{
$datasetRaw->{'ZGVNation'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {
application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+14 -2
View File
@@ -145,7 +145,14 @@
AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
LIMIT 1
) AS "ReihungstestDatum"
) AS "ReihungstestDatum",
(
SELECT ps.zgvnation
FROM public.tbl_prestudent ps
WHERE ps.person_id = p.person_id
ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
LIMIT 1
) AS "ZGVNation"
FROM public.tbl_person p
LEFT JOIN (
SELECT tpl.person_id,
@@ -200,7 +207,8 @@
'Statusgrund',
'Reihungstest angetreten',
'Reihungstest angemeldet',
'Reihungstest Datum'
'Reihungstest Datum',
'ZGV Nation'
),
'formatRow' => function($datasetRaw) {
@@ -284,6 +292,10 @@
$datasetRaw->{'ReihungstestDatum'} = date_format(date_create($datasetRaw->{'ReihungstestDatum'}),'d.m.Y');
}
if ($datasetRaw->{'ZGVNation'} == null)
{
$datasetRaw->{'ZGVNation'} = '-';
}
return $datasetRaw;
},
'markRow' => function($datasetRaw) {