-
caselib->import;?>
+port->import;?>
file->importSummary, $allCount, html::input('maxImport', $config->file->maxImport, "style='width:50px'"), ceil($allCount / $config->file->maxImport));?>
import, "id='import'", 'btn btn-primary');?>
@@ -23,118 +44,186 @@ $(function()
-
-
caselib->import;?>
+port->import;?>
- ";
echo '
- ' . html::a(helper::createLink('misc', 'downloadClient', '', '', true), $lang->downloadClient, '', "title='$lang->downloadClient' class='iframe text-ellipsis' data-width='600'") . ' '; + echo "
- " . $lang->downloadMobile . "
- ";
+ echo "
v1.2";
+ echo "
";
echo ' - ' . html::a($lang->clientHelpLink, $lang->clientHelp, '', "title='$lang->clientHelp' target='_blank'") . ' '; echo '
@@ -44,6 +45,11 @@ include 'chosen.html.php';
}
?>
+
+
+
+
+
+doc->textTypes);?>
+
+
+doc->noticeAcl['doc']);?>
+
diff --git a/module/doc/view/edit.html.php b/module/doc/view/edit.html.php
index 3569041e5c..2ccac715c4 100644
--- a/module/doc/view/edit.html.php
+++ b/module/doc/view/edit.html.php
@@ -10,109 +10,8 @@
* @link http://www.zentao.net
*/
?>
-
-contentType == 'html') include '../../common/view/kindeditor.html.php';?>
-contentType == 'markdown') include '../../common/view/markdown.html.php';?>
-content != $doc->draft);?>
-doc->confirmUpdateContent);?>
-id);?>
-draft);?>
-
diff --git a/module/doc/view/showfiles.html.php b/module/doc/view/showfiles.html.php
index 1939c8f81b..9266493800 100644
--- a/module/doc/view/showfiles.html.php
+++ b/module/doc/view/showfiles.html.php
@@ -45,9 +45,20 @@
extension, '', $file->title);?>
- objectType == 'requirement' ? $lang->URCommon : $lang->{$file->objectType}->common) . ' : ';?>
- objectType), 'view', "objectID=$file->objectID", '', true);?>' class='iframe' data-width='90%'>
- objectType][$file->objectID];?>
+ objectType == 'requirement')
+ {
+ $commonTitle = $lang->URCommon . ' : ';
+ }
+ else
+ {
+ if(!isset($lang->{$file->objectType}->common)) $app->loadLang($file->objectType);
+ $commonTitle = $lang->{$file->objectType}->common . ' : ';
+ }
+ echo $commonTitle;
+ ?>
+ objectType), 'view', "objectID=$file->objectID", '', true);?>' class='iframe' data-width='90%'>
+ objectType][$file->objectID])) echo $sourcePairs[$file->objectType][$file->objectID];?>
extension;?>
@@ -101,9 +112,20 @@
diff --git a/module/doc/view/tablecontents.html.php b/module/doc/view/tablecontents.html.php
index 5b0225f5de..6442f4f00a 100644
--- a/module/doc/view/tablecontents.html.php
+++ b/module/doc/view/tablecontents.html.php
@@ -93,11 +93,12 @@ if(empty($type)) $type = 'product';
$html .= "
";
diff --git a/module/execution/config.php b/module/execution/config.php
index 2e46428e5b..46880f681f 100644
--- a/module/execution/config.php
+++ b/module/execution/config.php
@@ -15,6 +15,8 @@ $config->execution->modelList['kanban'] = 'kanban';
$config->execution->statusActions = array('start', 'putoff', 'suspend', 'close', 'activate');
+$config->execution->kanbanMethod = array('kanban', 'cfd', 'build', 'view', 'manageproducts', 'team', 'managemembers', 'whitelist', 'addwhitelist', 'edit');
+
global $lang, $app;
$app->loadLang('task');
$config->execution->task = new stdclass();
@@ -117,6 +119,39 @@ $config->execution->search['params']['canceledDate'] = array('operator' => '='
$config->execution->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
$config->execution->search['params']['activatedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$app->loadLang('execution');
+$config->execution->all = new stdclass();
+$config->execution->all->search['module'] = 'execution';
+$config->execution->all->search['fields']['name'] = $lang->execution->execName;
+$config->execution->all->search['fields']['id'] = $lang->execution->execId;
+$config->execution->all->search['fields']['status'] = $lang->execution->execStatus;
+$config->execution->all->search['fields']['project'] = $lang->execution->project;
+$config->execution->all->search['fields']['PM'] = $lang->execution->owner;
+$config->execution->all->search['fields']['openedBy'] = $lang->execution->openedBy;
+$config->execution->all->search['fields']['openedDate'] = $lang->execution->openedDate;
+$config->execution->all->search['fields']['begin'] = $lang->execution->begin;
+$config->execution->all->search['fields']['end'] = $lang->execution->end;
+$config->execution->all->search['fields']['realBegan'] = $lang->execution->realBegan;
+$config->execution->all->search['fields']['realEnd'] = $lang->execution->realEnd;
+$config->execution->all->search['fields']['closedBy'] = $lang->execution->closedBy;
+$config->execution->all->search['fields']['lastEditedDate'] = $lang->execution->lastEditedDate;
+$config->execution->all->search['fields']['closedDate'] = $lang->execution->closedDate;
+
+$config->execution->all->search['params']['name'] = array('operator' => 'include', 'control' => 'input', 'values' => '');
+$config->execution->all->search['params']['id'] = array('operator' => '=', 'control' => 'input', 'values' => '');
+$config->execution->all->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => array('') + $lang->execution->statusList);
+$config->execution->all->search['params']['project'] = array('operator' => '=', 'control' => 'select', 'values' => '');
+$config->execution->all->search['params']['PM'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
+$config->execution->all->search['params']['openedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
+$config->execution->all->search['params']['openedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$config->execution->all->search['params']['begin'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$config->execution->all->search['params']['end'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$config->execution->all->search['params']['realBegan'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$config->execution->all->search['params']['realEnd'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$config->execution->all->search['params']['closedBy'] = array('operator' => '=', 'control' => 'select', 'values' => 'users');
+$config->execution->all->search['params']['lastEditedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+$config->execution->all->search['params']['closedDate'] = array('operator' => '=', 'control' => 'input', 'values' => '', 'class' => 'date');
+
$config->printKanban = new stdClass();
$config->printKanban->col['story'] = 1;
$config->printKanban->col['wait'] = 2;
@@ -139,7 +174,14 @@ $config->execution->gantt->linkType['end']['end'] = 2;
$config->execution->gantt->linkType['begin']['end'] = 3;
$config->execution->datatable = new stdclass();
-$config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'percent', 'attribute', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn', 'actions');
+if(!isset($config->setCode) or $config->setCode == 1)
+{
+ $config->execution->datatable->defaultField = array('id', 'name', 'code', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+}
+else
+{
+ $config->execution->datatable->defaultField = array('id', 'name', 'project', 'PM', 'status', 'progress', 'begin', 'end', 'estimate', 'consumed', 'left', 'burn');
+}
$config->execution->datatable->fieldList['id']['title'] = 'idAB';
$config->execution->datatable->fieldList['id']['fixed'] = 'left';
@@ -151,10 +193,13 @@ $config->execution->datatable->fieldList['name']['fixed'] = 'left';
$config->execution->datatable->fieldList['name']['width'] = 'auto';
$config->execution->datatable->fieldList['name']['required'] = 'yes';
-$config->execution->datatable->fieldList['code']['title'] = 'code';
-$config->execution->datatable->fieldList['code']['fixed'] = 'no';
-$config->execution->datatable->fieldList['code']['width'] = '95';
-$config->execution->datatable->fieldList['code']['required'] = 'no';
+if(!isset($config->setCode) or $config->setCode == 1)
+{
+ $config->execution->datatable->fieldList['code']['title'] = 'code';
+ $config->execution->datatable->fieldList['code']['fixed'] = 'no';
+ $config->execution->datatable->fieldList['code']['width'] = '95';
+ $config->execution->datatable->fieldList['code']['required'] = 'no';
+}
$config->execution->datatable->fieldList['project']['title'] = 'project';
$config->execution->datatable->fieldList['project']['fixed'] = 'no';
@@ -177,18 +222,6 @@ $config->execution->datatable->fieldList['progress']['width'] = '70';
$config->execution->datatable->fieldList['progress']['required'] = 'no';
$config->execution->datatable->fieldList['progress']['sort'] = 'no';
-$config->execution->datatable->fieldList['percent']['title'] = 'percent';
-$config->execution->datatable->fieldList['percent']['fixed'] = 'no';
-$config->execution->datatable->fieldList['percent']['width'] = '85';
-$config->execution->datatable->fieldList['percent']['required'] = 'no';
-$config->execution->datatable->fieldList['percent']['sort'] = 'no';
-
-$config->execution->datatable->fieldList['attribute']['title'] = 'attribute';
-$config->execution->datatable->fieldList['attribute']['fixed'] = 'no';
-$config->execution->datatable->fieldList['attribute']['width'] = '80';
-$config->execution->datatable->fieldList['attribute']['required'] = 'no';
-$config->execution->datatable->fieldList['attribute']['sort'] = 'no';
-
$config->execution->datatable->fieldList['openedDate']['title'] = 'openedDate';
$config->execution->datatable->fieldList['openedDate']['fixed'] = 'no';
$config->execution->datatable->fieldList['openedDate']['width'] = '85';
@@ -239,9 +272,3 @@ $config->execution->datatable->fieldList['burn']['fixed'] = 'no';
$config->execution->datatable->fieldList['burn']['width'] = '80';
$config->execution->datatable->fieldList['burn']['required'] = 'no';
$config->execution->datatable->fieldList['burn']['sort'] = 'no';
-
-$config->execution->datatable->fieldList['actions']['title'] = 'actions';
-$config->execution->datatable->fieldList['actions']['fixed'] = 'right';
-$config->execution->datatable->fieldList['actions']['width'] = '180';
-$config->execution->datatable->fieldList['actions']['required'] = 'yes';
-$config->execution->datatable->fieldList['actions']['sort'] = 'no';
diff --git a/module/execution/control.php b/module/execution/control.php
index 433c01591d..733cadbe29 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -107,7 +107,7 @@ class execution extends control
* @access public
* @return void
*/
- public function task($executionID = 0, $status = 'all', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 100, $pageID = 1)
+ public function task($executionID = 0, $status = 'unclosed', $param = 0, $orderBy = '', $recTotal = 0, $recPerPage = 100, $pageID = 1)
{
$this->loadModel('tree');
$this->loadModel('search');
@@ -191,7 +191,8 @@ class execution extends control
$pager = new pager($recTotal, $recPerPage, $pageID);
/* Get tasks. */
- $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
+ $allTasks = $this->task->getExecutionTasks($executionID);
+ $tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
if(empty($tasks) and $pageID > 1)
{
$pager = pager::init(0, $recPerPage, 1);
@@ -221,7 +222,7 @@ class execution extends control
/* Assign. */
$this->view->tasks = $tasks;
- $this->view->allTasksNum = $this->task->getExecutionTasks($executionID);
+ $this->view->allTasks = $allTasks;
$this->view->summary = $this->execution->summary($tasks);
$this->view->tabID = 'task';
$this->view->pager = $pager;
@@ -240,7 +241,7 @@ class execution extends control
$this->view->moduleID = $moduleID;
$this->view->moduleTree = $this->tree->getTaskTreeMenu($executionID, $productID, $startModuleID = 0, array('treeModel', 'createTaskLink'), $extra);
$this->view->memberPairs = $memberPairs;
- $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), 'noempty');
+ $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products));
$this->view->setModule = true;
$this->view->canBeChanged = common::canModify('execution', $execution); // Determines whether an object is editable.
$this->view->showBranch = $showBranch;
@@ -942,6 +943,7 @@ class execution extends control
/* Save session. */
$this->session->set('bugList', $this->app->getURI(true), 'execution');
+ $this->session->set('buildList', $this->app->getURI(true), 'execution');
$type = strtolower($type);
$queryID = ($type == 'bysearch') ? (int)$param : 0;
@@ -977,7 +979,7 @@ class execution extends control
$memberPairs = $this->user->processAccountSort($memberPairs);
/* Build the search form. */
- $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
+ $actionURL = $this->createLink('execution', 'bug', "executionID=$executionID&productID=$productID&branch=$branch&orderBy=$orderBy&build=$build&type=bysearch&queryID=myQueryID");
$this->execution->buildBugSearchForm($products, $queryID, $actionURL);
$product = $this->product->getById($productID);
@@ -1666,7 +1668,6 @@ class execution extends control
}
}
- $this->app->loadLang('kanban');
$this->loadModel('user');
$poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', '', $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
@@ -1744,13 +1745,6 @@ class execution extends control
$branches = $this->project->getBranchesByProject($executionID);
$linkedProductIdList = empty($branches) ? '' : array_keys($branches);
- if($execution->type == 'kanban')
- {
- global $lang;
- $lang->executionCommon = $lang->execution->kanban;
- include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
- }
-
if(!empty($newPlans) and $confirm == 'yes')
{
$newPlans = explode(',', $newPlans);
@@ -1825,13 +1819,9 @@ class execution extends control
if($message) $this->lang->saveSuccess = $message;
if($_POST['status'] == 'doing') $this->loadModel('common')->syncPPEStatus($executionID);
- if($execution->type == 'kanban') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
/* If link from no head then reload. */
- if(isonlybody())
- {
- return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
- }
+ if(isonlybody()) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => inlink('view', "executionID=$executionID")));
}
@@ -1880,7 +1870,6 @@ class execution extends control
}
$this->loadModel('user');
- $this->loadModel('kanban');
$poUsers = $this->user->getPairs('noclosed|nodeleted|pofirst', $execution->PO, $this->config->maxCount);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["PM"] = $this->config->user->moreLink;
@@ -1919,10 +1908,6 @@ class execution extends control
$this->view->teamMembers = $this->execution->getTeamMembers($executionID);
if($this->config->systemMode == 'new') $this->view->allProjects = $this->project->getPairsByModel($project->model, 0, 'noclosed', $project->id);
- $this->view->laneCount = $this->kanban->getLaneCount($executionID, $execution->type);
- $this->view->heightType = $execution->displayCards > 2 ? 'custom' : 'auto';
- $this->view->displayCards = $execution->displayCards ? $execution->displayCards : '';
-
$this->display();
}
@@ -2280,11 +2265,7 @@ class execution extends control
$type = $this->config->vision == 'lite' ? 'kanban' : 'stage,sprint,kanban';
if(empty($execution) || strpos($type, $execution->type) === false) return print(js::error($this->lang->notFound) . js::locate('back'));
- if($execution->type == 'kanban')
- {
- if(defined('RUN_MODE') && RUN_MODE == 'api') return print($this->fetch('execution', 'kanban', "executionID=$executionID"));
- return print(js::locate(inlink('kanban', "executionID=$executionID")));
- }
+ if($execution->type == 'kanban' and defined('RUN_MODE') and RUN_MODE == 'api') return print($this->fetch('execution', 'kanban', "executionID=$executionID"));
$this->app->loadLang('program');
@@ -2305,18 +2286,37 @@ class execution extends control
$this->execution->setMenu($execution->id);
$this->app->loadLang('bug');
- $type = 'noweekend';
- 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))
- and strpos($type, 'delay') === false)
- $type .= ',withdelay';
+ if($execution->type == 'kanban')
+ {
+ $this->app->loadClass('date');
- $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 : $execution->end;
- list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d', $execution->end);
- $chartData = $this->execution->buildBurnData($executionID, $dateList, $type);
+ $begin = date('Y-m-d', strtotime('-13 days'));
+ $begin = (helper::isZeroDate($execution->begin) or helper::diffDate($begin, $execution->begin) > 0) ? $begin : $execution->begin;
+ $end = helper::today();
+ $dateList = date::getDateList($begin, $end, 'Y-m-d', 'noweekend');
+ $chartData = $this->execution->buildCFDData($executionID, $dateList, 'task');
+ if(isset($chartData['line'])) $chartData['line'] = array_reverse($chartData['line']);
+
+ $this->view->begin = helper::safe64Encode(urlencode($begin));
+ $this->view->end = helper::safe64Encode(urlencode($end));
+ }
+ else
+ {
+ $type = 'noweekend';
+ 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))
+ and strpos($type, 'delay') === false)
+ {
+ $type .= ',withdelay';
+ }
+
+ $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 : $execution->end;
+ list($dateList, $interval) = $this->execution->getDateList($execution->begin, $endDate, $type, 0, 'Y-m-d', $execution->end);
+ $chartData = $this->execution->buildBurnData($executionID, $dateList, $type);
+ }
/* Load pager. */
$this->app->loadClass('pager', $static = true);
@@ -2474,7 +2474,7 @@ class execution extends control
unset($this->lang->kanban->type['all']);
}
- if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'pri_asc';
+ if($groupBy == 'story' and $browseType == 'task' and !isset($this->lang->kanban->orderList[$orderBy])) $orderBy = 'id_asc';
$kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy, '', $orderBy);
if(empty($kanbanGroup))
{
@@ -2604,6 +2604,33 @@ class execution extends control
$this->display();
}
+ /**
+ * Set Kanban.
+ *
+ * @param int $executionID
+ * @access public
+ * @return void
+ */
+ public function setKanban($executionID)
+ {
+ $execution = $this->execution->getByID($executionID);
+
+ if($_POST)
+ {
+ $this->execution->setKanban($executionID);
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+ }
+
+ $this->view->title = $this->lang->execution->setKanban;
+ $this->view->execution = $execution;
+ $this->view->laneCount = $this->loadModel('kanban')->getLaneCount($executionID, $execution->type);
+ $this->view->heightType = $execution->displayCards > 2 ? 'custom' : 'auto';
+ $this->view->displayCards = $execution->displayCards ? $execution->displayCards : '';
+
+ $this->display();
+ }
+
/**
* Tree view.
* Product
@@ -2992,6 +3019,8 @@ class execution extends control
$this->execution->setMenu($execution->id);
if(!empty($this->config->user->moreLink)) $this->config->moreLinks["accounts[]"] = $this->config->user->moreLink;
+ if($execution->type == 'kanban') $this->lang->execution->copyTeamTitle = str_replace($this->lang->execution->common, $this->lang->execution->kanban, $this->lang->execution->copyTeamTitle);
+
$title = $this->lang->execution->manageMembers . $this->lang->colon . $execution->name;
$position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
$position[] = $this->lang->execution->manageMembers;
@@ -3647,16 +3676,16 @@ class execution extends control
* All execution.
*
* @param string $status
- * @param int $projectID
* @param string $orderBy
* @param int $productID
+ * @param string $param
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @access public
* @return void
*/
- public function all($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 100, $pageID = 1)
+ public function all($status = 'undone', $orderBy = 'order_asc', $productID = 0, $param = '', $recTotal = 0, $recPerPage = 100, $pageID = 1)
{
$this->app->loadLang('my');
$this->app->loadLang('product');
@@ -3669,27 +3698,22 @@ class execution extends control
if($this->app->viewType == 'mhtml')
{
- if($this->app->rawModule == 'project' and $this->app->rawMethod == 'execution')
- {
- $projects = $this->project->getPairsByProgram();
- $projectID = $this->project->saveState($projectID, $projects);
- $this->project->setMenu($projectID);
- }
- else
- {
- $executionID = $this->execution->saveState(0, $this->executions);
- $this->execution->setMenu($executionID);
- }
+ $executionID = $this->execution->saveState(0, $this->executions);
+ $this->execution->setMenu($executionID);
}
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
+ $queryID = ($status == 'bySearch') ? (int)$param : 0;
+ $actionURL = $this->createLink('execution', 'all', "status=bySearch&orderBy=$orderBy&productID=$productID¶m=myQueryID");
+ $this->execution->buildSearchFrom($queryID, $actionURL);
+
$this->view->title = $this->lang->execution->allExecutions;
$this->view->position[] = $this->lang->execution->allExecutions;
- $executionStats = $this->project->getStats($projectID, $status, $productID, 0, 30, $orderBy, $pager);
+ $executionStats = $this->project->getStats(0, $status, $productID, 0, 30, $orderBy, $pager, false, $queryID);
$parentIdList = array();
foreach($executionStats as $execution)
@@ -3700,20 +3724,19 @@ class execution extends control
$parents = array();
if($parentIdList) $parents = $this->execution->getByIdList($parentIdList);
- $allExecutionsNum = $this->project->getStats($projectID, 'all');
+ $allExecutionsNum = $this->project->getStats(0, 'all');
$this->view->allExecutionsNum = count($allExecutionsNum);
$this->view->executionStats = $executionStats;
- $this->view->productList = $this->loadModel('product')->getProductPairsByProject($projectID);
+ $this->view->productList = $this->loadModel('product')->getProductPairsByProject(0);
$this->view->productID = $productID;
- $this->view->projectID = $projectID;
$this->view->parents = $parents;
- $this->view->projects = array('') + $this->project->getPairsByProgram();
$this->view->pager = $pager;
$this->view->orderBy = $orderBy;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->view->status = $status;
$this->view->from = $from;
+ $this->view->param = $param;
$this->view->isStage = (isset($project->model) and $project->model == 'waterfall') ? true : false;
$this->display();
@@ -3740,6 +3763,9 @@ class execution extends control
/* Set the menu. If the executionID = 0, use the indexMenu instead. */
$this->execution->setMenu($executionID);
+ $execution = $this->execution->getByID($executionID);
+ if(!empty($execution->acl) and $execution->acl != 'private') $this->locate($this->createLink('execution', 'task', "executionID=$executionID"));
+
echo $this->fetch('personnel', 'whitelist', "objectID=$executionID&module=$module&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
}
@@ -3760,6 +3786,9 @@ class execution extends control
/* Set the menu. If the executionID = 0, use the indexMenu instead. */
$this->execution->setMenu($executionID);
+ $execution = $this->execution->getByID($executionID);
+ if(!empty($execution->acl) and $execution->acl != 'private') $this->locate($this->createLink('execution', 'task', "executionID=$executionID"));
+
echo $this->fetch('personnel', 'addWhitelist', "objectID=$executionID&dept=$deptID©ID=$copyID&objectType=sprint&module=execution");
}
diff --git a/module/execution/css/all.css b/module/execution/css/all.css
index 36584c5c7a..3d4796798e 100644
--- a/module/execution/css/all.css
+++ b/module/execution/css/all.css
@@ -1,10 +1,9 @@
body {margin-bottom: 25px;}
+.main-table tbody>tr>td {border-bottom: 0px solid #eee;}
.table-responsive {overflow-y: hidden !important;}
#product_chosen .chosen-single {width: 180px;}
.table-children {border-left: 2px solid #cbd0db; border-right: 2px solid #cbd0db;}
-.table tbody > tr.table-children.table-child-top {border-top: 2px solid #cbd0db;}
-.table tbody > tr.table-children.table-child-bottom {border-bottom: 2px solid #cbd0db;}
.table td.has-child > a:not(.plan-toggle) {max-width: 90%; max-width: calc(100% - 30px); display: inline-block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
.table td.has-child > .plan-toggle {color: #838a9d; position: relative; top: 1px;overflow: initial !important;}
.table td.has-child > .plan-toggle:hover {color: #006af1; cursor: pointer;}
@@ -14,7 +13,7 @@ body {margin-bottom: 25px;}
.table th.hours {padding-right: 8px !important;}
.main-table tbody > tr.table-children > td:first-child::before {width: 3px;}
td.hours {text-align: right; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
-td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: -1px;}
+td.flex {display: flex; flex-flow: row nowrap; justify-content: flex-start; align-items: center; margin-bottom: 0px;}
td.datatable-cell.flex {margin-bottom: -2px;}
td.flex span.label-badge {margin-left: 5px; min-width: 50px;}
td.flex span.label-badge.label-light {min-width: 22px;}
@@ -32,6 +31,9 @@ td.flex span.project-type-label {min-width: 40px;}
.c-project{text-overflow: unset !important;}
canvas {height: 28px;}
-.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 1px solid #cbd0db !important;}
-.parent.has-child.c-name.flex {margin-bottom: -2px !important;}
+.parent.has-child.c-name.flex, .table-child-bottom > .c-name.flex {border-bottom: 0px solid #cbd0db !important;}
#tableCustomBtn {padding-bottom: 5px;}
+#datatable-executionList .table-child-bottom > .c-name.flex {border-bottom: 1px solid #cbd0db !important;}
+#datatable-executionList .table-child-bottom.table-child-top > .c-name.flex {border-bottom: 2px solid #cbd0db !important;}
+#datatable-executionList .parent.has-child.c-name.flex {border-bottom: 1px solid #cbd0db !important;}
+#datatable-executionList tr:last-child .c-name.flex {margin-top: 1px !important;}
diff --git a/module/execution/css/bug.css b/module/execution/css/bug.css
index efe9b23e31..095e852326 100644
--- a/module/execution/css/bug.css
+++ b/module/execution/css/bug.css
@@ -9,3 +9,4 @@
td.delayed {color: #fff; background: #e84e0f !important;}
.c-severity {width: 80px;}
+.c-confirmed {overflow: hidden;}
diff --git a/module/execution/css/create.css b/module/execution/css/create.css
index 56238fb200..839355f188 100644
--- a/module/execution/css/create.css
+++ b/module/execution/css/create.css
@@ -25,13 +25,10 @@
#plansBox .row {display: inline-table; width: 102%;}
#plansBox .row .col-sm-4 {display: inline-block; float: none; padding-right: 13px;}
-#mainContent .laneHeightBox .radio-inline+.radio-inline {margin-left: 20px;}
-#mainContent .laneHeightBox .tip {color: #999;}
-
#dateRange {vertical-align: top; padding-top: 13px;}
#dateRangeOption {vertical-align: top; padding-top: 13px;}
#beginLabel {white-space: nowrap;}
#endLabel {white-space: nowrap;}
#copyProjectModal .projectSelect {display: inline-block; margin-left: 10px; width: 20%;}
#copyProjectModal .titleBox{position: relative; bottom: 3px; display: inline-block;}
-a.chosen-single > div > b {top: -4px !important;}
\ No newline at end of file
+a.chosen-single > div > b {top: -4px !important;}
diff --git a/module/execution/css/edit.css b/module/execution/css/edit.css
index ea0bd27693..9e94aabddd 100644
--- a/module/execution/css/edit.css
+++ b/module/execution/css/edit.css
@@ -5,6 +5,4 @@
.chosen-container.chosen-highlight-selected .disabled-result.result-selected {background: none;}
-#mainContent .laneHeightBox .radio-inline+.radio-inline, #mainContent .importBox .radio-inline+.radio-inline {margin-left: 20px;}
-#mainContent .laneHeightBox .tip {color: #999;}
#dateRange {vertical-align: top; padding-top: 13px;}
diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index 7a47cf694f..e167b91aba 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -36,7 +36,9 @@
.region .kanban-header-col > .title {max-width: 80% !important;}
.region .kanban-header-col > .title {margin: 0}
.region .kanban-header-col > .title > span {display: inline-block; overflow: hidden; padding-right:2px; position: initial; max-width: 85px !important;}
-.region .kanban-header-col > .title > span.storyColumn {max-width: 100% !important;}
+.region .kanban-header-col > .title > .storyColumn {margin-right: 30px;}
+.region .kanban-header-col > .title > .storyColumn .text {font-weight: 700; color:rgb(51, 51, 51);}
+.region .kanban-header-col > .title > .storyColumn + .dropdown-menu {top: 45px; left: auto;}
.region .kanban-header-col > .title > .text-grey {opacity: .5; font-weight: bold; color: #8b91a2;}
.region .kanban-header-col > .title > .count {opacity: .5; font-weight: bold; color: #8b91a2;}
.region .kanban-header-col > .title > .error {color: #333333; padding-left: 2px; font-size: 10px; padding-top: 1px; padding-right: 2px;}
@@ -115,3 +117,7 @@
#rdKanbanSearchInput {width: 150px;}
#rdSearchBox {display: none; width: 150px;}
.btn-link.querybox-toggle {background-color: rgba(0,0,0,0);}
+
+#kanban .kanban-affixed .kanban-header-col .title.action-dbc {pointer-events: none;}
+#kanban .kanban-affixed .kanban-header-col .title.action-dbc .storyColumn .text {color: #fff;}
+#kanban .kanban-affixed .kanban-header-col .title.action-dbc .storyColumn .caret {display: none;}
diff --git a/module/execution/css/setkanban.css b/module/execution/css/setkanban.css
new file mode 100644
index 0000000000..4602590fc3
--- /dev/null
+++ b/module/execution/css/setkanban.css
@@ -0,0 +1,8 @@
+#mainContent tr > th{width: 66px;}
+[lang^='en'] #mainContent tr > th, [lang^='de'] #mainContent tr > th, [lang^='fr'] #mainContent tr > th{width: 105px;}
+
+#mainContent .table-form > tbody > tr > th {vertical-align: top; padding-right: 5px;}
+#mainContent .radio-inline {display: block;}
+#mainContent .radio-inline+.radio-inline {margin-left: 0px; padding-top: 8px;}
+#mainContent label > .tip {color: #999;}
+#mainContent #cardBox th {vertical-align: middle;}
diff --git a/module/execution/css/taskkanban.css b/module/execution/css/taskkanban.css
index 74960863c8..09efcb06c9 100644
--- a/module/execution/css/taskkanban.css
+++ b/module/execution/css/taskkanban.css
@@ -29,7 +29,8 @@
.kanban-affixed .kanban-header-col > .title > .text,
.kanban-affixed .kanban-header-col > .title > .count {color: #fff!important;}
.kanban-header-col > .title > .text {max-width: 110px !important;}
-.kanban-header-col > .title > .storyColumn.text {max-width: 100% !important;}
+.kanban-header-col > .title > .storyColumn .text {font-weight: 700; color:rgb(51, 51, 51);}
+.kanban-header-col > .title > .storyColumn + .dropdown-menu {top: 45px; left: auto;}
#kanbanContainer {margin: 0;}
#kanbanContainer > .panel-body {overflow: auto;}
@@ -68,3 +69,7 @@
#teskKanbanSearchInput {width: 150px;}
#searchBox {display: none; width: 150px;}
.btn-link.querybox-toggle {background-color: rgba(0,0,0,0);}
+
+#kanbans .kanban-affixed .kanban-header-col .title.action-dbc {pointer-events: none;}
+#kanbans .kanban-affixed .kanban-header-col .title.action-dbc .storyColumn .text {color: #fff;}
+#kanbans .kanban-affixed .kanban-header-col .title.action-dbc .storyColumn .caret {display: none;}
diff --git a/module/execution/css/view.css b/module/execution/css/view.css
index f3bfe055e9..50fb65983c 100644
--- a/module/execution/css/view.css
+++ b/module/execution/css/view.css
@@ -19,3 +19,8 @@
.timeline>li.active:before {left: -30px;}
.timeline>li>div:after {left: -27px;}
.timeline .timeline-text {display: block; overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
+
+#cfdChart {margin-top: -20px;}
+
+#triggerModal .modal-dialog {top: 15% !important; overflow-y: auto; max-height: 80%;}
+#triggerModal .modal-dialog::-webkit-scrollbar-track {background-color: white;}
diff --git a/module/execution/js/all.js b/module/execution/js/all.js
index 419eafd3fb..7d52829c0b 100644
--- a/module/execution/js/all.js
+++ b/module/execution/js/all.js
@@ -11,7 +11,7 @@ $(function()
if(isCNLang && nameWidth < 150 && !useDatatable) $('#executionsForm thead th.c-name').css('width', '150px');
if(!isCNLang && nameWidth < 200 && !useDatatable) $('#executionsForm thead th.c-name').css('width', '200px');
- toggleFold('#executionsForm', unfoldExecutions, projectID, 'execution');
+ toggleFold('#executionsForm', unfoldExecutions, 0, 'execution');
$('.table td.has-child > .plan-toggle').each(function()
{
@@ -59,6 +59,26 @@ $(function()
$('.table td.has-child > .plan-toggle').removeClass('collapsed');
}
});
+
+ $('#executionsForm').table(
+ {
+ statisticCreator: function(table)
+ {
+ var $table = table.getTable();
+ var $checkedRows = $table.find(table.isDataTable ? '.datatable-row-left.checked' : 'tbody>tr.checked');
+ var $originTable = table.isDataTable ? table.$.find('.datatable-origin') : null;
+ var $rows = $table.find(table.isDataTable ? '.datatable-rows .datatable-row-left' : 'tbody>tr');
+
+ var taskIdList = [];
+ $rows.each(function()
+ {
+ var $row = $(this);
+ if($originTable) $row = $originTable.find('tbody>tr[data-id="' + $row.data('id') + '"]');
+ var data = $row.data();
+ taskIdList.push(data.id);
+ });
+ }
+ })
});
function byProduct(productID, projectID, status)
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index 0e8071a6f9..9d88292f43 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -143,7 +143,7 @@ function loadBranches(product)
var projectID = (typeof(systemMode) != 'undefined' && systemMode == 'new') ? $('#project').val() : 0;
var index = $inputgroup.find('select:first').attr('id').replace('products' , '');
- $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=0¶m=active&projectID=" + projectID + "&withMainBranch="), function(data)
+ $.get(createLink('branch', 'ajaxGetBranches', "productID=" + $(product).val() + "&oldBranch=¶m=active&projectID=" + projectID + "&withMainBranch="), function(data)
{
if(data)
{
diff --git a/module/execution/js/create.js b/module/execution/js/create.js
index 3aa6046ffd..ecf65d9fc2 100644
--- a/module/execution/js/create.js
+++ b/module/execution/js/create.js
@@ -5,9 +5,6 @@ function setCopyProject(executionID)
$(function()
{
- var heightType = $("[name='heightType']:checked").val();
- setCardCount(heightType);
-
$(document).on('click', '#copyProjects a', function()
{
setCopyProject($(this).data('id')); $('#copyProjectModal').modal('hide');
diff --git a/module/execution/js/edit.js b/module/execution/js/edit.js
index 0017e84793..87b8d8de54 100644
--- a/module/execution/js/edit.js
+++ b/module/execution/js/edit.js
@@ -37,9 +37,6 @@ $().ready(function()
$(function()
{
- var heightType = $("[name='heightType']:checked").val();
- setCardCount(heightType);
-
/* If the story of the product which linked the execution under the project, you don't allow to remove the product. */
$("#productsBox select[name^='products']").each(function()
{
diff --git a/module/execution/js/importbug.js b/module/execution/js/importbug.js
index 0c1643303f..9464587e8b 100644
--- a/module/execution/js/importbug.js
+++ b/module/execution/js/importbug.js
@@ -23,5 +23,9 @@ function goback(executionID)
kanbanData = $.parseJSON(data);
parent.updateKanban(kanbanData);
}
+ else
+ {
+ parent.location.reload();
+ }
});
}
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 50ac5ec859..2e3d2f7363 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -361,6 +361,7 @@ function hideKanbanAction()
$('.contextmenu').removeClass('contextmenu-show');
$('.contextmenu .contextmenu-menu').removeClass('open').removeClass('in');
$('#moreTasks, #moreColumns').animate({right: -400}, 500);
+ $('.storyColumn').parent().removeClass('open');
}
/**
@@ -760,8 +761,15 @@ function renderCount($count, count, column)
{
if(groupBy == 'story' && column.type == 'story')
{
- $count.prev().addClass('storyColumn');
- $count.prev().parent().append('');
+ var orderButton = ''
+ + ""
+ + ''
+ + '';
+
+ $count.parent().next().html(orderButton);
+ $count.parent().next().addClass('createButton');
$count.remove();
return;
}
@@ -1477,6 +1485,8 @@ $(function()
if($.cookie('isFullScreen') == 1) $.cookie('isFullScreen', 0);
+ changeOrder = false;
+
window.kanbanScaleSize = +$.zui.store.get('executionKanbanScaleSize', 1);
$('#kanbanScaleSize').text(window.kanbanScaleSize);
$('#kanbanScaleControl .btn[data-type="+"]').attr('disabled', window.kanbanScaleSize >= 4 ? 'disabled' : null);
@@ -1590,11 +1600,10 @@ $(function()
$('.color0 .cardcolor').css('border', '1px solid #fff');
});
- $(document).on('click', '#kanban span.caret.changeOrderBy', function(event)
+ document.addEventListener('scroll', function()
{
- orderBy = orderBy == 'pri_desc' ? 'pri_asc' : 'pri_desc';
- searchCards(rdSearchValue);
- })
+ hideKanbanAction();
+ }, true);
/* Init sortable */
var sortType = '';
@@ -1813,7 +1822,7 @@ function toggleRDSearchBox()
}
else
{
- $(".querybox-toggle").css("color", "3c495c");
+ $(".querybox-toggle").css("color", "#3c495c");
$('#rdKanbanSearchInput').attr('value', '');
searchCards('');
}
@@ -1823,12 +1832,16 @@ function toggleRDSearchBox()
* Search all cards.
*
* @param string $value
+ * @param string order
+ *
* @access public
* @return void
*/
-function searchCards(value)
+function searchCards(value, order = '')
{
rdSearchValue = value;
+ orderBy = order == '' ? orderBy : order;
+ if(order != '') changeOrder = true;
$.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=RD&searchValue=' + rdSearchValue + '&orderBy=' + orderBy), function(data)
{
lastUpdateData = data;
diff --git a/module/execution/js/setkanban.js b/module/execution/js/setkanban.js
new file mode 100644
index 0000000000..d7bb2c8362
--- /dev/null
+++ b/module/execution/js/setkanban.js
@@ -0,0 +1,5 @@
+$(function()
+{
+ var heightType = $("[name='heightType']:checked").val();
+ setCardCount(heightType);
+});
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 9fc36d555f..5ad57d972c 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -341,9 +341,16 @@ function renderColumnCount($count, count, col)
{
if(groupBy == 'story' && col.type == 'story')
{
- $count.prev().addClass('storyColumn');
- $count.prev().parent().append('');
- $count.remove();
+ var orderButton = ''
+ + ""
+ + ''
+ + '';
+
+ $count.parent().next().html(orderButton);
+ $count.parent().next().addClass('createButton');
+ $count.hide();
return;
}
@@ -1220,6 +1227,7 @@ $(function()
$('#kanbanScaleControl .btn[data-type="+"]').attr('disabled', window.kanbanScaleSize >= 4 ? 'disabled' : null);
$('#kanbanScaleControl .btn[data-type="-"]').attr('disabled', window.kanbanScaleSize <= 1 ? 'disabled' : null);
+ changeOrder = false;
/* Common options */
var commonOptions =
{
@@ -1274,12 +1282,6 @@ $(function()
event.preventDefault();
});
- $(document).on('click', '#kanbans span.caret.changeOrderBy', function(event)
- {
- orderBy = orderBy == 'pri_desc' ? 'pri_asc' : 'pri_desc';
- searchCards(searchValue);
- })
-
/* Init contextmenu */
$('#kanbans').on('click', '[data-contextmenu]', function(event)
{
@@ -1332,6 +1334,11 @@ $(function()
}
});
+ document.addEventListener('scroll', function()
+ {
+ $('.storyColumn').parent().removeClass('open');
+ }, true);
+
$('#type_chosen .chosen-single span').prepend('');
$('#group_chosen .chosen-single span').prepend(kanbanLang.laneGroup + ': ');
@@ -1339,7 +1346,7 @@ $(function()
lastUpdateData = '';
setInterval(function()
{
- $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=execution&searchValue=' + searchValue + '&orderBy' + orderBy), function(data)
+ $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy + '&from=execution&searchValue=' + searchValue + '&orderBy=' + orderBy), function(data)
{
if(lastUpdateData == '') lastUpdateData = data;
if(data && lastUpdateData !== data)
@@ -1459,7 +1466,7 @@ function toggleSearchBox()
}
else
{
- $(".querybox-toggle").css("color", "3c495c");
+ $(".querybox-toggle").css("color", "#3c495c");
$('#taskKanbanSearchInput').attr('value', '');
searchCards('');
}
@@ -1469,12 +1476,16 @@ function toggleSearchBox()
* Search kanban cards.
*
* @param string value
+ * @param string order
+ *
* @access public
* @return void
*/
-function searchCards(value)
+function searchCards(value, order = '')
{
searchValue = value;
+ orderBy = order == '' ? orderBy : order;
+ if(order != '') changeOrder = true;
$.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=0&browseType=" + browseType + "&groupBy=" + groupBy + '&from=execution&searchValue=' + value + '&orderBy=' + orderBy), function(data)
{
lastUpdateData = data;
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 980d2630c3..375cb05ff8 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -137,6 +137,7 @@ $lang->execution->batchCreateTask = 'Batch create task';
$lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon}";
$lang->execution->myTask = "My Task";
$lang->execution->list = "{$lang->executionCommon} List";
+$lang->execution->allProject = 'All';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
@@ -170,7 +171,6 @@ $lang->execution->cfdTypeList['story'] = "View by {$lang->SRCommon}";
$lang->execution->cfdTypeList['task'] = "View by task";
$lang->execution->cfdTypeList['bug'] = "View By bug";
-$lang->team = new stdclass();
$lang->team->account = 'Konto';
$lang->team->role = 'Rolle';
$lang->team->join = 'Beigetreten';
@@ -413,6 +413,7 @@ $lang->execution->storyDragError = "The {$lang->SRCommon} is still
$lang->execution->countTip = ' (%s member)';
$lang->execution->pleaseInput = "Enter";
$lang->execution->week = 'week';
+$lang->execution->checkedExecutions = 'Seleted %s items';
/* Statistics. */
$lang->execution->charts = new stdclass();
@@ -462,6 +463,7 @@ $lang->execution->orderList['stage_desc'] = "Phase Ab.";
$lang->execution->kanban = "Kanban";
$lang->execution->kanbanSetting = "Kanban Einstellung";
+$lang->execution->setKanban = "Kanban Einstellung";
$lang->execution->resetKanban = "Einstellungen zurücksetzen";
$lang->execution->printKanban = "Kanban drucken";
$lang->execution->fullScreen = "Full Screen";
@@ -512,6 +514,11 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
+$lang->execution->featureBar['bug']['all'] = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
$lang->execution->myExecutions = 'Ich bin beteiligt.';
$lang->execution->doingProject = 'Laufende Projekte';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index 073dca6109..0b0ed597ad 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -137,11 +137,12 @@ $lang->execution->batchCreateTask = 'Batch create task';
$lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon}";
$lang->execution->myTask = "My Task";
$lang->execution->list = 'List';
+$lang->execution->allProject = 'All';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
-$lang->execution->estimate = 'estimate';
-$lang->execution->consumed = 'consumed';
+$lang->execution->estimate = 'Estimate';
+$lang->execution->consumed = 'Consumed';
$lang->execution->left = 'Left';
if($this->config->systemMode == 'new') $lang->execution->copyTeamTip = "copy Project/{$lang->execution->common} team members";
@@ -170,7 +171,6 @@ $lang->execution->cfdTypeList['story'] = "View by {$lang->SRCommon}";
$lang->execution->cfdTypeList['task'] = "View by task";
$lang->execution->cfdTypeList['bug'] = "View By bug";
-$lang->team = new stdclass();
$lang->team->account = 'User';
$lang->team->role = 'Role';
$lang->team->join = 'Joined';
@@ -413,6 +413,7 @@ $lang->execution->storyDragError = "The {$lang->SRCommon} is still
$lang->execution->countTip = ' (%s member)';
$lang->execution->pleaseInput = "Enter";
$lang->execution->week = 'week';
+$lang->execution->checkedExecutions = 'Seleted %s items';
/* Statistics. */
$lang->execution->charts = new stdclass();
@@ -462,6 +463,7 @@ $lang->execution->orderList['stage_desc'] = "Story Phase Descending";
$lang->execution->kanban = "Kanban";
$lang->execution->kanbanSetting = "Settings";
+$lang->execution->setKanban = "Set Kanban";
$lang->execution->resetKanban = "Reset";
$lang->execution->printKanban = "Print";
$lang->execution->fullScreen = "Full Screen";
@@ -512,6 +514,11 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
+$lang->execution->featureBar['bug']['all'] = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
$lang->execution->myExecutions = 'Mine';
$lang->execution->doingProject = 'Ongoing Projects';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index 41db8fde8b..bec2096bbb 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -137,6 +137,7 @@ $lang->execution->batchCreateTask = 'Batch create task';
$lang->execution->kanbanNoLinkProduct = "Kanban not linked {$lang->productCommon}";
$lang->execution->myTask = "My Task";
$lang->execution->list = "{$lang->executionCommon} List";
+$lang->execution->allProject = 'Tous';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
@@ -170,7 +171,6 @@ $lang->execution->cfdTypeList['story'] = "View by {$lang->SRCommon}";
$lang->execution->cfdTypeList['task'] = "View by task";
$lang->execution->cfdTypeList['bug'] = "View By bug";
-$lang->team = new stdclass();
$lang->team->account = 'Utilisateur';
$lang->team->role = 'Rôle';
$lang->team->join = 'Ajouté';
@@ -413,6 +413,7 @@ $lang->execution->storyDragError = "The {$lang->SRCommon} is still
$lang->execution->countTip = ' (%s member)';
$lang->execution->pleaseInput = "Enter";
$lang->execution->week = 'week';
+$lang->execution->checkedExecutions = "Pour s électionner l'élément%s";
/* Statistics. */
$lang->execution->charts = new stdclass();
@@ -462,6 +463,7 @@ $lang->execution->orderList['stage_desc'] = "Story Phase Descendante";
$lang->execution->kanban = "Kanban";
$lang->execution->kanbanSetting = "Paramétrage";
+$lang->execution->setKanban = "Paramétrage";
$lang->execution->resetKanban = "Réinitialiser";
$lang->execution->printKanban = "Impression";
$lang->execution->fullScreen = "Full Screen";
@@ -512,6 +514,11 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
+$lang->execution->featureBar['bug']['all'] = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
$lang->execution->myExecutions = "J'étais impliqué";
$lang->execution->doingProject = 'Projets en cours';
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index c1f02f6280..154243765a 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -418,6 +418,11 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
+$lang->execution->featureBar['bug']['all'] = 'All';
+$lang->execution->featureBar['bug']['unresolved'] = 'Active';
+
+$lang->execution->featureBar['build']['all'] = 'Build List';
+
$lang->execution->myExecutions = 'Tôi tham gia';
$lang->execution->doingProject = 'Hiện trường';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index b8ab7d649f..3d7ff4c33a 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -137,6 +137,7 @@ $lang->execution->batchCreateTask = '批量建任务';
$lang->execution->kanbanNoLinkProduct = "看板没有关联{$lang->productCommon}";
$lang->execution->myTask = "我的任务";
$lang->execution->list = '列表';
+$lang->execution->allProject = '全部项目';
/* Fields of zt_team. */
$lang->execution->root = '源ID';
@@ -170,7 +171,6 @@ $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 = '角色';
$lang->team->join = '加盟日';
@@ -369,8 +369,8 @@ $lang->execution->noMembers = '暂时没有团队成员。';
$lang->execution->workloadTotal = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
// $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
$lang->execution->linkAllStoryTip = "(项目下还未关联{$lang->SRCommon}，可直接关联该{$lang->execution->common}所关联产品的{$lang->SRCommon})";
-if($config->systemMode == 'classic') $lang->execution->copyTeamTitle = "选择一个{$lang->execution->common}团队来复制";
-if($config->systemMode == 'new') $lang->execution->copyTeamTitle = "选择一个{$lang->project->common}或{$lang->execution->common}团队来复制";
+if($config->systemMode == 'classic') $lang->execution->copyTeamTitle = "选择一个{$lang->execution->common}团队";
+if($config->systemMode == 'new') $lang->execution->copyTeamTitle = "选择一个{$lang->project->common}或{$lang->execution->common}团队";
/* 交互提示。*/
$lang->execution->confirmDelete = "您确定删除{$lang->executionCommon}[%s]吗？";
@@ -413,6 +413,7 @@ $lang->execution->storyDragError = "该{$lang->SRCommon}还是草
$lang->execution->countTip = '（%s人）';
$lang->execution->pleaseInput = "请输入";
$lang->execution->week = '周';
+$lang->execution->checkedExecutions = '已选择%s项';
/* 统计。*/
$lang->execution->charts = new stdclass();
@@ -462,6 +463,7 @@ $lang->execution->orderList['stage_desc'] = "{$lang->SRCommon}阶段倒序";
$lang->execution->kanban = "看板";
$lang->execution->kanbanSetting = "看板设置";
+$lang->execution->setKanban = "设置看板";
$lang->execution->resetKanban = "恢复默认";
$lang->execution->printKanban = "打印看板";
$lang->execution->fullScreen = "看板全屏展示";
@@ -512,6 +514,11 @@ $lang->execution->featureBar['all']['doing'] = $lang->execution->statusList[
$lang->execution->featureBar['all']['suspended'] = $lang->execution->statusList['suspended'];
$lang->execution->featureBar['all']['closed'] = $lang->execution->statusList['closed'];
+$lang->execution->featureBar['bug']['all'] = '所有';
+$lang->execution->featureBar['bug']['unresolved'] = '未解决';
+
+$lang->execution->featureBar['build']['all'] = '所有版本';
+
$lang->execution->myExecutions = '我参与的';
$lang->execution->doingProject = '进行中的项目';
diff --git a/module/execution/model.php b/module/execution/model.php
index bc4b048e4c..e0aee7f9cc 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -66,12 +66,22 @@ class executionModel extends model
$execution = $this->getByID($executionID);
if($execution and $execution->type == 'kanban')
{
- $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);
+ global $lang;
+ $lang->executionCommon = $lang->execution->kanban;
+ include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
+
+ $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->menu->settings = array('link' => "{$this->lang->settings}|execution|view|executionID=%s", 'subModule' => 'personnel', 'alias' => 'edit,manageproducts,team,whitelist,addwhitelist,managemembers', 'class' => 'dropdown dropdown-hover');
+ $this->lang->execution->dividerMenu = '';
+
+ $this->lang->execution->menu->settings['subMenu'] = new stdclass();
+ $this->lang->execution->menu->settings['subMenu']->view = array('link' => "{$this->lang->overview}|execution|view|executionID=%s", 'subModule' => 'view', 'alias' => 'edit,start,suspend,putoff,close');
+ $this->lang->execution->menu->settings['subMenu']->products = array('link' => "{$this->lang->productCommon}|execution|manageproducts|executionID=%s");
+ $this->lang->execution->menu->settings['subMenu']->team = array('link' => "{$this->lang->team->common}|execution|team|executionID=%s", 'alias' => 'managemembers');
+ $this->lang->execution->menu->settings['subMenu']->whitelist = array('link' => "{$this->lang->whitelist}|execution|whitelist|executionID=%s", 'subModule' => 'personnel', 'alias' => 'addwhitelist');
}
if(!$this->app->user->admin and strpos(",{$this->app->user->view->sprints},", ",$executionID,") === false and !defined('TUTORIAL') and $executionID != 0) return print(js::error($this->lang->execution->accessDenied) . js::locate('back'));
@@ -90,6 +100,8 @@ class executionModel extends model
include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
}
+ if(isset($execution->cal) and $execution->acl != 'private') unset($this->lang->execution->menu->settings['subMenu']->whitelist);
+
if($execution and $execution->lifetime == 'ops')
{
unset($this->lang->execution->menu->story);
@@ -379,12 +391,13 @@ class executionModel extends model
$this->lang->project->code = $this->lang->execution->execCode;
}
+ $this->lang->error->unique = $this->lang->error->repeat;
$sprintProject = isset($sprint->project) ? $sprint->project : '0';
$this->dao->insert(TABLE_EXECUTION)->data($sprint)
->autoCheck($skipFields = 'begin,end')
->batchcheck($this->config->execution->create->requiredFields, 'notempty')
- ->checkIF((!empty($sprint->name) and $this->config->systemMode == 'new'), 'name', 'unique', "`type` in ('sprint','stage', 'kanban') and `project` = $sprintProject")
- ->checkIF(!empty($sprint->code), 'code', 'unique', "`type` in ('sprint','stage', 'kanban')")
+ ->checkIF((!empty($sprint->name) and $this->config->systemMode == 'new'), 'name', 'unique', "`type` in ('sprint','stage', 'kanban') and `project` = $sprintProject and `deleted` = '0'")
+ ->checkIF(!empty($sprint->code), 'code', 'unique', "`type` in ('sprint','stage', 'kanban') and `deleted` = '0'")
->checkIF($sprint->begin != '', 'begin', 'date')
->checkIF($sprint->end != '', 'end', 'date')
->checkIF($sprint->end != '', 'end', 'ge', $sprint->begin)
@@ -462,7 +475,7 @@ class executionModel extends model
$oldExecution = $this->dao->findById($executionID)->from(TABLE_EXECUTION)->fetch();
/* Judgment of required items. */
- if($oldExecution->type != 'stage' and $this->post->code == '')
+ if($oldExecution->type != 'stage' and $this->post->code == '' and (!isset($this->config->setCode) or $this->config->setCode == 1))
{
dao::$errors['code'] = sprintf($this->lang->error->notempty, $this->lang->execution->code);
return false;
@@ -528,6 +541,7 @@ class executionModel extends model
}
/* Update data. */
+ $this->lang->error->unique = $this->lang->error->repeat;
$executionProject = isset($execution->project) ? $execution->project : '0';
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck($skipFields = 'begin,end')
@@ -535,8 +549,8 @@ class executionModel extends model
->checkIF($execution->begin != '', 'begin', 'date')
->checkIF($execution->end != '', 'end', 'date')
->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', 'kanban') and `project` = $executionProject")
- ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban')")
+ ->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban') and `project` = $executionProject and `deleted` = '0'")
+ ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage', 'kanban') and `deleted` = '0'")
->checkFlow()
->where('id')->eq($executionID)
->limit(1)
@@ -656,17 +670,17 @@ class executionModel extends model
}
}
+ $this->lang->error->unique = $this->lang->error->repeat;
$extendFields = $this->getFlowExtendFields();
foreach($data->executionIDList as $executionID)
{
$executionName = $data->names[$executionID];
- $executionCode = $data->codes[$executionID];
+ if(isset($data->codes)) $executionCode = $data->codes[$executionID];
$executionID = (int)$executionID;
$executions[$executionID] = new stdClass();
$executions[$executionID]->id = $executionID;
$executions[$executionID]->name = $executionName;
- $executions[$executionID]->code = $executionCode;
$executions[$executionID]->PM = $data->PMs[$executionID];
$executions[$executionID]->PO = $data->POs[$executionID];
$executions[$executionID]->QD = $data->QDs[$executionID];
@@ -680,13 +694,15 @@ class executionModel extends model
$executions[$executionID]->days = $data->dayses[$executionID];
$executions[$executionID]->lastEditedBy = $this->app->user->account;
$executions[$executionID]->lastEditedDate = helper::now();
+
+ if(isset($data->codes)) $executions[$executionID]->code = $executionCode;
if(isset($data->projects)) $executions[$executionID]->project = zget($data->projects, $executionID, 0);
if(isset($data->attributes)) $executions[$executionID]->attribute = zget($data->attributes, $executionID, '');
if($executions[$executionID]->status == 'closed') $executions[$executionID]->closedDate = helper::now();
if($executions[$executionID]->status == 'suspended') $executions[$executionID]->suspendedDate = helper::today();
/* Check unique code for edited executions. */
- if($projectModel == 'scrum' and empty($executionCode))
+ if($projectModel == 'scrum' and isset($executionCode) and empty($executionCode))
{
dao::$errors['code'][] = 'execution#' . $executionID . sprintf($this->lang->error->notempty, $this->lang->project->code);
return false;
@@ -773,8 +789,8 @@ class executionModel extends model
->checkIF($execution->begin != '', 'begin', 'date')
->checkIF($execution->end != '', 'end', 'date')
->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')")
+ ->checkIF((!empty($execution->name) and $this->config->systemMode == 'new'), 'name', 'unique', "id != $executionID and type in ('sprint','stage','kanban') and `project` = $projectID and `deleted` = '0'")
+ ->checkIF(!empty($execution->code), 'code', 'unique', "id != $executionID and type in ('sprint','stage','kanban') and `deleted` = '0'")
->checkFlow()
->where('id')->eq($executionID)
->limit(1)
@@ -933,6 +949,8 @@ class executionModel extends model
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
+ ->setDefault('closedBy', '')
+ ->setDefault('closedDate', '')
->stripTags($this->config->execution->editor->activate['id'], $this->config->allowedTags)
->remove('comment,readjustTime,readjustTask')
->get();
@@ -1060,6 +1078,25 @@ class executionModel extends model
}
}
+ /**
+ * Set Kanban.
+ *
+ * @param int $executionID
+ * @access public
+ * @return void
+ */
+ public function setKanban($executionID)
+ {
+ $execution = fixer::input('post')
+ ->setIF($this->post->heightType == 'auto', 'displayCards', 0)
+ ->remove('heightType')
+ ->get();
+
+ if(isset($_POST['heightType']) and $this->post->heightType == 'custom' and !$this->loadModel('kanban')->checkDisplayCards($execution->displayCards)) return;
+
+ $this->dao->update(TABLE_EXECUTION)->data($execution)->where('id')->eq((int)$executionID)->exec();
+ }
+
/**
* Check the workload format and total.
*
@@ -1409,7 +1446,7 @@ class executionModel extends model
->andWhere('t2.deleted')->eq(0)
->fetchPairs();
- $products = $this->loadModel('product')->getProductPairsByProject($projectID);
+ $products = $this->loadModel('product')->getProductPairsByProject($projectID, 'all', $executionProducts);
foreach($executions as $id => $execution)
{
@@ -1516,10 +1553,6 @@ class executionModel extends model
{
$link = helper::createLink($module, 'task', "executionID=%s");
}
- elseif($module == 'execution' and $method == 'cfd')
- {
- $link = helper::createLink('execution', 'kanban', "executionID=%s");
- }
elseif($module == 'bug' and $method == 'create' and $this->app->tab == 'execution')
{
$link = helper::createLink($module, $method, "productID=0&branch=0&extra=executionID=%s");
@@ -2583,9 +2616,13 @@ class executionModel extends model
}
}
- $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
+ if($this->config->systemMode == 'new')
+ {
+ $projectID = $this->dao->select('project')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetch('project');
+ $this->session->set('project', $projectID);
+ $this->linkStory($projectID, $planStories, $planProducts);
+ }
$this->linkStory($executionID, $planStories, $planProducts);
- if($this->config->systemMode == 'new') $this->linkStory($projectID, $planStories, $planProducts);
}
/**
@@ -2903,13 +2940,13 @@ class executionModel extends model
public function unlinkMember($sprintID, $account)
{
$sprint = $this->getByID($sprintID);
- $type = ($sprint->type == 'stage' || $sprint->type == 'sprint') ? 'execution' : $sprint->type;
+ $type = strpos(',stage,sprint,kanban,', ",$sprint->type,") !== false ? 'execution' : $sprint->type;
$this->dao->delete()->from(TABLE_TEAM)->where('root')->eq((int)$sprintID)->andWhere('type')->eq($type)->andWhere('account')->eq($account)->exec();
$this->updateUserView($sprintID, 'sprint', array($account));
/* Remove team members from the sprint or stage, and determine whether to remove team members from the execution. */
- if($sprint->type == 'stage' || $sprint->type == 'sprint')
+ if(strpos(',stage,sprint,kanban,', ",$sprint->type,") !== false)
{
$teamMember = $this->dao->select('t1.id, t2.account')->from(TABLE_EXECUTION)->alias('t1')
->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id = t2.root')
@@ -3156,7 +3193,7 @@ class executionModel extends model
}
elseif((helper::today() > $execution->end))
{
- $begin = date($execution->end, strtotime('-13 days')) > $execution->begin ? date($execution->end, strtotime('-13 days')) : $execution->begin;
+ $begin = date('Y-m-d', strtotime('-13 days', strtotime($execution->end))) > $execution->begin ? date('Y-m-d', strtotime('-13 days', strtotime($execution->end))) : $execution->begin;
$end = $execution->end;
}
@@ -3239,6 +3276,7 @@ class executionModel extends model
}
$current = $begin;
+ $today = helper::today();
$endTime = strtotime($end);
$preValue = 0;
$todayTag = 0;
@@ -3252,18 +3290,19 @@ class executionModel extends model
{
$currentTime = strtotime($current);
if($currentTime > $endTime) break;
- if(isset($sets[$current])) $preValue = $sets[$current]->value;
if($currentTime > time() and !$todayTag)
{
$todayTag = $i + 1;
}
+ if(isset($sets[$current])) $preValue = $sets[$current]->value;
if(!isset($sets[$current]) and $mode == 'noempty')
{
$sets[$current] = new stdclass();
$sets[$current]->name = $current;
- $sets[$current]->value = $preValue;
+ $sets[$current]->value = helper::diffDate($current, $today) < 0 ? $preValue : 'null';
}
+
$nextDay = date(DT_DATE1, $currentTime + 24 * 3600);
$current = $nextDay;
}
@@ -3401,6 +3440,8 @@ class executionModel extends model
->orderBy($orderBy)
->fetchAll('id');
+ $this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task', true);
+
if(empty($tasks)) return array();
$taskTeam = $this->dao->select('*')->from(TABLE_TEAM)->where('root')->in(array_keys($tasks))->andWhere('type')->eq('task')->fetchGroup('root');
@@ -4320,6 +4361,8 @@ class executionModel extends model
$this->loadModel('execution');
$this->loadModel('programplan');
+ $today = helper::today();
+
if(!$isChild)
{
$trClass = 'is-top-level table-nest-child-hide';
@@ -4344,8 +4387,22 @@ class executionModel extends model
echo '
-
-doc->noticeAcl['doc']);?>
-
+type == 'text' and !isonlybody()):?>
+
+
+
+
diff --git a/module/doc/view/editothertype.html.php b/module/doc/view/editothertype.html.php
new file mode 100644
index 0000000000..3569041e5c
--- /dev/null
+++ b/module/doc/view/editothertype.html.php
@@ -0,0 +1,118 @@
+
+ * @package doc
+ * @version $Id: edit.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $
+ * @link http://www.zentao.net
+ */
+?>
+
+contentType == 'html') include '../../common/view/kindeditor.html.php';?>
+contentType == 'markdown') include '../../common/view/markdown.html.php';?>
+content != $doc->draft);?>
+doc->confirmUpdateContent);?>
+id);?>
+draft);?>
+
-
-
-
-
- - id;?> - createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='$doc->title'");?> - arrow . ' ' . $lang->doc->edit;?> -
-save, '', 'id="top-submit" class="btn btn-primary"');?>
-
+
+doc->noticeAcl['doc']);?>
+
diff --git a/module/doc/view/edittexttype.html.php b/module/doc/view/edittexttype.html.php
new file mode 100644
index 0000000000..fa3b18a86e
--- /dev/null
+++ b/module/doc/view/edittexttype.html.php
@@ -0,0 +1,181 @@
+
+ * @package doc
+ * @version $Id: create.html.php 975 2010-07-29 03:30:25Z jajacn@126.com $
+ * @link http://www.zentao.net
+ */
+?>
+
+contentType == 'html') include '../../common/view/kindeditor.html.php';?>
+contentType == 'markdown') include '../../common/view/markdown.html.php';?>
+content != $doc->draft);?>
+doc->confirmUpdateContent);?>
+id);?>
+draft);?>
+doc->placeholder);?>
+
+
+createLink('doc', 'objectlibs', "type=$type&objectID=$objectID&libID={$lib->id}&docID={$doc->id}");?>
+
+
+
+
+
+ + id;?> + createLink('doc', 'view', "docID=$doc->id"), $doc->title, '', "title='$doc->title'");?> + arrow . ' ' . $lang->doc->edit;?> +
+save, '', 'id="top-submit" class="btn btn-primary"');?>
+
+
+
+
+doc->noticeAcl['doc']);?>
+
diff --git a/module/doc/view/selectlibtype.html.php b/module/doc/view/selectlibtype.html.php
index 8c92315749..77e3ccb27b 100644
--- a/module/doc/view/selectlibtype.html.php
+++ b/module/doc/view/selectlibtype.html.php
@@ -14,22 +14,29 @@
-
' . $lang->doc->selectLibType . '';?>
+' . $lang->doc->create . '';?>
title;?>
- objectType == 'requirement' ? $lang->URCommon : $lang->{$file->objectType}->common) . ' : ';?>
- objectType), 'view', "objectID=$file->objectID", '', true);?>' title='objectType][$file->objectID];?>' class='iframe' data-width='90%'>
- objectType][$file->objectID];?>
+ objectType == 'requirement')
+ {
+ $commonTitle = $lang->URCommon . ' : ';
+ }
+ else
+ {
+ if(!isset($lang->{$file->objectType}->common)) $app->loadLang($file->objectType);
+ $commonTitle = $lang->{$file->objectType}->common . ' : ';
+ }
+ echo $commonTitle;
+ ?>
+ objectType), 'view', "objectID=$file->objectID", '', true);?>' title='objectType][$file->objectID])) echo $sourcePairs[$file->objectType][$file->objectID];?>' class='iframe' data-width='90%'>
+ objectType][$file->objectID])) echo $sourcePairs[$file->objectType][$file->objectID];?>
- ' : '
- ' . html::a(sprintf($link, $id), $executionNames[$id], '', "class='$selected clickable' title='{$executionNames[$id]}' data-key='" . zget($executionsPinYin, $executionNames[$id], '') . "' data-app='{$this->app->tab}'") . ' '; + $myExecutionsHtml .= '
- ' . html::a(sprintf($executionLink, $id), $executionNames[$id], '', "class='$selected clickable' title='{$executionNames[$id]}' data-key='" . zget($executionsPinYin, $executionNames[$id], '') . "' data-app='{$this->app->tab}'") . ' '; if($selected == 'selected') $tabActive = 'myExecution'; @@ -96,7 +98,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, $id), $executionNames[$id], '', "class='$selected clickable' title='{$executionNames[$id]}' data-key='" . zget($executionsPinYin, $executionNames[$id], '') . "' data-app='{$this->app->tab}'") . ' '; + $normalExecutionsHtml .= '
- ' . html::a(sprintf($executionLink, $id), $executionNames[$id], '', "class='$selected clickable' title='{$executionNames[$id]}' data-key='" . zget($executionsPinYin, $executionNames[$id], '') . "' data-app='{$this->app->tab}'") . ' '; if($selected == 'selected') $tabActive = 'other'; @@ -104,7 +106,7 @@ foreach($executions as $projectID => $projectExecutions) } else if($execution->status == 'done' or $execution->status == 'closed') { - $closedExecutionsHtml .= '
- ' . html::a(sprintf($link, $id), $executionNames[$id], '', "class='$selected clickable' title='{$executionNames[$id]}' data-key='" . zget($executionsPinYin, $executionNames[$id], '') . "' data-app='{$this->app->tab}'") . ' '; + $closedExecutionsHtml .= '
- ' . html::a(sprintf($executionLink, $id), $executionNames[$id], '', "class='$selected clickable' title='{$executionNames[$id]}' data-key='" . zget($executionsPinYin, $executionNames[$id], '') . "' data-app='{$this->app->tab}'") . ' '; if($selected == 'selected') $tabActive = 'closed'; } @@ -114,7 +116,7 @@ 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]))) { - $myExecutionsHtml .= '
- ' . html::a(sprintf($link, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$executionNames[$execution->id]}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . ' '; + $myExecutionsHtml .= '
- ' . html::a(sprintf($executionLink, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$executionNames[$execution->id]}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . ' '; if($selected == 'selected') $tabActive = 'myExecution'; @@ -122,7 +124,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), $executionNames[$execution->id], '', "class='$selected clickable' title='{$executionNames[$execution->id]}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . ' '; + $normalExecutionsHtml .= '
- ' . html::a(sprintf($executionLink, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$executionNames[$execution->id]}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . ' '; if($selected == 'selected') $tabActive = 'other'; @@ -130,7 +132,7 @@ foreach($executions as $projectID => $projectExecutions) } else if($execution->status == 'done' or $execution->status == 'closed') { - $closedExecutionsHtml .= '
- ' . html::a(sprintf($link, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$executionNames[$execution->id]}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . ' '; + $closedExecutionsHtml .= '
- ' . html::a(sprintf($executionLink, $execution->id), $executionNames[$execution->id], '', "class='$selected clickable' title='{$executionNames[$execution->id]}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->tab}'") . ' '; if($selected == 'selected') $tabActive = 'closed'; } diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php index b1aa1a8181..715cf14aae 100644 --- a/module/execution/view/all.html.php +++ b/module/execution/view/all.html.php @@ -16,14 +16,11 @@ $datatableId = $this->moduleName . ucfirst($this->methodName); $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable'); ?> + - execution->all->unfoldExecutions) ? json_decode($config->execution->all->unfoldExecutions, true) : array(); -$unfoldExecutions = zget($unfoldExecutions, $projectID, array()); -js::set('unfoldExecutions', $unfoldExecutions); js::set('unfoldAll', $lang->execution->treeLevel['all']); js::set('foldAll', $lang->execution->treeLevel['root']); js::set('isCNLang', !$this->loadModel('common')->checkNotCN()) @@ -38,48 +35,38 @@ js::set('isCNLang', !$this->loadModel('common')->checkNotCN()) " . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy"), $lang->product->allProduct) . ""; + echo "
- " . html::a($this->createLink('project', 'execution', "status=$status&orderby=$orderBy"), $lang->product->allProduct) . " "; foreach($productList as $key => $product) { $class = $productID == $key ? 'class="active"' : ''; - echo "
- " . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy&productID=$key"), $product) . " "; + echo "
- " . html::a($this->createLink('project', 'execution', "status=$status&orderby=$orderBy&productID=$key"), $product) . " "; } ?>
- ';
$closedExecutionsHtml = $config->systemMode == 'new' ? '
- ' : '
- ';
+$kanbanLink = $this->createLink('execution', 'kanban', "executionID=%s");
+$taskLink = $this->createLink('execution', 'task', "executionID=%s");
foreach($executions as $projectID => $projectExecutions)
{
/* Adapt to the old version. */
@@ -75,10 +77,10 @@ foreach($executions as $projectID => $projectExecutions)
foreach($projectExecutions as $index => $execution)
{
- $kanbanLink = $this->createLink('execution', 'kanban', "executionID=%s");
- $taskLink = $this->createLink('execution', 'task', "executionID=%s");
- if($execution->type != 'kanban' and $link == $kanbanLink) $link = $taskLink;
- if($execution->type == 'kanban' and $link != $kanbanLink) $link = $kanbanLink;
+ $executionLink = $link;
+ $isKanbanMethod = ((in_array($method, $config->execution->kanbanMethod) and $module == 'execution') or (strpos(',create,edit,', ",$method,") !== false and $module == 'build'));
+ if(isset($execution->type) and $execution->type == 'kanban' and !$isKanbanMethod) $executionLink = $kanbanLink;
+ if(isset($execution->type) and $execution->type != 'kanban' and strpos(',kanban,cfd,', ",$method,") !== false) $executionLink = $taskLink;
$selected = $execution->id == $executionID ? 'selected' : '';
if(!empty($execution->children))
@@ -88,7 +90,7 @@ foreach($executions as $projectID => $projectExecutions)
$selected = $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 .= '
- execution->selectProject}'");?>
-
-
+ execution->byQuery;?>