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

Zeiterfassungs Update

Browse Source 
* Implementerung Fahrzeugverwaltung
 * neue Buchungsart Fahrtenbuch
 * Diverse Bugfixes
This commit is contained in:
Spitzer Daniel
2024-03-26 08:08:01 +01:00
parent 81e3b1ccd5
commit 025522a740
18 changed files with 1305 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/Timerecording/TimerecordingModel.php
View File

@@ -11,6 +11,10 @@ class TimerecordingModel
private $timerecordingCategory_id;
private $businesstrip;
private $businesstrip_info;
private $timerecordingCar_id;
private $mileage_start;
private $mileage_end;
private $homeoffice;
private $comment;
private $approved;
@@ -174,7 +178,20 @@ class TimerecordingModel
$where .= " AND `start` >= $start AND `days` !=0 ORDER by start ASC";
}
}
if (array_key_exists("timerecordingCar_id", $filter)) {
$timerecordingCar = $filter['timerecordingCar_id'];
if (is_numeric($timerecordingCar)) {
$where .= " AND `timerecordingCar_id` = $timerecordingCar ORDER by mileage_end DESC LIMIT 1";
}
}
if (array_key_exists("timerecordingCar_id_all", $filter)) {
$timerecordingCar = $filter['timerecordingCar_id_all'];
if (is_numeric($timerecordingCar)) {
$where .= " AND `timerecordingCar_id` = $timerecordingCar ORDER by mileage_start ASC";
}
}
if (array_key_exists("starttime", $filter) && array_key_exists("endtime", $filter)) {
$starttime = $filter['starttime'];