diff options
Diffstat (limited to 'app/Controller')
| -rw-r--r-- | app/Controller/Analytic.php | 29 | ||||
| -rw-r--r-- | app/Controller/Group.php | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/app/Controller/Analytic.php b/app/Controller/Analytic.php index e03d8cab..bebb13fa 100644 --- a/app/Controller/Analytic.php +++ b/app/Controller/Analytic.php @@ -1,6 +1,7 @@ <?php namespace Kanboard\Controller; +use Kanboard\Model\Task as TaskModel; /** * Project Analytic controller @@ -166,4 +167,32 @@ class Analytic extends Base 'title' => t($title, $project['name']), ))); } + + /** + * Show comparison between actual and estimated hours chart + * + * @access public + */ + public function compareHours() + { + $project = $this->getProject(); + $params = $this->getProjectFilters('analytic', 'compareHours'); + $query = $this->taskFilter->search('status:all')->filterByProject($params['project']['id'])->getQuery(); + + $paginator = $this->paginator + ->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( + 'project' => $project, + 'paginator' => $paginator, + 'metrics' => $stats, + 'title' => t('Compare hours for "%s"', $project['name']), + ))); + } } diff --git a/app/Controller/Group.php b/app/Controller/Group.php index 395a954d..3e6505e9 100644 --- a/app/Controller/Group.php +++ b/app/Controller/Group.php @@ -42,7 +42,7 @@ class Group extends Base $group = $this->group->getById($group_id); $paginator = $this->paginator - ->setUrl('group', 'users') + ->setUrl('group', 'users', array('group_id' => $group_id)) ->setMax(30) ->setOrder('username') ->setQuery($this->groupMember->getQuery($group_id)) |