From bb8b4c0e36afc05ff5b0cb3ac6465351a696b001 Mon Sep 17 00:00:00 2001 From: Frederic Guillot Date: Sun, 5 Jul 2015 16:07:21 -0400 Subject: Add task analytics --- app/Controller/Activity.php | 16 +++++ app/Controller/Task.php | 11 ++-- app/Core/Helper.php | 2 +- app/Helper/Datetime.php | 94 ---------------------------- app/Helper/Dt.php | 110 +++++++++++++++++++++++++++++++++ app/Model/TaskAnalytic.php | 74 ++++++++++++++++++++++ app/Model/Transition.php | 16 +++++ app/ServiceProvider/ClassProvider.php | 1 + app/Template/activity/task.php | 5 ++ app/Template/board/task_private.php | 4 +- app/Template/subtask/show.php | 2 +- app/Template/task/activity.php | 5 -- app/Template/task/analytics.php | 32 ++++++++++ app/Template/task/sidebar.php | 5 +- app/Template/task/transitions.php | 2 +- app/Template/timetable_day/index.php | 4 +- app/Template/timetable_extra/index.php | 4 +- app/Template/timetable_off/index.php | 4 +- app/Template/timetable_week/index.php | 8 +-- tests/units/DatetimeHelperTest.php | 10 +-- 20 files changed, 284 insertions(+), 125 deletions(-) delete mode 100644 app/Helper/Datetime.php create mode 100644 app/Helper/Dt.php create mode 100644 app/Model/TaskAnalytic.php create mode 100644 app/Template/activity/task.php delete mode 100644 app/Template/task/activity.php create mode 100644 app/Template/task/analytics.php diff --git a/app/Controller/Activity.php b/app/Controller/Activity.php index 2276b3b8..234e4be4 100644 --- a/app/Controller/Activity.php +++ b/app/Controller/Activity.php @@ -26,4 +26,20 @@ class Activity extends Base 'title' => t('%s\'s activity', $project['name']) ))); } + + /** + * Display task activities + * + * @access public + */ + public function task() + { + $task = $this->getTask(); + + $this->response->html($this->taskLayout('activity/task', array( + 'title' => $task['title'], + 'task' => $task, + 'events' => $this->projectActivity->getTask($task['id']), + ))); + } } diff --git a/app/Controller/Task.php b/app/Controller/Task.php index dc83f7b1..b6e4845f 100644 --- a/app/Controller/Task.php +++ b/app/Controller/Task.php @@ -88,19 +88,20 @@ class Task extends Base } /** - * Display task activities + * Display task analytics * * @access public */ - public function activites() + public function analytics() { $task = $this->getTask(); - $this->response->html($this->taskLayout('task/activity', array( + $this->response->html($this->taskLayout('task/analytics', array( 'title' => $task['title'], 'task' => $task, - 'ajax' => $this->request->isAjax(), - 'events' => $this->projectActivity->getTask($task['id']), + 'lead_time' => $this->taskAnalytic->getLeadTime($task), + 'cycle_time' => $this->taskAnalytic->getCycleTime($task), + 'column_averages' => $this->taskAnalytic->getAverageTimeByColumn($task), ))); } diff --git a/app/Core/Helper.php b/app/Core/Helper.php index e4f225b0..64eaed23 100644 --- a/app/Core/Helper.php +++ b/app/Core/Helper.php @@ -12,7 +12,7 @@ use Pimple\Container; * * @property \Helper\App $app * @property \Helper\Asset $asset - * @property \Helper\Datetime $datetime + * @property \Helper\Dt $dt * @property \Helper\File $file * @property \Helper\Form $form * @property \Helper\Subtask $subtask diff --git a/app/Helper/Datetime.php b/app/Helper/Datetime.php deleted file mode 100644 index 74ea9bdd..00000000 --- a/app/Helper/Datetime.php +++ /dev/null @@ -1,94 +0,0 @@ -getWeekDay($day); - } - - return $values; - } - - /** - * Get the localized day name from the day number - * - * @access public - * @param integer $day Day number - * @return string - */ - public function getWeekDay($day) - { - return dt('%A', strtotime('next Monday +'.($day - 1).' days')); - } -} diff --git a/app/Helper/Dt.php b/app/Helper/Dt.php new file mode 100644 index 00000000..be595605 --- /dev/null +++ b/app/Helper/Dt.php @@ -0,0 +1,110 @@ +diff($dtT)->format('%a days, %h hours, %i minutes and %s seconds'); + } + + /** + * Get the age of an item in quasi human readable format. + * It's in this format: <1h , NNh, NNd + * + * @access public + * @param integer $timestamp Unix timestamp of the artifact for which age will be calculated + * @param integer $now Compare with this timestamp (Default value is the current unix timestamp) + * @return string + */ + public function age($timestamp, $now = null) + { + if ($now === null) { + $now = time(); + } + + $diff = $now - $timestamp; + + if ($diff < 900) { + return t('<15m'); + } + if ($diff < 1200) { + return t('<30m'); + } + else if ($diff < 3600) { + return t('<1h'); + } + else if ($diff < 86400) { + return '~'.t('%dh', $diff / 3600); + } + + return t('%dd', ($now - $timestamp) / 86400); + } + + /** + * Get all hours for day + * + * @access public + * @return array + */ + public function getDayHours() + { + $values = array(); + + foreach (range(0, 23) as $hour) { + foreach (array(0, 30) as $minute) { + $time = sprintf('%02d:%02d', $hour, $minute); + $values[$time] = $time; + } + } + + return $values; + } + + /** + * Get all days of a week + * + * @access public + * @return array + */ + public function getWeekDays() + { + $values = array(); + + foreach (range(1, 7) as $day) { + $values[$day] = $this->getWeekDay($day); + } + + return $values; + } + + /** + * Get the localized day name from the day number + * + * @access public + * @param integer $day Day number + * @return string + */ + public function getWeekDay($day) + { + return dt('%A', strtotime('next Monday +'.($day - 1).' days')); + } +} diff --git a/app/Model/TaskAnalytic.php b/app/Model/TaskAnalytic.php new file mode 100644 index 00000000..41579c7d --- /dev/null +++ b/app/Model/TaskAnalytic.php @@ -0,0 +1,74 @@ +board->getColumnsList($task['project_id']); + $averages = $this->transition->getAverageTimeSpentByTask($task['id']); + + foreach ($columns as $column_id => $column_title) { + + $time_spent = 0; + + if (empty($averages) && $task['column_id'] == $column_id) { + $time_spent = time() - $task['date_creation']; + } + else { + $time_spent = isset($averages[$column_id]) ? $averages[$column_id] : 0; + } + + $result[] = array( + 'id' => $column_id, + 'title' => $column_title, + 'time_spent' => $time_spent, + ); + } + + return $result; + } +} diff --git a/app/Model/Transition.php b/app/Model/Transition.php index cb759e4a..959b6aca 100644 --- a/app/Model/Transition.php +++ b/app/Model/Transition.php @@ -38,6 +38,22 @@ class Transition extends Base )); } + /** + * Get average time spent by task for each column + * + * @access public + * @param integer $task_id + * @return array + */ + public function getAverageTimeSpentByTask($task_id) + { + return $this->db + ->hashtable(self::TABLE) + ->groupBy('src_column_id') + ->eq('task_id', $task_id) + ->getAll('src_column_id', 'SUM(time_spent) AS time_spent'); + } + /** * Get all transitions by task * diff --git a/app/ServiceProvider/ClassProvider.php b/app/ServiceProvider/ClassProvider.php index 1fa0d0ef..609f5824 100644 --- a/app/ServiceProvider/ClassProvider.php +++ b/app/ServiceProvider/ClassProvider.php @@ -42,6 +42,7 @@ class ClassProvider implements ServiceProviderInterface 'SubtaskTimeTracking', 'Swimlane', 'Task', + 'TaskAnalytic', 'TaskCreation', 'TaskDuplication', 'TaskExport', diff --git a/app/Template/activity/task.php b/app/Template/activity/task.php new file mode 100644 index 00000000..cc4aad03 --- /dev/null +++ b/app/Template/activity/task.php @@ -0,0 +1,5 @@ +
+

+
+ +render('event/events', array('events' => $events)) ?> \ No newline at end of file diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php index 87121f2c..3f4010ea 100644 --- a/app/Template/board/task_private.php +++ b/app/Template/board/task_private.php @@ -43,8 +43,8 @@
- datetime->age($task['date_creation']) ?> - datetime->age($task['date_moved']) ?> + dt->age($task['date_creation']) ?> + dt->age($task['date_moved']) ?>
diff --git a/app/Template/subtask/show.php b/app/Template/subtask/show.php index b91e830f..cc82a74e 100644 --- a/app/Template/subtask/show.php +++ b/app/Template/subtask/show.php @@ -48,7 +48,7 @@ url->link(t('Stop timer'), 'timer', 'subtask', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?> - (datetime->age($subtask['timer_start_date']) ?>) + (dt->age($subtask['timer_start_date']) ?>) url->link(t('Start timer'), 'timer', 'subtask', array('timer' => 'start', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?> diff --git a/app/Template/task/activity.php b/app/Template/task/activity.php deleted file mode 100644 index cc4aad03..00000000 --- a/app/Template/task/activity.php +++ /dev/null @@ -1,5 +0,0 @@ -
-

-
- -render('event/events', array('events' => $events)) ?> \ No newline at end of file diff --git a/app/Template/task/analytics.php b/app/Template/task/analytics.php new file mode 100644 index 00000000..dbee0e9c --- /dev/null +++ b/app/Template/task/analytics.php @@ -0,0 +1,32 @@ +
+

+
+ +
+ +
+ +

+ + + + + + + + + + + +
e($column['title']) ?>dt->duration($column['time_spent']) ?>
+ +
+ +
\ No newline at end of file diff --git a/app/Template/task/sidebar.php b/app/Template/task/sidebar.php index bb137ac9..8b0f3c6e 100644 --- a/app/Template/task/sidebar.php +++ b/app/Template/task/sidebar.php @@ -5,11 +5,14 @@ url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • - url->link(t('Activity stream'), 'task', 'activites', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
  • url->link(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>
    • +
  • + url->link(t('Analytics'), 'task', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> +
    • 0 || $task['time_spent'] > 0): ?>
  • url->link(t('Time tracking'), 'task', 'timesheet', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php index 6455fd66..2ca2387f 100644 --- a/app/Template/task/transitions.php +++ b/app/Template/task/transitions.php @@ -19,7 +19,7 @@ e($transition['src_column']) ?> e($transition['dst_column']) ?> url->link($this->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?> - + dt->duration($transition['time_spent']) ?> diff --git a/app/Template/timetable_day/index.php b/app/Template/timetable_day/index.php index d2877816..386ceec2 100644 --- a/app/Template/timetable_day/index.php +++ b/app/Template/timetable_day/index.php @@ -30,10 +30,10 @@ form->csrf() ?> form->label(t('Start time'), 'start') ?> - form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('start', $this->dt->getDayHours(), $values, $errors) ?> form->label(t('End time'), 'end') ?> - form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('end', $this->dt->getDayHours(), $values, $errors) ?>
    diff --git a/app/Template/timetable_extra/index.php b/app/Template/timetable_extra/index.php index d3224ae6..e9982335 100644 --- a/app/Template/timetable_extra/index.php +++ b/app/Template/timetable_extra/index.php @@ -42,10 +42,10 @@ form->checkbox('all_day', t('All day'), 1) ?> form->label(t('Start time'), 'start') ?> - form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('start', $this->dt->getDayHours(), $values, $errors) ?> form->label(t('End time'), 'end') ?> - form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('end', $this->dt->getDayHours(), $values, $errors) ?> form->label(t('Comment'), 'comment') ?> form->text('comment', $values, $errors) ?> diff --git a/app/Template/timetable_off/index.php b/app/Template/timetable_off/index.php index 75e02dbd..615c2b8d 100644 --- a/app/Template/timetable_off/index.php +++ b/app/Template/timetable_off/index.php @@ -42,10 +42,10 @@ form->checkbox('all_day', t('All day'), 1) ?> form->label(t('Start time'), 'start') ?> - form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('start', $this->dt->getDayHours(), $values, $errors) ?> form->label(t('End time'), 'end') ?> - form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('end', $this->dt->getDayHours(), $values, $errors) ?> form->label(t('Comment'), 'comment') ?> form->text('comment', $values, $errors) ?> diff --git a/app/Template/timetable_week/index.php b/app/Template/timetable_week/index.php index 552e9302..d58c6cfb 100644 --- a/app/Template/timetable_week/index.php +++ b/app/Template/timetable_week/index.php @@ -13,7 +13,7 @@ - datetime->getWeekDay($slot['day']) ?> + dt->getWeekDay($slot['day']) ?> @@ -32,13 +32,13 @@ form->csrf() ?> form->label(t('Day'), 'day') ?> - form->select('day', $this->datetime->getWeekDays(), $values, $errors) ?> + form->select('day', $this->dt->getWeekDays(), $values, $errors) ?> form->label(t('Start time'), 'start') ?> - form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('start', $this->dt->getDayHours(), $values, $errors) ?> form->label(t('End time'), 'end') ?> - form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + form->select('end', $this->dt->getDayHours(), $values, $errors) ?>
    diff --git a/tests/units/DatetimeHelperTest.php b/tests/units/DatetimeHelperTest.php index 216cf34c..21d452dd 100644 --- a/tests/units/DatetimeHelperTest.php +++ b/tests/units/DatetimeHelperTest.php @@ -2,13 +2,13 @@ require_once __DIR__.'/Base.php'; -use Helper\Datetime; +use Helper\Dt; class DatetimeHelperTest extends Base { public function testAge() { - $h = new Datetime($this->container); + $h = new Dt($this->container); $this->assertEquals('<15m', $h->age(0, 30)); $this->assertEquals('<30m', $h->age(0, 1000)); @@ -20,7 +20,7 @@ class DatetimeHelperTest extends Base public function testGetDayHours() { - $h = new Datetime($this->container); + $h = new Dt($this->container); $slots = $h->getDayHours(); @@ -36,7 +36,7 @@ class DatetimeHelperTest extends Base public function testGetWeekDays() { - $h = new Datetime($this->container); + $h = new Dt($this->container); $slots = $h->getWeekDays(); @@ -48,7 +48,7 @@ class DatetimeHelperTest extends Base public function testGetWeekDay() { - $h = new Datetime($this->container); + $h = new Dt($this->container); $this->assertEquals('Monday', $h->getWeekDay(1)); $this->assertEquals('Sunday', $h->getWeekDay(7)); -- cgit v1.2.3