Zeiterfassung update

application/Timerecording/TimerecordingController.php

@@ -29,12 +29,13 @@ class TimerecordingController extends mfBaseController
         $datatype = $this->request->datatype;
         $dataweek = $this->request->dataweek;
         $datamonth = $this->request->datamonth;
+        $datayear = $this->request->datayear;
 
         $data = [];
 
         switch ($do) {
             case "getTimerecordings":
-                $return = $this->getTimerecordingsApi($datatype, $dataweek, $datamonth);
+                $return = $this->getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear);
                 break;
             default:
                 $return = false;
@@ -79,7 +80,14 @@ class TimerecordingController extends mfBaseController
 
     protected function checkTimerecording($starttime, $endtime, $id = NULL)
     {
-        $searchArray = ['user_id' => $this->me->id, 'starttime' => $starttime, 'endtime' => $endtime];
+        $r = $this->request;
+        if ($r->user_id) {
+            $userid = $r->user_id;
+        } else {
+            $userid = $this->me->id;
+        }
+
+        $searchArray = ['user_id' => $userid, 'starttime' => $starttime, 'endtime' => $endtime];
         if ($id) {
             $searchArray['id'] = $id;
         }
@@ -87,6 +95,7 @@ class TimerecordingController extends mfBaseController
         if ($timerecordings) {
             $result['state'] = "error";
             $result['error'] = "Zeitüberschneidung mit anderer Buchung";
+
         } else {
             $result['state'] = "success";
         }
@@ -132,11 +141,15 @@ class TimerecordingController extends mfBaseController
         }
 
         $data = [];
-        $data['user_id'] = $this->me->id;
+        if ($r->user_id) {
+            $data['user_id'] = $r->user_id;
+        } else {
+            $data['user_id'] = $this->me->id;
+        }
         $data['start'] = $starttime;
         $data['end'] = $endtime;
         $data['timerecordingCategory_id'] = trim($r->timerecordingCategory_id);
