Zeiterfassungs Update
* Autofill Bugfix
This commit is contained in:
@@ -50,7 +50,6 @@ class TimerecordingController extends mfBaseController
|
||||
default:
|
||||
$return = false;
|
||||
}
|
||||
echo $do;
|
||||
if (!is_array($return) || !count($return)) {
|
||||
$data = ["status" => "error"];
|
||||
$this->returnJson($data);
|
||||
@@ -236,10 +235,10 @@ class TimerecordingController extends mfBaseController
|
||||
}
|
||||
if ($ajax == 1) {
|
||||
if ($r->ajax == 1) {
|
||||
if ($isTime<0) {
|
||||
if ($isTime < 0) {
|
||||
$isTime = 0;
|
||||
}
|
||||
if ($cleanTime<0) {
|
||||
if ($cleanTime < 0) {
|
||||
$cleanTime = 0;
|
||||
}
|
||||
$result['state'] = "success";
|
||||
@@ -917,7 +916,6 @@ class TimerecordingController extends mfBaseController
|
||||
|
||||
protected function fillWorkinghours($dataweek)
|
||||
{
|
||||
|
||||
$employee = TimerecordingEmployeeModel::search(['user_id' => $this->me->id]);
|
||||
if ($employee) {
|
||||
$auto_workinghours = $employee[0]->auto_workinghours;
|
||||
@@ -989,6 +987,8 @@ class TimerecordingController extends mfBaseController
|
||||
$this->updatePlushours($this->me->id);
|
||||
$this->updateHolidays($this->me->id);
|
||||
}
|
||||
$result['message'] = "Ok";
|
||||
return $result;
|
||||
}
|
||||
|
||||
protected function deleteAction()
|
||||
|
||||
Reference in New Issue
Block a user