Add a page to display completed tasks and add the completion date column for tasks

4 files changed, 82 insertions, 3 deletions

diff --git a/templates/board_index.php b/templates/board_index.php
index 777d601b..abd511b7 100644
--- a/templates/board_index.php
+++ b/templates/board_index.php
@@ -1,7 +1,9 @@
 <section id="main">
 
-    <div class="page-header">
-        <h2><?= t('Project "%s"', $current_project_name) ?></h2>
+    <div class="page-header board">
+        <h2>
+            <?= t('Project "%s"', $current_project_name) ?>
+        </h2>
         <ul>
             <?php foreach ($projects as $project_id => $project_name): ?>
             <?php if ($project_id != $current_project_id): ?>
@@ -13,6 +15,12 @@
         </ul>
     </div>
 
+    <div class="project-menu">
+        <ul>
+            <li><a href="?controller=project&amp;action=tasks&amp;project_id=<?= $current_project_id ?>"><?= t('completed tasks') ?></a></li>
+        </ul>
+    </div>
+
     <table id="board" data-project-id="<?= $current_project_id ?>">
         <tr>
             <?php $column_with = round(100 / count($columns), 2); ?>
diff --git a/templates/project_index.php b/templates/project_index.php
index 0fc2468c..d144e41f 100644
--- a/templates/project_index.php
+++ b/templates/project_index.php
@@ -31,7 +31,21 @@
                     <?= $project['is_active'] ? t('Active') : t('Inactive') ?>
                 </td>
                 <td>
-                    <?= t('%d tasks on the board', $project['nb_active_tasks']) ?>, <?= t('%d tasks in total', $project['nb_tasks']) ?>
+                    <?php if ($project['nb_tasks'] > 0): ?>
+
+                        <?php if ($project['nb_active_tasks'] > 0): ?>
+                            <a href="?controller=board&amp;action=show&amp;project_id=<?= $project['id'] ?>"><?= t('%d tasks on the board', $project['nb_active_tasks']) ?></a>,
+                        <?php endif ?>
+
+                        <?php if ($project['nb_inactive_tasks'] > 0): ?>
+                            <a href="?controller=project&amp;action=tasks&amp;project_id=<?= $project['id'] ?>"><?= t('%d closed tasks', $project['nb_inactive_tasks']) ?></a>,
+                        <?php endif ?>
+
+                        <?= t('%d tasks in total', $project['nb_tasks']) ?>
+
+                    <?php else: ?>
+                        <?= t('no task for this project') ?>
+                    <?php endif ?>
                 </td>
                 <td>
                     <ul>
diff --git a/templates/project_tasks.php b/templates/project_tasks.php
new file mode 100644
index 00000000..ed244c34
--- /dev/null
+++ b/templates/project_tasks.php
@@ -0,0 +1,52 @@
+<section id="main">
+    <div class="page-header">
+        <h2><?= t('Completed tasks for "%s"', $project['name']) ?><span id="page-counter"> (<?= $nb_tasks ?>)</span></h2>
+        <ul>
+            <li><a href="?controller=board&amp;action=show&amp;project_id=<?= $project['id'] ?>"><?= t('Back to the board') ?></a></li>
+            <li><a href="?controller=project&amp;action=index"><?= t('List of projects') ?></a></li>
+            <?php if ($_SESSION['user']['is_admin'] == 1): ?>
+                <li><a href="?controller=project&amp;action=create"><?= t('New project') ?></a></li>
+            <?php endif ?>
+        </ul>
+    </div>
+    <section>
+    <?php if (empty($tasks)): ?>
+        <p class="alert"><?= t('No task') ?></p>
+    <?php else: ?>
+        <table>
+            <tr>
+                <th><?= t('Id') ?></th>
+                <th><?= t('Column') ?></th>
+                <th><?= t('Title') ?></th>
+                <th><?= t('Assignee') ?></th>
+                <th><?= t('Date created') ?></th>
+                <th><?= t('Date completed') ?></th>
+            </tr>
+            <?php foreach ($tasks as $task): ?>
+            <tr>
+                <td class="task task-<?= $task['color_id'] ?>">
+                    <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('Show this task') ?>"><?= Helper\escape($task['id']) ?></a>
+                </td>
+                <td>
+                    <?= Helper\escape($task['column_title']) ?>
+                </td>
+                <td>
+                    <a href="?controller=task&amp;action=show&amp;task_id=<?= $task['id'] ?>" title="<?= t('Show this task') ?>"><?= Helper\escape($task['title']) ?></a>
+                </td>
+                <td>
+                    <?= Helper\escape($task['username']) ?>
+                </td>
+                <td>
+                    <?= dt('%B %e, %G at %k:%M %p', $task['date_creation']) ?>
+                </td>
+                <td>
+                    <?php if ($task['date_completed']): ?>
+                        <?= dt('%B %e, %G at %k:%M %p', $task['date_completed']) ?>
+                    <?php endif ?>
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </table>
+    <?php endif ?>
+    </section>
+</section>
\ No newline at end of file
diff --git a/templates/task_show.php b/templates/task_show.php
index 99738f9c..f09f249e 100644
--- a/templates/task_show.php
+++ b/templates/task_show.php
@@ -12,6 +12,11 @@
             <li>
                 <?= dt('Created on %B %e, %G at %k:%M %p', $task['date_creation']) ?>
             </li>
+            <?php if ($task['date_completed']): ?>
+            <li>
+                <?= dt('Completed on %B %e, %G at %k:%M %p', $task['date_completed']) ?>
+            </li>
+            <?php endif ?>
             <li>
                 <strong>
                 <?php if ($task['username']): ?>