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

Make sure that project daily column stats works when score is null

Browse Source
This commit is contained in:
Frederic Guillot
2016-01-17 13:46:33 -05:00
parent d45fa6a33b
commit 1259e911e4
2 changed files with 36 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/Model/ProjectDailyColumnStats.php
View File

@@ -186,15 +186,11 @@ class ProjectDailyColumnStats extends Base
$columns = array();
foreach ($totals as $column_id => $total) {
$columns[$column_id] = array('total' => $total);
$columns[$column_id] = array('total' => $total, 'score' => 0);
}
foreach ($scores as $column_id => $score) {
if (isset($columns[$column_id])) {
$columns[$column_id]['score'] = $score;
} else {
$columns[$column_id] = array('score' => $score);
}
$columns[$column_id]['score'] = (int) $score;
}
return $columns;
@@ -213,6 +209,7 @@ class ProjectDailyColumnStats extends Base
->columns('column_id', 'SUM(score) AS score')
->eq('project_id', $project_id)
->eq('is_active', Task::STATUS_OPEN)
->notNull('score')
->groupBy('column_id')
->findAll();