From a5fbd453575346cefacc17dab0bc330be905a5cf Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Fri, 16 Mar 2018 17:54:33 +0100 Subject: [PATCH] =?UTF-8?q?Spalte=20Nation=20hinzgrf=C3=BCgt,=20Login=20wi?= =?UTF-8?q?th=20code=20wird=20f=C3=BCr=20Liste=20ignoriert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/views/system/infocenter/infocenterData.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) mode change 100644 => 100755 application/views/system/infocenter/infocenterData.php diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php old mode 100644 new mode 100755 index 663e69ca6..48df269b2 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -9,10 +9,12 @@ p.vorname AS "Vorname", p.nachname AS "Nachname", p.gebdatum AS "Gebdatum", + p.staatsbuergerschaft AS "Nation", ( SELECT zeitpunkt FROM system.tbl_log WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\') + AND logdata->>\'name\' != \'Login with code\' AND person_id = p.person_id ORDER BY zeitpunkt DESC LIMIT 1 @@ -21,6 +23,7 @@ SELECT insertvon FROM system.tbl_log WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\') + AND logdata->>\'name\' != \'Login with code\' AND person_id = p.person_id ORDER BY zeitpunkt DESC LIMIT 1 @@ -141,7 +144,7 @@ 'hideSave' => false, 'checkboxes' => 'PersonId', 'additionalColumns' => array('Details'), - 'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Letzte Aktion','Letzter Bearbeiter', + 'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation','Letzte Aktion','Letzter Bearbeiter', 'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'), 'formatRaw' => function($datasetRaw) { @@ -189,6 +192,11 @@ $datasetRaw->{'StgAbgeschickt'} = 'N/A'; } + if ($datasetRaw->{'Nation'} == null) + { + $datasetRaw->{'Nation'} = '-'; + } + return $datasetRaw; }, 'markRow' => function($datasetRaw) {