From 09a82b1a031ff74831840a926b2fde64460fb7fb Mon Sep 17 00:00:00 2001 From: Gerald Raab Date: Tue, 18 Dec 2018 16:30:59 +0100 Subject: [PATCH] =?UTF-8?q?Diverse=20Filter=20f=C3=BCr=20Infocenter=20ange?= =?UTF-8?q?passt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ReihungstestUebersichtData.php | 2 +- .../system/infocenter/infocenterData.php | 10 +++++++ .../infocenter/infocenterFreigegebenData.php | 12 +++++++-- .../infocenterReihungstestAbsolviertData.php | 1 - system/filtersupdate.php | 26 ++++++++++++------- 5 files changed, 37 insertions(+), 14 deletions(-) mode change 100644 => 100755 application/views/organisation/reihungstest/ReihungstestUebersichtData.php mode change 100644 => 100755 application/views/system/infocenter/infocenterFreigegebenData.php mode change 100644 => 100755 application/views/system/infocenter/infocenterReihungstestAbsolviertData.php mode change 100644 => 100755 system/filtersupdate.php diff --git a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php old mode 100644 new mode 100755 index 7e1ab197c..158a46e3b --- a/application/views/organisation/reihungstest/ReihungstestUebersichtData.php +++ b/application/views/organisation/reihungstest/ReihungstestUebersichtData.php @@ -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) diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php index f1a5ae8fd..8922de4c0 100755 --- a/application/views/system/infocenter/infocenterData.php +++ b/application/views/system/infocenter/infocenterData.php @@ -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')), diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php old mode 100644 new mode 100755 index 08797586d..02981a6c6 --- a/application/views/system/infocenter/infocenterFreigegebenData.php +++ b/application/views/system/infocenter/infocenterFreigegebenData.php @@ -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'} = '-'; diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php old mode 100644 new mode 100755 index d238cea64..63a2d906c --- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php +++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php @@ -184,7 +184,6 @@ 'query' => $query, 'app' => InfoCenter::APP, 'datasetName' => 'reihungstestAbsolviert', - 'filterKurzbz' => 'InfoCenterReihungstestAbsolviert5days', 'filter_id' => $this->input->get('filter_id'), 'requiredPermissions' => 'infocenter', 'checkboxes' => 'PersonId', diff --git a/system/filtersupdate.php b/system/filtersupdate.php old mode 100644 new mode 100755 index e90189142..a55d7943b --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -253,8 +253,8 @@ $filters = array( 'dataset_name' => 'freigegeben', 'filter_kurzbz' => 'InfoCenterFreigegeben5days', 'description' => '{"5 Tage Letzte Aktion"}', - 'sort' => 1, - 'default_filter' => true, + 'sort' => 2, + 'default_filter' => false, 'filter' => ' { "name": "Freigegeben - 5 Tage Letzte Aktion", @@ -288,8 +288,8 @@ $filters = array( 'dataset_name' => 'freigegeben', 'filter_kurzbz' => 'InfoCenterFreigegebenAlle', 'description' => '{Alle}', - 'sort' => 2, - 'default_filter' => false, + 'sort' => 1, + 'default_filter' => true, 'filter' => ' { "name": "Freigegeben - Alle", @@ -298,9 +298,12 @@ $filters = array( {"name": "Nachname"}, {"name": "StgAbgeschickt"}, {"name": "LastAction"}, + {"name": "LastActionType"}, {"name": "User/Operator"}, {"name": "LockUser"}, - {"name": "Statusgrund"} + {"name": "Statusgrund"}, + {"name": "Studiensemester"}, + {"name": "ReihungstestApplied"} ], "filters": [ { @@ -347,9 +350,12 @@ $filters = array( "columns": [ {"name": "fakultaet"}, {"name": "datum"}, + {"name": "uhrzeit"}, {"name": "oeffentlich"}, {"name": "studiengaenge"}, - {"name": "freie_plaetze"} + {"name": "freie_plaetze"}, + {"name": "anzahl_angemeldet"}, + {"name": "rt_studiengang"} ], "filters": [] } @@ -361,8 +367,8 @@ $filters = array( 'dataset_name' => 'reihungstestAbsolviert', 'filter_kurzbz' => 'InfoCenterReihungstestAbsolviert5days', 'description' => '{"Letzten 5 Tage"}', - 'sort' => 1, - 'default_filter' => true, + 'sort' => 2, + 'default_filter' => false, 'filter' => ' { "name": "Reihungstest absolviert - Letzten 5 Tage", @@ -395,8 +401,8 @@ $filters = array( 'dataset_name' => 'reihungstestAbsolviert', 'filter_kurzbz' => 'InfoCenterReihungstestAbsolviertAlle', 'description' => '{Alle}', - 'sort' => 2, - 'default_filter' => false, + 'sort' => 1, + 'default_filter' => true, 'filter' => ' { "name": "Reihungstest absolviert - Alle",