Merge branch 'spidev' into 'master'

Zeiterfassung

See merge request fronk/thetool!1003

application/TimerecordingEmployee/TimerecordingEmployeeController.php

@@ -16,6 +16,47 @@ class TimerecordingEmployeeController extends mfBaseController
         }
     }
 
+    protected function apiAction()
+    {
+        $do = $this->request->do;
+        $r = $this->request;
+
+        $data = [];
+
+        switch ($do) {
+            case "saveWorkingHours":
+                $userid = $r->userid;
+                $enddate = $r->enddate;
+                $workinghours = $r->workingHours;
+                $data = [];
+                $data['user_id'] = $userid;
+                $data['enddate'] = strtotime($enddate) + 10800;
+                $data['workinghours'] = json_encode($workinghours);
+                $timerecordingemployeesworkinghoursHistory = TimerecordingEmployeeWorkingHourHistoryModel::create($data);
+                $timerecordingemployeesworkinghoursHistory->save();
+                break;
+            case "deleteWorkingHours":
+                $id = $r->id;
+                $timerecordingemployeesworkinghoursHistory = new TimerecordingEmployeeWorkingHourHistory($id);
+                if (!$timerecordingemployeesworkinghoursHistory->id || $timerecordingemployeesworkinghoursHistory->id != $id) {
+                    $data = ["status" => "error"];
+                    $this->returnJson($data);
+                }
+                $timerecordingemployeesworkinghoursHistory->delete();
+                break;
+            default:
+                $data = ["status" => "error"];
+                $this->returnJson($data);
+        }
+        if (!is_array($return) || !count($return)) {
+            $data = ["status" => "error"];
+            $this->returnJson($data);
+        }
+        $data['status'] = "OK";
+        $data['result'] = $return;
+        $this->returnJson($data);
+    }
+
     protected function indexAction()
     {
 
@@ -56,6 +97,8 @@ class TimerecordingEmployeeController extends mfBaseController
 
             $this->layout()->set("timerecordingemployees", $timerecordingemployees);
         }
+        $timerecordingworkinghourshistory = $this->generateWorkingHoursHistory($userid);
+        $this->layout()->set("timerecordingworkinghourshistory", $timerecordingworkinghourshistory);
         $timerecordinguser = UserModel::search(['worker_id' => $userid]);
         $this->layout()->set("timerecordinguser", $timerecordinguser);
         return $this->addAction();
@@ -219,4 +262,26 @@ class TimerecordingEmployeeController extends mfBaseController
         $this->redirect("TimerecordingEmployee");
     }
 
+    protected function generateWorkingHoursHistory($userid)
+    {
+        $days_short = TimerecordingEmployeeWorkingHourModel::$days_short;
+        $TimerecordingEmployeeWorkingHourHistory = TimerecordingEmployeeWorkingHourHistoryModel::search(['user_id' => $userid]);
+        foreach ($TimerecordingEmployeeWorkingHourHistory as $key => $value) {
+            $workinghours = json_decode($value->workinghours, true);
+            $datetimetext = "";
+            $secondcounter = "";
+            foreach ($workinghours as $key2 => $data) {
+                $secondcounter = $secondcounter + strtotime(date("Y-m-d " . $data['end'] . ":00")) - strtotime(date("Y-m-d " . $data['start'] . ":00"));
+                $datetimetext .= $days_short[$data['day']] . " " . $data['start'] . " - " . $data['end'] . "<br>";
+                $datetimetext = TimerecordingEmployeeWorkingHourModel::cleardays($datetimetext);
+            }
+
+
+            $result[$value->enddate]['workinghours'] = $datetimetext;
+            $result[$value->enddate]['workingtime'] = $secondcounter;
+            $result[$value->enddate]['id'] = $value->id;
+        }
+        return $result;
+    }
+
 }

application/TimerecordingEmployeeWorkingHourHistory/TimerecordingEmployeeWorkingHourHistory.php

