diff --git a/application/components/filters/Vertragsverwaltung.php b/application/components/filters/Vertragsverwaltung.php new file mode 100644 index 000000000..81e6775b3 --- /dev/null +++ b/application/components/filters/Vertragsverwaltung.php @@ -0,0 +1,29 @@ + 'core', + 'datasetName' => 'vertragsverwaltung', + 'query' => ' + SELECT + b.uid , p.person_id, + p.vorname, p.nachname, + gebdatum, + COALESCE(b.alias, b.uid) AS email, + STRING_AGG(DISTINCT va.bezeichnung, \', \') AS Vertragsarten, + STRING_AGG(DISTINCT u.bezeichnung, \', \') AS Unternehmen, + STRING_AGG(d.dienstverhaeltnis_id::TEXT, \', \') AS ids, + CASE + WHEN b.aktiv = true THEN \'aktiv\' + ELSE \'naktiv\' + END AS "aktiv" + FROM + hr.tbl_dienstverhaeltnis d + JOIN public.tbl_benutzer b ON d.mitarbeiter_uid = b.uid + JOIN public.tbl_person p ON p.person_id = b.person_id + JOIN public.tbl_organisationseinheit u ON d.oe_kurzbz = u.oe_kurzbz + JOIN hr.tbl_vertragsart va ON d.vertragsart_kurzbz = va.vertragsart_kurzbz + WHERE b.aktiv = true + GROUP BY b.uid, p.person_id, p.vorname, p.nachname, b.alias, b.aktiv + ORDER BY nachname, vorname + ', + 'requiredPermissions' => 'vertrag/mitarbeiter' + ); \ No newline at end of file diff --git a/application/config/navigation.php b/application/config/navigation.php index 8f327fde8..752a70464 100644 --- a/application/config/navigation.php +++ b/application/config/navigation.php @@ -332,4 +332,5 @@ $config['navigation_menu']['system/issues/Issues/*'] = array( 'target' => '_blank', 'requiredPermissions' => array('admin:rw') ), + ); diff --git a/application/controllers/Vertragsverwaltung.php b/application/controllers/Vertragsverwaltung.php index bcd00abb1..f68ed1737 100644 --- a/application/controllers/Vertragsverwaltung.php +++ b/application/controllers/Vertragsverwaltung.php @@ -9,6 +9,7 @@ class Vertragsverwaltung extends Auth_Controller $permissions = []; $router = load_class('Router'); $permissions[$router->method] = ['vertrag/mitarbeiter:r']; + #$permissions[$router->method] = ['admin:rw']; parent::__construct($permissions); // Load Libraries diff --git a/public/js/api/factory/vertraege/vertraege.js b/public/js/api/factory/vertraege/vertraege.js index a925f71e9..afd5cb166 100644 --- a/public/js/api/factory/vertraege/vertraege.js +++ b/public/js/api/factory/vertraege/vertraege.js @@ -126,6 +126,7 @@ export default { params }; }, + //loaded by mitarbeiter_header_js getMitarbeiter(){ return { method: 'get', diff --git a/public/js/components/DetailHeader/DetailHeader.js b/public/js/components/DetailHeader/DetailHeader.js index 0e035b8a3..f86be4ae7 100644 --- a/public/js/components/DetailHeader/DetailHeader.js +++ b/public/js/components/DetailHeader/DetailHeader.js @@ -181,13 +181,13 @@ export default {