From 085d8facdcaeebb52f5400ad5abff073e357d883 Mon Sep 17 00:00:00 2001 From: Daniel Spitzer Date: Sun, 29 Dec 2024 20:24:36 +0100 Subject: [PATCH] Zeiterfassung Neue Features: * BP Stunden Aufbuchen/Mindern * Spezialbuchungen ohne Verechnungstechnische relevanz --- .../default/TimerecordingCategories/Form.php | 10 +++-- .../default/TimerecordingCategories/Index.php | 8 +++- Layout/default/TimerecordingEmployee/Form.php | 16 +++++++- .../default/TimerecordingEmployee/Index.php | 14 ++++--- Layout/default/TimerecordingReport/Index.php | 27 ++++++++----- .../Timerecording/TimerecordingController.php | 38 +++++++++++++++++-- .../Timerecording/TimerecordingModel.php | 1 + .../TimerecordingCategoryModel.php | 2 +- .../TimerecordingEmployeeController.php | 7 ++++ .../TimerecordingEmployeeModel.php | 1 + .../TimerecordingReportController.php | 32 ++++++++++++++-- public/js/pages/timerecordingReport/index.js | 22 +++++++++++ 12 files changed, 151 insertions(+), 27 deletions(-) diff --git a/Layout/default/TimerecordingCategories/Form.php b/Layout/default/TimerecordingCategories/Form.php index 96072b0fe..f2419733f 100644 --- a/Layout/default/TimerecordingCategories/Form.php +++ b/Layout/default/TimerecordingCategories/Form.php @@ -55,9 +55,13 @@
diff --git a/Layout/default/TimerecordingCategories/Index.php b/Layout/default/TimerecordingCategories/Index.php index 3f70046ce..81014cbd4 100644 --- a/Layout/default/TimerecordingCategories/Index.php +++ b/Layout/default/TimerecordingCategories/Index.php @@ -59,7 +59,9 @@ - + superexpertEnabled() && $timerecordingcategories->hourday==8) || $timerecordingcategories->hourday!=8): + ?> name ?> short ?> @@ -76,7 +78,9 @@ title="Löschen"> - + diff --git a/Layout/default/TimerecordingEmployee/Form.php b/Layout/default/TimerecordingEmployee/Form.php index ec5b92589..58e7b1d76 100644 --- a/Layout/default/TimerecordingEmployee/Form.php +++ b/Layout/default/TimerecordingEmployee/Form.php @@ -72,6 +72,7 @@ $daysSelect .= ""; +
@@ -146,7 +147,7 @@ $daysSelect .= "";
+ superexpertEnabled()): ?> +
+ +
+
+ only_admin) echo 'checked="checked"'; ?> + type="checkbox" name="only_admin" value="1"/> +
+
+
+