From 4fe562cbe2e73bdfc463d887923cb6b77caa47bb Mon Sep 17 00:00:00 2001 From: KarpAlex Date: Wed, 13 Apr 2022 20:08:08 +0200 Subject: [PATCH] =?UTF-8?q?Fehlerzust=C3=A4ndigkeiten=20and=20issues=20GUI?= =?UTF-8?q?=20improvements:=20-=20menu=20link=20opens=20in=20new=20tab=20-?= =?UTF-8?q?=20controller=20id=20set=20for=20easier=20refresh=20-=20added?= =?UTF-8?q?=20person=20and=20oe=20Zust=C3=A4ndigkeiten=20to=20issues=20lis?= =?UTF-8?q?t=20-?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/config/navigation.php | 1 + .../controllers/system/issues/Issues.php | 3 +- .../system/issues/IssuesZustaendigkeiten.php | 1 + .../views/system/issues/issuesData.php | 91 +++++++++++++------ public/js/issues/issuesZustaendigkeiten.js | 2 +- system/filtersupdate.php | 8 +- system/phrasesupdate.php | 40 ++++++++ 7 files changed, 112 insertions(+), 34 deletions(-) diff --git a/application/config/navigation.php b/application/config/navigation.php index 5d0be2925..111e55c97 100644 --- a/application/config/navigation.php +++ b/application/config/navigation.php @@ -242,6 +242,7 @@ $config['navigation_menu']['system/issues/Issues/*'] = array( 'description' => 'Fehler Zuständigkeiten', 'icon' => 'cogs', 'sort' => 100, + 'target' => '_blank', 'requiredPermissions' => array('admin:rw') ) ); diff --git a/application/controllers/system/issues/Issues.php b/application/controllers/system/issues/Issues.php index fc1fb56f1..da92c251c 100644 --- a/application/controllers/system/issues/Issues.php +++ b/application/controllers/system/issues/Issues.php @@ -39,6 +39,7 @@ class Issues extends Auth_Controller ); $this->_setAuthUID(); // sets property uid + $this->setControllerId(); // sets the controller id } public function index() @@ -127,7 +128,7 @@ class Issues extends Auth_Controller { $all_funktionen_oe_kurzbz[$benutzerfunktion->oe_kurzbz][] = $benutzerfunktion->funktion_kurzbz; - // separate oes for the funktion needed for displaying issues + // separate oes for the additional funktion which enables displaying issues if ($benutzerfunktion->funktion_kurzbz == self::FUNKTION_KURZBZ) { $oe_kurzbz_for_funktion[] = $benutzerfunktion->oe_kurzbz; diff --git a/application/controllers/system/issues/IssuesZustaendigkeiten.php b/application/controllers/system/issues/IssuesZustaendigkeiten.php index 635fda2bc..fe546f735 100644 --- a/application/controllers/system/issues/IssuesZustaendigkeiten.php +++ b/application/controllers/system/issues/IssuesZustaendigkeiten.php @@ -39,6 +39,7 @@ class IssuesZustaendigkeiten extends Auth_Controller ); $this->_setAuthUID(); // sets property uid + $this->setControllerId(); // sets the controller id } public function index() diff --git a/application/views/system/issues/issuesData.php b/application/views/system/issues/issuesData.php index c9a1d3828..f45bab091 100644 --- a/application/views/system/issues/issuesData.php +++ b/application/views/system/issues/issuesData.php @@ -1,7 +1,9 @@ p->t('fehlermonitoring', 'statuscode')), ucfirst($this->p->t('person', 'vorname')), ucfirst($this->p->t('person', 'nachname')), - ucfirst($this->p->t('fehlermonitoring', 'hauptzustaendig')) + ucfirst($this->p->t('fehlermonitoring', 'hauptzustaendig')), + ucfirst($this->p->t('fehlermonitoring', 'zustaendigePersonen')), + ucfirst($this->p->t('fehlermonitoring', 'zustaendigeOrganisationseinheiten')) ), 'formatRow' => function($datasetRaw) { @@ -171,6 +190,18 @@ $filterWidgetArray = array( $datasetRaw->{'Verarbeitet von'} = '-'; } + if ($datasetRaw->{'Person Zuständigkeiten'} == null) + { + $datasetRaw->{'Person Zuständigkeiten'} = '-'; + } + + if ($datasetRaw->{'Organisationseinheit Zuständigkeiten'} == null) + { + $datasetRaw->{'Organisationseinheit Zuständigkeiten'} = '-'; + } + + + return $datasetRaw; }, 'markRow' => function($datasetRaw) { diff --git a/public/js/issues/issuesZustaendigkeiten.js b/public/js/issues/issuesZustaendigkeiten.js index 83b5005bc..17d1ab101 100644 --- a/public/js/issues/issuesZustaendigkeiten.js +++ b/public/js/issues/issuesZustaendigkeiten.js @@ -71,7 +71,7 @@ var IssuesZustaendigkeiten = { fehlerCodes.push( { fehlercode: code.fehlercode, - fullFehlerBezeichnung: code.fehlercode + ' - ' + code.fehler_kurzbz + fullFehlerBezeichnung: code.fehlercode + (!code.fehler_kurzbz ? '' : ' - ' + code.fehler_kurzbz) } ); } diff --git a/system/filtersupdate.php b/system/filtersupdate.php index fd1174a76..644433213 100644 --- a/system/filtersupdate.php +++ b/system/filtersupdate.php @@ -926,7 +926,9 @@ $filters = array( {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, - {"name": "Fehlerstatus"} + {"name": "Fehlerstatus"}, + {"name": "Person Zuständigkeiten"}, + {"name": "Organisationseinheit Zuständigkeiten"} ], "filters": [ { @@ -960,7 +962,9 @@ $filters = array( {"name": "Vorname"}, {"name": "Nachname"}, {"name": "PersonId"}, - {"name": "Fehlerstatus"} + {"name": "Fehlerstatus"}, + {"name": "Person Zuständigkeiten"}, + {"name": "Organisationseinheit Zuständigkeiten"} ], "filters": [ { diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index 0203fa13a..40b6ece3e 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -14175,6 +14175,46 @@ array( ) ) ), + array( + 'app' => 'core', + 'category' => 'fehlermonitoring', + 'phrase' => 'zustaendigePersonen', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => "zuständige Personen", + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => "responsible persons", + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), + array( + 'app' => 'core', + 'category' => 'fehlermonitoring', + 'phrase' => 'zustaendigeOrganisationseinheiten', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => "zuständige Organisationseinheiten", + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => "responsible organisation units", + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), array( 'app' => 'core', 'category' => 'ui',