2024-03-12 15:46:37 +01:00
parent 106ecea2b5 d8fcad2b0c
commit 396fabc957
4 changed files with 7 additions and 7 deletions
@@ -1,4 +1,4 @@
<?/** @var TYPE_NAME $git_merge_ts */?>
<?php/** @var TYPE_NAME $git_merge_ts */?>
<!DOCTYPE html>
<!DOCTYPE html>
<html lang="en">
<html lang="en">
<head>
<head>
 
@@ -50,7 +50,6 @@ class TimerecordingController extends mfBaseController
            default:
            default:
                $return = false;
                $return = false;
        }
        }
        echo $do;
        if (!is_array($return) || !count($return)) {
        if (!is_array($return) || !count($return)) {
            $data = ["status" => "error"];
            $data = ["status" => "error"];
            $this->returnJson($data);
            $this->returnJson($data);
@@ -236,10 +235,10 @@ class TimerecordingController extends mfBaseController
        }
        }
        if ($ajax == 1) {
        if ($ajax == 1) {
            if ($r->ajax == 1) {
            if ($r->ajax == 1) {
                if ($isTime<0) {
                if ($isTime < 0) {
                    $isTime = 0;
                    $isTime = 0;
                }
                }
                if ($cleanTime<0) {
                if ($cleanTime < 0) {
                    $cleanTime = 0;
                    $cleanTime = 0;
                }
                }
                $result['state'] = "success";
                $result['state'] = "success";
@@ -917,7 +916,6 @@ class TimerecordingController extends mfBaseController
    protected function fillWorkinghours($dataweek)
    protected function fillWorkinghours($dataweek)
    {
    {
        $employee = TimerecordingEmployeeModel::search(['user_id' => $this->me->id]);
        $employee = TimerecordingEmployeeModel::search(['user_id' => $this->me->id]);
        if ($employee) {
        if ($employee) {
            $auto_workinghours = $employee[0]->auto_workinghours;
            $auto_workinghours = $employee[0]->auto_workinghours;
@@ -989,6 +987,8 @@ class TimerecordingController extends mfBaseController
            $this->updatePlushours($this->me->id);
            $this->updatePlushours($this->me->id);
            $this->updateHolidays($this->me->id);
            $this->updateHolidays($this->me->id);
        }
        }
        $result['message'] = "Ok";
        return $result;
    }
    }
    protected function deleteAction()
    protected function deleteAction()
 
@@ -6,7 +6,7 @@ document.addEventListener('DOMContentLoaded', () => {
    // @formatter:on
    // @formatter:on
    const notyf = new Notyf({
    const notyf = new Notyf({
        duration: 10000, position: {
        duration: 10000 * 1000, position: {
            x: 'right', y: 'bottom',
            x: 'right', y: 'bottom',
        }, ripple: true, dismissible: true, fontSize: '32px',
        }, ripple: true, dismissible: true, fontSize: '32px',
    });
    });