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

added internal rates (#1591)

Browse Source
This commit is contained in:
Kevin Papst
2020-04-08 14:50:15 +02:00
committed by GitHub
parent 82c713031e
commit 68d703d1e3
128 changed files with 4044 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Export/Base/RendererTrait.php
View File

@@ -54,6 +54,7 @@ trait RendererTrait
'activities' => [],
'currency' => $currency,
'rate' => 0,
'rate_internal' => 0,
'duration' => 0,
];
}
@@ -63,6 +64,7 @@ trait RendererTrait
'activity' => $activityName,
'currency' => $currency,
'rate' => 0,
'rate_internal' => 0,
'duration' => 0,
];
}
@@ -73,6 +75,11 @@ trait RendererTrait
}
$summary[$id]['rate'] += $exportItem->getRate();
if (method_exists($exportItem, 'getInternalRate')) {
$summary[$id]['rate_internal'] += $exportItem->getInternalRate();
} else {
$summary[$id]['rate_internal'] += $exportItem->getRate();
}
$summary[$id]['duration'] += $duration;
$summary[$id]['activities'][$activityId]['rate'] += $exportItem->getRate();
$summary[$id]['activities'][$activityId]['duration'] += $duration;