From cdbf9de6fe610dd1de5f2350bd4344fd9e149b1a Mon Sep 17 00:00:00 2001 From: Spitzer Daniel Date: Mon, 19 Feb 2024 14:52:58 +0100 Subject: [PATCH] =?UTF-8?q?Zeiterfassung=20update=20*=20Mails=20f=C3=BCr?= =?UTF-8?q?=20Antragspflichtige=20Buchungen=20*=20Mails=20f=C3=BCr=20Geneh?= =?UTF-8?q?migungen=20und=20Ablehnungen=20*=20Korrekturen=20Update=20*=20K?= =?UTF-8?q?alender=20locales=20hinzugef=C3=BCgt=20*=20Button=20f=C3=BCr=20?= =?UTF-8?q?autoausf=C3=BCllen=20eingebaut?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Config update define("TT_TIMERECORDING_EMAIL","zeiterfassung@xinon.at"); define("TT_TIMERECORDING_EMAIL_NAME","Xinon Zeiterfassung"); --- Layout/default/Timerecording/Index.php | 4 +++- Layout/default/TimerecordingReport/Index.php | 4 ++-- application/Timerecording/TimerecordingController.php | 2 ++ public/js/pages/timerecording/index.js | 3 +++ 4 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Layout/default/Timerecording/Index.php b/Layout/default/Timerecording/Index.php index 67936bac2..eefaa1564 100644 --- a/Layout/default/Timerecording/Index.php +++ b/Layout/default/Timerecording/Index.php @@ -198,11 +198,13 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
-
+
+ +
diff --git a/Layout/default/TimerecordingReport/Index.php b/Layout/default/TimerecordingReport/Index.php index b30b931c3..aea59aef9 100644 --- a/Layout/default/TimerecordingReport/Index.php +++ b/Layout/default/TimerecordingReport/Index.php @@ -102,10 +102,10 @@ $years[time() - 31536000] = date('Y', time() - 31536000); -

Buchungen

+

Auswertungen/Korrekturen

diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php index 0e1a755f3..d2480725e 100644 --- a/application/Timerecording/TimerecordingController.php +++ b/application/Timerecording/TimerecordingController.php @@ -265,6 +265,7 @@ class TimerecordingController extends mfBaseController if ($employee) { $holiDays = $employee[0]->holidays; $plusHours = $employee[0]->plushours; + $auto_workinghours = $employee[0]->auto_workinghours; } $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $this->me->id]); @@ -441,6 +442,7 @@ class TimerecordingController extends mfBaseController } endforeach; $json['success'] = true; + $json['time']['auto_workinghours'] = $auto_workinghours; $json['time']['is'] = sprintf('%02dh:%02dm', floor($isSeconds / 3600), floor($isSeconds / 60 % 60)); $json['time']['must'] = sprintf('%02dh:%02dm', floor($mustSeconds / 3600), floor($mustSeconds / 60 % 60)); $json['time']['holidays'] = $holiDays; diff --git a/public/js/pages/timerecording/index.js b/public/js/pages/timerecording/index.js index 5a0d1a61f..87413db26 100644 --- a/public/js/pages/timerecording/index.js +++ b/public/js/pages/timerecording/index.js @@ -86,6 +86,9 @@ table = $('#datatable').DataTable({ $('#must-time').text(json.time.must); $('#holidays').text(json.time.holidays); $('#plushours').text(json.time.plushours); + if (json.time.auto_workinghours == "1") { + $('#auto-workinghours-button').show(); + } return json.data; }