diff options
Diffstat (limited to 'app/Template')
-rw-r--r-- | app/Template/activity/task.php (renamed from app/Template/task/activity.php) | 0 | ||||
-rw-r--r-- | app/Template/board/task_private.php | 4 | ||||
-rw-r--r-- | app/Template/subtask/show.php | 2 | ||||
-rw-r--r-- | app/Template/task/analytics.php | 32 | ||||
-rw-r--r-- | app/Template/task/sidebar.php | 5 | ||||
-rw-r--r-- | app/Template/task/transitions.php | 2 | ||||
-rw-r--r-- | app/Template/timetable_day/index.php | 4 | ||||
-rw-r--r-- | app/Template/timetable_extra/index.php | 4 | ||||
-rw-r--r-- | app/Template/timetable_off/index.php | 4 | ||||
-rw-r--r-- | app/Template/timetable_week/index.php | 8 |
10 files changed, 50 insertions, 15 deletions
diff --git a/app/Template/task/activity.php b/app/Template/activity/task.php index cc4aad03..cc4aad03 100644 --- a/app/Template/task/activity.php +++ b/app/Template/activity/task.php 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 @@ <?php if ($task['is_active'] == 1): ?> <div class="task-board-days"> - <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->datetime->age($task['date_creation']) ?></span> - <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->datetime->age($task['date_moved']) ?></span> + <span title="<?= t('Task age in days')?>" class="task-days-age"><?= $this->dt->age($task['date_creation']) ?></span> + <span title="<?= t('Days in this column')?>" class="task-days-incolumn"><?= $this->dt->age($task['date_moved']) ?></span> </div> <?php else: ?> <div class="task-board-closed"><i class="fa fa-ban fa-fw"></i><?= t('Closed') ?></div> 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 @@ <?php if ($subtask['is_timer_started']): ?> <i class="fa fa-pause"></i> <?= $this->url->link(t('Stop timer'), 'timer', 'subtask', array('timer' => 'stop', 'project_id' => $task['project_id'], 'task_id' => $subtask['task_id'], 'subtask_id' => $subtask['id'])) ?> - (<?= $this->datetime->age($subtask['timer_start_date']) ?>) + (<?= $this->dt->age($subtask['timer_start_date']) ?>) <?php else: ?> <i class="fa fa-play-circle-o"></i> <?= $this->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/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 @@ +<div class="page-header"> + <h2><?= t('Analytics') ?></h2> +</div> + +<div class="listing"> + <ul> + <li><?= t('Lead time: ').'<strong>'.$this->dt->duration($lead_time) ?></strong></li> + <li><?= t('Cycle time: ').'<strong>'.$this->dt->duration($cycle_time) ?></strong></li> + </ul> +</div> + +<h3><?= t('Average time spent for each column') ?></h3> +<table class="table-stripped"> + <tr> + <th><?= t('Column') ?></th> + <th><?= t('Average time spent') ?></th> + </tr> + <?php foreach ($column_averages as $column): ?> + <tr> + <td><?= $this->e($column['title']) ?></td> + <td><?= $this->dt->duration($column['time_spent']) ?></td> + </tr> + <?php endforeach ?> +</table> + +<div class="alert alert-info"> + <ul> + <li><?= t('The lead time is the time between the task creation and the completion.') ?></li> + <li><?= t('The cycle time is the time between the start date and the completion.') ?></li> + <li><?= t('If the task is not closed the current time is used.') ?></li> + </ul> +</div>
\ 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 @@ <?= $this->url->link(t('Summary'), 'task', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <li> - <?= $this->url->link(t('Activity stream'), 'task', 'activites', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + <?= $this->url->link(t('Activity stream'), 'activity', 'task', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> <li> <?= $this->url->link(t('Transitions'), 'task', 'transitions', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> </li> + <li> + <?= $this->url->link(t('Analytics'), 'task', 'analytics', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?> + </li> <?php if ($task['time_estimated'] > 0 || $task['time_spent'] > 0): ?> <li> <?= $this->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 @@ <td><?= $this->e($transition['src_column']) ?></td> <td><?= $this->e($transition['dst_column']) ?></td> <td><?= $this->url->link($this->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?></td> - <td><?= n(round($transition['time_spent'] / 3600, 2)).' '.t('hours') ?></td> + <td><?= $this->dt->duration($transition['time_spent']) ?></td> </tr> <?php endforeach ?> </table> 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 @@ <?= $this->form->csrf() ?> <?= $this->form->label(t('Start time'), 'start') ?> - <?= $this->form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('start', $this->dt->getDayHours(), $values, $errors) ?> <?= $this->form->label(t('End time'), 'end') ?> - <?= $this->form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('end', $this->dt->getDayHours(), $values, $errors) ?> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> 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 @@ <?= $this->form->checkbox('all_day', t('All day'), 1) ?> <?= $this->form->label(t('Start time'), 'start') ?> - <?= $this->form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('start', $this->dt->getDayHours(), $values, $errors) ?> <?= $this->form->label(t('End time'), 'end') ?> - <?= $this->form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('end', $this->dt->getDayHours(), $values, $errors) ?> <?= $this->form->label(t('Comment'), 'comment') ?> <?= $this->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 @@ <?= $this->form->checkbox('all_day', t('All day'), 1) ?> <?= $this->form->label(t('Start time'), 'start') ?> - <?= $this->form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('start', $this->dt->getDayHours(), $values, $errors) ?> <?= $this->form->label(t('End time'), 'end') ?> - <?= $this->form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('end', $this->dt->getDayHours(), $values, $errors) ?> <?= $this->form->label(t('Comment'), 'comment') ?> <?= $this->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 @@ </tr> <?php foreach ($timetable as $slot): ?> <tr> - <td><?= $this->datetime->getWeekDay($slot['day']) ?></td> + <td><?= $this->dt->getWeekDay($slot['day']) ?></td> <td><?= $slot['start'] ?></td> <td><?= $slot['end'] ?></td> <td> @@ -32,13 +32,13 @@ <?= $this->form->csrf() ?> <?= $this->form->label(t('Day'), 'day') ?> - <?= $this->form->select('day', $this->datetime->getWeekDays(), $values, $errors) ?> + <?= $this->form->select('day', $this->dt->getWeekDays(), $values, $errors) ?> <?= $this->form->label(t('Start time'), 'start') ?> - <?= $this->form->select('start', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('start', $this->dt->getDayHours(), $values, $errors) ?> <?= $this->form->label(t('End time'), 'end') ?> - <?= $this->form->select('end', $this->datetime->getDayHours(), $values, $errors) ?> + <?= $this->form->select('end', $this->dt->getDayHours(), $values, $errors) ?> <div class="form-actions"> <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/> |