diff --git a/Layout/default/TimerecordingEmployee/Index.php b/Layout/default/TimerecordingEmployee/Index.php
index 28167f002..d0f1a795f 100644
--- a/Layout/default/TimerecordingEmployee/Index.php
+++ b/Layout/default/TimerecordingEmployee/Index.php
@@ -42,6 +42,9 @@ $type[3] = "Lehrling";
@@ -73,6 +79,9 @@ $type[3] = "Lehrling";
= ($timerecordingemployees[$timerecordinguser->id]['startdate']) ? date("d.m.Y", $timerecordingemployees[$timerecordinguser->id]['startdate']) : "-" ?> |
= ($timerecordingworkinghours) ? $timerecordingworkinghours[$timerecordinguser->id]['datetimetext'] : "" ?> |
= $sum ?> |
+ = sprintf('%02d:%02d', ($timerecordingemployees[$timerecordinguser->id]['plushours_now']/ 3600),($timerecordingemployees[$timerecordinguser->id]['plushours_now']/ 60 % 60)) ?> |
+ = sprintf('%02d:%02d', ($timerecordingemployees[$timerecordinguser->id]['overtime_now']/ 3600),($timerecordingemployees[$timerecordinguser->id]['overtime_now']/ 60 % 60)) ?> |
+ = ($timerecordingemployees[$timerecordinguser->id]['holidays_now']) ? $timerecordingemployees[$timerecordinguser->id]['holidays_now'].' Tage' : '' ?> |
= ($timerecordingemployees[$timerecordinguser->id]['auto_workinghours'] == '1') ? 'Ja' : 'Nein' ?> |
$timerecordingemployees[$timerecordinguser->id]['id'], "userid" => $timerecordinguser->id]) ?>">
- var hidesearch = [6];
+ var hidesearch = [3,4,5,6,7,9];
$(document).ready(function () {
diff --git a/application/Timerecording/TimerecordingController.php b/application/Timerecording/TimerecordingController.php
index 455c7579b..b52c4943b 100644
--- a/application/Timerecording/TimerecordingController.php
+++ b/application/Timerecording/TimerecordingController.php
@@ -18,6 +18,9 @@ class TimerecordingController extends mfBaseController
protected function indexAction()
{
+ $this->updatePlushours($this->me->id);
+ $this->updateHolidays($this->me->id);
+
$timerecordingCategoriess = TimerecordingCategoryModel::getAll();
$this->layout()->set("timerecordingCategoriess", $timerecordingCategoriess);
$this->layout()->setTemplate("Timerecording/Index");
diff --git a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
index a4fce4ecd..a76f9a4a7 100644
--- a/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
+++ b/application/TimerecordingEmployee/TimerecordingEmployeeModel.php
@@ -147,6 +147,9 @@ class TimerecordingEmployeeModel
$where .= " AND user_id=$userid";
}
}
+ if (array_key_exists("startdate", $filter)) {
+ $where .= " AND startdate is not null";
+ }
//var_dump($filter, $where);exit;
return $where;
|