Luca/thetool
1
0
Fork 0
Code Issues 5 Pull Requests 5 Actions Packages Projects Releases Wiki Activity

Zeiterfassungs Update

Browse Source 
* Neuer Buchungszeitraum bei den Buchungskategorien ZA Uhrzeit (von/bis)
 * Überprüfungen/Berechungen/Errorhandling ZAs
 * Anpassungen Freigaben nun mit Standartfilter Offen
This commit is contained in:
Spitzer Daniel
2024-03-12 13:30:52 +01:00
parent 6e02b849bd
commit d1a25a23c2
13 changed files with 341 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
application/Timerecording/TimerecordingModel.php
View File

@@ -5,6 +5,8 @@ class TimerecordingModel
private $user_id;
private $start;
private $end;
private $hours;
private $hours_overtime;
private $days;
private $timerecordingCategory_id;
private $businesstrip;
@@ -159,6 +161,12 @@ class TimerecordingModel
$where .= " AND `start` >= $start AND `timerecordingCategory_id` = $timerecordingCategory_id ORDER by start ASC";
}
}
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";
}
}
if (array_key_exists("start", $filter) && array_key_exists("days", $filter)) {
$days = $filter['days'];
$start = $filter['start'];