Kalender Anpassungen

- Anpassungen bei neuen Kalenderbenutzern

application/Timerecording/TimerecordingController.php

@@ -292,7 +292,7 @@ class TimerecordingController extends mfBaseController
         } else if ($hourday == 3) {
             $starttime = strtotime($r->date . " 00:00:00");
             $endtime = NULL;
-        } else if ($hourday == 5) {
+        } else if ($hourday == 5 || $hourday == 9) {
             $starttime = strtotime($r->date . " 00:00:00");
             $endtime = strtotime($r->date . " 23:59:00");
         } else if ($hourday == 8) {
@@ -300,7 +300,7 @@ class TimerecordingController extends mfBaseController
             $endtime = strtotime($r->date . " 23:59:00");
         }
 
-        if ($hourday != 5 && $hourday != 7 && $hourday != 8) {
+        if ($hourday != 5 && $hourday != 7 && $hourday != 8 && $hourday != 9) {
             $result = $this->checkTimerecording($starttime, $endtime, $id);
         }
         if ($result['state'] == "error") {
@@ -342,9 +342,14 @@ class TimerecordingController extends mfBaseController
         if ($hourday == 8) {
             $data['days'] = 0;
             $data['hours_bpa'] = $r->days * 60 * 60;
+        } else if ($hourday == 9) {
+            $data['days'] = 0;
+            $data['hours'] = $r->days * 60 * 60;
+            $data['hours'] = 0 - $data['hours'];
         } else {
             $data['days'] = $r->days;
         }
+
         $data['timerecordingCar_id'] = $r->timerecordingCar_id;
         $data['mileage_start'] = $r->mileage_start;
         $data['mileage_end'] = $r->mileage_end;

application/Timerecording/TimerecordingModel.php

@@ -74,12 +74,13 @@ class TimerecordingModel
         }
         return $item;
     }
+
     public static function getAllHours($user_id)
     {
         $items = [];
 
         $db = FronkDB::singleton();
-        $sql="SELECT SUM(`end` - `start`) AS gesamt_summe FROM Timerecording where user_id=$user_id AND `timerecordingCategory_id` =1";
+        $sql = "SELECT SUM(`end` - `start`) AS gesamt_summe FROM Timerecording where user_id=$user_id AND `timerecordingCategory_id` =1";
         $res = $db->query($sql);
         if ($db->num_rows($res)) {
             while ($data = $db->fetch_object($res)) {
@@ -185,7 +186,7 @@ class TimerecordingModel
         if (array_key_exists("start", $filter) && array_key_exists("hours", $filter)) {
             $start = $filter['start'];
             if (is_numeric($start)) {
-                $where .= " AND `start` >= $start AND (`hours`>0 or `hours_overtime`>0) ORDER by start ASC";
+                $where .= " AND `start` >= $start AND (`hours`>0  or `hours`<0 or `hours_overtime`>0) ORDER by start ASC";
             }
         }
         if (array_key_exists("start", $filter) && array_key_exists("days", $filter)) {