From 9e1f4fa6c7eae1b46cf5431ab085b82e970e2d57 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Mon, 14 Dec 2015 22:13:11 -0500 Subject: Improve pull-request that compare hours --- app/Controller/Analytic.php | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'app/Controller') 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']), - ))); + ))); } } -- cgit v1.2.3