From d4ae2f135dd8ef3e5d5b09e29d21396f626f0dd7 Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sun, 16 Nov 2014 21:36:46 -0500
Subject: Add daily project summary export

---
 app/Template/project/export_daily_summary.php | 26 ++++++++++++++++++++++++++
 app/Template/project/export_tasks.php         | 24 ++++++++++++++++++++++++
 app/Template/project_export.php               | 24 ------------------------
 app/Template/project_sidebar.php              | 15 ++++++++++++---
 4 files changed, 62 insertions(+), 27 deletions(-)
 create mode 100644 app/Template/project/export_daily_summary.php
 create mode 100644 app/Template/project/export_tasks.php
 delete mode 100644 app/Template/project_export.php

(limited to 'app/Template')

diff --git a/app/Template/project/export_daily_summary.php b/app/Template/project/export_daily_summary.php
new file mode 100644
index 00000000..763cd81c
--- /dev/null
+++ b/app/Template/project/export_daily_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">
+
+    <?= Helper\form_hidden('controller', $values) ?>
+    <?= Helper\form_hidden('action', $values) ?>
+    <?= Helper\form_hidden('project_id', $values) ?>
+
+    <?= Helper\form_label(t('Start Date'), 'from') ?>
+    <?= Helper\form_text('from', $values, $errors, array('required', 'placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?><br/>
+
+    <?= Helper\form_label(t('End Date'), 'to') ?>
+    <?= Helper\form_text('to', $values, $errors, array('required', 'placeholder="'.Helper\in_list($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
new file mode 100644
index 00000000..02eb389f
--- /dev/null
+++ b/app/Template/project/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">
+
+    <?= Helper\form_hidden('controller', $values) ?>
+    <?= Helper\form_hidden('action', $values) ?>
+    <?= Helper\form_hidden('project_id', $values) ?>
+
+    <?= Helper\form_label(t('Start Date'), 'from') ?>
+    <?= Helper\form_text('from', $values, $errors, array('required', 'placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?><br/>
+
+    <?= Helper\form_label(t('End Date'), 'to') ?>
+    <?= Helper\form_text('to', $values, $errors, array('required', 'placeholder="'.Helper\in_list($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.php b/app/Template/project_export.php
deleted file mode 100644
index 02eb389f..00000000
--- a/app/Template/project_export.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">
-
-    <?= Helper\form_hidden('controller', $values) ?>
-    <?= Helper\form_hidden('action', $values) ?>
-    <?= Helper\form_hidden('project_id', $values) ?>
-
-    <?= Helper\form_label(t('Start Date'), 'from') ?>
-    <?= Helper\form_text('from', $values, $errors, array('required', 'placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?><br/>
-
-    <?= Helper\form_label(t('End Date'), 'to') ?>
-    <?= Helper\form_text('to', $values, $errors, array('required', 'placeholder="'.Helper\in_list($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 7d6e0bfb..bd56edaf 100644
--- a/app/Template/project_sidebar.php
+++ b/app/Template/project_sidebar.php
@@ -6,9 +6,6 @@
         </li>
 
         <?php if (Helper\is_admin() || $project['is_private']): ?>
-        <li>
-            <a href="?controller=project&amp;action=export&amp;project_id=<?= $project['id'] ?>"><?= t('Tasks Export') ?></a>
-        </li>
         <li>
             <a href="?controller=project&amp;action=share&amp;project_id=<?= $project['id'] ?>"><?= t('Public access') ?></a>
         </li>
@@ -44,4 +41,16 @@
         </li>
         <?php endif ?>
     </ul>
+
+    <?php if (Helper\is_admin() || $project['is_private']): ?>
+    <h2><?= t('Exports') ?></h2>
+    <ul>
+        <li>
+            <?= Helper\a(t('Tasks'), 'project', 'exportTasks', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= Helper\a(t('Daily project summary'), 'project', 'exportDailyProjectSummary', array('project_id' => $project['id'])) ?>
+        </li>
+    </li>
+    <?php endif ?>
 </div>
\ No newline at end of file
-- 
cgit v1.2.3