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

Release 1.19.5 (#3265)

Browse Source
This commit is contained in:
Kevin Papst
2022-04-26 18:48:43 +02:00
committed by GitHub
parent 41e8e196ec
commit 76899d2fdb
133 changed files with 849 additions and 683 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -28,6 +28,7 @@ trait RendererTrait
$customerId = 'none';
$projectId = 'none';
$activityId = 'none';
$userId = 'none';
$customer = null;
$project = null;
$activity = null;
@@ -44,6 +45,10 @@ trait RendererTrait
$activityId = $exportItem->getActivity()->getId();
}
if (null !== ($user = $exportItem->getUser())) {
$userId = $user->getId();
}
$id = $customerId . '_' . $projectId;
$type = $exportItem->getType();
$category = $exportItem->getCategory();
@@ -59,6 +64,7 @@ trait RendererTrait
'duration' => 0,
'type' => [],
'types' => [],
'users' => []
];
if ($project !== null) {
@@ -90,6 +96,7 @@ trait RendererTrait
'rate' => 0,
'rate_internal' => 0,
'duration' => 0,
'users' => []
];
if ($activity !== null) {
@@ -97,31 +104,57 @@ trait RendererTrait
}
}
if (!isset($summary[$id]['users'][$userId])) {
$summary[$id]['users'][$userId] = [
'user' => $user,
'rate' => 0,
'rate_internal' => 0,
'duration' => 0,
];
}
if (!isset($summary[$id]['activities'][$activityId]['users'][$userId])) {
$summary[$id]['activities'][$activityId]['users'][$userId] = [
'user' => $user,
'rate' => 0,
'rate_internal' => 0,
'duration' => 0,
];
}
$duration = $exportItem->getDuration();
if (null === $duration) {
$duration = 0;
}
$summary[$id]['rate'] += $exportItem->getRate();
$summary[$id]['type'][$type]['rate'] += $exportItem->getRate();
$summary[$id]['types'][$type][$category]['rate'] += $exportItem->getRate();
$rate = $exportItem->getRate();
$internalRate = $rate;
if (method_exists($exportItem, 'getInternalRate')) {
$summary[$id]['rate_internal'] += $exportItem->getInternalRate();
$summary[$id]['type'][$type]['rate_internal'] += $exportItem->getInternalRate();
$summary[$id]['types'][$type][$category]['rate_internal'] += $exportItem->getInternalRate();
} else {
$summary[$id]['rate_internal'] += $exportItem->getRate();
$summary[$id]['type'][$type]['rate_internal'] += $exportItem->getRate();
$summary[$id]['types'][$type][$category]['rate_internal'] += $exportItem->getRate();
$internalRate = $exportItem->getInternalRate();
}
// rate
$summary[$id]['rate'] += $rate;
$summary[$id]['type'][$type]['rate'] += $rate;
$summary[$id]['types'][$type][$category]['rate'] += $rate;
$summary[$id]['users'][$userId]['rate'] += $rate;
$summary[$id]['activities'][$activityId]['rate'] += $rate;
$summary[$id]['activities'][$activityId]['users'][$userId]['rate'] += $rate;
// internal rate
$summary[$id]['rate_internal'] += $internalRate;
$summary[$id]['type'][$type]['rate_internal'] += $internalRate;
$summary[$id]['types'][$type][$category]['rate_internal'] += $internalRate;
$summary[$id]['users'][$userId]['rate_internal'] += $internalRate;
$summary[$id]['activities'][$activityId]['rate_internal'] += $internalRate;
$summary[$id]['activities'][$activityId]['users'][$userId]['rate_internal'] += $internalRate;
// duration
$summary[$id]['duration'] += $duration;
$summary[$id]['type'][$type]['duration'] += $duration;
$summary[$id]['types'][$type][$category]['duration'] += $duration;
$summary[$id]['activities'][$activityId]['rate'] += $exportItem->getRate();
$summary[$id]['users'][$userId]['duration'] += $duration;
$summary[$id]['activities'][$activityId]['duration'] += $duration;
$summary[$id]['activities'][$activityId]['users'][$userId]['duration'] += $duration;
}
asort($summary);
@@ -226,7 +259,6 @@ trait RendererTrait
foreach ($exportItems as $exportItem) {
$customerId = 'none';
$projectId = 'none';
$customer = null;
$project = null;
$activity = null;
@@ -261,6 +293,8 @@ trait RendererTrait
'money' => $activity->getBudget(),
'time_left' => null,
'money_left' => null,
'time_left_total' => null,
'money_left_total' => null,
];
}
}
@@ -273,10 +307,12 @@ trait RendererTrait
$project = $statisticModel->getActivity()->getProject();
$id = $project->getCustomer()->getId() . '_' . $project->getId();
if ($statisticModel->hasTimeBudget()) {
$summary[$id][$activityId]['time_left'] = $statisticModel->getTimeBudgetOpen();
$summary[$id][$activityId]['time_left'] = $statisticModel->getTimeBudgetOpenRelative();
$summary[$id][$activityId]['time_left_total'] = $statisticModel->getTimeBudgetOpen();
}
if ($statisticModel->hasBudget()) {
$summary[$id][$activityId]['money_left'] = $statisticModel->getBudgetOpen();
$summary[$id][$activityId]['money_left'] = $statisticModel->getBudgetOpenRelative();
$summary[$id][$activityId]['money_left_total'] = $statisticModel->getBudgetOpen();
}
}