From 25028997fa06b543192daaccf2866348cfc71498 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Tue, 5 Jul 2022 15:03:15 +0800
Subject: [PATCH] * Finish task #59701.

---
 config/zentaopms.php               |   1 +
 db/update17.2.sql                  |   9 ++
 db/zentao.sql                      |  10 +++
 module/common/lang/menu.php        |  23 ++---
 module/execution/control.php       |  58 +++++++++++++
 module/execution/css/cfd.css       |  11 +++
 module/execution/lang/de.php       |   7 ++
 module/execution/lang/en.php       |   7 ++
 module/execution/lang/fr.php       |   7 ++
 module/execution/lang/zh-cn.php    |   7 ++
 module/execution/model.php         | 132 +++++++++++++++++++++++++++++
 module/execution/view/cfd.html.php |  96 +++++++++++++++++++++
 module/group/lang/resource.php     |   4 +
 13 files changed, 361 insertions(+), 11 deletions(-)
 create mode 100644 db/update17.2.sql
 create mode 100644 module/execution/css/cfd.css
 create mode 100644 module/execution/view/cfd.html.php

diff --git a/config/zentaopms.php b/config/zentaopms.php
index 7c03077b46..35f48866f3 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -270,6 +270,7 @@ define('TABLE_PROJECTCASE',   '`' . $config->db->prefix . 'projectcase`');
 define('TABLE_TASKESTIMATE',  '`' . $config->db->prefix . 'taskestimate`');
 define('TABLE_EFFORT',        '`' . $config->db->prefix . 'effort`');
 define('TABLE_BURN',          '`' . $config->db->prefix . 'burn`');
+define('TABLE_CFD',           '`' . $config->db->prefix . 'cfd`');
 define('TABLE_BUILD',         '`' . $config->db->prefix . 'build`');
 define('TABLE_ACL',           '`' . $config->db->prefix . 'acl`');
 
