jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

fix duration calculation for multiple entries of same activity

Browse Source
This commit is contained in:
Kevin Papst
2020-08-19 10:08:25 +02:00
parent 15c3acfa0b
commit ec612d1046
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Repository/TimesheetRepository.php
View File

@@ -416,7 +416,7 @@ class TimesheetRepository extends EntityRepository
$newDateBegin = clone $endTmp; $newDateBegin = clone $endTmp;
} }
// make sure to exclude entries that are outside the requested timerange: // make sure to exclude entries that are outside the requested time-range:
// these entries can exist if you have long running entries that started before $begin // these entries can exist if you have long running entries that started before $begin
// for statistical reasons we have to include everything between $begin and $end while // for statistical reasons we have to include everything between $begin and $end while
// excluding everything that is outside of that range // excluding everything that is outside of that range
@@ -449,6 +449,7 @@ class TimesheetRepository extends EntityRepository
. '_' . $result->getProject()->getId() . '_' . $result->getProject()->getId()
. '_' . $result->getActivity()->getId() . '_' . $result->getActivity()->getId()
; ;
if (!isset($results[$dateKey]['details'][$detailsId])) { if (!isset($results[$dateKey]['details'][$detailsId])) {
$results[$dateKey]['details'][$detailsId] = [ $results[$dateKey]['details'][$detailsId] = [
'project' => $result->getProject(), 'project' => $result->getProject(),
@@ -456,10 +457,10 @@ class TimesheetRepository extends EntityRepository
'duration' => 0, 'duration' => 0,
'rate' => 0, 'rate' => 0,
]; ];
$results[$dateKey]['details'][$detailsId]['duration'] += $duration;
$results[$dateKey]['details'][$detailsId]['rate'] += $rate;
} }
$results[$dateKey]['details'][$detailsId]['duration'] += $duration;
$results[$dateKey]['details'][$detailsId]['rate'] += $rate;
} }
$beginTmp = $newDateBegin; $beginTmp = $newDateBegin;