From 8c07a0d03e64227c552f3b4530d3a1e1ba53402b Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 3 Sep 2016 20:39:13 -0400
Subject: Convert task distribution chart to Vue.js component

---
 app/Controller/AnalyticController.php       |  4 ++--
 app/ServiceProvider/RouteProvider.php       |  2 +-
 app/Template/analytic/sidebar.php           |  4 ++--
 app/Template/analytic/task_distribution.php | 30 +++++++++++++++++++++++++
 app/Template/analytic/tasks.php             | 34 -----------------------------
 app/Template/project/dropdown.php           |  4 ++--
 app/Template/project_header/dropdown.php    |  4 ++--
 app/Template/task_move_position/show.php    |  2 +-
 8 files changed, 40 insertions(+), 44 deletions(-)
 create mode 100644 app/Template/analytic/task_distribution.php
 delete mode 100644 app/Template/analytic/tasks.php

(limited to 'app')

diff --git a/app/Controller/AnalyticController.php b/app/Controller/AnalyticController.php
index c3e7409a..1949b6b8 100644
--- a/app/Controller/AnalyticController.php
+++ b/app/Controller/AnalyticController.php
@@ -83,11 +83,11 @@ class AnalyticController extends BaseController
      *
      * @access public
      */
-    public function tasks()
+    public function taskDistribution()
     {
         $project = $this->getProject();
 
-        $this->response->html($this->helper->layout->analytic('analytic/tasks', array(
+        $this->response->html($this->helper->layout->analytic('analytic/task_distribution', array(
             'project' => $project,
             'metrics' => $this->taskDistributionAnalytic->build($project['id']),
             'title' => t('Task distribution'),
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 8801e3d0..580ed6e5 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -109,7 +109,7 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('export/summary/:project_id', 'ExportController', 'summary');
 
             // Analytics routes
-            $container['route']->addRoute('analytics/tasks/:project_id', 'AnalyticController', 'tasks');
+            $container['route']->addRoute('analytics/tasks/:project_id', 'AnalyticController', 'taskDistribution');
             $container['route']->addRoute('analytics/users/:project_id', 'AnalyticController', 'users');
             $container['route']->addRoute('analytics/cfd/:project_id', 'AnalyticController', 'cfd');
             $container['route']->addRoute('analytics/burndown/:project_id', 'AnalyticController', 'burndown');
diff --git a/app/Template/analytic/sidebar.php b/app/Template/analytic/sidebar.php
index 0f5ee101..1468cee5 100644
--- a/app/Template/analytic/sidebar.php
+++ b/app/Template/analytic/sidebar.php
@@ -1,7 +1,7 @@
 <div class="sidebar">
     <ul>
-        <li <?= $this->app->checkMenuSelection('AnalyticController', 'tasks') ?>>
-            <?= $this->url->link(t('Task distribution'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
+        <li <?= $this->app->checkMenuSelection('AnalyticController', 'taskDistribution') ?>>
+            <?= $this->url->link(t('Task distribution'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
         </li>
         <li <?= $this->app->checkMenuSelection('AnalyticController', 'users') ?>>
             <?= $this->url->link(t('User repartition'), 'AnalyticController', 'users', array('project_id' => $project['id'])) ?>
diff --git a/app/Template/analytic/task_distribution.php b/app/Template/analytic/task_distribution.php
new file mode 100644
index 00000000..311e8c65
--- /dev/null
+++ b/app/Template/analytic/task_distribution.php
@@ -0,0 +1,30 @@
+<div class="page-header">
+    <h2><?= t('Task distribution') ?></h2>
+</div>
+
+<?php if (empty($metrics)): ?>
+    <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
+<?php else: ?>
+    <chart-project-task-distribution :metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>'></chart-project-task-distribution>
+
+    <table class="table-striped">
+        <tr>
+            <th><?= t('Column') ?></th>
+            <th><?= t('Number of tasks') ?></th>
+            <th><?= t('Percentage') ?></th>
+        </tr>
+        <?php foreach ($metrics as $metric): ?>
+        <tr>
+            <td>
+                <?= $this->text->e($metric['column_title']) ?>
+            </td>
+            <td>
+                <?= $metric['nb_tasks'] ?>
+            </td>
+            <td>
+                <?= n($metric['percentage']) ?>%
+            </td>
+        </tr>
+        <?php endforeach ?>
+    </table>
+<?php endif ?>
diff --git a/app/Template/analytic/tasks.php b/app/Template/analytic/tasks.php
deleted file mode 100644
index 4bc19784..00000000
--- a/app/Template/analytic/tasks.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div class="page-header">
-    <h2><?= t('Task distribution') ?></h2>
-</div>
-
-<?php if (empty($metrics)): ?>
-    <p class="alert"><?= t('Not enough data to show the graph.') ?></p>
-<?php else: ?>
-    <section id="analytic-task-repartition">
-
-    <div id="chart" data-metrics='<?= json_encode($metrics, JSON_HEX_APOS) ?>'></div>
-
-    <table class="table-striped">
-        <tr>
-            <th><?= t('Column') ?></th>
-            <th><?= t('Number of tasks') ?></th>
-            <th><?= t('Percentage') ?></th>
-        </tr>
-        <?php foreach ($metrics as $metric): ?>
-        <tr>
-            <td>
-                <?= $this->text->e($metric['column_title']) ?>
-            </td>
-            <td>
-                <?= $metric['nb_tasks'] ?>
-            </td>
-            <td>
-                <?= n($metric['percentage']) ?>%
-            </td>
-        </tr>
-        <?php endforeach ?>
-    </table>
-
-    </section>
-<?php endif ?>
diff --git a/app/Template/project/dropdown.php b/app/Template/project/dropdown.php
index 90dccf21..e3cf41c2 100644
--- a/app/Template/project/dropdown.php
+++ b/app/Template/project/dropdown.php
@@ -25,10 +25,10 @@
             <?= $this->url->link(t('Activity'), 'ActivityController', 'project', array('project_id' => $project['id'])) ?>
         </li>
 
-        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>&nbsp;
-                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/project_header/dropdown.php b/app/Template/project_header/dropdown.php
index f8901289..baf4cc16 100644
--- a/app/Template/project_header/dropdown.php
+++ b/app/Template/project_header/dropdown.php
@@ -50,10 +50,10 @@
 
         <?= $this->hook->render('template:project:dropdown', array('project' => $project)) ?>
 
-        <?php if ($this->user->hasProjectAccess('AnalyticController', 'tasks', $project['id'])): ?>
+        <?php if ($this->user->hasProjectAccess('AnalyticController', 'taskDistribution', $project['id'])): ?>
             <li>
                 <i class="fa fa-line-chart fa-fw"></i>
-                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'tasks', array('project_id' => $project['id'])) ?>
+                <?= $this->url->link(t('Analytics'), 'AnalyticController', 'taskDistribution', array('project_id' => $project['id'])) ?>
             </li>
         <?php endif ?>
 
diff --git a/app/Template/task_move_position/show.php b/app/Template/task_move_position/show.php
index 29e1bcb1..49b49164 100644
--- a/app/Template/task_move_position/show.php
+++ b/app/Template/task_move_position/show.php
@@ -2,7 +2,7 @@
     <h2><?= t('Move task to another position on the board') ?></h2>
 </div>
 
-<script type="x/templates" id="template-task-move-position">
+<script type="x/template" id="template-task-move-position">
     <?= $this->form->label(t('Swimlane'), 'swimlane') ?>
     <select v-model="swimlaneId" @change="onChangeSwimlane()" id="form-swimlane">
         <option v-for="swimlane in board" v-bind:value="swimlane.id">
-- 
cgit v1.2.3