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/ProjectController.php
View File

@@ -304,6 +304,7 @@ final class ProjectController extends AbstractController
$comments = null;
$teams = null;
$rates = [];
$now = $this->getDateTimeFactory()->createDateTime();
if ($this->isGranted('edit', $project)) {
if ($this->isGranted('create_team')) {
@@ -313,7 +314,7 @@ final class ProjectController extends AbstractController
}
if ($this->isGranted('budget', $project)) {
$stats = $statisticService->getProjectStatistics($project);
$stats = $statisticService->getBudgetStatisticModel($project, $now);
}
if ($this->isGranted('comments', $project)) {
@@ -337,7 +338,7 @@ final class ProjectController extends AbstractController
'team' => $defaultTeam,
'teams' => $teams,
'rates' => $rates,
'now' => $this->getDateTimeFactory()->createDateTime(),
'now' => $now,
]);
}