Merge branch 'spidev' into 'master'
Zeiterfassung Feature Updates See merge request fronk/thetool!2098
This commit is contained in:
@@ -110,11 +110,6 @@ class TimerecordingReportExportController extends mfBaseController
|
|||||||
if (!isset($istPerDay[$day])) $istPerDay[$day] = 0;
|
if (!isset($istPerDay[$day])) $istPerDay[$day] = 0;
|
||||||
$seconds = $tr->end - $tr->start;
|
$seconds = $tr->end - $tr->start;
|
||||||
$istPerDay[$day] += $seconds;
|
$istPerDay[$day] += $seconds;
|
||||||
} else if ($cat->hourday == 10) {
|
|
||||||
$day = date('Y-m-d', $tr->start);
|
|
||||||
if (!isset($istPerDay[$day])) $istPerDay[$day] = 0;
|
|
||||||
$seconds = $tr->end - $tr->start;
|
|
||||||
$istPerDay[$day] -= $seconds;
|
|
||||||
} else if ($cat->hourday == 2 || $cat->hourday == 3) {
|
} else if ($cat->hourday == 2 || $cat->hourday == 3) {
|
||||||
$calcstart = max($tr->start, $month_start);
|
$calcstart = max($tr->start, $month_start);
|
||||||
$calcend = $tr->end ? min($tr->end, $month_end) : min(time(), $month_end);
|
$calcend = $tr->end ? min($tr->end, $month_end) : min(time(), $month_end);
|
||||||
|
|||||||
Reference in New Issue
Block a user