diff --git a/Layout/default/TimerecordingReport/Index.php b/Layout/default/TimerecordingReport/Index.php index c6af1b85b..497c0cff0 100644 --- a/Layout/default/TimerecordingReport/Index.php +++ b/Layout/default/TimerecordingReport/Index.php @@ -316,7 +316,7 @@ $years[time() - 31536000] = date('Y', time() - 31536000); - + diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php index b52c4943b..86cadc2e3 100644 --- a/application/Timerecording/TimerecordingController.php +++ b/application/Timerecording/TimerecordingController.php @@ -365,7 +365,6 @@ class TimerecordingController extends mfBaseController $data['holidays_now'] = $holidays_now; $employeeupdate->update($data); $employeeupdate->save(); - } } } @@ -386,10 +385,13 @@ class TimerecordingController extends mfBaseController $endtime = date("Y-m-d", $endtime); $endtime = strtotime($endtime . " 23:59:00"); - - $return = $this->getTimerecordingsApi(5, null, null, null, $plushours_timestamp, $endtime); - $diffTime = $return['is'] - $return['must']; - $plushours_now = $plushours_now + $diffTime; + if ($plushours_timestamp > 0) { + $return = $this->getTimerecordingsApi(5, null, null, null, $plushours_timestamp, $endtime); + $diffTime = $return['is'] - $return['must']; + $plushours_now = $plushours_now + $diffTime; + } else { + $diffTime = 0; + } if ($employee->plushours_now != $diffTime) { $employeeupdate = new TimerecordingEmployee($employee->id); $data = []; diff --git a/public/assets/css/datatables-std.css b/public/assets/css/datatables-std.css index 622aeed0b..06364cc9e 100644 --- a/public/assets/css/datatables-std.css +++ b/public/assets/css/datatables-std.css @@ -125,26 +125,32 @@ table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) { width: unset; display: table-cell; } -.deny-button -{ + +.deny-button { color: #f00; } + .edit-td { text-align: left; letter-spacing: 12px; font-size: 1.1em; } -.display-calendar -{ - color:#0d6efd; + +.display-calendar { + color: #0d6efd; font-size: 30px; - margin-right:10px; + margin-right: 10px; cursor: pointer; } -.active-calendar -{ - color:#25b343; + +.active-calendar { + color: #25b343; } + +.select2-minw { + min-width: 150px; +} + @media (max-width: 1200px) { .fa-circle-xmark, .fa-ban, .fa-trash, .fa-edit, .fa-square-check, .fa-arrows-up-down-left-right { font-size: 25px; @@ -212,17 +218,21 @@ table.dataTable.table-sm > thead > tr > th:not(.sorting_disabled) { font-size: 14px; margin: 12px 3px 7px 0px; } - .display-calendar - { - font-size:35px; - margin-top:5px; - margin-right:10px; - margin-bottom:20px; + + .display-calendar { + font-size: 35px; + margin-top: 5px; + margin-right: 10px; + margin-bottom: 20px; } - .label-calendar - { - margin-top:7px; + + .label-calendar { + margin-top: 7px; + } + + .select2-minw { + min-width: unset; } } @@ -270,10 +280,11 @@ table.dataTable.dtr-inline.collapsed > tbody > tr.parent > td:first-child:before transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out; transition: border-color .15s ease-in-out, box-shadow .15s ease-in-out, -webkit-box-shadow .15s ease-in-out; } -table.dataTable.table-hover>tbody>tr:hover>* { + +table.dataTable.table-hover > tbody > tr:hover > * { box-shadow: none; } -table.dataTable.table-striped>tbody>tr:nth-of-type(2n+1)>* { - box-shadow: none; +table.dataTable.table-striped > tbody > tr:nth-of-type(2n+1) > * { + box-shadow: none; } \ No newline at end of file diff --git a/public/js/pages/timerecordingReport/index.js b/public/js/pages/timerecordingReport/index.js index 01b13ebd4..e7714c9e5 100644 --- a/public/js/pages/timerecordingReport/index.js +++ b/public/js/pages/timerecordingReport/index.js @@ -35,7 +35,7 @@ $('#filterrow th').each(function (i) { options += ''; }); - $(this).html(''); + $(this).html(''); } else { $(this).html('');
MitarbeiterMitarbeiter Datum Von Bis