' . zget($users, $doc->editedBy) . ' ' . $doc->editedDate . '';
+ if(common::hasPriv('doc', 'updateOrder'))
+ {
+ $treeMenu[$module->id] .= "
";
+ $treeMenu[$module->id] .= html::a('javascript:;', "", '', "title='{$this->lang->doc->updateOrder}' class='sortDoc'");
+ $treeMenu[$module->id] .= '
';
+ }
}
if($currentMethod == 'objectlibs')
{
- $treeMenu[$module->id] .= "
" . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), " " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'") . '';
- if(common::hasPriv('doc', 'edit'))
+ $class = common::hasPriv('doc', 'updateOrder') ? 'sortDoc' : '';
+ $treeMenu[$module->id] .= "
" . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), " " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title $class' title='{$doc->title}'") . '';
+ if(common::hasPriv('doc', 'edit') or common::hasPriv('doc', 'updateOrder'))
{
$treeMenu[$module->id] .= "
";
- $treeMenu[$module->id] .= html::a(helper::createLink('doc', 'edit', "docID={$doc->id}&comment=false&objectType=$type&objectID=$objectID&libID=$libID"), "", '', "title={$this->lang->doc->edit} data-app={$this->app->tab}");
+ if(common::hasPriv('doc', 'edit')) $treeMenu[$module->id] .= html::a(helper::createLink('doc', 'edit', "docID={$doc->id}&comment=false&objectType=$type&objectID=$objectID&libID=$libID"), "", '', "title={$this->lang->doc->edit} data-app={$this->app->tab}");
+ if(common::hasPriv('doc', 'updateOrder')) $treeMenu[$module->id] .= html::a('javascript:;', "", '', "title='{$this->lang->doc->updateOrder}' class='sortDoc'");
$treeMenu[$module->id] .= '
';
}
$treeMenu[$module->id] .= '
';
}
elseif($currentMethod == 'tablecontents')
{
- $treeMenu[$module->id] .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), "
" . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'");
+ $class = common::hasPriv('doc', 'updateOrder') ? 'sortDoc' : '';
+ $treeMenu[$module->id] .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$libID&docID={$doc->id}"), "
" . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title $class' title='{$doc->title}'");
+ $treeMenu[$module->id] .= '
';
}
$treeMenu[$module->id] .= '';
@@ -2511,22 +2534,25 @@ EOT;
}
else
{
- if($currentMethod == 'tablecontents')
+ $li = "
" . $module->name . '';
+ if($currentMethod == 'tablecontents' and common::hasPriv('tree', 'updateOrder'))
{
- $li = "
" . $module->name . '';
+ $li .= "
";
+ $li .= html::a('javascript:;', "", '', "title='{$this->lang->doc->updateOrder}' class='sortModule'");
+ $li .= '
';
}
else
{
- $li = "
" . $module->name . '';
- if(common::hasPriv('tree', 'edit') or common::hasPriv('tree', 'browse'))
+ if(common::hasPriv('tree', 'edit') or common::hasPriv('tree', 'browse') or common::hasPriv('tree', 'browse') or common::hasPriv('tree', 'updateOrder'))
{
$li .= "
";
- if(common::hasPriv('tree', 'edit')) $li .= html::a(helper::createLink('tree', 'edit', "module=$module->id&type=doc"), "", '', "data-toggle='modal' title={$this->lang->doc->editType}");
- if(common::hasPriv('tree', 'browse')) $li .= html::a(helper::createLink('tree', 'browse', "rootID=$libID&type=doc&module=$module->id", '', 1), "", '', "class='iframe' title={$this->lang->doc->editChildType}");
+ if(common::hasPriv('tree', 'edit')) $li .= html::a(helper::createLink('tree', 'edit', "module=$module->id&type=doc"), "", '', "data-toggle='modal' title='{$this->lang->doc->editType}'");
+ if(common::hasPriv('tree', 'browse')) $li .= html::a(helper::createLink('tree', 'browse', "rootID=$libID&type=doc&module=$module->id", '', 1), "", '', "class='iframe' title='{$this->lang->doc->editChildType}'");
+ if(common::hasPriv('tree', 'updateOrder')) $li .= html::a('javascript:;', "", '', "title='{$this->lang->doc->updateOrder}' class='sortModule'");
$li .= '
';
}
- $li .= '
';
}
+ $li .= '
';
}
if($treeMenu[$module->id])
{
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 32cbbc41b9..701393f393 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -79,7 +79,7 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
/* Make modules tree sortable */
$('#modules').sortable(
{
- trigger: '.module-name>a.sort-module',
+ trigger: '.module-name>a.sort-module, .tree-actions>.sortModule>.icon-move, .module-name>a.sortDoc, .tree-actions>.sortDoc>.icon-move',
dropToClass: 'sort-to',
stopPropagation: true,
nested: true,
@@ -100,7 +100,15 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
{
if($('#modules').hasClass('sortable-sorting')) $ul.addClass('is-sorting');
}, 100);
- return $ul.children('li');
+
+ if($ele.hasClass('sortDoc'))
+ {
+ return $ul.children('li.sortDoc');
+ }
+ else
+ {
+ return $ul.children('li.catalog');
+ }
},
always: function()
{
@@ -110,16 +118,34 @@ $sideWidth = common::checkNotCN() ? '270' : '238';
{
if(!e.changed) return;
- var orders = {};
- $('#modules').find('li.can-sort').each(function()
+ var orders = {};
+ var link = '';
+ var elementClass = e.list.context.className;
+ if(elementClass.indexOf('sortDoc') >= 0)
{
- var $li = $(this);
+ $('#modules').find('li.sortDoc').each(function()
+ {
+ var $li = $(this);
- var item = $li.data();
- '' == 'book' ? orders['sort[' + item.id + ']'] = $li.attr('data-order') || item.order : orders['orders[' + item.id + ']'] = $li.attr('data-order') || item.order;
- });
+ var item = $li.data();
+ orders['orders[' + item.id + ']'] = $li.attr('data-order') || item.order;
+ });
+
+ link = createLink('doc', 'updateOrder');
+ }
+ else
+ {
+ $('#modules').find('li.can-sort').each(function()
+ {
+ var $li = $(this);
+
+ var item = $li.data();
+ '' == 'book' ? orders['sort[' + item.id + ']'] = $li.attr('data-order') || item.order : orders['orders[' + item.id + ']'] = $li.attr('data-order') || item.order;
+ });
+
+ link = '' == 'book' ? createLink('doc', 'sortBookOrder') : createLink('tree', 'updateOrder');
+ }
- var link = '' == 'book' ? createLink('doc', 'sortBookOrder') : createLink('tree', 'updateOrder');
$.post(link, orders, function(data){}).error(function()
{
bootbox.alert(lang.timeout);
diff --git a/module/execution/control.php b/module/execution/control.php
index ba411988dd..0f3f306bda 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1149,12 +1149,12 @@ class execution extends control
* @access public
* @return void
*/
- public function burn($executionID = 0, $type = 'noweekend', $interval = 0, $burnBy = 'left')
+ public function burn($executionID = 0, $type = 'noweekend,nodelay', $interval = 0, $burnBy = 'left')
{
$this->loadModel('report');
$execution = $this->commonAction($executionID);
$executionID = $execution->id;
- $burnBy = $this->cookie->burnBy ? $this->cookie->burnBy : $burnBy;
+ $burnBy = $this->cookie->burnBy ? $this->cookie->burnBy : $burnBy;
/* Header and position. */
$title = $execution->name . $this->lang->colon . $this->lang->execution->burn;
@@ -1163,7 +1163,10 @@ class execution extends control
/* Get date list. */
$executionInfo = $this->execution->getByID($executionID);
- list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $executionInfo->end, $type, $interval, 'Y-m-d');
+ $deadline = $execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate;
+ $deadline = strpos('closed,suspended', $execution->status) === false ? helper::today() : $deadline;
+ $endDate = strpos($type, 'withdelay') !== false ? $deadline : $executionInfo->end;
+ list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d');
$chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
$dayList = array_fill(1, floor((int)$execution->days / $this->config->execution->maxBurnDay) + 5, '');
@@ -1677,11 +1680,16 @@ class execution extends control
if($this->app->tab == 'project')
{
- $projectID = $this->session->project;
- $project = $this->project->getById($projectID);
+ $projectID = $this->session->project;
+ $project = $this->project->getById($projectID);
+ $allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', isset($projectID) ? $projectID : 0);
$this->project->setMenu($projectID);
$this->view->project = $project;
}
+ else
+ {
+ $allProjects = $this->project->getPairsByModel('all', 0, 'noclosed', isset($projectID) ? $projectID : 0);
+ }
if(!$this->post->executionIDList) return print(js::locate($this->session->executionList, 'parent'));
$executionIDList = $this->post->executionIDList;
@@ -1718,7 +1726,7 @@ class execution extends control
$this->view->position[] = $this->lang->execution->batchEdit;
$this->view->executionIDList = $executionIDList;
$this->view->executions = $executions;
- $this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', isset($projectID) ? $projectID : 0);
+ $this->view->allProjects = $allProjects;
$this->view->pmUsers = $pmUsers;
$this->view->poUsers = $poUsers;
$this->view->qdUsers = $qdUsers;
@@ -1833,6 +1841,7 @@ class execution extends control
if(!empty($_POST))
{
$this->loadModel('action');
+ $this->execution->computeBurn($executionID);
$changes = $this->execution->suspend($executionID);
if(dao::isError()) return print(js::error(dao::getError()));
@@ -1928,6 +1937,7 @@ class execution extends control
if(!empty($_POST))
{
$this->loadModel('action');
+ $this->execution->computeBurn($executionID);
$changes = $this->execution->close($executionID);
if(dao::isError()) return print(js::error(dao::getError()));
@@ -3149,7 +3159,16 @@ class execution extends control
}
$projectExecutions = array();
- foreach($orderedExecutions as $execution) $projectExecutions[$execution->project][] = $execution;
+ $parentIdList = array();
+ foreach($orderedExecutions as $execution)
+ {
+ $projectExecutions[$execution->project][] = $execution;
+ if($execution->type != 'stage') continue;
+ if($execution->grade == 2 and $execution->project != $execution->parent) $parentIdList[$execution->parent] = $execution->parent;
+ }
+
+ $parents = array();
+ if($parentIdList) $parents = $this->execution->getByIdList($parentIdList);
$this->view->link = $this->execution->getLink($module, $method, $extra);
$this->view->module = $module;
@@ -3158,6 +3177,7 @@ class execution extends control
$this->view->extra = $extra;
$this->view->projects = $projectPairs;
$this->view->executions = $projectExecutions;
+ $this->view->parents = $parents;
$this->display();
}
diff --git a/module/execution/css/burn.css b/module/execution/css/burn.css
index b954f140ad..71e7d4b506 100644
--- a/module/execution/css/burn.css
+++ b/module/execution/css/burn.css
@@ -6,5 +6,6 @@
#burnLegend > div {position: relative; padding-left: 30px;}
#burnLegend > div > .barline {position: absolute; width: 20px; left: 0; top: 13px; height: 3px; background: #EEEEEE;}
#burnLegend .line-real .bg-primary {background: #1183fb;}
+#burnLegend .line-real .bg-delay {background: red;}
.pull-left .input-control {margin-right: 10px;}
diff --git a/module/execution/js/burn.js b/module/execution/js/burn.js
index 85e78025cf..192151808a 100644
--- a/module/execution/js/burn.js
+++ b/module/execution/js/burn.js
@@ -5,6 +5,18 @@ $(function()
{
location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + type + '&interval=' + $(this).val());
});
+
+ $('#weekend').click(function()
+ {
+ var browseType = type.match('noweekend') ? type.replace('noweekend', 'withweekend') : type.replace('withweekend', 'noweekend');
+ location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + browseType + '&interval=' + interval);
+ });
+
+ $('#delay').click(function()
+ {
+ var browseType = type.match('nodelay') ? type.replace('nodelay', 'withdelay') : type.replace('withdelay', 'nodelay');
+ location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + browseType + '&interval=' + interval);
+ });
})
/* Save burn as image.*/
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index ff3a64f56c..b125445210 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -328,6 +328,10 @@ if(!window.kanbanDropRules)
{
backlog: ['ready', 'backlog'],
ready: ['backlog', 'ready'],
+ tested: ['verified'],
+ verified: ['tested', 'released'],
+ released: ['verified', 'closed'],
+ closed: ['released'],
},
bug:
{
@@ -957,7 +961,12 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
/* Story lane. */
if(cardType == 'story')
{
- if(toColType == 'ready' || toColType == 'backlog')
+ if(toColType == 'closed' && priv.canCloseStory)
+ {
+ var link = createLink('story', 'close', 'storyID=' + objectID, '', true);
+ showIframe = true;
+ }
+ else
{
if(toColType == 'ready' && typeof(reviewStoryParis[objectID]) != 'undefined')
{
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 8df8beb996..56a6cf5af4 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -480,6 +480,10 @@ if(!window.kanbanDropRules)
{
backlog: ['ready'],
ready: ['backlog'],
+ tested: ['verified'],
+ verified: ['tested', 'released'],
+ released: ['verified', 'closed'],
+ closed: ['released'],
},
bug:
{
@@ -495,7 +499,7 @@ if(!window.kanbanDropRules)
{
'wait': ['developing', 'developed', 'canceled', 'closed'],
'developing': ['developed', 'pause', 'canceled'],
- 'developed': ['closed'],
+ 'developed': ['developing', 'closed'],
'pause': ['developing'],
'canceled': ['developing'],
'closed': ['developing'],
@@ -683,7 +687,12 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
/* Story lane. */
if(cardType == 'story')
{
- if(toColType == 'ready' || toColType == 'backlog')
+ if(toColType == 'closed' && priv.canCloseStory)
+ {
+ var link = createLink('story', 'close', 'storyID=' + objectID, '', true);
+ showIframe = true;
+ }
+ else
{
if(toColType == 'ready' && typeof(reviewStoryParis[objectID]) != 'undefined')
{
@@ -706,7 +715,7 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
updateKanban(browseType, kanbanGroup[groupBy]);
}
}
- })
+ });
}
}
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 0c7530ff03..8b2a97e1ac 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -359,7 +359,9 @@ $lang->execution->linkStory = 'Link Story';
$lang->execution->createTask = 'Create Task';
$lang->execution->goback = "Go Back";
$lang->execution->noweekend = 'Exclude Weekend';
+$lang->execution->nowdelay = 'Exclude Delay Date';
$lang->execution->withweekend = 'Include Weekend';
+$lang->execution->withdelay = 'Include Delay Date';
$lang->execution->interval = 'Intervals ';
$lang->execution->fixFirstWithLeft = 'Update hours left too';
$lang->execution->unfinishedExecution = "This {$lang->executionCommon} has ";
@@ -384,6 +386,7 @@ $lang->execution->charts->burn->graph->rotateNames = 1;
$lang->execution->charts->burn->graph->showValues = 0;
$lang->execution->charts->burn->graph->reference = 'Ideal';
$lang->execution->charts->burn->graph->actuality = 'Actual';
+$lang->execution->charts->burn->graph->delay = 'Delay';
$lang->execution->placeholder = new stdclass();
$lang->execution->placeholder->code = "Abbreviation of {$lang->executionCommon} name";
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index b3cd85caf9..060c63b27f 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -359,7 +359,9 @@ $lang->execution->linkStory = "关联{$lang->SRCommon}";
$lang->execution->createTask = '创建任务';
$lang->execution->goback = "返回任务列表";
$lang->execution->noweekend = '去除周末';
+$lang->execution->nodelay = '去除延期日期';
$lang->execution->withweekend = '显示周末';
+$lang->execution->withdelay = '显示延期日期';
$lang->execution->interval = '间隔';
$lang->execution->fixFirstWithLeft = '修改剩余工时';
$lang->execution->unfinishedExecution = "该{$lang->executionCommon}下还有";
@@ -384,6 +386,7 @@ $lang->execution->charts->burn->graph->rotateNames = 1;
$lang->execution->charts->burn->graph->showValues = 0;
$lang->execution->charts->burn->graph->reference = '参考';
$lang->execution->charts->burn->graph->actuality = '实际';
+$lang->execution->charts->burn->graph->delay = '延期';
$lang->execution->placeholder = new stdclass();
$lang->execution->placeholder->code = '团队内部的简称';
diff --git a/module/execution/model.php b/module/execution/model.php
index 854121d41c..9973811363 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -481,6 +481,8 @@ class executionModel extends model
->remove('products, branch, uid, plans, syncStories, contactListMenu, teamMembers')
->get();
+ if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);
+
if($this->config->systemMode == 'new' and (empty($execution->project) or $execution->project == $oldExecution->project)) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end);
if(dao::isError()) return false;
@@ -516,6 +518,7 @@ class executionModel extends model
->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage') and `project` = $executionProject")
->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage')")
+ ->checkFlow()
->where('id')->eq($executionID)
->checkFlow()
->limit(1)
@@ -694,13 +697,6 @@ class executionModel extends model
if(is_array($executions[$executionID]->{$extendField->field})) $executions[$executionID]->{$extendField->field} = join(',', $executions[$executionID]->{$extendField->field});
$executions[$executionID]->{$extendField->field} = htmlSpecialString($executions[$executionID]->{$extendField->field});
- $message = $this->checkFlowRule($extendField, $executions[$executionID]->{$extendField->field});
-
- if($message)
- {
- dao::$errors['message'][] = $message;
- return false;
- }
}
}
@@ -751,6 +747,7 @@ class executionModel extends model
->checkIF($execution->end != '', 'end', 'ge', $execution->begin)
->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage') and `project` = $projectID")
->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage')")
+ ->checkFlow()
->where('id')->eq($executionID)
->limit(1)
->exec();
@@ -814,6 +811,7 @@ class executionModel extends model
->autoCheck()
->check($this->config->execution->start->requiredFields, 'notempty')
->checkIF($execution->realBegan != '', 'realBegan', 'le', helper::today())
+ ->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -847,6 +845,7 @@ class executionModel extends model
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
+ ->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -870,10 +869,12 @@ class executionModel extends model
->setDefault('status', 'suspended')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
+ ->setDefault('suspendedDate', helper::today())
->remove('comment')->get();
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
+ ->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -909,6 +910,7 @@ class executionModel extends model
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
+ ->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -979,6 +981,7 @@ class executionModel extends model
->check($this->config->execution->close->requiredFields,'notempty')
->checkIF($execution->realEnd != '', 'realEnd', 'le', helper::today())
->checkIF($execution->realEnd != '', 'realEnd', 'ge', $oldExecution->realBegan)
+ ->checkFlow()
->where('id')->eq((int)$executionID)
->exec();
@@ -2827,21 +2830,77 @@ class executionModel extends model
/**
* Compute burn of a execution.
*
+ * @param int $executionID
* @access public
* @return array
*/
- public function computeBurn()
+ public function computeBurn($executionID = 0)
{
$today = helper::today();
- $burns = array();
-
$executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
- ->where('end')->ge($today)
- ->andWhere('type')->ne('ops')
+ ->where('type')->in('sprint,stage')
+ ->andWhere('lifetime')->ne('ops')
->andWhere('status')->notin('done,closed,suspended')
+ ->beginIF($executionID)->andWhere('id')->eq($executionID)->fi()
->fetchPairs();
- if(!$executions) return $burns;
+ if(!$executions) return array();
+ /* Update historical data of burn. */
+ $table = $this->config->edition == 'open' ? TABLE_TASKESTIMATE : TABLE_EFFORT;
+ $field = $this->config->edition == 'open' ? 'task' : 'objectID';
+ $totalConsumed = $this->dao->select("t2.execution as execution, t1.$field as task, t1.date as date, sum(t1.consumed) as totalConsumed")->from($table)->alias('t1')
+ ->leftJoin(TABLE_TASK)->alias('t2')->on("t1.$field=t2.id")
+ ->where('t2.execution')->in(array_keys($executions))
+ ->beginIF($this->config->edition != 'open')->andWhere('t1.objectType')->eq('task')->fi()
+ ->andWhere('t2.deleted')->eq('0')
+ ->andWhere('t2.parent')->ge('0')
+ ->andWhere('t2.status')->ne('cancel')
+ ->andWhere('t1.date')->ne($today)
+ ->groupBy("t1.$field, t1.date")
+ ->orderBy('t1.id_desc')
+ ->fetchGroup('task', 'date');
+
+ $latestIdList = $this->dao->select('max(id) as id')->from($table)
+ ->where($field)->in(array_keys($totalConsumed))
+ ->beginIF($this->config->edition != 'open')->andWhere('objectType')->eq('task')->fi()
+ ->groupBy("$field,date")->fetchAll('id');
+ $latestLefts = $this->dao->select("$field, date, `left`")->from($table)
+ ->where('id')->in(array_keys($latestIdList))
+ ->fetchGroup($field, 'date');
+
+ $burnList = array();
+ foreach($totalConsumed as $taskID => $consumedList)
+ {
+ foreach($consumedList as $date => $consumed)
+ {
+ $executionID = $consumed->execution;
+ if(!isset($burnList[$executionID])) $burnList[$executionID] = array();
+
+ if(!isset($burnList[$executionID][$date]))
+ {
+ $burnList[$executionID][$date] = new stdclass();
+ $burnList[$executionID][$date]->consumed = 0;
+ $burnList[$executionID][$date]->left = 0;
+ }
+
+ $burnList[$executionID][$date]->consumed += $consumed->totalConsumed;
+ $burnList[$executionID][$date]->left += $latestLefts[$taskID][$date]->left;
+ }
+ }
+
+ foreach($burnList as $executionID => $burns)
+ {
+ foreach($burns as $date => $burn)
+ {
+ $burn->execution = $executionID;
+ $burn->date = $date;
+
+ $this->dao->replace(TABLE_BURN)->data($burn)->exec();
+ $burn->executionName = $executions[$burn->execution];
+ }
+ }
+
+ /* Update today's data of burn. */
$burns = $this->dao->select("execution, '$today' AS date, sum(estimate) AS `estimate`, sum(`left`) AS `left`, SUM(consumed) AS `consumed`")
->from(TABLE_TASK)
->where('execution')->in(array_keys($executions))
@@ -2861,8 +2920,9 @@ class executionModel extends model
->where('execution')->in(array_keys($executions))
->andWhere('deleted')->eq('0')
->andWhere('parent')->ge('0')
- ->andWhere('status')->eq('done')
+ ->andWhere('status', true)->eq('done')
->orWhere('status')->eq('closed')
+ ->markRight(1)
->groupBy('execution')
->fetchAll('execution');
$storyPoints = $this->dao->select('t1.project, sum(t2.estimate) AS `storyPoint`')->from(TABLE_PROJECTSTORY)->alias('t1')
@@ -2893,8 +2953,10 @@ class executionModel extends model
$this->dao->replace(TABLE_BURN)->data($burn)->exec();
$burn->executionName = $executions[$burn->execution];
+ $burnList[$executionID][$today] = $burn;
}
- return $burns;
+
+ return $burnList;
}
/**
@@ -2927,10 +2989,12 @@ class executionModel extends model
*
* @param int $executionID
* @param string $burnBy
+ * @param bool $showDelay
+ * @param array $dateList
* @access public
* @return array
*/
- public function getBurnDataFlot($executionID = 0, $burnBy = '')
+ public function getBurnDataFlot($executionID = 0, $burnBy = '', $showDelay = false, $dateList = array())
{
/* Get execution and burn counts. */
$execution = $this->getById($executionID);
@@ -2943,11 +3007,29 @@ class executionModel extends model
foreach($sets as $date => $set)
{
if($date < $execution->begin) continue;
- if($date > $execution->end) continue;
+ if(!$showDelay and $date > $execution->end) $set->value = 'null';
+ if($showDelay and $date < $execution->end) $set->value = 'null';
$burnData[$date] = $set;
$count++;
}
+
+ if($showDelay)
+ {
+ foreach($dateList as $date)
+ {
+ if(!isset($burnData[$date]))
+ {
+ $set = new stdClass();
+ $set->name = $date;
+ $set->left = 0;
+ $set->value = 'null';
+
+ $burnData[$date] = $set;
+ }
+ }
+ }
+
$burnData = array_reverse($burnData);
return $burnData;
@@ -3632,6 +3714,15 @@ class executionModel extends model
$chartData['burnLine'] = $this->report->createSingleJSON($sets, $dateList);
$chartData['baseLine'] = $baselineJSON;
+ $execution = $this->getById($executionID);
+ if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
+ or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)
+ or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
+ {
+ $delaySets = $this->getBurnDataFlot($executionID, $burnBy, true, $dateList);
+ $chartData['delayLine'] = $this->report->createSingleJSON($delaySets, $dateList);
+ }
+
return $chartData;
}
@@ -3996,4 +4087,36 @@ class executionModel extends model
}
$this->dao->update(TABLE_PROJECT)->set('path')->eq($path['path'])->set('grade')->eq($path['grade'])->where('id')->eq($execution->id)->exec();
}
+
+ /**
+ * Build execution action menu.
+ *
+ * @param object $execution
+ * @param string $type
+ * @access public
+ * @return string
+ */
+ public function buildOperateMenu($execution, $type = 'view')
+ {
+ if($execution->deleted) return '';
+
+ $menu = '';
+ $params = "executionID=$execution->id";
+
+ $menu .= "
";
+ $menu .= $this->buildMenu('execution', 'start', $params, $execution, $type, '', '', 'iframe', true);
+ $menu .= $this->buildMenu('execution', 'activate', $params, $execution, $type, '', '', 'iframe', true);
+ $menu .= $this->buildMenu('execution', 'putoff', $params, $execution, $type, '', '', 'iframe', true);
+ $menu .= $this->buildMenu('execution', 'suspend', $params, $execution, $type, '', '', 'iframe', true);
+ $menu .= $this->buildMenu('execution', 'close', $params, $execution, $type, '', '', 'iframe', true);
+
+ $menu .= "
";
+ $menu .= $this->buildFlowMenu('execution', $execution, 'view', 'direct');
+ $menu .= "
";
+
+ $menu .= $this->buildMenu('execution', 'edit', "execution=$execution->id", $execution);
+ $menu .= $this->buildMenu('execution', 'delete', "execution=$execution->id", $execution, 'button', 'trash', 'hiddenwin');
+
+ return $menu;
+ }
}
diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php
index 5d014e6ce1..f5c2d77aa6 100644
--- a/module/execution/view/ajaxgetdropmenu.html.php
+++ b/module/execution/view/ajaxgetdropmenu.html.php
@@ -46,7 +46,12 @@ foreach($executions as $projectID => $projectExecutions)
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account]))) $executionCounts[$projectID]['myExecution'] ++;
if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account])) $executionCounts[$projectID]['others'] ++;
if($execution->status == 'done' or $execution->status == 'closed') $executionCounts[$projectID]['closed'] ++;
- $executionNames[] = $execution->name;
+ $onlyChildStage = $execution->grade == 2 and $execution->project != $execution->parent;
+ $executionNames[$execution->id] = $execution->name;
+ if($onlyChildStage and isset($parents[$execution->parent]))
+ {
+ $executionNames[$execution->id] = $parents[$execution->parent]->name . '/' . $execution->name;
+ }
}
}
$executionsPinYin = common::convert2Pinyin($executionNames);
@@ -77,7 +82,7 @@ foreach($executions as $projectID => $projectExecutions)
$selected = $execution->id == $executionID ? 'selected' : '';
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account])))
{
- $myExecutionsHtml .= '
' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected clickable' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '';
+ $myExecutionsHtml .= '
' . html::a(sprintf($link, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '';
if($selected == 'selected') $tabActive = 'myExecution';
@@ -85,7 +90,7 @@ foreach($executions as $projectID => $projectExecutions)
}
else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
{
- $normalExecutionsHtml .= '
' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected clickable' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '';
+ $normalExecutionsHtml .= '
' . html::a(sprintf($link, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '';
if($selected == 'selected') $tabActive = 'other';
@@ -93,7 +98,7 @@ foreach($executions as $projectID => $projectExecutions)
}
else if($execution->status == 'done' or $execution->status == 'closed')
{
- $closedExecutionsHtml .= '
' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected clickable' title='$execution->name' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '';
+ $closedExecutionsHtml .= '
' . html::a(sprintf($link, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='$execution->name' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . '';
if($selected == 'selected') $tabActive = 'closed';
}
@@ -171,7 +176,7 @@ $(function()
$('li.has-list div.hide-in-search').removeClass('hidden');
$('.nav-tabs li.active').find('span').show();
}
-
+
if($('.form-control.search-input').val().length > 0)
{
$('#closed').attr("hidden", false);
@@ -191,7 +196,7 @@ $(function()
$('#closed').attr("hidden", true);
$('#gray-line').attr("hidden", true);
}
-
+
var listItem = $(this).find('.has-list');
listItem.each(function ()
{
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index 71da19f850..81ea61c552 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -18,13 +18,24 @@
execution->burnXUnit);?>
execution->burnYUnit);?>
+
' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}{$lang->execution->burn}' class='btn btn-primary' id='computeBurn'");
- echo '
';
- echo html::a($this->createLink('execution', 'burn', "executionID=$executionID&type=$weekend&interval=$interval"), $lang->execution->$weekend, '', "class='btn btn-link'");
+ if(strpos('wait,doing', $execution->status) !== false)
+ {
+ common::printLink('execution', 'computeBurn', 'reload=yes', '
' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
+ echo '
';
+ }
+
+ $weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
+ $delay = strpos($type, 'withdelay') !== false ? 'nodelay' : 'withdelay';
+ echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
+ if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
+ or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)
+ or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
+ echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
+
if(common::canModify('execution', $execution)) common::printLink('execution', 'fixFirst', "execution=$execution->id", $lang->execution->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
echo $lang->execution->howToUpdateBurn;
?>
@@ -54,6 +65,9 @@
execution->charts->burn->graph->reference;?>
execution->charts->burn->graph->actuality;?>
+
+
execution->charts->burn->graph->delay;?>
+
@@ -94,6 +108,19 @@ function initBurnChar()
}]
};
+ var delaySets =
+ {
+ label: "execution->charts->burn->graph->delay;?>",
+ color: 'red',
+ pointStrokeColor: 'red',
+ pointHighlightStroke: 'red',
+ pointColor: 'red',
+ fillColor: 'rgba(0,106,241, .07)',
+ pointHighlightFill: '#fff',
+ data:
+ }
+ if(type.match('withdelay')) data.datasets.push(delaySets);
+
var burnChart = $("#burnCanvas").lineChart(data,
{
pointDotStrokeWidth: 2,
diff --git a/module/execution/view/computeburn.html.php b/module/execution/view/computeburn.html.php
index ea9ea7d339..8cbbbff589 100644
--- a/module/execution/view/computeburn.html.php
+++ b/module/execution/view/computeburn.html.php
@@ -11,8 +11,11 @@
*/
?>
$burnList)
{
- echo $burn->execution . "\t" . $burn->executionName . "\t" . $burn->date . "\t" . $burn->left . "\n";
+ foreach($burnList as $date => $burn)
+ {
+ echo $burn->execution . "\t" . $burn->executionName . "\t" . $burn->date . "\t" . $burn->left . "\n";
+ }
}
?>
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index cfddc793bd..ec45f38420 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -105,6 +105,7 @@ js::set('priv',
'canEditStory' => common::hasPriv('story', 'edit'),
'canDeleteStory' => common::hasPriv('story', 'delete'),
'canChangeStory' => common::hasPriv('story', 'change'),
+ 'canCloseStory' => common::hasPriv('story', 'close'),
'canUnlinkStory' => common::hasPriv('execution', 'unlinkStory'),
)
);
diff --git a/module/execution/view/taskkanban.html.php b/module/execution/view/taskkanban.html.php
index 4d86ea58cd..7ec69b0041 100644
--- a/module/execution/view/taskkanban.html.php
+++ b/module/execution/view/taskkanban.html.php
@@ -193,7 +193,8 @@ js::set('priv',
'canStartTask' => common::hasPriv('task', 'start'),
'canAssignBug' => common::hasPriv('bug', 'assignto'),
'canConfirmBug' => common::hasPriv('bug', 'confirmBug'),
- 'canActivateBug' => common::hasPriv('bug', 'activate')
+ 'canActivateBug' => common::hasPriv('bug', 'activate'),
+ 'canCloseStory' => common::hasPriv('story', 'close')
)
);
?>
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index fabcf9761c..90ec222e0e 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -146,26 +146,9 @@