@@ -0,0 +1,60 @@
+<?php
+
+class TimerecordingEmployeeWorkingHourHistory extends mfBaseModel
+{
+    private $editor;
+    private $creator;
+    private $user;
+    
+
+
+    public function getProperty($name)
+{
+    if ($this->$name == null) {
+
+        if (!$this->id) {
+            return null;
+        }
+
+        if ($name == "creator") {
+            $this->creator = mfValuecache::singleton()->get("Worker-id-" . $this->create_by);
+            if ($this->creator === null) {
+                $this->creator = new User($this->create_by);
+                if ($this->creator->id) {
+                    mfValuecache::singleton()->set("Worker-id-" . $this->create_by, $this->creator);
+                }
+            }
+            return $this->creator;
+        }
+
+        if ($name == "editor") {
+            $this->editor = mfValuecache::singleton()->get("Worker-id-" . $this->edit_by);
+            if ($this->editor === null) {
+                $this->editor = new User($this->edit_by);
+                if ($this->editor->id) {
+                    mfValuecache::singleton()->set("Worker-id-" . $this->edit_by, $this->editor);
+                }
+            }
+            return $this->editor;
+        }
+
+        $classname = ucfirst($name);
+        $idfield = $name . "_id";
+        $this->$name = mfValuecache::singleton()->get("mfObjectmodel-$name-" . $this->$idfield);
+        if (!$this->$name) {
+            $this->$name = new $classname($this->$idfield);
+        }
+
+        if ($this->$name->id) {
+            mfValuecache::singleton()->set("mfObjectmodel-$name-" . $this->$name->id, $this->$name);
+            return $this->$name;
+        } else {
+            return null;
+        }
+
+    }
+
+    return $this->$name;
+}
+
+}

application/TimerecordingEmployeeWorkingHourHistory/TimerecordingEmployeeWorkingHourHistoryController.php

@@ -0,0 +1,131 @@
+<?php
+
+class TimerecordingEmployeeWorkingHourHistoryController extends mfBaseController
+{
+
+    protected function init()
+    {
+        $this->needlogin = true;
+        $me = new User();
+        $me->loadMe();
+        $this->me = $me;
+        $this->layout()->set("me", $me);
+
+        if (!$me->is(["Admin"])) {
+            $this->redirect("Dashboard");
+        }
+    }
+
+    protected function indexAction()
+    {
+
+        $this->layout()->setTemplate("TimerecordingEmployeeWorkingHourHistory/Index");
+        $timerecordingemployeeworkinghourhistorys = TimerecordingEmployeeWorkingHourHistoryModel::getAll();
+        $this->layout()->set("timerecordingemployeeworkinghourhistorys", $timerecordingemployeeworkinghourhistorys);
+
+    }
+
+    protected function addAction()
+    {
+        $users=UserModel::getAll();
+        $this->layout()->set("users", $users);
+    
+        $this->layout()->setTemplate("TimerecordingEmployeeWorkingHourHistory/Form");
+
+    }
+
+    protected function editAction()
+    {
+        $id = $this->request->id;
+
+        if (!is_numeric($id) || !$id) {
+            $this->layout()->setFlash("tt History nicht gefunden", "error");
+            $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+        }
+
+        $timerecordingemployeeworkinghourhistorys = new TimerecordingEmployeeWorkingHourHistory($id);
+        if ($timerecordingemployeeworkinghourhistorys->id != $id) {
+            $this->layout()->setFlash("tt History nicht gefunden", "error");
+            $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+        }
+
+        $this->layout()->set("timerecordingemployeeworkinghourhistorys", $timerecordingemployeeworkinghourhistorys);
+        return $this->addAction();
+    }
+
+    protected function saveAction()
+    {
+        $r = $this->request;
+        $id = $r->id;
+        //var_dump($r->get());exit;
+        if (is_numeric($id) && $id > 0) {
+            $mode = "edit";
+            $timerecordingemployeeworkinghourhistorys = new TimerecordingEmployeeWorkingHourHistory($id);
+            if (!$timerecordingemployeeworkinghourhistorys->id) {
+                $this->layout()->setFlash("tt History nicht gefunden", "error");
+                $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+            }
+        } else {
+            $mode = "add";
+        }
+
+        $data = [];
+        $data['user_id'] = trim($r->user_id);
+        $data['end'] = trim($r->end);
+        $data['times'] = trim($r->times);
+        
+
+        if (!$data['user_id']) {
+            $data['user_id']=NULL;
+        }
+        if (!$data['end']) {
+            $data['end']=NULL;
+        }
+        if (!$data['times']) {
+            $data['times']=NULL;
+        }
+        
+
+//        var_dump($_FILES);
+//        var_dump($upload);
+//        exit;
+
+
+        if ($mode == "edit") {
+            $timerecordingemployeeworkinghourhistorys->update($data);
+
+        } else {
+            $timerecordingemployeeworkinghourhistorys = TimerecordingEmployeeWorkingHourHistoryModel::create($data);
+        }
+//        var_dump($filestore);
+//        exit;
+        $id = $timerecordingemployeeworkinghourhistorys->save();
+
+        if (!$id) {
+            $this->layout()->setFlash("tt History konnte nicht angelegt werden", "error");
+            $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+        }
+
+        if ($mode == "edit") {
+            $this->layout()->setFlash("tt History erfolgreich geändert", "success");
+        } else if ($mode = "add") {
+            $this->layout()->setFlash("tt History erfolgreich angelegt", "success");
+        }
+        $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+    }
+
+
+    protected function deleteAction()
+    {
+        $id = $this->request->id;
+        $timerecordingemployeeworkinghourhistorys = new TimerecordingEmployeeWorkingHourHistory($id);
+        if (!$timerecordingemployeeworkinghourhistorys->id || $timerecordingemployeeworkinghourhistorys->id != $id) {
+            $this->layout()->setFlash("tt History nicht gefunden.", "error");
+            $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+        }
+
+        $timerecordingemployeeworkinghourhistorys->delete();
+        $this->redirect("TimerecordingEmployeeWorkingHourHistory");
+    }
+
+}

