From d1d04d6feeebeba2aea5333d7a4229fcec799f75 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 4 Jan 2015 21:14:57 -0500
Subject: Add subtasks export and move export actions to a specific controller

---
 app/Template/export/subtasks.php              | 24 ++++++++++++++++++++++++
 app/Template/export/summary.php               | 26 ++++++++++++++++++++++++++
 app/Template/export/tasks.php                 | 24 ++++++++++++++++++++++++
 app/Template/project/export_daily_summary.php | 26 --------------------------
 app/Template/project/export_tasks.php         | 24 ------------------------
 app/Template/project/sidebar.php              |  7 +++++--
 6 files changed, 79 insertions(+), 52 deletions(-)
 create mode 100644 app/Template/export/subtasks.php
 create mode 100644 app/Template/export/summary.php
 create mode 100644 app/Template/export/tasks.php
 delete mode 100644 app/Template/project/export_daily_summary.php
 delete mode 100644 app/Template/project/export_tasks.php

(limited to 'app/Template')

diff --git a/app/Template/export/subtasks.php b/app/Template/export/subtasks.php
new file mode 100644
index 00000000..aa999a56
--- /dev/null
+++ b/app/Template/export/subtasks.php
@@ -0,0 +1,24 @@
+<div class="page-header">
+    <h2>
+        <?= t('Subtasks exportation for "%s"', $project['name']) ?>
+    </h2>
+</div>
+
+<form method="get" action="?" autocomplete="off">
+
+    <?= $this->formHidden('controller', $values) ?>
+    <?= $this->formHidden('action', $values) ?>
+    <?= $this->formHidden('project_id', $values) ?>
+
+    <?= $this->formLabel(t('Start Date'), 'from') ?>
+    <?= $this->formText('from', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?><br/>
+
+    <?= $this->formLabel(t('End Date'), 'to') ?>
+    <?= $this->formText('to', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?>
+
+    <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/export/summary.php b/app/Template/export/summary.php
new file mode 100644
index 00000000..191d36b6
--- /dev/null
+++ b/app/Template/export/summary.php
@@ -0,0 +1,26 @@
+<div class="page-header">
+    <h2>
+        <?= t('Daily project summary export for "%s"', $project['name']) ?>
+    </h2>
+</div>
+
+<p class="alert alert-info"><?= t('This export contains the number of tasks per column grouped per day.') ?></p>
+
+<form method="get" action="?" autocomplete="off">
+
+    <?= $this->formHidden('controller', $values) ?>
+    <?= $this->formHidden('action', $values) ?>
+    <?= $this->formHidden('project_id', $values) ?>
+
+    <?= $this->formLabel(t('Start Date'), 'from') ?>
+    <?= $this->formText('from', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?><br/>
+
+    <?= $this->formLabel(t('End Date'), 'to') ?>
+    <?= $this->formText('to', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?>
+
+    <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/export/tasks.php b/app/Template/export/tasks.php
new file mode 100644
index 00000000..e502085c
--- /dev/null
+++ b/app/Template/export/tasks.php
@@ -0,0 +1,24 @@
+<div class="page-header">
+    <h2>
+        <?= t('Tasks exportation for "%s"', $project['name']) ?>
+    </h2>
+</div>
+
+<form method="get" action="?" autocomplete="off">
+
+    <?= $this->formHidden('controller', $values) ?>
+    <?= $this->formHidden('action', $values) ?>
+    <?= $this->formHidden('project_id', $values) ?>
+
+    <?= $this->formLabel(t('Start Date'), 'from') ?>
+    <?= $this->formText('from', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?><br/>
+
+    <?= $this->formLabel(t('End Date'), 'to') ?>
+    <?= $this->formText('to', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?>
+
+    <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+    </div>
+</form>
\ No newline at end of file
diff --git a/app/Template/project/export_daily_summary.php b/app/Template/project/export_daily_summary.php
deleted file mode 100644
index 191d36b6..00000000
--- a/app/Template/project/export_daily_summary.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<div class="page-header">
-    <h2>
-        <?= t('Daily project summary export for "%s"', $project['name']) ?>
-    </h2>
-</div>
-
-<p class="alert alert-info"><?= t('This export contains the number of tasks per column grouped per day.') ?></p>
-
-<form method="get" action="?" autocomplete="off">
-
-    <?= $this->formHidden('controller', $values) ?>
-    <?= $this->formHidden('action', $values) ?>
-    <?= $this->formHidden('project_id', $values) ?>
-
-    <?= $this->formLabel(t('Start Date'), 'from') ?>
-    <?= $this->formText('from', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?><br/>
-
-    <?= $this->formLabel(t('End Date'), 'to') ?>
-    <?= $this->formText('to', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?>
-
-    <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/project/export_tasks.php b/app/Template/project/export_tasks.php
deleted file mode 100644
index e502085c..00000000
--- a/app/Template/project/export_tasks.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<div class="page-header">
-    <h2>
-        <?= t('Tasks exportation for "%s"', $project['name']) ?>
-    </h2>
-</div>
-
-<form method="get" action="?" autocomplete="off">
-
-    <?= $this->formHidden('controller', $values) ?>
-    <?= $this->formHidden('action', $values) ?>
-    <?= $this->formHidden('project_id', $values) ?>
-
-    <?= $this->formLabel(t('Start Date'), 'from') ?>
-    <?= $this->formText('from', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?><br/>
-
-    <?= $this->formLabel(t('End Date'), 'to') ?>
-    <?= $this->formText('to', $values, $errors, array('required', 'placeholder="'.$this->inList($date_format, $date_formats).'"'), 'form-date') ?>
-
-    <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
-
-    <div class="form-actions">
-        <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
-    </div>
-</form>
\ No newline at end of file
diff --git a/app/Template/project/sidebar.php b/app/Template/project/sidebar.php
index f28f6b0d..f4809fde 100644
--- a/app/Template/project/sidebar.php
+++ b/app/Template/project/sidebar.php
@@ -54,10 +54,13 @@
     <h2><?= t('Exports') ?></h2>
     <ul>
         <li>
-            <?= $this->a(t('Tasks'), 'project', 'exportTasks', array('project_id' => $project['id'])) ?>
+            <?= $this->a(t('Tasks'), 'export', 'tasks', array('project_id' => $project['id'])) ?>
         </li>
         <li>
-            <?= $this->a(t('Daily project summary'), 'project', 'exportDailyProjectSummary', array('project_id' => $project['id'])) ?>
+            <?= $this->a(t('Subtasks'), 'export', 'subtasks', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->a(t('Daily project summary'), 'export', 'summary', array('project_id' => $project['id'])) ?>
         </li>
     </ul>
     <?php endif ?>
-- 
cgit v1.2.3