diff --git a/application/controllers/api/frontend/v1/Zeitsperren.php b/application/controllers/api/frontend/v1/Zeitsperren.php index 1743521ee..aa25e911d 100644 --- a/application/controllers/api/frontend/v1/Zeitsperren.php +++ b/application/controllers/api/frontend/v1/Zeitsperren.php @@ -8,13 +8,13 @@ class Zeitsperren extends FHCAPI_Controller { parent::__construct([ 'getZeitsperrenUser' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], - 'getTypenZeitsperren' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], - 'getTypenErreichbarkeit' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], - 'getStunden' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], + 'getTypenZeitsperren' => self::PERM_LOGGED, + 'getTypenErreichbarkeit' => self::PERM_LOGGED, + 'getStunden' => self::PERM_LOGGED, 'loadZeitsperre' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], - 'add' => self::PERM_LOGGED, - 'update' => self::PERM_LOGGED, - 'delete' => self::PERM_LOGGED, + 'add' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], + 'update' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], + 'delete' => ['basis/mitarbeiter:r', 'admin:r', 'assistenz:r'], ]); // Load Libraries diff --git a/application/views/CisRouterView/CisRouterView.php b/application/views/CisRouterView/CisRouterView.php index e4812c2ca..7448fadf6 100644 --- a/application/views/CisRouterView/CisRouterView.php +++ b/application/views/CisRouterView/CisRouterView.php @@ -24,7 +24,7 @@ $includesArray = array( 'public/css/components/abgabetool/abgabe.css', 'public/css/Cis4/Cms.css', 'public/css/Cis4/Studium.css', - 'public/css/components/Zeitsperren.css', //70747 + 'public/css/components/Zeitsperrenma.css', //70747 'public/css/Cis4/Zeitsperren.css', //77941 ), 'customJSs' => array( diff --git a/application/views/Vertragsverwaltung.php b/application/views/Vertragsverwaltung.php index 4a73be945..390798cd8 100644 --- a/application/views/Vertragsverwaltung.php +++ b/application/views/Vertragsverwaltung.php @@ -19,7 +19,6 @@ $includesArray = array( 'public/css/components/primevue.css', 'public/css/Vertragsverwaltung.css', 'public/css/components/Detailheader.css', - 'public/css/components/Zeitsperren.css' ], 'customJSs' => [ #'vendor/npm-asset/primevue/tree/tree.min.js', diff --git a/public/css/components/Zeitsperren.css b/public/css/components/Zeitsperren.css deleted file mode 100644 index 3e5e4a632..000000000 --- a/public/css/components/Zeitsperren.css +++ /dev/null @@ -1,3 +0,0 @@ -.item-inactive { - text-decoration: line-through; -} \ No newline at end of file diff --git a/public/css/components/Zeitsperrenma.css b/public/css/components/Zeitsperrenma.css new file mode 100644 index 000000000..4cbf7331d --- /dev/null +++ b/public/css/components/Zeitsperrenma.css @@ -0,0 +1,15 @@ +.item-inactive { + text-decoration: line-through; +} + +.table-scroll { + height: calc(100vh - 300px); + overflow: auto; +} + +.zeitsperrenma-content thead th { + position: sticky; + top: 0; + background: white; + z-index: 2; +} \ No newline at end of file diff --git a/public/js/components/Cis/ZeitsperrenMitarbeiter/Details/listsZeitsperren.js b/public/js/components/Cis/ZeitsperrenMitarbeiter/Details/listsZeitsperren.js index b5b0bd25f..899d188d5 100644 --- a/public/js/components/Cis/ZeitsperrenMitarbeiter/Details/listsZeitsperren.js +++ b/public/js/components/Cis/ZeitsperrenMitarbeiter/Details/listsZeitsperren.js @@ -454,8 +454,10 @@ export default { } }, template: ` -
-
+
+ + +

{{$p.t('zeitsperren/title_allMa')}} {{$p.t('zeitsperren/title_fix')}} {{$p.t('zeitsperren/title_fixLecturers')}} @@ -534,43 +536,46 @@ export default {

- - - - - - - - - - - + + + +
UID -
{{ day.weekday }}
-
{{ day.day }}
-
{{m.sperren[0].nachname}} {{m.sperren[0].vorname}} +
+ + + + + + + + + - - - - -
UID +
{{ day.weekday }}
+
{{ day.day }}
+
+
{{m.sperren[0].nachname}} {{m.sperren[0].vorname}} + +
+
+

{{$p.t('ui/keineEintraegeGefunden')}}

+
-
-

{{$p.t('ui/keineEintraegeGefunden')}}

`, diff --git a/public/js/components/Cis/ZeitsperrenMitarbeiter/ZeitsperrenMa.js b/public/js/components/Cis/ZeitsperrenMitarbeiter/ZeitsperrenMa.js index ab988e64c..5d1b263b0 100644 --- a/public/js/components/Cis/ZeitsperrenMitarbeiter/ZeitsperrenMa.js +++ b/public/js/components/Cis/ZeitsperrenMitarbeiter/ZeitsperrenMa.js @@ -64,32 +64,30 @@ export default { }, }, template: ` -
- -
-
+
+
+ -
+ {{ $p.t(button.title) }} +
+
- - - +
+ +
- `, } \ No newline at end of file