diff --git a/db/update17.2.sql b/db/update17.2.sql
new file mode 100644
index 0000000000..b56b9b3ed4
--- /dev/null
+++ b/db/update17.2.sql
@@ -0,0 +1,9 @@
+CREATE TABLE `zt_cfd` (
+  `id` int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `execution` int(8) NOT NULL,
+  `type` char(30) NOT NULL,
+  `name` char(30) NOT NULL,
+  `count` smallint NOT NULL,
+  `date` date NOT NULL,
+  UNIQUE KEY `execution_type_name_date` (`execution`,`type`,`name`,`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
diff --git a/db/zentao.sql b/db/zentao.sql
index 84a4bb10af..3b2586c43d 100755
--- a/db/zentao.sql
+++ b/db/zentao.sql
@@ -411,6 +411,16 @@ CREATE TABLE IF NOT EXISTS `zt_casestep` (
   KEY `case` (`case`),
   KEY `version` (`version`)
 ) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+-- DROP TABLE IF EXISTS `zt_cfd`;
+CREATE TABLE `zt_cfd` (
+  `id` int(8) NOT NULL AUTO_INCREMENT PRIMARY KEY,
+  `execution` int(8) NOT NULL,
+  `type` char(30) NOT NULL,
+  `name` char(30) NOT NULL,
+  `count` smallint NOT NULL,
+  `date` date NOT NULL,
+  UNIQUE KEY `execution_type_name_date` (`execution`,`type`,`name`,`date`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
 -- DROP TABLE IF EXISTS `zt_company`;
 CREATE TABLE IF NOT EXISTS `zt_company` (
   `id` mediumint(8) unsigned NOT NULL auto_increment,
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index 43252f5b86..6901a125a0 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -323,17 +323,18 @@ if($config->systemMode == 'new') $lang->execution->menu->more = array('link' =>
 /* Execution menu order. */
 $lang->execution->menuOrder[5]  = 'task';
 $lang->execution->menuOrder[10] = 'kanban';
-$lang->execution->menuOrder[15] = 'burn';
-$lang->execution->menuOrder[20] = 'view';
-$lang->execution->menuOrder[25] = 'story';
-$lang->execution->menuOrder[30] = 'qa';
-$lang->execution->menuOrder[35] = 'repo';
-$lang->execution->menuOrder[40] = 'devops';
-$lang->execution->menuOrder[45] = 'doc';
-$lang->execution->menuOrder[50] = 'build';
-$lang->execution->menuOrder[55] = 'release';
-$lang->execution->menuOrder[60] = 'action';
-$lang->execution->menuOrder[65] = 'settings';
+$lang->execution->menuOrder[15] = 'CFD';
+$lang->execution->menuOrder[20] = 'burn';
+$lang->execution->menuOrder[25] = 'view';
+$lang->execution->menuOrder[30] = 'story';
+$lang->execution->menuOrder[35] = 'qa';
+$lang->execution->menuOrder[40] = 'repo';
+$lang->execution->menuOrder[45] = 'devops';
+$lang->execution->menuOrder[50] = 'doc';
+$lang->execution->menuOrder[55] = 'build';
+$lang->execution->menuOrder[60] = 'release';
+$lang->execution->menuOrder[65] = 'action';
+$lang->execution->menuOrder[70] = 'settings';
 
 $lang->execution->menu->doc['subMenu'] = new stdclass();
 
diff --git a/module/execution/control.php b/module/execution/control.php
index b509ca3f4f..97ac9f3111 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1283,6 +1283,64 @@ class execution extends control
         $this->display();
     }
 
+    /**
+     * Kanban CFD.
+     *
+     * @param  int    $executionID
+     * @param  string $type
+     * @access public
+     * @return void
+     */
+    public function cfd($executionID = 0, $type = 'story')
+    {
+        $execution   = $this->commonAction($executionID);
+        $executionID = $execution->id;
+
+        $this->loadModel('kanban');
+        $this->app->loadClass('date');
+
+        $end = helper::today() > $execution->end ? $execution->end : helper::today();
+        if(helper::today() > $execution->end)
+        {
+            if(date($execution->end, strtotime('-14 days')) > $execution->begin)
+            {
+                $begin = date($execution->end, strtotime('-14 days'));
+            }
+            else
+            {
+                $begin = $execution->begin;
+            }
+        }
+        elseif(($execution->begin < helper::today()) and (helper::today() < $execution->end))
+        {
+            $begin = (date('Y-m-d', strtotime('-14 days')) < $execution->begin) ? $execution->begin : date('Y-m-d', strtotime('-14 days'));
+        }
+
+        $dateList = date::getDateList($begin, $end, 'Y-m-d', '');
+
+        $this->view->title         = $this->lang->execution->CFD;
+        $this->view->type          = $type;
+        $this->view->execution     = $execution;
+        $this->view->executionName = $execution->name;
+        $this->view->executionID   = $executionID;
+        $this->view->chartData     = $this->execution->buildCFDData($executionID, $dateList, $type);
+        $this->display();
+    }
+
+    /**
+     * Compute cfd datas.
+     *
+     * @param  string $reload
+     * @param  int    $executionID
+     * @access public
+     * @return void
+     */
+    public function computeCFD($reload = 'no', $executionID = 0)
+    {
+        $this->execution->computeCFD($executionID);
+        if($reload == 'yes') return print(js::reload('parent'));
+    }
+
     /**
      * Fix burn for first date.
      *
diff --git a/module/execution/css/cfd.css b/module/execution/css/cfd.css
new file mode 100644
index 0000000000..3e705de6b9
--- /dev/null
+++ b/module/execution/css/cfd.css
@@ -0,0 +1,11 @@
+.main-content > h2 {font-size: 16px;}
+#cfdWrapper {max-width: 1400px; margin: 0 auto; padding: 25px 100px 10px; position: relative;}
+#cfdYUnit {position: absolute; color: #CBD0DB; top: 0; left: 90px;}
+#cfdXUnit {position: absolute; color: #CBD0DB; bottom: 20px; right: 60px;}
+#cfdLegend {position: absolute; right: 0; width: 80px; height: 60px; top: 50%; margin-top: -30px; line-height: 30px; color: #838A9D; font-size: 12px;}
+#cfdLegend > div {position: relative; padding-left: 30px;}
+#cfdLegend > div > .barline {position: absolute; width: 20px; left: 0; top: 13px; height: 3px; background: #EEEEEE;}
+#cfdLegend .line-real .bg-primary {background: #1183fb;}
+#cfdLegend .line-real .bg-delay   {background: red;}
+
+.pull-left .input-control {margin-right: 10px;}
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 0441cf1ed8..41d14ce627 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -118,6 +118,7 @@ $lang->execution->relatedMember       = 'Teammitglieder';
 $lang->execution->watermark           = 'Exported by ZenTao';
 $lang->execution->burnXUnit           = '(Date)';
 $lang->execution->burnYUnit           = '(Hours)';
+$lang->execution->count               = '(Count)';
 $lang->execution->waitTasks           = 'Waiting Tasks';
 $lang->execution->viewByUser          = 'By User';
 $lang->execution->oneProduct          = "Only one stage can be linked {$lang->productCommon}";
@@ -165,6 +166,10 @@ $lang->execution->lifeTimeList['short'] = "Short-Term";
 $lang->execution->lifeTimeList['long']  = "Long-Term";
 $lang->execution->lifeTimeList['ops']   = "DevOps";
 
+$lang->execution->cfdTypeList['story'] = "{$lang->SRCommon}";
+$lang->execution->cfdTypeList['task']  = "Task";
+$lang->execution->cfdTypeList['bug']   = "Bug";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'Konto';
 $lang->team->role       = 'Rolle';
@@ -221,6 +226,8 @@ $lang->execution->build               = 'Builds';
 $lang->execution->testtask            = 'Testaufgaben';
 $lang->execution->burn                = 'Burndown';
 $lang->execution->computeBurn         = 'Aktualisieren';
+$lang->execution->CFD                 = 'Cumulative Flow diagrams';
+$lang->execution->computeCFD          = 'Compute Cumulative Flow diagrams';
 $lang->execution->burnData            = 'Burndown Daten';
 $lang->execution->fixFirst            = 'Bearbeite Mannstunden des ersten Tags';
 $lang->execution->team                = 'Teammitglieder';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 3d1edaddc3..9595d15d66 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -118,6 +118,7 @@ $lang->execution->relatedMember       = 'Team';
 $lang->execution->watermark           = 'Exported by ZenTao';
 $lang->execution->burnXUnit           = '(Date)';
 $lang->execution->burnYUnit           = '(Hours)';
+$lang->execution->count               = '(Count)';
 $lang->execution->waitTasks           = 'Waiting Tasks';
 $lang->execution->viewByUser          = 'By User';
 $lang->execution->oneProduct          = "Only one stage can be linked {$lang->productCommon}";
@@ -165,6 +166,10 @@ $lang->execution->lifeTimeList['short'] = "Short-Term";
 $lang->execution->lifeTimeList['long']  = "Long-Term";
 $lang->execution->lifeTimeList['ops']   = "DevOps";
 
+$lang->execution->cfdTypeList['story'] = "{$lang->SRCommon}";
+$lang->execution->cfdTypeList['task']  = "Task";
+$lang->execution->cfdTypeList['bug']   = "Bug";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'User';
 $lang->team->role       = 'Role';
@@ -221,6 +226,8 @@ $lang->execution->build               = 'Build List';
 $lang->execution->testtask            = 'Request';
 $lang->execution->burn                = 'Burndown';
 $lang->execution->computeBurn         = 'Update';
+$lang->execution->CFD                 = 'Cumulative Flow diagrams';
+$lang->execution->computeCFD          = 'Compute Cumulative Flow diagrams';
 $lang->execution->burnData            = 'Burndown Data';
 $lang->execution->fixFirst            = 'Edit 1st-Day Estimates';
 $lang->execution->team                = 'Members';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index ff687861fd..984b261d54 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -118,6 +118,7 @@ $lang->execution->relatedMember       = 'Equipe';
 $lang->execution->watermark           = 'Exporté par ZenTao';
 $lang->execution->burnXUnit           = '(Date)';
 $lang->execution->burnYUnit           = '(Hours)';
+$lang->execution->count               = '(Count)';
 $lang->execution->waitTasks           = 'Waiting Tasks';
 $lang->execution->viewByUser          = 'Par Utilisateur';
 $lang->execution->oneProduct          = "Only one stage can be linked {$lang->productCommon}";
@@ -165,6 +166,10 @@ $lang->execution->lifeTimeList['short'] = "Short-Term";
 $lang->execution->lifeTimeList['long']  = "Long-Term";
 $lang->execution->lifeTimeList['ops']   = "DevOps";
 
+$lang->execution->cfdTypeList['story'] = "{$lang->SRCommon}";
+$lang->execution->cfdTypeList['task']  = "Task";
+$lang->execution->cfdTypeList['bug']   = "Bug";
+
 $lang->team = new stdclass();
 $lang->team->account    = 'Utilisateur';
 $lang->team->role       = 'Rôle';
@@ -221,6 +226,8 @@ $lang->execution->build               = 'Liste Builds';
 $lang->execution->testtask            = 'Recette';
 $lang->execution->burn                = ' Atterrissage';
 $lang->execution->computeBurn         = 'Calculer';
+$lang->execution->CFD                 = 'Cumulative Flow diagrams';
+$lang->execution->computeCFD          = 'Compute Cumulative Flow diagrams';
 $lang->execution->burnData            = "Données d'atterrissage";
 $lang->execution->fixFirst            = 'Fixer 1er-Jour Estimation';
 $lang->execution->team                = 'Membres';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index eb4a3b6bd7..4438833e1e 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -118,6 +118,7 @@ $lang->execution->relatedMember       = '相关成员';
 $lang->execution->watermark           = '由禅道导出';
 $lang->execution->burnXUnit           = '(日期)';
 $lang->execution->burnYUnit           = '(工时)';
+$lang->execution->count               = '(数量)';
 $lang->execution->waitTasks           = '待处理';
 $lang->execution->viewByUser          = '按用户查看';
 $lang->execution->oneProduct          = "阶段只能关联一个{$lang->productCommon}";
@@ -165,6 +166,10 @@ $lang->execution->lifeTimeList['short'] = "短期";
 $lang->execution->lifeTimeList['long']  = "长期";
 $lang->execution->lifeTimeList['ops']   = "运维";
 
+$lang->execution->cfdTypeList['story'] = "{$lang->SRCommon}";
+$lang->execution->cfdTypeList['task']  = "任务";
+$lang->execution->cfdTypeList['bug']   = "Bug";
+
 $lang->team = new stdclass();
 $lang->team->account    = '用户';
 $lang->team->role       = '角色';
@@ -221,6 +226,8 @@ $lang->execution->build               = '所有版本';
 $lang->execution->testtask            = '测试单';
 $lang->execution->burn                = '燃尽图';
 $lang->execution->computeBurn         = '更新燃尽图';
+$lang->execution->CFD                 = '累积流图';
+$lang->execution->computeCFD          = '更新累积流图';
 $lang->execution->burnData            = '燃尽图数据';
 $lang->execution->fixFirst            = '修改首天工时';
 $lang->execution->team                = '团队成员';
diff --git a/module/execution/model.php b/module/execution/model.php
index 124dd02c13..9cb8195a56 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -68,6 +68,7 @@ class executionModel extends model
         {
             $this->lang->execution->menu         = new stdclass();
             $this->lang->execution->menu->kanban = array('link' => "{$this->lang->kanban->common}|execution|kanban|executionID=%s");
+            $this->lang->execution->menu->CFD    = array('link' => "{$this->lang->execution->CFD}|execution|cfd|executionID=%s");
             $this->lang->execution->menu->build  = array('link' => "{$this->lang->build->common}|execution|build|executionID=%s");
             $this->lang->execution->dividerMenu  = '';
             $this->lang->execution->accessDenied = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->accessDenied);
@@ -2997,6 +2998,75 @@ class executionModel extends model
         return $burns;
     }
 
+    /**
+     * Compute cfd of a execution.
+     *
+     * @param  int    $executionID
+     * @access public
+     * @return array
+     */
+    public function computeCFD($executionID = 0)
+    {
+        $today = helper::today();
+        $executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
+            ->where('type')->eq('kanban')
+            ->andWhere('status')->notin('done,closed,suspended')
+            ->beginIF($executionID)->andWhere('id')->in($executionID)->fi()
+            ->fetchPairs();
+        if(!$executions) return array();
+
+        /* Update today's data of cfd. */
+        $cells = $this->dao->select("t1.id, t1.kanban as execution, t1.`column`, t1.type, t1.cards, t1.lane, t2.name, t2.parent")
+            ->from(TABLE_KANBANCELL)->alias('t1')
+            ->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.column = t2.id')
+            ->where('t1.kanban')->in(array_keys($executions))
+            ->andWhere('t2.deleted')->eq('0')
+            ->andWhere('t1.type')->in('story,bug,task')
+            ->orderBy('t2.id asc')
+            ->fetchAll('id');
+
+        /* Group by type/name/execution/colID. */
+        $columnGroup = array();
+        $parentNames = array();
+        foreach($cells as $id => $column)
+        {
+            if($column->parent == '-1')
+            {
+                $parentNames[$column->column] = $column->name;
+                continue;
+            }
+
+            $column->name = isset($parentNames[$column->parent]) ? $parentNames[$column->parent] . "($column->name)" : $column->name;
+            $columnGroup[$column->execution][$column->type][$column->name][$column->lane][$column->column] = $column;
+        }
+
+        foreach($columnGroup as $executionID => $executionGroup)
+        {
+            foreach($executionGroup as $type => $columns)
+            {
+                foreach($columns as $colName => $laneGroup)
+                {
+                    $cfd = new stdclass();
+                    $cfd->count = 0;
+                    $cfd->date  = $today;
+                    $cfd->type  = $type;
+                    foreach($laneGroup as $laneID => $columnGroup)
+                    {
+                        foreach($columnGroup as $colID => $columnCard)
+                        {
+                            $cards = trim($columnCard->cards, ',');
+                            $cfd->count += $cards ? count(explode(',', $cards)) : 0;
+                        }
+                    }
+
+                    $cfd->name      = $colName;
+                    $cfd->execution = $executionID;
+                    $this->dao->replace(TABLE_CFD)->data($cfd)->exec();
+                }
+            }
+        }
+    }
+
     /**
      * Fix burn for first day.
      *
@@ -3134,6 +3204,68 @@ class executionModel extends model
         if($todayTag > $counts) return array_slice($sets, $todayTag - $counts, $counts);
     }
 
+    /**
+     * Build CFD data.
+     * 
+     * @param  int    $executionID
+     * @param  string $type
+     * @param  array  $dateList
+     * @access public
+     * @return void
+     */
+    public function buildCFDData($executionID, $dateList, $type)
+    {
+        $this->loadModel('report');
+        $setGroup = $this->getCFDData($executionID, $dateList, $type);
+
+        if(empty($setGroup)) return array();
+
+        $chartData['labels'] = $this->report->convertFormat($dateList, DT_DATE5);
+        //$chartData['line']   = $this->report->createSingleJSON($sets, $dateList);
+
+
+        $chartData['line'] = array();
+        foreach($setGroup as $name => $sets)
+        {
+            $chartData['line'][$name] = $this->report->createSingleJSON($sets, $dateList);
+        }
+
+        return $chartData;
+    }
+
+    /**
+     * Get CFD data to display.
+     *
+     * @param  int    $executionID
+     * @param  string $type
+     * @param  array  $dateList
+     * @access public
+     * @return void
+     */
+    public function getCFDData($executionID = 0, $dateList = array(), $type = 'story')
+    {
+        $execution = $this->getById($executionID);
+
+        $setGroup = $this->dao->select("date, `count` AS value, `name`")->from(TABLE_CFD)
+            ->where('execution')->eq((int)$executionID)
+            ->andWhere('type')->eq($type)
+            ->andWhere('date')->in($dateList)
+            ->orderBy('date DESC, id asc')->fetchGroup('name', 'date');
+
+        $data = array();
+        foreach($setGroup as $name => $sets)
+        {
+            foreach($sets as $date => $set)
+            {
+                if($date < $execution->begin) continue;
+
+                $data[$name][$date] = $set;
+            }
+        }
+
+        return $data;
+    }
+
     /**
      * Get taskes by search.
      *
diff --git a/module/execution/view/cfd.html.php b/module/execution/view/cfd.html.php
new file mode 100644
index 0000000000..36908a4ecd
--- /dev/null
+++ b/module/execution/view/cfd.html.php
@@ -0,0 +1,96 @@
+<?php
+/**
+ * The burn view file of execution module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      Chunsheng Wang <chunsheng@cnezsoft.com>
+ * @package     execution
+ * @version     $Id: cfd.html.php 4164 2013-01-20 08:27:55Z wwccss $
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<?php include '../../common/view/chart.html.php';?>
+<?php js::set('executionID', $executionID);?>
+<?php js::set('executionName', $execution->name);?>
+<?php js::set('watermark', $lang->execution->watermark);?>
+<?php js::set('cfdXUnit', $lang->execution->burnXUnit);?>
+<?php js::set('cfdYUnit', $lang->execution->burnYUnit);?>
+<?php js::set('type', $type);?>
+<div id='mainMenu' class='clearfix'>
+  <div class='btn-toolbar pull-left'>
+    <?php
+    if(strpos('wait,doing', $execution->status) !== false)
+    {
+        common::printLink('execution', 'computeCFD', "reload=yes&executionID=$executionID", '<i class="icon icon-refresh"></i> ' . $lang->execution->computeCFD, 'hiddenwin', "title='{$lang->execution->computeCFD}' class='btn btn-primary' id='computeCFD'");
+        echo '<div class="space"></div>';
+    }
+    ?>
+    <div class='input-control w-100px'>
+      <?php echo html::select('type', $lang->execution->cfdTypeList, $type, "class='form-control chosen'");?>
+    </div>
+  </div>
+</div>
+<div id='mainContent' class='main-content'>
+  <h2 class='text-center'><?php echo $executionName . ' - ' . zget($lang->execution->cfdTypeList, $type) . $lang->execution->CFD;?></h2>
+  <div id="cfdWrapper">
+    <div id="cfdChart">
+      <canvas id="cfdCanvas"></canvas>
+    </div>
+    <div id="cfdYUnit"><?php echo $lang->execution->count;?></div>
+    <div id="cfdXUnit"><?php echo $lang->execution->burnXUnit;?></div>
+  </div>
+</div>
+<script>
+var sets   = [];
+var colors = ['#33B4DB', '#7ECF69', '#FFC73A', '#FF5A61', '#50C8D0', '#AF5AFF', '#4EA3FF', '#6C73FF', '#FF8C5A'];
+var i      = 0;
+<?php foreach($chartData['line'] as $label => $set):?>
+sets.push({
+    label: '<?php echo $label;?>',
+    color: colors[i],
+    pointStrokeColor: colors[i],
+    pointHighlightStroke: colors[i],
+    pointColor: colors[i],
+    fillColor: colors[i] + '12',
+    pointHighlightFill: colors[i],
+    data: <?php echo $set;?>
+})
+i ++;
+<?php endforeach;?>
+
+$('#type').change(function()
+{
+    location.href = createLink('execution', 'cfd', 'executionID=' + executionID + '&type=' + $(this).val());
+});
+
+$(function(){ initBurnChar();})
+
+function initBurnChar()
+{
+    var data =
+    {
+        labels: <?php echo json_encode($chartData['labels'])?>,
+        datasets: sets
+    };
+
+    var cfdChart = $("#cfdCanvas").lineChart(data,
+    {
+        pointDotStrokeWidth: 2,
+        pointDotRadius: 3,
+        datasetStrokeWidth: 3,
+        datasetFill: true,
+        datasetStroke: true,
+        scaleShowBeyondLine: false,
+        responsive: true,
+        bezierCurve: false,
+        scaleFontColor: '#838A9D',
+        tooltipXPadding: 10,
+        tooltipYPadding: 10,
+        multiTooltipTitleTemplate: '<%= label %> <?php echo $lang->execution->count;?>',
+        multiTooltipTemplate: "<%if (datasetLabel){%><%=datasetLabel%>: <%}%><%= value %>",
+    });
+}
+</script>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 7b018eb9b1..484d3166c5 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -734,6 +734,8 @@ $lang->resource->execution->bug               = 'bug';
 $lang->resource->execution->testreport        = 'testreport';
 $lang->resource->execution->burn              = 'burn';
 $lang->resource->execution->computeBurn       = 'computeBurnAction';
+$lang->resource->execution->cfd               = 'CFD';
+$lang->resource->execution->computeCFD        = 'computeCFD';
 $lang->resource->execution->fixFirst          = 'fixFirst';
 $lang->resource->execution->burnData          = 'burnData';
 $lang->resource->execution->team              = 'teamAction';
@@ -792,6 +794,8 @@ $lang->execution->methodOrder[115] = 'testtask';
 $lang->execution->methodOrder[120] = 'testreport';
 $lang->execution->methodOrder[125] = 'burn';
 $lang->execution->methodOrder[130] = 'computeBurn';
+$lang->execution->methodOrder[132] = 'cfd';
+$lang->execution->methodOrder[133] = 'computeCFD';
 $lang->execution->methodOrder[135] = 'fixFirst';
 $lang->execution->methodOrder[140] = 'burnData';
 $lang->execution->methodOrder[145] = 'team';