From daa076eea7185a3b67dbfed7b34e42f3049026df Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 3 Sep 2016 21:20:54 -0400
Subject: Convert time comparison chart to Vue.js component

---
 app/Template/analytic/compare_hours.php   | 62 -------------------------------
 app/Template/analytic/sidebar.php         |  4 +-
 app/Template/analytic/time_comparison.php | 61 ++++++++++++++++++++++++++++++
 3 files changed, 63 insertions(+), 64 deletions(-)
 delete mode 100644 app/Template/analytic/compare_hours.php
 create mode 100644 app/Template/analytic/time_comparison.php

(limited to 'app/Template/analytic')

diff --git a/app/Template/analytic/compare_hours.php b/app/Template/analytic/compare_hours.php
deleted file mode 100644
index c0b9cfc3..00000000
--- a/app/Template/analytic/compare_hours.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Estimated vs actual time') ?></h2>
-</div>
-
-<div class="listing">
-    <ul>
-        <li><?= t('Estimated hours: ').'<strong>'.$this->text->e($metrics['open']['time_estimated'] + $metrics['closed']['time_estimated']) ?></strong></li>
-        <li><?= t('Actual hours: ').'<strong>'.$this->text->e($metrics['open']['time_spent'] + $metrics['closed']['time_spent']) ?></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-compare-hours">
-    <div id="chart"
-        data-metrics='<?= json_encode($metrics, JSON_HEX_APOS)?>'
-        data-label-spent="<?= t('Hours Spent') ?>"
-        data-label-estimated="<?= t('Hours Estimated') ?>"
-        data-label-closed="<?= t('Closed') ?>"
-        data-label-open="<?= t('Open') ?>"></div>
-
-    <?php if ($paginator->isEmpty()): ?>
-        <p class="alert"><?= t('No tasks found.') ?></p>
-    <?php elseif (! $paginator->isEmpty()): ?>
-        <table class="table-fixed table-small table-scrolling">
-            <tr>
-                <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
-                <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
-                <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
-                <th class="column-10"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
-            </tr>
-            <?php foreach ($paginator->getCollection() as $task): ?>
-            <tr>
-                <td class="task-table color-<?= $task['color_id'] ?>">
-                    <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-                </td>
-                <td>
-                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
-                </td>
-                <td>
-                    <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?>
-                        <?= t('Open') ?>
-                    <?php else: ?>
-                        <?= t('Closed') ?>
-                    <?php endif ?>
-                </td>
-                <td>
-                    <?= $this->text->e($task['time_estimated']) ?>
-                </td>
-                <td>
-                    <?= $this->text->e($task['time_spent']) ?>
-                </td>
-            </tr>
-            <?php endforeach ?>
-        </table>
-
-        <?= $paginator ?>
-    <?php endif ?>
-</section>
-<?php endif ?>
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index ceb57fac..f768a11d 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -18,8 +18,8 @@
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'leadAndCycleTime') ?>>
             <?= $this->url->link(t('Lead and cycle time'), 'AnalyticController', 'leadAndCycleTime', array('project_id' => $project['id'])) ?>
         </li>
-        <li <?= $this->app->checkMenuSelection('AnalyticController', 'compareHours') ?>>
-            <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'compareHours', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'timeComparison') ?>>
+            <?= $this->url->link(t('Estimated vs actual time'), 'AnalyticController', 'timeComparison', array('project_id' => $project['id'])) ?>
         </li>
 
         <?= $this->hook->render('template:analytic:sidebar', array('project' => $project)) ?>
diff --git a/app/Template/analytic/time_comparison.php b/app/Template/analytic/time_comparison.php
new file mode 100644
index 00000000..ee0ee4b6
--- /dev/null
+++ b/app/Template/analytic/time_comparison.php
@@ -0,0 +1,61 @@
+<div class="page-header">
+    <h2><?= t('Estimated vs actual time') ?></h2>
+</div>
+
+<div class="listing">
+    <ul>
+        <li><?= t('Estimated hours: ').'<strong>'.$this->text->e($metrics['open']['time_estimated'] + $metrics['closed']['time_estimated']) ?></strong></li>
+        <li><?= t('Actual hours: ').'<strong>'.$this->text->e($metrics['open']['time_spent'] + $metrics['closed']['time_spent']) ?></strong></li>
+    </ul>
+</div>
+
+<?php if (empty($metrics)): ?>
+    <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+    <?php if ($paginator->isEmpty()): ?>
+        <p class="alert"><?= t('No tasks found.') ?></p>
+    <?php elseif (! $paginator->isEmpty()): ?>
+        <chart-project-time-comparison
+            :metrics='<?= json_encode($metrics, JSON_HEX_APOS)?>'
+            label-spent="<?= t('Hours Spent') ?>"
+            label-estimated="<?= t('Hours Estimated') ?>"
+            label-closed="<?= t('Closed') ?>"
+            label-open="<?= t('Open') ?>">
+        </chart-project-time-comparison>
+
+        <table class="table-fixed table-small table-scrolling">
+            <tr>
+                <th class="column-5"><?= $paginator->order(t('Id'), 'tasks.id') ?></th>
+                <th><?= $paginator->order(t('Title'), 'tasks.title') ?></th>
+                <th class="column-5"><?= $paginator->order(t('Status'), 'tasks.is_active') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Estimated Time'), 'tasks.time_estimated') ?></th>
+                <th class="column-10"><?= $paginator->order(t('Actual Time'), 'tasks.time_spent') ?></th>
+            </tr>
+            <?php foreach ($paginator->getCollection() as $task): ?>
+            <tr>
+                <td class="task-table color-<?= $task['color_id'] ?>">
+                    <?= $this->url->link('#'.$this->text->e($task['id']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                </td>
+                <td>
+                    <?= $this->url->link($this->text->e($task['title']), 'TaskViewController', 'show', array('task_id' => $task['id'], 'project_id' => $task['project_id']), false, '', t('View this task')) ?>
+                </td>
+                <td>
+                    <?php if ($task['is_active'] == \Kanboard\Model\TaskModel::STATUS_OPEN): ?>
+                        <?= t('Open') ?>
+                    <?php else: ?>
+                        <?= t('Closed') ?>
+                    <?php endif ?>
+                </td>
+                <td>
+                    <?= $this->text->e($task['time_estimated']) ?>
+                </td>
+                <td>
+                    <?= $this->text->e($task['time_spent']) ?>
+                </td>
+            </tr>
+            <?php endforeach ?>
+        </table>
+
+        <?= $paginator ?>
+    <?php endif ?>
+<?php endif ?>
-- 
cgit v1.2.3