application/TimerecordingEmployeeWorkingHourHistory/TimerecordingEmployeeWorkingHourHistoryModel.php

@@ -0,0 +1,128 @@
+<?php
+
+class TimerecordingEmployeeWorkingHourHistoryModel
+{
+    private $user_id;
+    private $enddate;
+    private $workinghours;
+    
+
+    public static function find($data)
+    {
+
+    }
+
+    public static function create(array $data)
+    {
+        $model = new TimerecordingEmployeeWorkingHourHistory();
+
+        foreach ($data as $field => $value) {
+            if (property_exists(get_called_class(), $field)) {
+                if (substr($field, 0, 5) == "vlan_" && !$value) {
+                    $model->$field = null;
+                    continue;
+                }
+                $model->$field = $value;
+            }
+        }
+
+        $me = mfValuecache::singleton()->get("me");
+        if (!$me) {
+            $me = new User();
+            $me->loadMe();
+            mfValuecache::singleton()->set("me", $me);
+        }
+
+        if ($model->create_by === null) {
+            $model->create_by = $me->id;
+        }
+        if ($model->edit_by === null) {
+            $model->edit_by = $me->id;
+        }
+
+        return $model;
+    }
+
+    public static function getOne($id)
+    {
+        if (!is_numeric($id) || !$id) {
+            throw new Exception("Invalid number", 400);
+        }
+        $item = [];
+        $db = FronkDB::singleton();
+
+        $res = $db->select("TimerecordingEmployeeWorkingHourHistory", "*", "id=$id LIMIT 1");
+        if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new TimerecordingEmployeeWorkingHourHistory($data);
+        }
+        return $item;
+    }
+
+
+    public static function getAll()
+    {
+        $items = [];
+
+        $db = FronkDB::singleton();
+
+        $res = $db->select("TimerecordingEmployeeWorkingHourHistory", "*", "1=1");
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new TimerecordingEmployeeWorkingHourHistory($data);
+            }
+        }
+        return $items;
+
+    }
+
+    public static function getFirst()
+    {
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("TimerecordingEmployeeWorkingHourHistory", "*", "$where ");
+        if ($db->num_rows($res)) {
+            $data = $db->fetch_object($res);
+            $item = new TimerecordingEmployeeWorkingHourHistory($data);
+            if ($item->id) {
+                return $item;
+            } else {
+                return null;
+            }
+        }
+        return null;
+    }
+
+    public static function search($filter)
+    {
+        $items = [];
+        $db = FronkDB::singleton();
+
+        $where = self::getSqlFilter($filter);
+        $res = $db->select("TimerecordingEmployeeWorkingHourHistory", "*", "$where ORDER by enddate DESC");
+        if ($db->num_rows($res)) {
+            while ($data = $db->fetch_object($res)) {
+                $items[] = new TimerecordingEmployeeWorkingHourHistory($data);
+            }
+        }
+        return $items;
+    }
+
+    private static function getSqlFilter($filter)
+    {
+        $where = "1=1 ";
+
+        //var_dump($filter);exit;
+        if (array_key_exists("user_id", $filter)) {
+            $userid = $filter['user_id'];
+            if (is_numeric($userid)) {
+                $where .= " AND user_id=$userid";
+            }
+        }
+
+        //var_dump($filter, $where);exit;
+        return $where;
+    }
+
+}