summaryrefslogtreecommitdiff
path: root/app/Controller
diff options
context:
space:
mode:
authorFrederic Guillot <fred@kanboard.net>2015-12-14 22:13:11 -0500
committerFrederic Guillot <fred@kanboard.net>2015-12-14 22:13:11 -0500
commit9e1f4fa6c7eae1b46cf5431ab085b82e970e2d57 (patch)
treeaa0f03c5c1d7897246e513e52c6a1f823709dd3d /app/Controller
parentdb7a9ddf5f6744956dc6826dd912987b7591177e (diff)
Improve pull-request that compare hours
Diffstat (limited to 'app/Controller')
-rw-r--r--app/Controller/Analytic.php10
1 files changed, 4 insertions, 6 deletions
diff --git a/app/Controller/Analytic.php b/app/Controller/Analytic.php
index 80ef3918..bebb13fa 100644
--- a/app/Controller/Analytic.php
+++ b/app/Controller/Analytic.php
@@ -173,21 +173,19 @@ class Analytic extends Base
*
* @access public
*/
-
public function compareHours()
{
$project = $this->getProject();
- $params = $this->getProjectFilters('analytic', 'compareHours');
+ $params = $this->getProjectFilters('analytic', 'compareHours');
$query = $this->taskFilter->search('status:all')->filterByProject($params['project']['id'])->getQuery();
-
$paginator = $this->paginator
- ->setUrl('analytics', 'compare_hours')
+ ->setUrl('analytic', 'compareHours', array('project_id' => $project['id']))
->setMax(30)
->setOrder(TaskModel::TABLE.'.id')
->setQuery($query)
->calculate();
-
+
$stats = $this->projectAnalytic->getHoursByStatus($project['id']);
$this->response->html($this->layout('analytic/compare_hours', array(
@@ -195,6 +193,6 @@ class Analytic extends Base
'paginator' => $paginator,
'metrics' => $stats,
'title' => t('Compare hours for "%s"', $project['name']),
- )));
+ )));
}
}