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

Diverse Filter für Infocenter angepasst

Browse Source
This commit is contained in:
Gerald Raab
2018-12-18 16:30:59 +01:00
parent b77521ed4b
commit 09a82b1a03
5 changed files with 37 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/organisation/reihungstest/ReihungstestUebersichtData.php
Regular → Executable
+1 -1
View File
@@ -28,7 +28,7 @@
/* Plaetze aus Termin oder zugeteilten Raeumen minus Schwund */
COALESCE(
max_teilnehmer,
(SELECT sum(arbeitsplaetze) - ceil(sum(arbeitsplaetze)/100.0*".$schwund.")
(SELECT sum(arbeitsplaetze) - sum(ceil(arbeitsplaetze/100.0*".$schwund."))
FROM
public.tbl_rt_ort
JOIN public.tbl_ort ON(tbl_rt_ort.ort_kurzbz=tbl_ort.ort_kurzbz)
application/views/system/infocenter/infocenterData.php
+10
View File
@@ -38,6 +38,15 @@
ORDER BY l.zeitpunkt DESC
LIMIT 1
) AS "LastAction",
(
SELECT l.taetigkeit_kurzbz
FROM system.tbl_log l
WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
AND l.person_id = p.person_id
ORDER BY l.zeitpunkt DESC
LIMIT 1
) AS "LastActionType",
(
SELECT l.insertvon
FROM system.tbl_log l
@@ -237,6 +246,7 @@
ucfirst($this->p->t('global', 'gesperrtVon')),
ucfirst($this->p->t('global', 'parkdatum')),
ucfirst($this->p->t('global', 'letzteAktion')),
'Aktionstyp',
ucfirst($this->p->t('global', 'letzterBearbeiter')),
ucfirst($this->p->t('lehre', 'studiensemester')),
ucfirst($this->p->t('global', 'gesendetAm')),
application/views/system/infocenter/infocenterFreigegebenData.php
Regular → Executable
+10 -2
View File
@@ -26,6 +26,15 @@
ORDER BY l.zeitpunkt DESC
LIMIT 1
) AS "LastAction",
(
SELECT l.taetigkeit_kurzbz
FROM system.tbl_log l
WHERE l.taetigkeit_kurzbz IN('.$TAETIGKEIT_KURZBZ.')
AND l.logdata->>\'name\' NOT IN ('.$LOGDATA_NAME.')
AND l.person_id = p.person_id
ORDER BY l.zeitpunkt DESC
LIMIT 1
) AS "LastActionType",
(
SELECT l.insertvon
FROM system.tbl_log l
@@ -181,7 +190,6 @@
'query' => $query,
'app' => InfoCenter::APP,
'datasetName' => 'freigegeben',
'filterKurzbz' => 'InfoCenterFreigegeben5days',
'filter_id' => $this->input->get('filter_id'),
'requiredPermissions' => 'infocenter',
'checkboxes' => 'PersonId',
@@ -196,6 +204,7 @@
'Sperrdatum',
'GesperrtVon',
'Letzte Aktion',
'Aktionstyp',
'Letzter Bearbeiter',
'StSem',
'GesendetAm',
@@ -278,7 +287,6 @@
{
$datasetRaw->{'ReihungstestApplied'} = 'Nein';
}
if ($datasetRaw->{'ZGVNation'} == null)
{
$datasetRaw->{'ZGVNation'} = '-';
application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
Regular → Executable
-1
View File
@@ -184,7 +184,6 @@
'query' => $query,
'app' => InfoCenter::APP,
'datasetName' => 'reihungstestAbsolviert',
'filterKurzbz' => 'InfoCenterReihungstestAbsolviert5days',
'filter_id' => $this->input->get('filter_id'),
'requiredPermissions' => 'infocenter',
'checkboxes' => 'PersonId',