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

Weekly reporting view (#1892)

Browse Source
This commit is contained in:
Kevin Papst
2020-08-16 12:20:33 +02:00
committed by Kevin Papst
parent 34a1e07824
commit ed4b82f4b1
39 changed files with 1130 additions and 248 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Repository/TimesheetRepository.php
View File

@@ -444,7 +444,11 @@ class TimesheetRepository extends EntityRepository
$results[$dateKey]['rate'] += $rate;
$results[$dateKey]['duration'] += $duration;
$detailsId = $result->getProject()->getCustomer()->getId() . '_' . $result->getProject()->getId();
$detailsId =
$result->getProject()->getCustomer()->getId()
. '_' . $result->getProject()->getId()
. '_' . $result->getActivity()->getId()
;
if (!isset($results[$dateKey]['details'][$detailsId])) {
$results[$dateKey]['details'][$detailsId] = [
'project' => $result->getProject(),