AS1024/Kanboard-Prod
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes cycle time calculation when the start date is defined in the future

Browse Source
This commit is contained in:
Frederic Guillot
2016-03-22 20:44:15 -04:00
parent 585f734333
commit 8768a4e369
5 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Analytic/AverageLeadCycleTimeAnalytic.php
View File

@@ -85,14 +85,15 @@ class AverageLeadCycleTimeAnalytic extends Base
*/
private function calculateCycleTime(array &$task)
{
if (empty($task['date_started'])) {
return 0;
$end = (int) $task['date_completed'] ?: time();
$start = (int) $task['date_started'];
// Start date can be in the future when defined with the Gantt chart
if ($start > 0 && $end > $start) {
return $end - $start;
}
$end = $task['date_completed'] ?: time();
$start = $task['date_started'];
return $end - $start;
return 0;
}
/**

9
app/Model/ProjectDailyStats.php
View File

@@ -56,12 +56,19 @@ class ProjectDailyStats extends Base
*/
public function getRawMetrics($project_id, $from, $to)
{
return $this->db->table(self::TABLE)
$metrics = $this->db->table(self::TABLE)
->columns('day', 'avg_lead_time', 'avg_cycle_time')
->eq('project_id', $project_id)
->gte('day', $from)
->lte('day', $to)
->asc('day')
->findAll();
foreach ($metrics as &$metric) {
$metric['avg_lead_time'] = (int) $metric['avg_lead_time'];
$metric['avg_cycle_time'] = (int) $metric['avg_cycle_time'];
}
return $metrics;
}
}