Merge pull-request #847 (recurring tasks)

3 files changed, 28 insertions, 1 deletions

diff --git a/app/Template/board/recurrence.php b/app/Template/board/recurrence.php
new file mode 100644
index 00000000..1b71bc34
--- /dev/null
+++ b/app/Template/board/recurrence.php
@@ -0,0 +1,18 @@
+<section class="tooltip-large">
+<?php if ($task['recurrence_status'] == \Model\Task::RECURE_STATUS_PENDING): ?>
+    <?= t('Recurrent task is scheduled to generate') ?><br/>
+<?php endif ?>
+<?php if ($task['recurrence_status'] == \Model\Task::RECURE_STATUS_PROCESSED): ?>
+    <?= t('Recurrent task has been generated') ?><br/>
+<?php endif ?>
+    <?= t('Trigger to generate recurrent task: %s', $recurrence_trigger_list[$task['recurrence_trigger']]) ?><br/>
+    <?= t('Factor to calculate new due date: %s', $task['recurrence_factor']) ?><br/>
+    <?= t('Timeframe to calculate new due date: %s', $recurrence_timeframe_list[$task['recurrence_timeframe']]) ?><br/>
+    <?= t('Base date to calculate new due date: %s', $recurrence_basedate_list[$task['recurrence_basedate']]) ?><br/>
+<?php if ($task['recurrence_parent']): ?>
+    <?= t('Recurrent task created by: %s', $task['recurrence_parent']) ?><br/>
+<?php endif ?>
+<?php if ($task['recurrence_child']): ?>
+    <?= t('Created recurrent task: %s', $task['recurrence_child']) ?><br/>
+<?php endif ?>
+</section>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 36ed2684..b8868f52 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -25,6 +25,14 @@
         </span>
     <?php endif ?>
 
+    <?php if ($task['recurrence_status'] == \Model\Task::RECURE_STATUS_PENDING): ?>
+        <span title="<?= t('Recurrence') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90"></i></span>
+    <?php endif ?>
+
+    <?php if ($task['recurrence_status'] == \Model\Task::RECURE_STATUS_PROCESSED): ?>
+        <span title="<?= t('Recurrence') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-refresh fa-rotate-90 fa-inverse"></i></span>
+    <?php endif ?>
+
     <?php if (! empty($task['nb_links'])): ?>
         <span title="<?= t('Links') ?>" class="task-board-tooltip" data-href="<?= $this->u('board', 'tasklinks', array('task_id' => $task['id'], 'project_id' => $task['project_id'])) ?>"><i class="fa fa-code-fork"></i>&nbsp;<?= $task['nb_links'] ?></span>
     <?php endif ?>
diff --git a/app/Template/board/task_menu.php b/app/Template/board/task_menu.php
index f3ec3019..fba2d71d 100644
--- a/app/Template/board/task_menu.php
+++ b/app/Template/board/task_menu.php
@@ -5,6 +5,7 @@
             <li><i class="fa fa-user"></i> <?= $this->a(t('Change assignee'), 'board', 'changeAssignee', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-tag"></i> <?= $this->a(t('Change category'), 'board', 'changeCategory', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-align-left"></i> <?= $this->a(t('Change description'), 'task', 'description', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
+            <li><i class="fa fa-refresh fa-rotate-90"></i> <?= $this->a(t('Edit recurrence'), 'task', 'recurrence', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-comment-o"></i> <?= $this->a(t('Add a comment'), 'comment', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-code-fork"></i> <?= $this->a(t('Add a link'), 'tasklink', 'create', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
             <li><i class="fa fa-pencil-square-o"></i> <?= $this->a(t('Edit this task'), 'task', 'edit', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, 'task-board-popover') ?></li>
@@ -12,4 +13,4 @@
             <li><i class="fa fa-close"></i> <?= $this->a(t('Close this task'), 'task', 'close', array('task_id' => $task['id'], 'project_id' => $task['project_id'], 'redirect' => 'board'), false, 'task-board-popover') ?></li>
         </ul>
     </span>
-</span>
\ No newline at end of file
+</span>