diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/Model/Task.php | 2 | ||||
| -rw-r--r-- | app/Templates/board_task.php | 17 |
2 files changed, 14 insertions, 5 deletions
diff --git a/app/Model/Task.php b/app/Model/Task.php index 10d125d4..7245417a 100644 --- a/app/Model/Task.php +++ b/app/Model/Task.php @@ -195,6 +195,8 @@ class Task extends Base ->columns( '(SELECT count(*) FROM comments WHERE task_id=tasks.id) AS nb_comments', '(SELECT count(*) FROM task_has_files WHERE task_id=tasks.id) AS nb_files', + '(SELECT count(*) FROM task_has_subtasks WHERE task_id=tasks.id) AS nb_subtasks', + '(SELECT count(*) FROM task_has_subtasks WHERE task_id=tasks.id AND status=2) AS nb_completed_subtasks', 'tasks.id', 'tasks.title', 'tasks.description', diff --git a/app/Templates/board_task.php b/app/Templates/board_task.php index 20947a02..4f3546e2 100644 --- a/app/Templates/board_task.php +++ b/app/Templates/board_task.php @@ -56,7 +56,7 @@ <?php endif ?> -<?php if (! empty($task['date_due']) || ! empty($task['nb_files']) || ! empty($task['nb_comments']) || ! empty($task['description'])): ?> +<?php if (! empty($task['date_due']) || ! empty($task['nb_files']) || ! empty($task['nb_comments']) || ! empty($task['description']) || ! empty($task['nb_subtasks'])): ?> <div class="task-board-footer"> <?php if (! empty($task['date_due'])): ?> @@ -66,20 +66,27 @@ <?php endif ?> <div class="task-board-icons"> + + <?php if (! empty($task['nb_subtasks'])): ?> + <span title="<?= t('Sub-Tasks') ?>"><?= $task['nb_completed_subtasks'].'/'.$task['nb_subtasks'] ?> <i class="fa fa-bars"></i></span> + <?php endif ?> + <?php if (! empty($task['nb_files'])): ?> - <?= $task['nb_files'] ?> <i class="fa fa-paperclip" title="<?= t('Attachments') ?>"></i> + <span title="<?= t('Attachments') ?>"><?= $task['nb_files'] ?> <i class="fa fa-paperclip"></i></span> <?php endif ?> <?php if (! empty($task['nb_comments'])): ?> - <?= $task['nb_comments'] ?> <i class="fa fa-comment-o" title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"></i> + <span title="<?= p($task['nb_comments'], t('%d comment', $task['nb_comments']), t('%d comments', $task['nb_comments'])) ?>"><?= $task['nb_comments'] ?> <i class="fa fa-comment-o"></i></span> <?php endif ?> <?php if (! empty($task['description'])): ?> + <span title="<?= t('Description') ?>"> <?php if (! isset($not_editable)): ?> - <a class="task-description-popover" href="?controller=task&action=description&task_id=<?= $task['id'] ?>"><i class="fa fa-file-text-o" title="<?= t('Description') ?>" data-href="?controller=task&action=description&task_id=<?= $task['id'] ?>"></i></a> + <a class="task-description-popover" href="?controller=task&action=description&task_id=<?= $task['id'] ?>"><i class="fa fa-file-text-o" data-href="?controller=task&action=description&task_id=<?= $task['id'] ?>"></i></a> <?php else: ?> - <i class="fa fa-file-text-o" title="<?= t('Description') ?>"></i> + <i class="fa fa-file-text-o"></i> <?php endif ?> + </span> <?php endif ?> </div> </div> |