copenhagentruckwash/api
1
0
Fork 0
Code Issues Pull Requests 1 Actions 2 Packages Projects Releases Wiki Activity

Refactor progress calculation to avoid mutating instance and improve clarity

Browse Source
This commit is contained in:
Jeppe Bundgaard
2026-02-27 00:32:41 +01:00
parent ea7633a908
commit 647b7f2d94
1 changed files with 19 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
services/nginx/app/modules/goals/classes/goals_criteria.php
+19 -15
View File
@@ -738,44 +738,48 @@ class goals_criteria implements goals_criteria_i
public function getProgressDetails(?string $timeframe = null): array
{
if ($timeframe) {
$this->setTimeframeByName($timeframe);
$criteria = $this;
if ($timeframe !== null) {
// Avoid mutating the current instance so repeated calls for different
// periods (e.g. departmental distribution) always use original goal bounds.
$criteria = clone $this;
$criteria->setTimeframeByName($timeframe);
}
$target = 0.0;
$active_dept_ids = $this->departments->listIDs();
$active_dept_ids = $criteria->departments->listIDs();
if ($timeframe === 'today') {
$days = $this->getTimeframeDayCount();
$days = $criteria->getTimeframeDayCount();
foreach ($active_dept_ids as $id) {
$target += (float)($this->department_daily_targets[$id] ?? 0) * $days;
$target += (float)($criteria->department_daily_targets[$id] ?? 0) * $days;
}
} elseif ($timeframe === 'week') {
$days = $this->getTimeframeDayCount();
$days = $criteria->getTimeframeDayCount();
foreach ($active_dept_ids as $id) {
$target += (float)($this->department_daily_targets[$id] ?? 0) * $days;
$target += (float)($criteria->department_daily_targets[$id] ?? 0) * $days;
}
} elseif ($timeframe === 'month') {
$days = $this->getTimeframeDayCount();
$days = $criteria->getTimeframeDayCount();
foreach ( $active_dept_ids as $id ) {
$target += (float)($this->department_daily_targets[$id] ?? 0) * $days;
$target += (float)($criteria->department_daily_targets[$id] ?? 0) * $days;
}
} elseif ($timeframe === 'year') {
$days = $this->getTimeframeDayCount();
$days = $criteria->getTimeframeDayCount();
foreach ( $active_dept_ids as $id ) {
$target += (float)($this->department_daily_targets[$id] ?? 0) * $days;
$target += (float)($criteria->department_daily_targets[$id] ?? 0) * $days;
}
} elseif ($timeframe === 'to_date') {
$days = $this->getTimeframeDayCount();
$days = $criteria->getTimeframeDayCount();
foreach ($active_dept_ids as $id) {
$target += (float)($this->department_daily_targets[$id] ?? 0) * $days;
$target += (float)($criteria->department_daily_targets[$id] ?? 0) * $days;
}
} else {
$target = (float)$this->target;
$target = (float)$criteria->target;
}
return [
'count' => $this->getProgress(),
'count' => $criteria->getProgress(),
'target' => $target
];
}