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 'task-18508/Zeitaufzeichnung_-_Pausenfehler'

Browse Source
This commit is contained in:
Harald Bamberger
2022-03-17 10:14:08 +01:00
parent 253fdf1414 04ecd3aa3a
commit ccc8bf8279
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/zeitaufzeichnung.class.php
+5 -5
View File
@@ -886,7 +886,7 @@ or not exists
{
$tagesbeginn = '';
$tagesende = '';
$pausesumme = '00:00';
$pausesumme = 0;
$tagessaldo = '';
$elsumme = '00:00';
$pflichtpause = false;
@@ -906,14 +906,14 @@ or not exists
$tagesende = $datum->formatDatum($row->ende, 'H:i');
if ($row->aktivitaet_kurzbz == "Pause")
$pausesumme = $row->diff;
{
list($h1, $m1) = explode(':', $row->diff);
$pausesumme += ($h1 * 3600 + $m1 * 60);
}
}
$tagessaldo = $datum->mktime_fromtimestamp($datum->formatDatum($tagesende, $format = 'Y-m-d H:i:s')) - $datum->mktime_fromtimestamp($datum->formatDatum($tagesbeginn, $format = 'Y-m-d H:i:s')) - 3600;
list($h1, $m1) = explode(':', $pausesumme);
$pausesumme = $h1 * 3600 + $m1 * 60;
list($h2, $m2) = explode(':', $elsumme);
$elsumme = $h2 * 3600 + $m2 * 60;