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

Replace dimplejs by c3js for chart drawing

Browse Source
This commit is contained in:
Frederic Guillot
2015-06-21 21:12:24 -04:00
parent 1465ca1ae1
commit 81e40e2c91
36 changed files with 320 additions and 366 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/Model/ProjectDailySummary.php
View File

@@ -149,9 +149,10 @@ class ProjectDailySummary extends Base
* @param integer $project_id Project id
* @param string $from Start date (ISO format YYYY-MM-DD)
* @param string $to End date
* @param string $column Column to aggregate
* @return array
*/
public function getAggregatedMetrics($project_id, $from, $to)
public function getAggregatedMetrics($project_id, $from, $to, $column = 'total')
{
$columns = $this->board->getColumnsList($project_id);
$column_ids = array_keys($columns);
@@ -172,7 +173,7 @@ class ProjectDailySummary extends Base
$aggregates[$record['day']] = array($record['day']);
}
$aggregates[$record['day']][$record['column_id']] = $record['total'];
$aggregates[$record['day']][$record['column_id']] = $record[$column];
}
// Aggregate by row