' . 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 be01e4169e..f711a2b2a1 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1677,9 +1677,15 @@ class execution extends control
if($this->app->tab == 'project')
{
- $projectID = $this->session->project;
+ $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 = $this->project->getById($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'));
@@ -1717,7 +1723,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('all', 0, 'noclosed', isset($projectID) ? $projectID : 0);
+ $this->view->allProjects = $allProjects;
$this->view->pmUsers = $pmUsers;
$this->view->poUsers = $poUsers;
$this->view->qdUsers = $qdUsers;
diff --git a/module/execution/js/batchedit.js b/module/execution/js/batchedit.js
index f9fca2bb2b..6c0e349d09 100644
--- a/module/execution/js/batchedit.js
+++ b/module/execution/js/batchedit.js
@@ -1,13 +1,14 @@
-$(function()
+function changeProject(obj, executionID, projectID)
{
- $('[id^="projects"]').change(function()
+ var $td = $(obj).closest('td');
+ if($td.find('[id^="syncStories"]').length == 0)
{
- var executionID = $(this).attr('id').replace('projects', '');
- var $td = $(this).closest('td');
- if($td.find('[id^="syncStories"]').length == 0)
- {
- $td.append("
");
- }
- $("#syncStories" + executionID).val(confirm(confirmSyncStories) ? 'yes' : 'no');
- })
-});
+ $td.append("
");
+ }
+ var confirmVal = confirm(confirmSync);
+ $("#syncStories" + executionID).val(confirmVal ? 'yes' : 'no');
+ if(!confirmVal)
+ {
+ $(obj).val(projectID).trigger("chosen:updated");
+ }
+};
diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index 0c09b6bfe8..3955629251 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -71,6 +71,6 @@ $(function()
{
$('#submit').after("
");
}
- $("#syncStories").val(confirm(confirmSyncStories) ? 'yes' : 'no');
+ $("#syncStories").val(confirm(confirmSync) ? 'yes' : 'no');
});
})
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index c9aa6aa2f0..0c7530ff03 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -340,7 +340,7 @@ if($config->systemMode == 'new') $lang->execution->copyTeamTitle = "Choose a
$lang->execution->confirmDelete = "Do you want to delete the {$lang->executionCommon}[%s]?";
$lang->execution->confirmUnlinkMember = "Do you want to unlink this User from {$lang->executionCommon}?";
$lang->execution->confirmUnlinkStory = "After {$lang->SRCommon} is removed, cased linked to {$lang->SRCommon} will be reomoved and tasks linked to {$lang->SRCommon} will be cancelled. Do you want to continue?";
-$lang->execution->confirmSyncStories = "After modifying the project, synchronize the execution related {$lang->SRCommon} to the new project?";
+$lang->execution->confirmSync = "After modifying the project, in order to maintain the consistency of data, the data of products, requirements, teams and whitelist associated with the implementation will be synchronized to the new project. Please know.";
$lang->execution->confirmUnlinkExecutionStory = "Do you want to unlink this Story from the execution?";
$lang->execution->notAllowedUnlinkStory = "This {$lang->SRCommon} is linked to the {$lang->executionCommon} of the execution. Remove it from the {$lang->executionCommon}, then try again.";
$lang->execution->notAllowRemoveProducts = "The story of this product is linked with the {$lang->executionCommon}. Unlink it before doing any action.";
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 9248f804cb..b3cd85caf9 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -340,7 +340,7 @@ if($config->systemMode == 'new') $lang->execution->copyTeamTitle = "选择
$lang->execution->confirmDelete = "您确定删除{$lang->executionCommon}[%s]吗？";
$lang->execution->confirmUnlinkMember = "您确定从该{$lang->executionCommon}中移除该用户吗？";
$lang->execution->confirmUnlinkStory = "移除该{$lang->SRCommon}后，该{$lang->SRCommon}关联的用例将被移除，该{$lang->SRCommon}关联的任务将被取消，请确认。";
-$lang->execution->confirmSyncStories = "修改所属项目后，执行关联的{$lang->SRCommon}是否同步到新项目中？";
+$lang->execution->confirmSync = "修改所属项目后,为了保持数据的一致性，该执行所关联的产品、需求、团队和白名单数据将会同步到新的项目中，请知悉。";
$lang->execution->confirmUnlinkExecutionStory = "您确定从该项目中移除该{$lang->SRCommon}吗？";
$lang->execution->notAllowedUnlinkStory = "该{$lang->SRCommon}已经与项目下{$lang->executionCommon}相关联，请从{$lang->executionCommon}中移除后再操作。";
$lang->execution->notAllowRemoveProducts = "该{$lang->productCommon}中的{$lang->SRCommon}已与该{$lang->executionCommon}进行了关联，请取消关联后再操作。";
diff --git a/module/execution/model.php b/module/execution/model.php
index 507ddfe98a..e50d9ec569 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -684,6 +684,27 @@ class executionModel extends model
$projectID = isset($execution->project) ? $execution->project : $oldExecution->project;
$project = $this->project->getByID($projectID);
+ if(isset($execution->project))
+ {
+ $executionProductList = $this->loadModel('product')->getProducts($executionID);
+ $projectProductList = $this->product->getProducts($execution->project);
+ $executionProductIdList = array_keys($executionProductList);
+ $projectProductIdList = array_keys($projectProductList);
+ $diffProductIdList = array_diff($executionProductIdList, $projectProductIdList);
+ if(!empty($diffProductIdList))
+ {
+ foreach($diffProductIdList as $key => $newProductID)
+ {
+ $data = $this->dao->select('*')->from(TABLE_PROJECTPRODUCT)
+ ->where('project')->eq($executionID)
+ ->andWhere('product')->eq($newProductID)
+ ->fetch();
+ $data->project = $execution->project;
+ $this->dao->insert(TABLE_PROJECTPRODUCT)->data($data)->exec();
+ }
+ }
+ }
+
if($project and $execution->begin < $project->begin)
{
dao::$errors['begin'] = sprintf($this->lang->execution->errorLetterProject, $project->begin);
@@ -2791,15 +2812,70 @@ class executionModel extends model
public function computeBurn()
{
$today = helper::today();
- $burns = array();
-
$executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
->where('end')->ge($today)
- ->andWhere('type')->ne('ops')
+ ->andWhere('type')->in('sprint,stage')
+ ->andWhere('lifetime')->ne('ops')
->andWhere('status')->notin('done,closed,suspended')
->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))
@@ -2852,8 +2928,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;
}
/**
@@ -3955,4 +4033,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/batchedit.html.php b/module/execution/view/batchedit.html.php
index 2ad0a2b496..5520f67890 100755
--- a/module/execution/view/batchedit.html.php
+++ b/module/execution/view/batchedit.html.php
@@ -83,7 +83,7 @@
|
systemMode == 'new' and isset($project) and $project->model == 'scrum'):?>
- project, "class='form-control picker-select'");?> |
+ project, "class='form-control picker-select' onchange='changeProject(this, $executionID, {$executions[$executionID]->project})'");?> |
name, "class='form-control'");?> |
code, "class='form-control'");?> |
@@ -137,5 +137,5 @@
execution->weekend);?>
-execution->confirmSyncStories);?>
+execution->confirmSync);?>
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/edit.html.php b/module/execution/view/edit.html.php
index 7c664b9c0a..449d728f84 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -220,6 +220,6 @@
execution->notAllowRemoveProducts);?>
-execution->confirmSyncStories);?>
+execution->confirmSync);?>
systemMode);?>
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 @@
- id";
- $browseLink = $this->session->executionList ? $this->session->executionList : inlink('browse', "executionID=$execution->id");
- common::printBack($browseLink);
- if(!$execution->deleted)
- {
- echo "
";
- common::printIcon('execution', 'start', "executionID=$execution->id", $execution, 'button', '', '', 'iframe', true);
- common::printIcon('execution', 'activate', "executionID=$execution->id", $execution, 'button', '', '', 'iframe', true);
- common::printIcon('execution', 'putoff', "executionID=$execution->id", $execution, 'button', '', '', 'iframe', true);
- common::printIcon('execution', 'suspend', "executionID=$execution->id", $execution, 'button', '', '', 'iframe', true);
- common::printIcon('execution', 'close', "executionID=$execution->id", $execution, 'button', '', '', 'iframe', true);
-
- echo $this->buildOperateMenu($execution, 'view');
-
- echo "
";
- common::printIcon('execution', 'edit', $params, $execution);
- common::printIcon('execution', 'delete', $params, $execution, 'button', 'trash', 'hiddenwin');
- }
- ?>
+ session->executionList ? $this->session->executionList : inlink('browse', "executionID=$execution->id");?>
+
+ execution->buildOperateMenu($execution, 'view');?>
diff --git a/module/gitlab/control.php b/module/gitlab/control.php
index dcf9627853..e3faaf7ada 100644
--- a/module/gitlab/control.php
+++ b/module/gitlab/control.php
@@ -259,7 +259,7 @@ class gitlab extends control
$user = $this->gitlab->apiGetCurrentUser($gitlab->url, $gitlab->token, true);
if(!is_object($user)) return $this->send(array('result' => 'fail', 'message' => array('url' => array(sprintf($this->lang->gitlab->hostError, $this->config->gitlab->minCompatibleVersion)))));
- if(isset($user->error)) return $this->send(array('result' => 'fail', 'message' => array('token' => array($this->lang->gitlab->tokenError))));
+ if(!isset($user->id)) return $this->send(array('result' => 'fail', 'message' => array('token' => array($this->lang->gitlab->tokenError))));
/* Verify version compatibility. */
$result = $this->gitlab->getVersion($gitlab->url, $gitlab->token);
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 60aa69d0a4..9e7c18a9bd 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1215,6 +1215,7 @@ $lang->resource->doc->objectLibs = 'objectLibs';
$lang->resource->doc->collect = 'collectAction';
$lang->resource->doc->tableContents = 'tableContents';
$lang->resource->doc->showFiles = 'showFiles';
+$lang->resource->doc->updateOrder = 'updateOrder';
$lang->doc->methodOrder[0] = 'index';
$lang->doc->methodOrder[5] = 'browse';
diff --git a/module/kanban/view/viewarchivedcard.html.php b/module/kanban/view/viewarchivedcard.html.php
index 09da6b4a0f..1a18aed718 100644
--- a/module/kanban/view/viewarchivedcard.html.php
+++ b/module/kanban/view/viewarchivedcard.html.php
@@ -19,6 +19,7 @@
#archivedCards .kanban-item > .info {margin-top: 5px; position: relative;}
#archivedCards .kanban-item > .info > .pri {height: 14px; border-width: 1px; font-size: 12px; line-height: 12px; min-width: 14px; padding: 0 1px;}
#archivedCards .kanban-item > .info > .time {margin-left: 10px; font-size: 12px}
+#archivedCards .kanban-item > .info.build > .time {margin-left:0px; font-size: 12px}
#archivedCards .kanban-item > .info > .user {position: absolute; right: 0; top: 0}
#archivedCards .card-actions {position: relative; padding: 15px 10px; padding-top: 0px;}
#archivedCards .card-actions > .btn {display: block;}
@@ -41,7 +42,9 @@
#archivedCards .card-item .has-color .info > .label-pri,
#archivedCards .card-item .has-color .info > .estimate,
#archivedCards .card-item .has-color .info > .label-light {color: #FFFFFF;}
+#archivedCards .info.execution .label-light, #archivedCards .info.productplan .label-light, #archivedCards .info.build .label-light, #archivedCards .info.release .label-light {background: #EFEFEF !important; color: #838A9D !important;}
#archivedCards .card-item .has-color .info > .label-pri {border-color: #FFFFFF;}
+#archivedCards .card-item .has-color .progress-box > .progress-number {color: #FFFFFF;}
#archivedCards .progress-box {width: 97%;}
#performable {padding: 25px 10px !important;}
@@ -91,51 +94,70 @@ $app->loadLang('productplan');
title) ? $card->title : $card->name;
- if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink('productplan', 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
+ if(common::hasPriv($card->fromType, 'view')) echo html::a($this->createLink($card->fromType, 'view', "id=$card->fromID"), $name, '', "class='cardName' title='$name'");
if(!common::hasPriv($card->fromType, 'view')) echo "$name
";
echo "";
- if($card->fromType != 'release' and isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "
" . $lang->{$card->fromType}->statusList[$card->objectStatus] . '';
- if(isset($card->date) and !helper::isZeroDate($card->date)) echo "
" . date("m/d", strtotime($card->date)) . ""
+ if(isset($lang->{$card->fromType}->statusList[$card->objectStatus])) echo "
" . $lang->{$card->fromType}->statusList[$card->objectStatus] . '';
+ if(isset($card->date) and !helper::isZeroDate($card->date)) echo "
" . date("Y-m-d", strtotime($card->date)) . ""
?>
- end) and !helper::isZeroDate($card->begin)):?>
+ end) and !helper::isZeroDate($card->begin) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?>
begin)) . $lang->kanbancard->beginAB;?>
- begin) and !helper::isZeroDate($card->end)):?>
+ begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01'):?>
end)) . $lang->kanbancard->deadlineAB;?>
- begin) and !helper::isZeroDate($card->end)):?>
+ begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01' and $card->fromType == ''):?>
begin)) . ' ~ ' . date("m/d", strtotime($card->end));?>
+ begin) and !helper::isZeroDate($card->end) and $card->begin != '2030-01-01' and $card->end != '2030-01-01' and $card->fromType != ''):?>
+
begin)) . ' ' . $lang->{$card->fromType}->to . ' ' . date("m-d", strtotime($card->end));?>
+
assignedTo);
+ if($card->begin == '2030-01-01' or $card->end == '2030-01-01') echo '
' . $lang->{$card->fromType}->future . '';
+
+ if($card->fromType == '') $assignedToList = explode(',', $card->assignedTo);
+ if($card->fromType == 'execution') $assignedToList = $card->PM;
+ if($card->fromType == 'build') $assignedToList = $card->builder;
+ if($card->fromType == 'release' or $card->fromType == 'productplan') $assignedToList = $card->createdBy;
$count = 0;
$members = '';
?>
- $account)
- {
- if(!isset($users[$account]) or !isset($usersAvatar[$account]))
- {
- unset($assignedToList[$index]);
- continue;
- }
- $members .= $users[$account] . ',';
- }
- $userCount = count($assignedToList);
- ?>
- 0):?>
-
- 2) continue;
- echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account, 'name' => $users[$account]), 'avatar-circle');
- $count ++;
- }
- ?>
- 2) echo "...";?>
-
+
+ $account)
+ {
+ if(!isset($users[$account]) or !isset($usersAvatar[$account]))
+ {
+ unset($assignedToList[$index]);
+ continue;
+ }
+ $members .= $users[$account] . ',';
+ }
+ $userCount = count($assignedToList);
+ ?>
+ 0):?>
+
+ 2) continue;
+ echo html::smallAvatar(array('avatar' => $usersAvatar[$account], 'account' => $account, 'name' => $users[$account]), 'avatar-circle');
+ $count ++;
+ }
+ ?>
+ 2) echo "...";?>
+
+
+
+ ";
+ echo html::smallAvatar(array('avatar' => $usersAvatar[$assignedToList], 'account' => $assignedToList, 'name' => $users[$assignedToList]), 'avatar-circle');
+ echo "
" . $lang->export, '', "class='btn btn-link export'", true, true)?>
@@ -26,11 +27,13 @@
+
diff --git a/module/product/view/view.html.php b/module/product/view/view.html.php
index 9dff1daa07..dd670efb83 100644
--- a/module/product/view/view.html.php
+++ b/module/product/view/view.html.php
@@ -161,7 +161,7 @@
$browseLink = $this->session->productList ? $this->session->productList : inlink('browse', "productID=$product->id");
common::printBack($browseLink);
- if(!$product->deleted) echo $this->buildOperateMenu($product, 'view');
+ if(!$product->deleted) echo $this->product->buildOperateMenu($product, 'view');
?>
buildOperateMenu($plan, 'browse'); ?> |
+ productplan->buildOperateMenu($plan, 'browse'); ?> |
diff --git a/module/productplan/view/view.html.php b/module/productplan/view/view.html.php
index cff6af86a6..76002e70b1 100644
--- a/module/productplan/view/view.html.php
+++ b/module/productplan/view/view.html.php
@@ -38,7 +38,7 @@