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

Merge branch 'feature-4834/Zeitaufzeichnung_OhneUeberlappung'

Browse Source
This commit is contained in:
Andreas Österreicher
2019-11-15 12:12:14 +01:00
parent 084056a1a0 5d57fd2441
commit 10b351f4da
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cis/private/tools/zeitaufzeichnung.php
+7 -4
View File
@@ -1490,16 +1490,19 @@ if($projekt->getProjekteMitarbeiter($user, true))
}
list($h2, $m2) = explode(':', $elsumme);
$elsumme = $h2*3600+$m2*60;
if ($tagessaldo > 18000 && $tagessaldo < 19800 && $pflichtpause==false && $elsumme == 0)
if ($datum->formatDatum($tag, 'Y-m-d') >= '2019-11-06')
{
//$pausesumme = $tagessaldo-18000;
$pausesumme = $pausesumme;
}
else if ($tagessaldo > 18000 && $tagessaldo < 19800 && $pflichtpause==false && $elsumme == 0)
{
$pausesumme = $tagessaldo-18000;
}
else if ($tagessaldo>18000 && $pflichtpause==false && $elsumme == 0)
{
//$pausesumme = $pausesumme+1800;
$pausesumme = $pausesumme;
$pausesumme = $pausesumme+1800;
}
if ($elsumme > 0){
$pausesumme = $pausesumme + $elsumme;
$pflichtpause = true;