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

Infocenter Spalten angepasst

Browse Source
This commit is contained in:
Andreas Österreicher
2018-03-02 11:35:42 +01:00
parent 96e2648b06
commit 67d7deeffc
2 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterData.php
+15 -5
View File
@@ -83,7 +83,7 @@
) AS "AnzahlAbgeschickt", ) AS "AnzahlAbgeschickt",
array_to_string( array_to_string(
( (
SELECT array_agg(distinct tbl_studiengang.kurzbzlang) SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz))
FROM FROM
public.tbl_prestudentstatus pss public.tbl_prestudentstatus pss
INNER JOIN public.tbl_prestudent ps USING(prestudent_id) INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
@@ -99,7 +99,7 @@
WHERE ende >= NOW() WHERE ende >= NOW()
) )
LIMIT 1 LIMIT 1
),\',\' ),\', \'
) AS "StgAbgeschickt", ) AS "StgAbgeschickt",
pl.zeitpunkt AS "LockDate", pl.zeitpunkt AS "LockDate",
pl.lockuser as "LockUser" pl.lockuser as "LockUser"
@@ -141,6 +141,8 @@
'hideSave' => false, 'hideSave' => false,
'checkboxes' => 'PersonId', 'checkboxes' => 'PersonId',
'additionalColumns' => array('Details'), 'additionalColumns' => array('Details'),
'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Letzte Aktion','Letzter Bearbeiter',
'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'),
'formatRaw' => function($datasetRaw) { 'formatRaw' => function($datasetRaw) {
$datasetRaw->{'Details'} = sprintf( $datasetRaw->{'Details'} = sprintf(
@@ -153,10 +155,18 @@
{ {
$datasetRaw->{'SendDate'} = 'Not sent'; $datasetRaw->{'SendDate'} = 'Not sent';
} }
else
{
$datasetRaw->{'SendDate'} = date_format(date_create($datasetRaw->{'SendDate'}),'Y-m-d H:i');
}
if ($datasetRaw->{'LastAction'} == null) if ($datasetRaw->{'LastAction'} == null)
{ {
$datasetRaw->{'LastAction'} = 'Not logged'; $datasetRaw->{'LastAction'} = '-';
}
else
{
$datasetRaw->{'LastAction'} = date_format(date_create($datasetRaw->{'LastAction'}),'Y-m-d H:i');
} }
if ($datasetRaw->{'User/Operator'} == '') if ($datasetRaw->{'User/Operator'} == '')
@@ -166,12 +176,12 @@
if ($datasetRaw->{'LockDate'} == null) if ($datasetRaw->{'LockDate'} == null)
{ {
$datasetRaw->{'LockDate'} = 'Not locked'; $datasetRaw->{'LockDate'} = '-';
} }
if ($datasetRaw->{'LockUser'} == null) if ($datasetRaw->{'LockUser'} == null)
{ {
$datasetRaw->{'LockUser'} = 'Not locked'; $datasetRaw->{'LockUser'} = '-';
} }
if ($datasetRaw->{'StgAbgeschickt'} == null) if ($datasetRaw->{'StgAbgeschickt'} == null)
application/views/widgets/filter/filter.php
+2 -2
View File
@@ -2,8 +2,8 @@
.filter-name-title { .filter-name-title {
font-family: inherit; font-family: inherit;
font-size: 20px; font-size: 16px;
font-weight: bold; /*font-weight: bold;*/
line-height: 1.1; line-height: 1.1;
color: black; color: black;
} }