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

monthly budget, monthly report, unified report calculation (#2684)

Browse Source
This commit is contained in:
Kevin Papst
2021-08-06 18:38:41 +02:00
committed by GitHub
parent 21f785638c
commit cefd747e91
196 changed files with 5031 additions and 2167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Controller/ActivityController.php
View File

@@ -124,6 +124,7 @@ final class ActivityController extends AbstractController
$rates = [];
$teams = null;
$defaultTeam = null;
$now = $this->getDateTimeFactory()->createDateTime();
if ($this->isGranted('edit', $activity)) {
if ($this->isGranted('create_team')) {
@@ -133,7 +134,7 @@ final class ActivityController extends AbstractController
}
if ($this->isGranted('budget', $activity)) {
$stats = $statisticService->getActivityStatistics($activity);
$stats = $statisticService->getBudgetStatisticModel($activity, $now);
}
if ($this->isGranted('permissions', $activity) || $this->isGranted('details', $activity) || $this->isGranted('view_team')) {
@@ -146,7 +147,7 @@ final class ActivityController extends AbstractController
'rates' => $rates,
'team' => $defaultTeam,
'teams' => $teams,
'now' => $this->getDateTimeFactory()->createDateTime(),
'now' => $now,
]);
}