-        $data['commend'] = trim($r->commend);
+        $data['comment'] = trim($r->comment);
 
         if (!$data['user_id']) {
             $this->layout()->setFlash("Benutzer darf nicht leer sein", "error");
@@ -153,8 +166,8 @@ class TimerecordingController extends mfBaseController
         if (!$data['timerecordingCategory_id']) {
             $data['timerecordingCategory_id'] = NULL;
         }
-        if (!$data['commend']) {
-            $data['commend'] = NULL;
+        if (!$data['comment']) {
+            $data['comment'] = NULL;
         }
 
         if ($mode == "edit") {
@@ -193,7 +206,7 @@ class TimerecordingController extends mfBaseController
                     $body .= 'von:  ' . date("d.m.Y", $data['start']) . ' bis: ' . date("d.m.Y", $data['end']);
                 }
                 $email = new Emailnotification();
-                $email->setSubject('Antrag für ' . $timerecordingCategoriess[0]->name . '  erstellt');
+                $email->setSubject('Antrag für ' . $timerecordingCategoriess[0]->name . ' erstellt');
                 $email->setBody($body);
                 $email->setFrom('zeiterfassung@xinon.at', 'Xinon Zeiterfassung');
                 $email->setTo('daniel.spitzer@inode.at');
@@ -217,13 +230,22 @@ class TimerecordingController extends mfBaseController
     }
 
 
-    protected function getTimerecordingsApi($datatype, $dataweek, $datamonth)
+    protected function getTimerecordingsApi($datatype, $dataweek, $datamonth, $datayear)
     {
         $mustSeconds = 0;
-        $isSeconds=0;
+        $isSeconds = 0;
+        $holiDays = 0;
+        $plusHours = 0;
+
         $rows = [];
+        $employee = TimerecordingEmployeeModel::search(['user_id' => $this->me->id]);
+        if ($employee) {
+            $holiDays = $employee[0]->holidays;
+            $plusHours = $employee[0]->plushours;
+
+        }
         $workinghours = TimerecordingEmployeeWorkingHourModel::search(['user_id' => $this->me->id]);
-        $holidays= TimerecordingHolidayModel::getAll();
+        $holidays = TimerecordingHolidayModel::getAll();
         foreach ($workinghours as $workinghour) {
 
             $whstart = strtotime(date('Y-m-d', time()) . " " . $workinghour->start . ":00");
@@ -243,8 +265,8 @@ class TimerecordingController extends mfBaseController
             $year = date('Y', $dataweek);
             $timestamp_montag = strtotime("{$year}-W{$kw}");
             $timestamp_sonntag = strtotime("{$year}-W{$kw}-7");
-            $timestamp_sonntag = strtotime(date("Y-m-d", $timestamp_sonntag) . ' 23:59:59');
-            $searchArray = ['user_id' => $this->me->id, 'start' => $timestamp_montag, 'end' => $timestamp_sonntag];
+            $lastdate = strtotime(date("Y-m-d", $timestamp_sonntag) . ' 23:59:59');
+            $searchArray = ['user_id' => $this->me->id, 'start' => $timestamp_montag, 'end' => $lastdate];
 
             $daycounter = '0';
 
@@ -261,7 +283,26 @@ class TimerecordingController extends mfBaseController
         } else if ($datatype == 2) {
             $firstdate = strtotime(date("Y-m-01", $datamonth));
             $lastdate = strtotime(date("Y-m-t", $datamonth));
-            $daycount=date("t", $datamonth);
+            $daycount = date("t", $datamonth);
+            $lastdate = strtotime(date("Y-m-d", $lastdate) . ' 23:59:59');
+            $searchArray = ['user_id' => $this->me->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' => $this->me->id, 'start' => $firstdate, 'end' => $lastdate];
             $timestamp = $firstdate;
@@ -281,7 +322,8 @@ class TimerecordingController extends mfBaseController
 
 
         $daysgerm = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa");
-        $timerecordingCategoriess = TimerecordingCategoryModel::getAll();
+        $timerecordingcategories = TimerecordingCategoryModel::getAll();
+
         $timerecordings = TimerecordingModel::search($searchArray);
         $responsecount = count($timerecordings);
         foreach ($timerecordings as $timerecording):
@@ -300,7 +342,7 @@ class TimerecordingController extends mfBaseController
                 $hours = floor($seconds / 3600);
                 $sum = sprintf("%02d", $hours) . ":" . sprintf("%02d", $minutes);
                 $day = $daysgerm[date("w", $timerecording->start)];
-                $isSeconds=$isSeconds+$seconds;
+                $isSeconds = $isSeconds + $seconds;
             } else if ($timerecording->timerecordingCategory->hourday == 2) {
                 $date = date("d.m.", $timerecording->start) . " - " . $daysgerm[date("w", $timerecording->end)] . " " . date("d.m.Y", $timerecording->end);
                 $datadate = date("Y-m-d", $timerecording->start);
@@ -308,7 +350,23 @@ class TimerecordingController extends mfBaseController
                 $start = "-";
                 $end = "-";
                 $day = $daysgerm[date("w", $timerecording->start)];
-//                echo $enddate-$datadate."<br>";
+
+                if ($lastdate < $timerecording->end) {
+                    $endtimecalc = $lastdate;
+                } else {
+                    $endtimecalc = $timerecording->end;
+                }
+                $summcounter = 0;
+                for ($i = $timerecording->start; $i <= $endtimecalc; $i = $i + 86400) {
+                    $holidaycounter = $workingHours[date("w", $i)];
+                    $isSeconds = $isSeconds + $holidaycounter;
+                    $summcounter = $summcounter + $holidaycounter;
+                }
+                $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->timerecordingCategory->hourday == 4) {
                 $date = date("d.m.Y", $timerecording->start);
                 $datadate = date("Y-m-d", $timerecording->start);
@@ -331,27 +389,31 @@ class TimerecordingController extends mfBaseController
         data-start="' . $start . '"
         data-end="' . $end . '"
         data-enddate="' . $enddate . '"
-        data-commend="' . $timerecording->commend . '"
+        data-comment="' . $timerecording->comment . '"
         title="Bearbeiten"></i>';
                 else :
                     $edit .= '<div class="edit-placeholder"></div>';
                 endif;
                 $edit .= '<i data-id="' . $timerecording->id . '" class="fas fa-trash text-danger delete-item" ></i>';
             endif;
-
-            $rows[] = array(
-                'date' => array('date' => $state . $day . " " . $date, 'order' => $orderdate),
-                'start' => array('start' => $start, 'order' => $start),
-                'end' => array('end' => $end, 'order' => $end),
-                'sum' => array('sum' => $sum, 'order' => $sum),
-                'category' => array('category' => $timerecording->timerecordingCategory->name, 'order' => $timerecording->timerecordingCategory->name),
-                'commend' => array('commend' => $timerecording->commend, 'order' => $timerecording->commend),
-                'edit' => array('edit' => $edit, 'order' => $edit),
-            );
+            if ($datatype == 3 && $timerecording->timerecordingCategory->hourday == 1) {
+            } else {
+                $rows[] = array(
+                    'date' => array('date' => $state . $day . " " . $date, 'order' => $orderdate),
+                    'start' => array('start' => $start, 'order' => $start),
+                    'end' => array('end' => $end, 'order' => $end),
+                    'sum' => array('sum' => $sum, 'order' => $sum),
+                    'category' => array('category' => $timerecording->timerecordingCategory->name, 'order' => $timerecording->timerecordingCategory->name),
+                    'comment' => array('comment' => $timerecording->comment, 'order' => $timerecording->comment),
+                    'edit' => array('edit' => $edit, 'order' => $edit),
+                );
+            }
         endforeach;
         $json['success'] = true;
-        $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']['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['data'] = $rows;
         $json['recordsFiltered'] = $responsecount;
         $json['recordsTotal'] = $responsecount;