Merged branch 'master' of https://github.com/fguillot/kanboard

only imports conflicted

3 files changed, 77 insertions, 0 deletions

diff --git a/app/Template/analytic/avg_time_columns.php b/app/Template/analytic/avg_time_columns.php
new file mode 100644
index 00000000..e74e7950
--- /dev/null
+++ b/app/Template/analytic/avg_time_columns.php
@@ -0,0 +1,29 @@
+<div class="page-header">
+    <h2><?= t('Average time spent into each column') ?></h2>
+</div>
+
+<?php if (empty($metrics)): ?>
+    <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+    <section id="analytic-avg-time-column">
+
+        <div id="chart" data-metrics='<?= json_encode($metrics) ?>' data-label="<?= t('Average time spent') ?>"></div>
+
+        <table class="table-stripped">
+        <tr>
+            <th><?= t('Column') ?></th>
+            <th><?= t('Average time spent') ?></th>
+        </tr>
+        <?php foreach ($metrics as $column): ?>
+        <tr>
+            <td><?= $this->e($column['title']) ?></td>
+            <td><?= $this->dt->duration($column['average']) ?></td>
+        </tr>
+        <?php endforeach ?>
+        </table>
+
+        <p class="alert alert-info">
+            <?= t('This chart show the average time spent into each column for the last %d tasks.', 1000) ?>
+        </p>
+    </section>
+<?php endif ?>
diff --git a/app/Template/analytic/lead_cycle_time.php b/app/Template/analytic/lead_cycle_time.php
new file mode 100644
index 00000000..d96bdcb8
--- /dev/null
+++ b/app/Template/analytic/lead_cycle_time.php
@@ -0,0 +1,42 @@
+<div class="page-header">
+    <h2><?= t('Average Lead and Cycle time') ?></h2>
+</div>
+
+<div class="listing">
+    <ul>
+        <li><?= t('Average lead time: ').'<strong>'.$this->dt->duration($average['avg_lead_time']) ?></strong></li>
+        <li><?= t('Average cycle time: ').'<strong>'.$this->dt->duration($average['avg_cycle_time']) ?></strong></li>
+    </ul>
+</div>
+
+<?php if (empty($metrics)): ?>
+    <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+    <section id="analytic-lead-cycle-time">
+
+        <div id="chart" data-metrics='<?= json_encode($metrics) ?>' data-label-cycle="<?= t('Cycle Time') ?>" data-label-lead="<?= t('Lead Time') ?>"></div>
+
+        <form method="post" class="form-inline" action="<?= $this->url->href('analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>" autocomplete="off">
+
+            <?= $this->form->csrf() ?>
+
+            <div class="form-inline-group">
+                <?= $this->form->label(t('Start Date'), 'from') ?>
+                <?= $this->form->text('from', $values, array(), array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
+            </div>
+
+            <div class="form-inline-group">
+                <?= $this->form->label(t('End Date'), 'to') ?>
+                <?= $this->form->text('to', $values, array(), array('required', 'placeholder="'.$this->text->in($date_format, $date_formats).'"'), 'form-date') ?>
+            </div>
+
+            <div class="form-inline-group">
+                <input type="submit" value="<?= t('Execute') ?>" class="btn btn-blue"/>
+            </div>
+        </form>
+
+        <p class="alert alert-info">
+            <?= t('This chart show the average lead and cycle time for the last %d tasks over the time.', 1000) ?>
+        </p>
+    </section>
+<?php endif ?>
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index 2d1a7c96..de03bdf8 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -13,5 +13,11 @@
         <li>
             <?= $this->url->link(t('Burndown chart'), 'analytic', 'burndown', array('project_id' => $project['id'])) ?>
         </li>
+        <li>
+            <?= $this->url->link(t('Average time into each column'), 'analytic', 'averageTimeByColumn', array('project_id' => $project['id'])) ?>
+        </li>
+        <li>
+            <?= $this->url->link(t('Lead and cycle time'), 'analytic', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
+        </li>
     </ul>
 </div>
\ No newline at end of file