blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-06-01 20:29:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into VorrueckungLetztesSemester

Browse Source
This commit is contained in:
Manfred
2023-01-17 15:59:12 +01:00
parent f52c9ed3c2 3fb20cf61e
commit 04584fdec9
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/zeitaufzeichnung.class.php
+2
View File
@@ -897,6 +897,8 @@ or not exists
foreach ($this->result as $row)
{
if($row->aktivitaet_kurzbz == 'DienstreiseMT' ) continue;
$datumtag = $datum->formatDatum($row->datum, 'Y-m-d');
if (($tagesbeginn == '' || $datum->mktime_fromtimestamp($datum->formatDatum($tagesbeginn, $format = 'Y-m-d H:i:s')) > $datum->mktime_fromtimestamp($datum->formatDatum($row->start, $format = 'Y-m-d H:i:s'))) && $row->aktivitaet_kurzbz != 'LehreExtern' && $row->aktivitaet_kurzbz != 'Ersatzruhe')