diff --git a/Layout/default/TimerecordingReport/Index.php b/Layout/default/TimerecordingReport/Index.php
index 2bbcfbf58..c6af1b85b 100644
--- a/Layout/default/TimerecordingReport/Index.php
+++ b/Layout/default/TimerecordingReport/Index.php
@@ -352,6 +352,7 @@ $years[time() - 31536000] = date('Y', time() - 31536000);
let insertUrl = "";
let deleteUrl = "";
let requestUrl = " 'getTimerecordings']) ?>";
+ let requestTimesUrl = " 'getTimerecordingsTimes']) ?>";
diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php
index 13e1f06f2..48bf920a7 100644
--- a/application/Timerecording/TimerecordingController.php
+++ b/application/Timerecording/TimerecordingController.php
@@ -262,7 +262,7 @@ class TimerecordingController extends mfBaseController
}
if ($id) {
$timerecordingCategoriess = TimerecordingCategoryModel::search(['id' => $data['timerecordingCategory_id']]);
- if ($timerecordingCategoriess[0]->approval == "1") {
+ if ($timerecordingCategoriess[0]->approval == "1" && !$r->user_id) {
$body = 'Beantrag von: ' . $this->me->name . '
';
$body .= 'Buchungsart: ' . $timerecordingCategoriess[0]->name . '
@@ -286,6 +286,9 @@ class TimerecordingController extends mfBaseController
$email->setTo(TT_TIMERECORDING_EMAIL);
$email->send();
}
+ if ($data['timerecordingCategory_id'] == "3") {
+ $this->updateHolidays($data['user_id']);
+ }
}
if ($mode == "edit") {
@@ -303,6 +306,69 @@ class TimerecordingController extends mfBaseController
$this->redirect("Timerecording");
}
+ protected function updateHolidays($userid)
+ {
+ $employee = TimerecordingEmployeeModel::search(['user_id' => $userid]);
+ if ($employee) {
+ $employee = $employee[0];
+ $holidays = $employee->holidays;
+ $holidays_now = $employee->holidays_now;
+ $holidays_timestamp = $employee->holidays_timestamp;
+ $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $userid]);
+ $realHolidays = TimerecordingHolidayModel::getAll();
+ foreach ($realHolidays as $realHoliday) {
+ $realholiDay[date('Y-m-d', $realHoliday->timestamp)] = $realHoliday->timestamp;
+ }
+ if (!$holidays_timestamp) {
+ $holidays_timestamp = $employee->startdate;
+ $holidays_now = $holidays;
+ }
+ $timerecordings = TimerecordingModel::search(['user_id' => $userid, 'start' => $holidays_timestamp, 'timerecordingCategory_id' => 3]);
+ foreach ($timerecordings as $timerecording) {
+ $daycounter = ($timerecording->end - $timerecording->start) / 86400;
+ $daycounter=intval(round($daycounter,0,PHP_ROUND_HALF_DOWN));
+ $daycounter = $daycounter * 86400;
+ if (is_int($daycounter)) {
+ for ($i = 86400; $i <= $daycounter; $i = $i + 86400) {
+ $holidayDays[date("Y-m-d", $timerecording->start + $i - 86400)] = 1;
+ }
+ }
+ }
+
+
+ foreach ($workinghours as $workinghour) {
+
+ $whstart = strtotime(date('Y-m-d', time()) . " " . $workinghour->start . ":00");
+ $whend = strtotime(date('Y-m-d', time()) . " " . $workinghour->end . ":00");
+ if (!$workingHours[$workinghour->day]) {
+ $workingHours[$workinghour->day] = $whend - $whstart;
+ } else {
+ $workingHours[$workinghour->day] = $workingHours[$workinghour->day] + $whend - $whstart;
+ }
+ }
+ //check if holiday is already in the list
+ foreach ($holidayDays as $key => $holidayDay) {
+ if ($realholiDay[$key]) {
+
+ } else if ($workingHours[date('w', strtotime($key))]) {
+ $holidays_now--;
+ }
+ }
+ if ($holidays_now != $employee->holidays_now) {
+ $employeeupdate = new TimerecordingEmployee($employee->id);
+ $data = [];
+ $data['holidays_now'] = $holidays_now;
+ $employeeupdate->update($data);
+ $employeeupdate->save();
+
+ }
+ }
+ }
+
+ protected function updatePlushours($userid)
+ {
+
+ }
protected function getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear)
{
@@ -314,8 +380,8 @@ class TimerecordingController extends mfBaseController
$rows = [];
$employee = TimerecordingEmployeeModel::search(['user_id' => $this->me->id]);
if ($employee) {
- $holiDays = $employee[0]->holidays;
- $plusHours = $employee[0]->plushours;
+ $holiDays = $employee[0]->holidays_now;
+ $plusHours = $employee[0]->plushours_now;
$auto_workinghours = $employee[0]->auto_workinghours;
}
@@ -621,12 +687,14 @@ class TimerecordingController extends mfBaseController
{
$id = $this->request->id;
$timerecordings = new Timerecording($id);
+ $userid = $timerecordings->user_id;
if (!$timerecordings->id || $timerecordings->id != $id) {
$this->layout()->setFlash("Buchung nicht gefunden.", "error");
$this->redirect("Timerecording");
}
-
$timerecordings->delete();
+ $this->updateHolidays($userid);
+
if ($this->request->ajax == 1) {
die();
}
diff --git a/application/Timerecording/TimerecordingModel.php b/application/Timerecording/TimerecordingModel.php
index 1d74c4516..7b83a7a1e 100644
--- a/application/Timerecording/TimerecordingModel.php
+++ b/application/Timerecording/TimerecordingModel.php
@@ -150,6 +150,15 @@ class TimerecordingModel
$where .= " AND ((`start` >= $start AND `start` <= $end) OR (`end` >= $start AND `end` <= $end) OR `end` is NULL) ORDER by user_id ASC";
}
}
+ if (array_key_exists("start", $filter) && array_key_exists("timerecordingCategory_id", $filter)) {
+ $start = $filter['start'];
+ $timerecordingCategory_id = $filter['timerecordingCategory_id'];
+ if (is_numeric($start) && is_numeric($timerecordingCategory_id)) {
+ $where .= " AND `start` >= $start AND `timerecordingCategory_id` = $timerecordingCategory_id ORDER by start ASC";
+ }
+ }
+
+
if (array_key_exists("starttime", $filter) && array_key_exists("endtime", $filter)) {
$starttime = $filter['starttime'];
$endtime = $filter['endtime'];
diff --git a/application/TimerecordingCalendar/TimerecordingCalendarController.php b/application/TimerecordingCalendar/TimerecordingCalendarController.php
index 97eb1fe46..699da04fe 100644
--- a/application/TimerecordingCalendar/TimerecordingCalendarController.php
+++ b/application/TimerecordingCalendar/TimerecordingCalendarController.php
@@ -20,6 +20,8 @@ class TimerecordingCalendarController extends mfBaseController
{
$timerecordingholidays = TimerecordingHolidayModel::getAll();
$this->layout()->set("timerecordingholidays", $timerecordingholidays);
+ $timerecordingemployees = TimerecordingEmployeeModel::getAll();
+ $this->layout()->set("timerecordingemployees", $timerecordingemployees);
$this->layout()->setTemplate("TimerecordingCalendar/Index");
}
diff --git a/application/TimerecordingEmployee/TimerecordingEmployeeController.php b/application/TimerecordingEmployee/TimerecordingEmployeeController.php
index 0986a1114..9d1110968 100644
--- a/application/TimerecordingEmployee/TimerecordingEmployeeController.php
+++ b/application/TimerecordingEmployee/TimerecordingEmployeeController.php
@@ -101,6 +101,12 @@ class TimerecordingEmployeeController extends mfBaseController
if (is_numeric($plushours)) {
$plushours = $plushours * 3600;
}
+ $overtime = $r->overtime;
+ $overtime = str_replace(',', '.', $overtime);
+ if (is_numeric($overtime)) {
+ $overtime = $overtime * 3600;
+ }
+
$data = [];
$data['user_id'] = trim($r->user_id);
@@ -109,8 +115,18 @@ class TimerecordingEmployeeController extends mfBaseController
$data['plushours'] = $plushours;
$data['startdate'] = strtotime($r->startdate);
$data['type'] = trim($r->type);
+ $data['overtime'] = $overtime;
+#
+ if (!$data['overtime']) {
+ $data['overtime'] = 0;
+ }
+ if ($r->birthday) {
+ $data['birthday'] = strtotime($r->birthday);
+ } else {
+ $data['birthday'] = null;
+ }
if (!$data['user_id']) {
$this->layout()->setFlash("Mitarbeiter darf nicht leer sein", "error");
$this->redirect("TimerecordingEmployee");
diff --git a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
index 2de108268..a4fce4ecd 100644
--- a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
+++ b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
@@ -7,10 +7,16 @@ class TimerecordingEmployeeModel
private $auto_workinghours;
private $holidays;
private $holidays_now;
+ private $holidays_timestamp;
private $plushours;
private $plushours_now;
+ private $plushours_timestamp;
private $overtime;
+ private $overtime_now;
+ private $overtime_timestamp;
+ private $bpahours;
private $startdate;
+ private $birthday;
public static function find($data)
diff --git a/application/TimerecordingReport/TimerecordingReportController.php b/application/TimerecordingReport/TimerecordingReportController.php
index c4e3423ae..68a0333fc 100644
--- a/application/TimerecordingReport/TimerecordingReportController.php
+++ b/application/TimerecordingReport/TimerecordingReportController.php
@@ -41,6 +41,9 @@ class TimerecordingReportController extends mfBaseController
case "getTimerecordings":
$return = $this->getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear);
break;
+ case "getTimerecordingsTimes":
+ $return = $this->getTimerecordingsTimes($datatype, $dataweek, $datamonth, $datayear);
+ break;
default:
$return = false;
}
@@ -307,6 +310,244 @@ class TimerecordingReportController extends mfBaseController
die();
}
+
+ protected function getTimerecordingsTimes($datatype, $dataweek, $datamonth, $datayear)
+ {
+ $r = $this->request;
+ $mustSeconds = 0;
+ $isSeconds = 0;
+ $holiDays = 0;
+ $plusHours = 0;
+
+ $rows = [];
+ $employee = TimerecordingEmployeeModel::search(['user_id' => $r->user_id]);
+ if ($employee) {
+ $holiDays = $employee[0]->holidays;
+ $plusHours = $employee[0]->plushours;
+ $auto_workinghours = $employee[0]->auto_workinghours;
+
+ }
+ $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $r->user_id]);
+ $holidays = TimerecordingHolidayModel::getAll();
+ foreach ($workinghours as $workinghour) {
+
+ $whstart = strtotime(date('Y-m-d', time()) . " " . $workinghour->start . ":00");
+ $whend = strtotime(date('Y-m-d', time()) . " " . $workinghour->end . ":00");
+ if (!$workingHours[$workinghour->day]) {
+ $workingHours[$workinghour->day] = $whend - $whstart;
+ } else {
+ $workingHours[$workinghour->day] = $workingHours[$workinghour->day] + $whend - $whstart;
+ }
+ }
+ foreach ($holidays as $holiday) {
+ $holiDay[date('Y-m-d', $holiday->timestamp)] = $holiday->timestamp;
+ }
+
+ if ($datatype == 1) {
+ $kw = date('W', $dataweek);
+ $year = date('Y', $dataweek);
+ $timestamp_montag = strtotime("{$year}-W{$kw}");
+ $timestamp_sonntag = strtotime("{$year}-W{$kw}-7");
+ $firstdate = strtotime(date("Y-m-d", $timestamp_montag) . " 00:00:00");
+ $lastdate = strtotime(date("Y-m-d", $timestamp_sonntag) . ' 23:59:59');
+ $searchArray = ['user_id' => $r->user_id, 'start' => $timestamp_montag, 'end' => $lastdate];
+
+ $daycounter = '0';
+
+ $timestamp = $timestamp_montag;
+ for ($i = 1; $i <= 7; $i++) {
+ $dDate = date('Y-m-d', $timestamp);
+ $dDay = date('w', $timestamp);
+ if (!$holiDay[$dDate]) {
+ $mustSeconds = $mustSeconds + $workingHours[$dDay];
+ }
+
+ $timestamp = $timestamp + 86400;
+ }
+ } else if ($datatype == 2) {
+ $firstdate = strtotime(date("Y-m-01", $datamonth));
+ $lastdate = strtotime(date("Y-m-t", $datamonth));
+ $daycount = date("t", $datamonth);
+ $lastdate = strtotime(date("Y-m-d", $lastdate) . ' 23:59:59');
+ $searchArray = ['user_id' => $r->user_id, 'start' => $firstdate, 'end' => $lastdate];
+ $timestamp = $firstdate;
+
+ for ($i = 1; $i <= $daycount; $i++) {
+ $dDate = date('Y-m-d', $timestamp);
+ $dDay = date('w', $timestamp);
+ if (!$holiDay[$dDate]) {
+ $mustSeconds = $mustSeconds + $workingHours[$dDay];
+ }
+
+ $timestamp = $timestamp + 86400;
+ }
+
+
+ } else if ($datatype == 3) {
+ $firstdate = strtotime(date("Y-01-01", $datayear));
+ $lastdate = strtotime(date("Y-12-31 23:59:59", $datayear));
+ $daycount = date("t", $datamonth);
+ $lastdate = strtotime(date("Y-m-d", $lastdate) . ' 23:59:59');
+ $searchArray = ['user_id' => $r->user_id, 'start' => $firstdate, 'end' => $lastdate];
+ $timestamp = $firstdate;
+
+ for ($i = 1; $i <= $daycount; $i++) {
+ $dDate = date('Y-m-d', $timestamp);
+ $dDay = date('w', $timestamp);
+ if (!$holiDay[$dDate]) {
+ $mustSeconds = $mustSeconds + $workingHours[$dDay];
+ }
+
+ $timestamp = $timestamp + 86400;
+ }
+
+
+ }
+
+
+ $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
+ $timerecordingcategories = TimerecordingCategoryModel::getAll();
+
+ $timerecordings = TimerecordingModel::search($searchArray);
+ $responsecount = count($timerecordings);
+ foreach ($timerecordings as $timerecording):
+ $state = "";
+ $enddate = "";
+ $sum = "-";
+ $day = "";
+ $orderdate = $timerecording->start;
+ if ($timerecording->timerecordingCategory->hourday == 1) {
+ $date = date("d.m.Y", $timerecording->start);
+ $datadate = date("Y-m-d", $timerecording->start);
+ $start = date("H:i", $timerecording->start);
+ $end = date("H:i", $timerecording->end);
+ $seconds = $timerecording->end - $timerecording->start;
+ $minutes = floor(($seconds % 3600) / 60);
+ $hours = floor($seconds / 3600);
+ $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
+ $day = $daysgerm[date("w", $timerecording->start)];
+ $isSeconds = $isSeconds + $seconds;
+ } else if ($timerecording->timerecordingCategory->hourday == 2 || ($timerecording->timerecordingCategory->hourday == 3 && $timerecording->end)) {
+ $date = date("d.m.", $timerecording->start) . " - " . $daysgerm[date("w", $timerecording->end)] . " " . date("d.m.Y", $timerecording->end);
+ $datadate = date("Y-m-d", $timerecording->start);
+ $enddate = date("Y-m-d", $timerecording->end);
+ $start = "-";
+ $end = "-";
+ $day = $daysgerm[date("w", $timerecording->start)];
+
+ if ($lastdate < $timerecording->end) {
+ $endtimecalc = $lastdate;
+ } else {
+ $endtimecalc = $timerecording->end;
+ }
+ if ($firstdate > $timerecording->start) {
+ $starttimecalc = $firstdate;
+ } else {
+ $starttimecalc = $timerecording->start;
+ }
+ $summcounter = 0;
+ $savecounter = 0;
+ for ($i = $starttimecalc; $i <= $endtimecalc; $i = $i + 86400) {
+ $holidaycounter = $workingHours[date("w", $i)];
+ $isSeconds = $isSeconds + $holidaycounter;
+ $summcounter = $summcounter + $holidaycounter;
+ if ($savecounter == 1000) {
+ echo $savecounter;
+ die();
+ }
+ $savecounter++;
+ }
+ $seconds = $summcounter;
+ $minutes = floor(($seconds % 3600) / 60);
+ $hours = floor($seconds / 3600);
+ $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
+
+ } else if ($timerecording->timerecordingCategory->hourday == 3 && !$timerecording->end) {
+ $date = date("d.m.Y", $timerecording->start) . " - " . $daysgerm[date("w", time())] . " " . date("d.m.Y", time());;
+ $datadate = date("Y-m-d", $timerecording->start);
+ $start = "-";
+ $end = "-";
+ $day = $daysgerm[date("w", $timerecording->start)];
+ if ($lastdate < $timerecording->end) {
+ $endtimecalc = $lastdate;
+ } else {
+ $endtimecalc = $timerecording->end;
+ }
+ if ($firstdate > $timerecording->start) {
+ $starttimecalc = $firstdate;
+ } else {
+ $starttimecalc = $timerecording->start;
+ }
+ $summcounter = 0;
+ $savecounter = 0;
+ for ($i = $starttimecalc; $i <= $endtimecalc; $i = $i + 86400) {
+ $holidaycounter = $workingHours[date("w", $i)];
+ $isSeconds = $isSeconds + $holidaycounter;
+ $summcounter = $summcounter + $holidaycounter;
+ if ($savecounter == 1000) {
+ echo $savecounter;
+ die();
+ }
+ $savecounter++;
+ }
+ $seconds = $summcounter;
+ $minutes = floor(($seconds % 3600) / 60);
+ $hours = floor($seconds / 3600);
+ $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
+
+ }
+
+ if ($timerecording->timerecordingCategory->approval == 1 && $timerecording->approved == 0) {
+ $state = '
';
+ } else if ($timerecording->timerecordingCategory->approval == 1 && $timerecording->approved == 1) {
+ $state = '
';
+ }
+ $edit = "";
+ if ($timerecording->businesstrip == 1) {
+ $category = "
" . $timerecording->timerecordingCategory->name . " (Dienstreise: " . $timerecording->businesstrip_info . ")";
+ } else {
+ $category = $timerecording->timerecordingCategory->name;
+ }
+ if ($timerecording->timerecordingCategory->hourday == 3 && !$timerecording->end) {
+ $category = $category . "
(offen)";
+ }
+
+
+ if ($timerecording->completed == 0 && $timerecording->timerecordingCategory->only_admin == 0):
+ if ($timerecording->approved == 0) :
+ $edit = '
';
+ else :
+ $edit .= '
';
+ endif;
+ $edit .= '
';
+ endif;
+ if ($datatype == 3 && $timerecording->timerecordingCategory->hourday == 1) {
+ } else {
+
+ }
+ 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;
+ $json['time']['plushours'] = sprintf('%02dh:%02dm', floor($plusHours / 3600), floor($plusHours / 60 % 60));
+ $json['recordsFiltered'] = $responsecount;
+ $json['recordsTotal'] = $responsecount;
+ $json = json_encode($json);
+ echo trim($json);
+ die();
+ }
+
protected function addAction()
{
diff --git a/db/migrations/20240222175444_timerecording_employee_add_field_overtime.php b/db/migrations/20240222175444_timerecording_employee_add_field_overtime.php
index dcbb61f15..eb1eb2351 100644
--- a/db/migrations/20240222175444_timerecording_employee_add_field_overtime.php
+++ b/db/migrations/20240222175444_timerecording_employee_add_field_overtime.php
@@ -10,6 +10,14 @@ final class TimerecordingEmployeeAddFieldOvertime extends AbstractMigration
if($this->getEnvironment() == "thetool") {
$table = $this->table("TimerecordingEmployee", ["signed" => true]);
$table->addColumn("overtime", "integer", ["null" => false, "default" => '0', "after" => "plushours_now"]);
+ $table->addColumn("overtime_now", "integer", ["null" => false, "default" => '0', "after" => "plushours_now"]);
+ $table->addColumn("overtime_timestamp", "integer", ["null" => true, "after" => "overtime_now"]);
+ $table->addColumn("holidays_timestamp", "integer", ["null" => true, "after" => "holidays_now"]);
+ $table->addColumn("plushours_timestamp", "integer", ["null" => true, "after" => "plushours_now"]);
+ $table->addColumn("birthday", "integer", ["null" => true, "after" => "startdate"]);
+
+
+ $table->addColumn("bpahours", "integer", ["null" => false, "default" => '0', "after" => "overtime"]);
$table->changeColumn('holidays_now', 'integer', ["null" => false, "default" => '0']);
$table->changeColumn('plushours_now', 'integer', ["null" => false, "default" => '0']);
$table->update();
diff --git a/public/js/pages/timerecordingReport/index.js b/public/js/pages/timerecordingReport/index.js
index c4c54969e..01b13ebd4 100644
--- a/public/js/pages/timerecordingReport/index.js
+++ b/public/js/pages/timerecordingReport/index.js
@@ -90,6 +90,7 @@ table = $('#datatable').DataTable({
$('#must-time').text(json.time.must);
$('#holidays').text(json.time.holidays);
$('#plushours').text(json.time.plushours);
+ $('#selectsearch').change();
return json.data;
}
@@ -182,6 +183,7 @@ if (state) {
$(document).ready(function () {
$(".select2").select2();
+
$("body").on("change", "#timerecordingCategory_id", function () {
if (parseInt($(this).find(':selected').data('hourday')) === 2) {
$("#endtime-div").hide();
@@ -295,6 +297,34 @@ $(document).ready(function () {
$("body").on("change", "#dataweek,#datamonth,#datayear", function () {
table.ajax.reload(null, false);
});
+
+ $("body").on("change", "#selectsearch", function () {
+ var datatype;
+ if (!$(this).val()) {
+ $('#must-time').text('N/A');
+ $('#is-time').text('N/A');
+ } else {
+ $('.display-calendar').each(function (index) {
+ if ($(this).hasClass('active-calendar')) {
+ datatype = $(this).data('datatype');
+ }
+ });
+ if (datatype == 1 || datatype == 2) {
+ $.post(requestTimesUrl, {
+ id: $.trim($(this).data('id')),
+ datatype: datatype,
+ user_id: $(this).find(':selected').data('userid'),
+ dataweek: $('#dataweek').val(),
+ datamonth: $('#datamonth').val(),
+ ajax: 1
+ }).done(function (data) {
+ var json = $.parseJSON(data);
+ $('#must-time').text(json.time.must);
+ $('#is-time').text(json.time.is);
+ });
+ }
+ }
+ });
$("body").on("click", ".display-calendar", function () {
$('.display-calendar').each(function (index) {
$(this).removeClass('active-calendar');
@@ -350,7 +380,7 @@ $(document).ready(function () {
e.preventDefault();
$('#alert-box').remove();
var userid;
- userid = $('#user_id_select').val();
+ userid = $('#user_id_select').val();
var businesstrip = false;
if ($('#businesstrip').prop('checked') == true) {
businesstrip = 1;
@@ -403,5 +433,6 @@ $(document).ready(function () {
});
});
$('#timerecordingCategory_id').change();
+
})
;
\ No newline at end of file