-
api->noModule;?>
-
-
@@ -95,14 +95,7 @@
$field = '';
for($i = 0; $i < $level; $i++)
{
- if($i + 1 < $level)
- {
- $field .= ' ';
- }
- else
- {
- $field .= ' ∟ ';
- }
+ $field .= ' ∟ ';
}
$field .= $data['field'];
$str .= '' . $field . ' ';
diff --git a/module/api/view/create.html.php b/module/api/view/create.html.php
index 43cd351874..0bd168a361 100644
--- a/module/api/view/create.html.php
+++ b/module/api/view/create.html.php
@@ -12,7 +12,6 @@
?>
-
struct->paramsType);
api->module;?>
-
+
diff --git a/module/api/view/edit.html.php b/module/api/view/edit.html.php
index b49d94fa49..6130a06918 100644
--- a/module/api/view/edit.html.php
+++ b/module/api/view/edit.html.php
@@ -13,7 +13,6 @@
-
lib);?>
-
-
+
';
-
- $('body').append(xuanAction);
+ if(xuanAction != "'>bug->productplan;?>
'>bug->assignedTo;?>
'>bug->deadline;?>
- '>bug->status;?>
'>bug->os;?>
'>bug->browser;?>
'>bug->keywords;?>
@@ -119,7 +118,6 @@
' style='overflow:visible'>plan, "class='form-control chosen'");?>
' style='overflow:visible'>assignedTo, "class='form-control chosen'");?>
' style='overflow:visible'>deadline, "class='form-control form-date'");?>
- >status, 'class=form-control');?>
>os, 'class=form-control');?>
>browser, 'class=form-control');?>
>keywords, 'class=form-control');?>
@@ -143,7 +141,7 @@
-
+ app->tab == 'product' ? html::a($this->session->bugList, $lang->goback, '', "class='btn btn-back btn-wide'") : html::backButton();?>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index 7e7b8b7b01..337d100e3e 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -146,6 +146,26 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
+
+ bug->feedbackBy;?>
+
+
+
+
+
+
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index 30cfc7cd40..1c1d21ae3e 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -137,7 +137,7 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
bug->status;?>
- bug->statusList, $bug->status, "class='form-control chosen'");?>
+ bug->statusList, $bug->status);?>
bug->confirmed;?>
@@ -151,6 +151,14 @@ if($this->app->tab == 'project') js::set('objectID', $bug->project);
bug->deadline;?>
deadline, "class='form-control form-date'");?>
+
+ bug->feedbackBy;?>
+ feedbackBy, "class='form-control'");?>
+
+
+ bug->notifyEmail;?>
+ notifyEmail, "class='form-control'");?>
+
bug->os;?>
bug->osList, $bug->os, "class='form-control chosen'");?>
diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php
index 0ec59c25e7..bb5d11e559 100644
--- a/module/bug/view/view.html.php
+++ b/module/bug/view/view.html.php
@@ -37,6 +37,9 @@
+app->getViewType() == 'xhtml'):?>
+
+
+ bug->feedbackBy;?>
+ feedbackBy;?>
+
+
+ bug->notifyEmail;?>
+ notifyEmail;?>
+
bug->os;?>
bug->osList[$bug->os];?>
@@ -300,7 +313,11 @@
if($bug->openedBuild)
{
$openedBuilds = explode(',', $bug->openedBuild);
- foreach($openedBuilds as $openedBuild) isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '
') : print($openedBuild . '
'); + foreach($openedBuilds as $openedBuild) + { + if(!$openedBuild) continue; + isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '
') : print($openedBuild . '
'); + } } else { @@ -394,6 +411,9 @@ printExtendFields($bug, 'div', "position=right&inForm=0&inCell=1");?> +app->getViewType() == 'xhtml'):?> + +
- goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?>
+ execution->activate . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?>
diff --git a/module/execution/view/close.html.php b/module/execution/view/close.html.php
index 9d9edf493d..11ebcd1ed4 100644
--- a/module/execution/view/close.html.php
+++ b/module/execution/view/close.html.php
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang
- * @package execution
+ * @package execution
* @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
* @link http://www.zentao.net
*/
@@ -30,12 +30,20 @@
+ execution->realEnd;?>
+
+
+
comment;?>
- goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?>
+ execution->close . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?>
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index a8d70a5385..80f26d7161 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -90,9 +90,31 @@
systemMode == 'new')) ? $lang->execution->execType : $lang->execution->type;?>
- execution->lifeTimeList, '', "class='form-control chosen' onchange='showLifeTimeTips()'"); ?>
+
+ stage->typeList, '', "class='form-control chosen'");
+ }
+ else
+ {
+ echo html::select('lifetime', $lang->execution->lifeTimeList, '', "class='form-control' onchange='showLifeTimeTips()'");
+ }
+ ?>
+
+
+
+ stage->percent;?>
+
+
+
+
execution->status;?>
execution->begin;?>
begin;?>
- execution->totalEstimate;?>
- totalEstimate . $lang->execution->workHour;?>
+ execution->realBeganAB;?>
+ realBegan == '0000-00-00' ? '' : $execution->realBegan;?>
execution->end;?>
end;?>
- execution->totalConsumed;?>
- totalConsumed . $lang->execution->workHour;?>
+ execution->realEndAB;?>
+ realEnd == '0000-00-00' ? '' : $execution->realEnd;?>
+ execution->totalEstimate;?>
+ totalEstimate . $lang->execution->workHour;?>
execution->totalDays;?>
days;?>
- execution->totalLeft;?>
- totalLeft . $lang->execution->workHour;?>
+ execution->totalConsumed;?>
+ totalConsumed . $lang->execution->workHour;?>
execution->totalHours;?>
- totalHours . $lang->execution->workHour;?>
+ totalHours . $lang->execution->workHour;?>
+
+
+ execution->totalLeft;?>
+ totalLeft . $lang->execution->workHour;?>
diff --git a/module/gitlab/model.php b/module/gitlab/model.php
index 3fcdad0671..61aa1fbce0 100644
--- a/module/gitlab/model.php
+++ b/module/gitlab/model.php
@@ -386,7 +386,7 @@ class gitlabModel extends model
if(is_numeric($host)) $host = $this->getApiRoot($host);
if(strpos($host, 'http://') !== 0 and strpos($host, 'https://') !== 0) return false;
- $url = sprintf($host, $api);
+ $url = sprintf($apiRoot, $api);
return json_decode(commonModel::http($url, $data, $options));
}
@@ -474,7 +474,7 @@ class gitlabModel extends model
*
* @param int $gitlabID
* @access public
- * @return array
+ * @return void
*/
public function apiGetProjects($gitlabID)
{
@@ -691,7 +691,6 @@ class gitlabModel extends model
public function apiUpdateHook($gitlabID, $projectID, $hookID)
{
$apiRoot = $this->getApiRoot($gitlabID);
- $url = sprintf($apiRoot, "/projects/{$projectID}/hooks/{$hookID}");
$postData = new stdclass;
$postData->enable_ssl_verification = "false";
@@ -700,6 +699,8 @@ class gitlabModel extends model
$postData->push_events = "true";
$postData->tag_push_events = "true";
$postData->note_events = "true";
+ $postData->url = $url;
+ $postData->token = $token;
$url = sprintf($apiRoot, "/projects/{$projectID}/hooks/{$hookID}");
return commonModel::http($url, $postData, $options = array(CURLOPT_CUSTOMREQUEST => 'PUT'));
@@ -1013,7 +1014,7 @@ class gitlabModel extends model
$type = zget($body, 'object_kind', '');
if(!$type or !is_callable(array($this, "webhookParse{$type}"))) return false;
// fix php 8.0 bug. link: https://www.php.net/manual/zh/function.call-user-func-array.php#125953
- //return call_user_func_array(array($this, "webhookParse{$type}"), array('body' => $body, $gitlabID));
+
return call_user_func_array(array($this, "webhookParse{$type}"), array($body, $gitlabID));
}
@@ -1041,7 +1042,7 @@ class gitlabModel extends model
$issue->issue->objectID = $object->id;
/* Parse markdown description to html. */
- $issue->issue->description = $this->app->loadClass('hyperdown')->makeHtml($issue->issue->description);
+ $issue->issue->description = commonModel::processMarkdown($issue->issue->description);
if(!isset($this->config->gitlab->maps->{$object->type})) return false;
$issue->object = $this->issueToZentaoObject($issue->issue, $gitlabID, $body->changes);
@@ -1248,9 +1249,9 @@ class gitlabModel extends model
/**
* Create webhook for zentao.
*
- * @param array $products
- * @param int $gitlabID
- * @param int $projectID
+ * @param int $products
+ * @param int $gitlabID
+ * @param int $projectID
* @access public
* @return bool
*/
@@ -1363,7 +1364,7 @@ class gitlabModel extends model
if($value) $issue->$field = $value;
}
- if(isset($issue->assignee_id) and $issue->assignee_id == 'closed') unset($issue->assignee_id);
+ if($isset($issue->assignee_id) and $issue->assignee_id == 'closed') unset($issue->assignee_id);
/* issue->state is null when creating it, we should put status_event when updating it. */
if(isset($issue->state) and $issue->state == 'closed') $issue->state_event = 'close';
diff --git a/module/gitlab/view/view.html.php b/module/gitlab/view/view.html.php
index b1cb6b07d3..30fc445968 100644
--- a/module/gitlab/view/view.html.php
+++ b/module/gitlab/view/view.html.php
@@ -27,3 +27,4 @@
+
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 786d2cf8b8..ad2a85f961 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -25,8 +25,11 @@ $lang->moduleOrder[40] = 'release';
$lang->moduleOrder[45] = 'project';
$lang->moduleOrder[50] = 'projectstory';
$lang->moduleOrder[55] = 'execution';
+$lang->moduleOrder[56] = 'kanban';
+$lang->moduleOrder[57] = 'programplan';
$lang->moduleOrder[60] = 'task';
$lang->moduleOrder[65] = 'build';
+$lang->moduleOrder[66] = 'design';
$lang->moduleOrder[70] = 'qa';
$lang->moduleOrder[75] = 'bug';
@@ -46,6 +49,7 @@ $lang->moduleOrder[130] = 'group';
$lang->moduleOrder[135] = 'user';
$lang->moduleOrder[140] = 'admin';
+$lang->moduleOrder[142] = 'stage';
$lang->moduleOrder[145] = 'extension';
$lang->moduleOrder[150] = 'custom';
$lang->moduleOrder[155] = 'action';
@@ -160,6 +164,32 @@ if($config->systemMode == 'new')
{
$lang->resource->my->project = 'project';
+ /* Design. */
+ $lang->resource->design = new stdclass();
+ $lang->resource->design->browse = 'browse';
+ $lang->resource->design->view = 'view';
+ $lang->resource->design->create = 'create';
+ $lang->resource->design->batchCreate = 'batchCreate';
+ $lang->resource->design->edit = 'edit';
+ $lang->resource->design->assignTo = 'assignTo';
+ $lang->resource->design->delete = 'delete';
+ $lang->resource->design->linkCommit = 'linkCommit';
+ $lang->resource->design->viewCommit = 'viewCommit';
+ $lang->resource->design->unlinkCommit = 'unlinkCommit';
+ $lang->resource->design->revision = 'revision';
+
+ $lang->design->methodOrder[5] = 'browse';
+ $lang->design->methodOrder[10] = 'view';
+ $lang->design->methodOrder[15] = 'create';
+ $lang->design->methodOrder[20] = 'batchCreate';
+ $lang->design->methodOrder[25] = 'edit';
+ $lang->design->methodOrder[30] = 'assignTo';
+ $lang->design->methodOrder[35] = 'delete';
+ $lang->design->methodOrder[40] = 'linkCommit';
+ $lang->design->methodOrder[45] = 'viewCommit';
+ $lang->design->methodOrder[50] = 'unlinkCommit';
+ $lang->design->methodOrder[55] = 'revision';
+
/* Program. */
$lang->resource->program = new stdclass();
$lang->resource->program->browse = 'browse';
@@ -203,6 +233,16 @@ if($config->systemMode == 'new')
$lang->program->methodOrder[95] = 'export';
$lang->program->methodOrder[100] = 'updateOrder';
+ /* Program plan. */
+ $lang->resource->programplan = new stdclass();
+ $lang->resource->programplan->browse = 'browse';
+ $lang->resource->programplan->create = 'create';
+ $lang->resource->programplan->edit = 'edit';
+
+ $lang->programplan->methodOrder[5] = 'browse';
+ $lang->programplan->methodOrder[10] = 'create';
+ $lang->programplan->methodOrder[15] = 'edit';
+
/* Project. */
$lang->resource->project = new stdclass();
$lang->resource->project->index = 'index';
@@ -335,6 +375,22 @@ if($config->systemMode == 'new')
$lang->projectrelease->methodOrder[65] = 'batchUnlinkBug';
$lang->projectrelease->methodOrder[70] = 'changeStatus';
+ /* Stage. */
+ $lang->resource->stage = new stdclass();
+ $lang->resource->stage->browse = 'browse';
+ $lang->resource->stage->create = 'create';
+ $lang->resource->stage->batchCreate = 'batchCreate';
+ $lang->resource->stage->edit = 'edit';
+ $lang->resource->stage->setType = 'setType';
+ $lang->resource->stage->delete = 'delete';
+
+ $lang->stage->methodOrder[5] = 'browse';
+ $lang->stage->methodOrder[10] = 'create';
+ $lang->stage->methodOrder[15] = 'batchCreate';
+ $lang->stage->methodOrder[20] = 'edit';
+ $lang->stage->methodOrder[25] = 'setType';
+ $lang->stage->methodOrder[30] = 'delete';
+
/* Stakeholer. */
$lang->resource->stakeholder = new stdclass();
$lang->resource->stakeholder->browse = 'browse';
@@ -558,6 +614,20 @@ $lang->release->methodOrder[60] = 'unlinkBug';
$lang->release->methodOrder[65] = 'batchUnlinkBug';
$lang->release->methodOrder[70] = 'changeStatus';
+/* Kanban */
+$lang->resource->kanban = new stdclass();
+$lang->resource->kanban->setLane = 'setLane';
+$lang->resource->kanban->setColumn = 'setColumn';
+$lang->resource->kanban->setWIP = 'setWIP';
+$lang->resource->kanban->laneMove = 'laneMove';
+$lang->resource->kanban->cardsSort = 'cardsSort';
+
+$lang->kanban->methodOrder[5] = 'setLane';
+$lang->kanban->methodOrder[10] = 'setColumn';
+$lang->kanban->methodOrder[15] = 'setWIP';
+$lang->kanban->methodOrder[20] = 'laneMove';
+$lang->kanban->methodOrder[25] = 'cardsSort';
+
/* Execution. */
$lang->resource->execution = new stdclass();
$lang->resource->execution->view = 'view';
@@ -778,6 +848,7 @@ $lang->resource->bug->confirmStoryChange = 'confirmStoryChange';
$lang->resource->bug->delete = 'deleteAction';
$lang->resource->bug->batchChangeModule = 'batchChangeModule';
$lang->resource->bug->batchChangeBranch = 'batchChangeBranch';
+$lang->resource->bug->batchChangePlan = 'batchChangePlan';
$lang->bug->methodOrder[0] = 'index';
$lang->bug->methodOrder[5] = 'browse';
@@ -1303,18 +1374,20 @@ $lang->tree->methodOrder[30] = 'delete';
/* Report. */
$lang->resource->report = new stdclass();
-$lang->resource->report->index = 'index';
-$lang->resource->report->projectDeviation = 'projectDeviation';
-$lang->resource->report->productSummary = 'productSummary';
-$lang->resource->report->bugCreate = 'bugCreate';
-$lang->resource->report->bugAssign = 'bugAssign';
-$lang->resource->report->workload = 'workload';
+$lang->resource->report->index = 'index';
+$lang->resource->report->projectDeviation = 'projectDeviation';
+$lang->resource->report->productSummary = 'productSummary';
+$lang->resource->report->bugCreate = 'bugCreate';
+$lang->resource->report->bugAssign = 'bugAssign';
+$lang->resource->report->workload = 'workload';
+$lang->resource->report->annualData = 'annual';
$lang->report->methodOrder[0] = 'index';
$lang->report->methodOrder[5] = 'projectDeviation';
$lang->report->methodOrder[10] = 'productSummary';
$lang->report->methodOrder[15] = 'bugCreate';
$lang->report->methodOrder[20] = 'workload';
+$lang->report->methodOrder[25] = 'annual';
/* Search. */
$lang->resource->search = new stdclass();
diff --git a/module/holiday/config.php b/module/holiday/config.php
new file mode 100644
index 0000000000..f46a285b1e
--- /dev/null
+++ b/module/holiday/config.php
@@ -0,0 +1,5 @@
+holiday)) $config->holiday = new stdclass();
+$config->holiday->require = new stdclass();
+$config->holiday->require->create = 'name,begin,end';
+$config->holiday->require->edit = 'name,begin,end';
diff --git a/module/holiday/control.php b/module/holiday/control.php
new file mode 100644
index 0000000000..e4dcf4fc8e
--- /dev/null
+++ b/module/holiday/control.php
@@ -0,0 +1,117 @@
+
+ * @package holiday
+ * @version $Id
+ * @link http://www.zentao.net
+ */
+class holiday extends control
+{
+ /**
+ * Holiday list.
+ *
+ * @access public
+ * @return void
+ */
+ public function index()
+ {
+ $this->locate(inlink('browse'));
+ }
+
+ /**
+ * Holiday list.
+ *
+ * @param string $year
+ * @access public
+ * @return void
+ */
+ public function browse($year = '')
+ {
+ $holidays = $this->holiday->getList($year);
+ $yearList = $this->holiday->getYearPairs();
+
+ $this->view->title = $this->lang->holiday->browse;
+ $this->view->holidays = $holidays;
+ $this->view->yearList = $yearList;
+ $this->view->currentYear = $year;
+ $this->display();
+ }
+
+ /**
+ * Create a holiday.
+ *
+ * @access public
+ * @return void
+ */
+ public function create()
+ {
+ if($_POST)
+ {
+ $holidayID = $this->holiday->create();
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ $actionID = $this->loadModel('action')->create('holiday', $holidayID, 'created');
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+ }
+
+ $this->view->title = $this->lang->holiday->create;
+ $this->display();
+ }
+
+ /**
+ * Edit holiday.
+ *
+ * @param int $id
+ * @access public
+ * @return void
+ */
+ public function edit($id)
+ {
+ $holiday = $this->holiday->getById($id);
+ if($_POST)
+ {
+ $this->holiday->update($id);
+ 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->holiday->edit;
+ $this->view->holiday = $holiday;
+ $this->display();
+ }
+
+ /**
+ * Delete holiday.
+ *
+ * @param int $id
+ * @param int $confirm
+ * @access public
+ * @return void
+ */
+ public function delete($id, $confirm = 'no')
+ {
+ if($confirm == 'no')
+ {
+ die(js::confirm($this->lang->holiday->confirmDelete, inLink('delete', "id=$id&confirm=yes")));
+ }
+ else
+ {
+ $holidayInformation = $this->dao->select('begin, end')->from(TABLE_HOLIDAY)->where('id')->eq($id)->fetch();
+ $this->dao->delete()->from(TABLE_HOLIDAY)->where('id')->eq($id)->exec();
+
+ /* Update project. */
+ $this->holiday->updateProgramPlanDuration($holidayInformation->begin, $holidayInformation->end);
+ $this->holiday->updateProjectRealDuration($holidayInformation->begin, $holidayInformation->end);
+
+ /* Update task. */
+ $this->holiday->updateTaskPlanDuration($holidayInformation->begin, $holidayInformation->end);
+ $this->holiday->updateTaskRealDuration($holidayInformation->begin, $holidayInformation->end);
+
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ die(js::reload('parent'));
+ }
+ }
+}
diff --git a/module/holiday/css/browse.css b/module/holiday/css/browse.css
new file mode 100644
index 0000000000..50d38310c3
--- /dev/null
+++ b/module/holiday/css/browse.css
@@ -0,0 +1,3 @@
+.tree .active{font-weight: bold;}
+.with-side .side {position: absolute; width: 130px;}
+.with-side .main {padding-left: 145px; float: left;}
diff --git a/module/holiday/css/index.html b/module/holiday/css/index.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/module/holiday/ext/model/zentaomax.php b/module/holiday/ext/model/zentaomax.php
new file mode 100644
index 0000000000..90de78ecd8
--- /dev/null
+++ b/module/holiday/ext/model/zentaomax.php
@@ -0,0 +1,276 @@
+dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('holiday')
+ ->andWhere('begin')->le($end)
+ ->andWhere('end')->ge($begin)
+ ->fetchAll('id');
+
+ $naturalDays = $this->getDaysBetween($begin, $end);
+
+ $holidays = array();
+ foreach($records as $record)
+ {
+ $dates = $this->getDaysBetween($record->begin, $record->end);
+ $holidays = array_merge($holidays, $dates);
+ }
+
+ return array_intersect($naturalDays, $holidays);
+}
+
+public function getWorkingDays($begin = '', $end = '')
+{
+ $records = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('working')
+ ->andWhere('begin')->le($end)
+ ->andWhere('end')->ge($begin)
+ ->fetchAll('id');
+
+ $workingDays = array();
+ foreach($records as $record)
+ {
+ $dates = $this->getDaysBetween($record->begin, $record->end);
+ $workingDays = array_merge($workingDays, $dates);
+ }
+ return $workingDays;
+}
+
+public function getActualWorkingDays($begin, $end)
+{
+ if(empty($begin) or empty($end) or $begin == '0000-00-00' or $end == '0000-00-00') return array();
+
+ $actualDays = array();
+ $currentDay = $begin;
+
+ $holidays = $this->getHolidays($begin, $end);
+ $workingDays = $this->getWorkingDays($begin, $end);
+ $weekend = isset($this->config->project->weekend) ? $this->config->project->weekend : 2;
+
+ /* When the start date and end date are the same. */
+ if($begin == $end)
+ {
+ if(in_array($begin, $workingDays)) return $actualDays[] = $begin;
+ if(in_array($begin, $holidays)) return $actualDays;
+
+ $w = date('w', strtotime($begin));
+ if($weekend == 2)
+ {
+ if($w == 0 or $w == 6) return $actualDays;
+ }
+ else
+ {
+ if($w == 0) return $actualDays;
+ }
+
+ $actualDays[] = $begin;
+ return $actualDays;
+ }
+
+ for($i = 0; $currentDay < $end; $i ++)
+ {
+ $currentDay = date('Y-m-d', strtotime("$begin + $i days"));
+ $w = date('w', strtotime($currentDay));
+
+ if(in_array($currentDay, $workingDays))
+ {
+ $actualDays[] = $currentDay;
+ continue;
+ }
+
+ if(in_array($currentDay, $holidays)) continue;
+ if($weekend == 2)
+ {
+ if($w == 0 or $w == 6) continue;
+ }
+ else
+ {
+ if($w == 0) continue;
+ }
+ $actualDays[] = $currentDay;
+ }
+
+ return $actualDays;
+}
+
+public function getDaysBetween($begin, $end)
+{
+ $beginTime = strtotime($begin);
+ $endTime = strtotime($end);
+ $days = ($endTime - $beginTime) / 86400;
+
+ $dateList = array();
+ for($i = 0; $i <= $days; $i ++) $dateList[] = date('Y-m-d', strtotime("+$i days", $beginTime));
+
+ return $dateList;
+}
+
+public function isHoliday($date)
+{
+ $record = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('holiday')
+ ->andWhere('begin')->le($date)
+ ->andWhere('end')->ge($date)
+ ->fetch();
+ return !empty($record);
+}
+
+public function isWorkingDay($date)
+{
+ $record = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('working')
+ ->andWhere('begin')->le($date)
+ ->andWhere('end')->ge($date)
+ ->fetch();
+ return !empty($record);
+}
+
+public function update($id)
+{
+ $result = parent::update($id);
+
+ if($result)
+ {
+ $beginDate = $this->post->begin;
+ $endDate = $this->post->end;
+
+ /* Update project. */
+ $this->updateProgramPlanDuration($beginDate, $endDate);
+ $this->updateProjectRealDuration($beginDate, $endDate);
+
+ /* Update task. */
+ $this->updateTaskPlanDuration($beginDate, $endDate);
+ $this->updateTaskRealDuration($beginDate, $endDate);
+ }
+
+ return $result;
+}
+
+public function create()
+{
+ $lastInsertID = parent::create();
+
+ if($lastInsertID)
+ {
+ $beginDate = $this->post->begin;
+ $endDate = $this->post->end;
+
+ /* Update project. */
+ $this->updateProgramPlanDuration($beginDate, $endDate);
+ $this->updateProjectRealDuration($beginDate, $endDate);
+
+ /* Update task. */
+ $this->updateTaskPlanDuration($beginDate, $endDate);
+ $this->updateTaskRealDuration($beginDate, $endDate);
+ }
+
+ return $lastInsertID;
+}
+
+public function delete($id, $null = null)
+{
+ $holidayInformation = $this->dao->select('begin,end')->from(TABLE_HOLIDAY)->where('id')->eq($id)->fetch();
+
+ $result = parent::delete($id, $null = null);
+ if($result)
+ {
+ /* Update project. */
+ $this->updateProgramPlanDuration($holidayInformation->begin, $holidayInformation->end);
+ $this->updateProjectRealDuration($holidayInformation->begin, $holidayInformation->end);
+
+ /* Update task. */
+ $this->updateTaskPlanDuration($holidayInformation->begin, $holidayInformation->end);
+ $this->updateTaskRealDuration($holidayInformation->begin, $holidayInformation->end);
+ }
+
+ return $result;
+}
+
+public function updateProgramPlanDuration($beginDate, $endDate)
+{
+ $updateProjectList = $this->dao->select('id, begin, end')
+ ->from(TABLE_PROJECT)
+ ->where('begin')->between($beginDate, $endDate)
+ ->orWhere('end')->between($beginDate, $endDate)
+ ->orWhere("(begin < '$beginDate' AND end > '$endDate')")
+ ->andWhere('status')->ne('done')
+ ->fetchAll();
+
+ foreach($updateProjectList as $project)
+ {
+ $realDuration = $this->getActualWorkingDays($project->begin, $project->end);
+ $realDuration = count($realDuration);
+
+ $this->dao->update(TABLE_PROJECT)
+ ->set('planDuration')->eq($realDuration)
+ ->where('id')->eq($project->id)
+ ->exec();
+ }
+}
+
+public function updateProjectRealDuration($beginDate, $endDate)
+{
+ $updateProjectList = $this->dao->select('id, realBegan, realEnd')
+ ->from(TABLE_PROJECT)
+ ->where('realBegan')->between($beginDate, $endDate)
+ ->orWhere('realEnd')->between($beginDate, $endDate)
+ ->orWhere("(realBegan < '$beginDate' AND realEnd > '$endDate')")
+ ->andWhere('status')->ne('done')
+ ->fetchAll();
+
+ foreach($updateProjectList as $project)
+ {
+ $realDuration = $this->getActualWorkingDays($project->realBegan, $project->realEnd);
+ $realDuration = count($realDuration);
+
+ $this->dao->update(TABLE_PROJECT)
+ ->set('realDuration')->eq($realDuration)
+ ->where('id')->eq($project->id)
+ ->exec();
+ }
+}
+
+public function updateTaskPlanDuration($beginDate, $endDate)
+{
+ $updateTaskList = $this->dao->select('id, estStarted, deadline')
+ ->from(TABLE_TASK)
+ ->where('estStarted')->between($beginDate, $endDate)
+ ->orWhere('deadline')->between($beginDate, $endDate)
+ ->orWhere("(estStarted < '$beginDate' AND deadline > '$endDate')")
+ ->andWhere('status') ->ne('done')
+ ->fetchAll();
+
+ foreach($updateTaskList as $task)
+ {
+ $planduration = $this->getActualWorkingDays($task->estStarted, $task->deadline);
+ $planduration = count($planduration);
+
+ $this->dao->update(TABLE_TASK)
+ ->set('planduration')->eq($planduration)
+ ->where('id')->eq($task->id)
+ ->exec();
+ }
+
+}
+
+public function updateTaskRealDuration($beginDate, $endDate)
+{
+ $updateTaskList = $this->dao->select('id, realStarted, finishedDate')
+ ->from(TABLE_TASK)
+ ->where('realStarted')->between($beginDate, $endDate)
+ ->orWhere("date_format(finishedDate,'%Y-%m-%d')")->between($beginDate, $endDate)
+ ->orWhere("(realStarted < '$beginDate' AND date_format(finishedDate,'%Y-%m-%d') > '$endDate')")
+ ->andWhere('status')->ne('done')
+ ->fetchAll();
+
+ foreach($updateTaskList as $task)
+ {
+ $realDuration = $this->getActualWorkingDays($task->realBegan, date('Y-m-d',strtotime($task->finishedDate)));
+ $realDuration = count($realDuration);
+
+ $this->dao->update(TABLE_TASK)
+ ->set('realDuration')->eq($realDuration)
+ ->where('id')->eq($task->id)
+ ->exec();
+ }
+}
diff --git a/module/holiday/lang/de.php b/module/holiday/lang/de.php
new file mode 100644
index 0000000000..c922267c1c
--- /dev/null
+++ b/module/holiday/lang/de.php
@@ -0,0 +1,27 @@
+holiday)) $lang->holiday = new stdclass();
+$lang->holiday->common = 'Holiday';
+$lang->holiday->browse = 'Browse';
+$lang->holiday->create = 'Create';
+$lang->holiday->edit = 'Edit';
+$lang->holiday->delete = 'Delete';
+
+$lang->holiday->createAction = 'Create Holiday';
+$lang->holiday->editAction = 'Edit Holiday';
+$lang->holiday->deleteAction = 'Delete Holiday';
+
+$lang->holiday->id = 'ID';
+$lang->holiday->name = 'Name';
+$lang->holiday->desc = 'Description';
+$lang->holiday->type = 'Type';
+$lang->holiday->begin = 'Begin';
+$lang->holiday->end = 'End';
+$lang->holiday->all = 'All';
+
+$lang->holiday->holiday = 'Holiday';
+
+$lang->holiday->typeList['holiday'] = 'Holiday';
+$lang->holiday->typeList['working'] = 'Working Day';
+
+$lang->holiday->emptyTip = 'No Holiday';
+$lang->holiday->confirmDelete = 'Confirm removal of holidays?';
diff --git a/module/holiday/lang/en.php b/module/holiday/lang/en.php
new file mode 100644
index 0000000000..c922267c1c
--- /dev/null
+++ b/module/holiday/lang/en.php
@@ -0,0 +1,27 @@
+holiday)) $lang->holiday = new stdclass();
+$lang->holiday->common = 'Holiday';
+$lang->holiday->browse = 'Browse';
+$lang->holiday->create = 'Create';
+$lang->holiday->edit = 'Edit';
+$lang->holiday->delete = 'Delete';
+
+$lang->holiday->createAction = 'Create Holiday';
+$lang->holiday->editAction = 'Edit Holiday';
+$lang->holiday->deleteAction = 'Delete Holiday';
+
+$lang->holiday->id = 'ID';
+$lang->holiday->name = 'Name';
+$lang->holiday->desc = 'Description';
+$lang->holiday->type = 'Type';
+$lang->holiday->begin = 'Begin';
+$lang->holiday->end = 'End';
+$lang->holiday->all = 'All';
+
+$lang->holiday->holiday = 'Holiday';
+
+$lang->holiday->typeList['holiday'] = 'Holiday';
+$lang->holiday->typeList['working'] = 'Working Day';
+
+$lang->holiday->emptyTip = 'No Holiday';
+$lang->holiday->confirmDelete = 'Confirm removal of holidays?';
diff --git a/module/holiday/lang/fr.php b/module/holiday/lang/fr.php
new file mode 100644
index 0000000000..c922267c1c
--- /dev/null
+++ b/module/holiday/lang/fr.php
@@ -0,0 +1,27 @@
+holiday)) $lang->holiday = new stdclass();
+$lang->holiday->common = 'Holiday';
+$lang->holiday->browse = 'Browse';
+$lang->holiday->create = 'Create';
+$lang->holiday->edit = 'Edit';
+$lang->holiday->delete = 'Delete';
+
+$lang->holiday->createAction = 'Create Holiday';
+$lang->holiday->editAction = 'Edit Holiday';
+$lang->holiday->deleteAction = 'Delete Holiday';
+
+$lang->holiday->id = 'ID';
+$lang->holiday->name = 'Name';
+$lang->holiday->desc = 'Description';
+$lang->holiday->type = 'Type';
+$lang->holiday->begin = 'Begin';
+$lang->holiday->end = 'End';
+$lang->holiday->all = 'All';
+
+$lang->holiday->holiday = 'Holiday';
+
+$lang->holiday->typeList['holiday'] = 'Holiday';
+$lang->holiday->typeList['working'] = 'Working Day';
+
+$lang->holiday->emptyTip = 'No Holiday';
+$lang->holiday->confirmDelete = 'Confirm removal of holidays?';
diff --git a/module/holiday/lang/index.html b/module/holiday/lang/index.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/module/holiday/lang/vi.php b/module/holiday/lang/vi.php
new file mode 100644
index 0000000000..a1560a635d
--- /dev/null
+++ b/module/holiday/lang/vi.php
@@ -0,0 +1,27 @@
+holiday)) $lang->holiday = new stdclass();
+$lang->holiday->common = 'Ngày lễ';
+$lang->holiday->browse = 'Browse';
+$lang->holiday->create = 'Tạo';
+$lang->holiday->edit = 'Sửa';
+$lang->holiday->delete = 'Xóa';
+
+$lang->holiday->createAction = 'Create Holiday';
+$lang->holiday->editAction = 'Edit Holiday';
+$lang->holiday->deleteAction = 'Delete Holiday';
+
+$lang->holiday->id = 'ID';
+$lang->holiday->name = 'Tên';
+$lang->holiday->desc = 'Mô tả';
+$lang->holiday->type = 'Loại';
+$lang->holiday->begin = 'Bắt đầu';
+$lang->holiday->end = 'Kết thúc';
+$lang->holiday->all = 'All';
+
+$lang->holiday->holiday = 'Ngày lễ';
+
+$lang->holiday->typeList['holiday'] = 'Ngày lễ';
+$lang->holiday->typeList['working'] = 'Ngày làm việc';
+
+$lang->holiday->emptyTip = 'No Holiday';
+$lang->holiday->confirmDelete = 'Confirm removal of holidays?';
diff --git a/module/holiday/lang/zh-cn.php b/module/holiday/lang/zh-cn.php
new file mode 100644
index 0000000000..5f38ebbcda
--- /dev/null
+++ b/module/holiday/lang/zh-cn.php
@@ -0,0 +1,27 @@
+holiday)) $lang->holiday = new stdclass();
+$lang->holiday->common = '节假日';
+$lang->holiday->browse = '浏览';
+$lang->holiday->create = '新建';
+$lang->holiday->edit = '编辑';
+$lang->holiday->delete = '删除';
+
+$lang->holiday->createAction = '创建节假日';
+$lang->holiday->editAction = '编辑节假日';
+$lang->holiday->deleteAction = '删除节假日';
+
+$lang->holiday->id = '编号';
+$lang->holiday->name = '名称';
+$lang->holiday->desc = '描述';
+$lang->holiday->type = '类型';
+$lang->holiday->begin = '开始日期';
+$lang->holiday->end = '结束日期';
+$lang->holiday->all = '所有';
+
+$lang->holiday->holiday = '假期';
+
+$lang->holiday->typeList['holiday'] = '假期';
+$lang->holiday->typeList['working'] = '补班';
+
+$lang->holiday->emptyTip = '暂时没有节假日。';
+$lang->holiday->confirmDelete = '确认删除节假日？';
diff --git a/module/holiday/lang/zh-tw.php b/module/holiday/lang/zh-tw.php
new file mode 100644
index 0000000000..43e0cd41ab
--- /dev/null
+++ b/module/holiday/lang/zh-tw.php
@@ -0,0 +1,27 @@
+holiday)) $lang->holiday = new stdclass();
+$lang->holiday->common = '節假日';
+$lang->holiday->browse = '瀏覽';
+$lang->holiday->create = '新建';
+$lang->holiday->edit = '編輯';
+$lang->holiday->delete = '刪除';
+
+$lang->holiday->createAction = '創建節假日';
+$lang->holiday->editAction = '編輯節假日';
+$lang->holiday->deleteAction = '刪除節假日';
+
+$lang->holiday->id = '編號';
+$lang->holiday->name = '名稱';
+$lang->holiday->desc = '描述';
+$lang->holiday->type = '類型';
+$lang->holiday->begin = '開始日期';
+$lang->holiday->end = '結束日期';
+$lang->holiday->all = '所有';
+
+$lang->holiday->holiday = '假期';
+
+$lang->holiday->typeList['holiday'] = '假期';
+$lang->holiday->typeList['working'] = '補班';
+
+$lang->holiday->emptyTip = '暫時沒有節假日。';
+$lang->holiday->confirmDelete = '確認刪除節假日？';
diff --git a/module/holiday/model.php b/module/holiday/model.php
new file mode 100644
index 0000000000..004dcc41e7
--- /dev/null
+++ b/module/holiday/model.php
@@ -0,0 +1,410 @@
+
+ * @package holiday
+ * @version $Id
+ * @link http://www.zentao.net
+ */
+class holidayModel extends model
+{
+ /**
+ * Get holiday by id.
+ *
+ * @param int $id
+ * @access public
+ * @return object
+ */
+ public function getById($id)
+ {
+ return $this->dao->select('*')->from(TABLE_HOLIDAY)->where('id')->eq($id)->fetch();
+ }
+
+ /**
+ * Get holiday list.
+ *
+ * @param string $year
+ * @param string $type
+ * @access public
+ * @return object
+ */
+ public function getList($year = '', $type = 'all')
+ {
+ return $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('1')
+ ->beginIf(!empty($year))
+ ->andWhere('year', true)->eq($year)
+ ->orWhere('begin')->like("$year-%")
+ ->orWhere('end')->like("$year-%")
+ ->markright(1)
+ ->fi()
+ ->beginIf($type != 'all' && $type)->andWhere('type')->eq($type)->fi()
+ ->fetchAll('id');
+ }
+
+ /**
+ * Get year pairs.
+ *
+ * @access public
+ * @return array
+ */
+ public function getYearPairs()
+ {
+ return $this->dao->select('year,year')->from(TABLE_HOLIDAY)->groupBy('year')->orderBy('year_desc')->fetchPairs();
+ }
+
+ /**
+ * Create a holiday.
+ *
+ * @access public
+ * @return int
+ */
+ public function create()
+ {
+ $holiday = fixer::input('post')->get();
+ $holiday->year = substr($holiday->begin, 0, 4);
+ if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin);
+ if(helper::isZeroDate($holiday->end)) return dao::$errors['end'][] = sprintf($this->lang->error->date, $this->lang->holiday->end);
+
+ $this->dao->insert(TABLE_HOLIDAY)->data($holiday)
+ ->autoCheck()
+ ->batchCheck($this->config->holiday->require->create, 'notempty')
+ ->check('end', 'ge', $holiday->begin)
+ ->exec();
+ if(dao::isError()) return false;
+
+ $beginDate = $this->post->begin;
+ $endDate = $this->post->end;
+
+ /* Update project. */
+ $this->updateProgramPlanDuration($beginDate, $endDate);
+ $this->updateProjectRealDuration($beginDate, $endDate);
+
+ /* Update task. */
+ $this->updateTaskPlanDuration($beginDate, $endDate);
+ $this->updateTaskRealDuration($beginDate, $endDate);
+
+ return $this->dao->lastInsertID();
+ }
+
+ /**
+ * Edit holiday.
+ *
+ * @param int $id
+ * @access public
+ * @return bool
+ */
+ public function update($id)
+ {
+ $holiday = fixer::input('post')->get();
+ $holiday->year = substr($holiday->begin, 0, 4);
+ if(helper::isZeroDate($holiday->year)) return dao::$errors['begin'][] = sprintf($this->lang->error->date, $this->lang->holiday->begin);
+ if(helper::isZeroDate($holiday->end)) return dao::$errors['end'][] = sprintf($this->lang->error->date, $this->lang->holiday->end);
+
+ $this->dao->update(TABLE_HOLIDAY)
+ ->data($holiday)
+ ->autoCheck()
+ ->batchCheck($this->config->holiday->require->edit, 'notempty')
+ ->check('end', 'ge', $holiday->begin)
+ ->where('id')->eq($id)
+ ->exec();
+
+ if(!dao::isError())
+ {
+ $beginDate = $this->post->begin;
+ $endDate = $this->post->end;
+
+ /* Update project. */
+ $this->updateProgramPlanDuration($beginDate, $endDate);
+ $this->updateProjectRealDuration($beginDate, $endDate);
+
+ /* Update task. */
+ $this->updateTaskPlanDuration($beginDate, $endDate);
+ $this->updateTaskRealDuration($beginDate, $endDate);
+ }
+ return !dao::isError();
+ }
+
+ /**
+ * Get holidays by begin and end.
+ *
+ * @param string $begin
+ * @param string $end
+ * @access public
+ * @return array
+ */
+ public function getHolidays($begin, $end)
+ {
+ $records = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('holiday')
+ ->andWhere('begin')->le($end)
+ ->andWhere('end')->ge($begin)
+ ->fetchAll('id');
+
+ $naturalDays = $this->getDaysBetween($begin, $end);
+
+ $holidays = array();
+ foreach($records as $record)
+ {
+ $dates = $this->getDaysBetween($record->begin, $record->end);
+ $holidays = array_merge($holidays, $dates);
+ }
+
+ return array_intersect($naturalDays, $holidays);
+ }
+
+ /**
+ * Get working days.
+ *
+ * @param string $begin
+ * @param string $end
+ * @access public
+ * @return array
+ */
+ public function getWorkingDays($begin = '', $end = '')
+ {
+ $records = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('working')
+ ->andWhere('begin')->le($end)
+ ->andWhere('end')->ge($begin)
+ ->fetchAll('id');
+
+ $workingDays = array();
+ foreach($records as $record)
+ {
+ $dates = $this->getDaysBetween($record->begin, $record->end);
+ $workingDays = array_merge($workingDays, $dates);
+ }
+ return $workingDays;
+ }
+
+ /**
+ * Get actual working days.
+ *
+ * @param string $begin
+ * @param string $end
+ * @access public
+ * @return array
+ */
+ public function getActualWorkingDays($begin, $end)
+ {
+ if(empty($begin) or empty($end) or $begin == '0000-00-00' or $end == '0000-00-00') return array();
+
+ $actualDays = array();
+ $currentDay = $begin;
+
+ $holidays = $this->getHolidays($begin, $end);
+ $workingDays = $this->getWorkingDays($begin, $end);
+ $weekend = isset($this->config->project->weekend) ? $this->config->project->weekend : 2;
+
+ /* When the start date and end date are the same. */
+ if($begin == $end)
+ {
+ if(in_array($begin, $workingDays)) return $actualDays[] = $begin;
+ if(in_array($begin, $holidays)) return $actualDays;
+
+ $w = date('w', strtotime($begin));
+ if($weekend == 2)
+ {
+ if($w == 0 or $w == 6) return $actualDays;
+ }
+ else
+ {
+ if($w == 0) return $actualDays;
+ }
+
+ $actualDays[] = $begin;
+ return $actualDays;
+ }
+
+ for($i = 0; $currentDay < $end; $i ++)
+ {
+ $currentDay = date('Y-m-d', strtotime("$begin + $i days"));
+ $w = date('w', strtotime($currentDay));
+
+ if(in_array($currentDay, $workingDays))
+ {
+ $actualDays[] = $currentDay;
+ continue;
+ }
+
+ if(in_array($currentDay, $holidays)) continue;
+ if($weekend == 2)
+ {
+ if($w == 0 or $w == 6) continue;
+ }
+ else
+ {
+ if($w == 0) continue;
+ }
+ $actualDays[] = $currentDay;
+ }
+
+ return $actualDays;
+ }
+
+ /**
+ * Get diff days.
+ *
+ * @param varchar $begin
+ * @param varchar $end
+ * @access public
+ * @return bool
+ */
+ public function getDaysBetween($begin, $end)
+ {
+ $beginTime = strtotime($begin);
+ $endTime = strtotime($end);
+ $days = ($endTime - $beginTime) / 86400;
+
+ $dateList = array();
+ for($i = 0; $i <= $days; $i ++) $dateList[] = date('Y-m-d', strtotime("+$i days", $beginTime));
+
+ return $dateList;
+ }
+
+ /**
+ * Judge if is holiday.
+ *
+ * @param string $date
+ * @access public
+ * @return bool
+ */
+ public function isHoliday($date)
+ {
+ $record = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('holiday')
+ ->andWhere('begin')->le($date)
+ ->andWhere('end')->ge($date)
+ ->fetch();
+ return !empty($record);
+ }
+
+ /**
+ * Judge if is working days.
+ *
+ * @param string $date
+ * @access public
+ * @return bool
+ */
+ public function isWorkingDay($date)
+ {
+ $record = $this->dao->select('*')->from(TABLE_HOLIDAY)
+ ->where('type')->eq('working')
+ ->andWhere('begin')->le($date)
+ ->andWhere('end')->ge($date)
+ ->fetch();
+ return !empty($record);
+ }
+
+ /**
+ * Update project plan duration.
+ *
+ * @param string $beginDate
+ * @param string $endDate
+ * @access public
+ * @return void
+ */
+ public function updateProgramPlanDuration($beginDate, $endDate)
+ {
+ $updateProjectList = $this->dao->select('id, begin, end')
+ ->from(TABLE_PROJECT)
+ ->where('begin')->between($beginDate, $endDate)
+ ->orWhere('end')->between($beginDate, $endDate)
+ ->orWhere("(begin < '$beginDate' AND end > '$endDate')")
+ ->andWhere('status')->ne('done')
+ ->fetchAll();
+
+ foreach($updateProjectList as $project)
+ {
+ $realDuration = $this->getActualWorkingDays($project->begin, $project->end);
+ $realDuration = count($realDuration);
+
+ $this->dao->update(TABLE_PROJECT)->set('planDuration')->eq($realDuration)->where('id')->eq($project->id)->exec();
+ }
+ }
+
+ /**
+ * Update project real duration.
+ *
+ * @param string $beginDate
+ * @param string $endDate
+ * @access public
+ * @return void
+ */
+ public function updateProjectRealDuration($beginDate, $endDate)
+ {
+ $updateProjectList = $this->dao->select('id, realBegan, realEnd')
+ ->from(TABLE_PROJECT)
+ ->where('realBegan')->between($beginDate, $endDate)
+ ->orWhere('realEnd')->between($beginDate, $endDate)
+ ->orWhere("(realBegan < '$beginDate' AND realEnd > '$endDate')")
+ ->andWhere('status')->ne('done')
+ ->fetchAll();
+
+ foreach($updateProjectList as $project)
+ {
+ $realDuration = $this->getActualWorkingDays($project->realBegan, $project->realEnd);
+ $realDuration = count($realDuration);
+
+ $this->dao->update(TABLE_PROJECT)->set('realDuration')->eq($realDuration)->where('id')->eq($project->id)->exec();
+ }
+ }
+
+ /**
+ * Update task plan duration.
+ *
+ * @param string $beginDate
+ * @param string $endDate
+ * @access public
+ * @return void
+ */
+ public function updateTaskPlanDuration($beginDate, $endDate)
+ {
+ $updateTaskList = $this->dao->select('id, estStarted, deadline')
+ ->from(TABLE_TASK)
+ ->where('estStarted')->between($beginDate, $endDate)
+ ->orWhere('deadline')->between($beginDate, $endDate)
+ ->orWhere("(estStarted < '$beginDate' AND deadline > '$endDate')")
+ ->andWhere('status') ->ne('done')
+ ->fetchAll();
+
+ foreach($updateTaskList as $task)
+ {
+ $planduration = $this->getActualWorkingDays($task->estStarted, $task->deadline);
+ $planduration = count($planduration);
+
+ $this->dao->update(TABLE_TASK)->set('planduration')->eq($planduration)->where('id')->eq($task->id)->exec();
+ }
+ }
+
+ /**
+ * Update task real duration.
+ *
+ * @param string $beginDate
+ * @param string $endDate
+ * @access public
+ * @return void
+ */
+ public function updateTaskRealDuration($beginDate, $endDate)
+ {
+ $updateTaskList = $this->dao->select('id, realStarted, finishedDate')
+ ->from(TABLE_TASK)
+ ->where('realStarted')->between($beginDate, $endDate)
+ ->orWhere("date_format(finishedDate,'%Y-%m-%d')")->between($beginDate, $endDate)
+ ->orWhere("(realStarted < '$beginDate' AND date_format(finishedDate,'%Y-%m-%d') > '$endDate')")
+ ->andWhere('status')->ne('done')
+ ->fetchAll();
+
+ foreach($updateTaskList as $task)
+ {
+ $realDuration = $this->getActualWorkingDays($task->realStarted, date('Y-m-d',strtotime($task->finishedDate)));
+ $realDuration = count($realDuration);
+
+ $this->dao->update(TABLE_TASK)->set('realDuration')->eq($realDuration)->where('id')->eq($task->id)->exec();
+ }
+ }
+}
\ No newline at end of file
diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php
new file mode 100644
index 0000000000..9f59722738
--- /dev/null
+++ b/module/holiday/view/browse.html.php
@@ -0,0 +1,72 @@
+
+ * @package holiday
+ * @version $Id$
+ * @link https://www.zentao.net
+ */
+?>
+
+-
diff --git a/module/api/view/releases.html.php b/module/api/view/releases.html.php
index 1c1e1a7d69..ca0afb44b6 100644
--- a/module/api/view/releases.html.php
+++ b/module/api/view/releases.html.php
@@ -41,7 +41,7 @@
")
+ {
+ xuanAction += '
';
+ $('body').append(xuanAction);
+ }
+ else
+ {
+ $('#scrollContent').css('height', 'calc(100% - 36px)');
+ }
$('.xuancard-actions a.iframe').modalTrigger();
})
diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php
index 0155f909ba..902709a2f4 100644
--- a/module/bug/lang/en.php
+++ b/module/bug/lang/en.php
@@ -41,13 +41,15 @@ $lang->bug->steps = 'Repro Steps';
$lang->bug->status = 'Status';
$lang->bug->statusAB = 'Status';
$lang->bug->subStatus = 'Sub Status';
-$lang->bug->activatedCount = 'Activated Times';
+$lang->bug->activatedCount = 'Activation';
$lang->bug->activatedCountAB = 'Active';
$lang->bug->activatedDate = 'ActivatedDate';
$lang->bug->confirmed = 'Confirmed';
$lang->bug->confirmedAB = 'C';
$lang->bug->toTask = 'Convert to Task';
$lang->bug->toStory = 'Convert to Story';
+$lang->bug->feedbackBy = 'From Name';
+$lang->bug->notifyEmail = 'From Email';
$lang->bug->mailto = 'Mailto';
$lang->bug->openedBy = 'ReportedBy';
$lang->bug->openedByAB = 'Reporter';
@@ -63,8 +65,8 @@ $lang->bug->resolvedByAB = 'ResolvedBy';
$lang->bug->resolution = 'Resolution';
$lang->bug->resolutionAB = 'Resolution';
$lang->bug->resolvedBuild = 'Build';
-$lang->bug->resolvedDate = 'Resolved Date';
-$lang->bug->resolvedDateAB = 'ResolvedDate';
+$lang->bug->resolvedDate = 'Resolved';
+$lang->bug->resolvedDateAB = 'Resolved';
$lang->bug->deadline = 'Deadline';
$lang->bug->deadlineAB = 'Deadline';
$lang->bug->plan = 'Plan';
@@ -99,6 +101,7 @@ $lang->bug->edit = 'Edit Bug';
$lang->bug->batchEdit = 'Batch Edit';
$lang->bug->batchChangeModule = 'Batch Edit Modules';
$lang->bug->batchChangeBranch = 'Batch Edit Branches';
+$lang->bug->batchChangePlan = 'Batch Edit Plans';
$lang->bug->batchClose = 'Batch Close';
$lang->bug->assignTo = 'Assign';
$lang->bug->assignAction = 'Assign Bug';
diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php
index fbcbf7aa1a..aadb1f1fc8 100644
--- a/module/bug/lang/zh-cn.php
+++ b/module/bug/lang/zh-cn.php
@@ -48,6 +48,8 @@ $lang->bug->confirmed = '是否确认';
$lang->bug->confirmedAB = '确认';
$lang->bug->toTask = '转任务';
$lang->bug->toStory = "转{$lang->SRCommon}";
+$lang->bug->feedbackBy = '反馈者';
+$lang->bug->notifyEmail = '通知邮箱';
$lang->bug->mailto = '抄送给';
$lang->bug->openedBy = '由谁创建';
$lang->bug->openedByAB = '创建者';
@@ -99,6 +101,7 @@ $lang->bug->edit = '编辑Bug';
$lang->bug->batchEdit = '批量编辑';
$lang->bug->batchChangeModule = '批量修改模块';
$lang->bug->batchChangeBranch = '批量修改分支';
+$lang->bug->batchChangePlan = '批量修改计划';
$lang->bug->batchClose = '批量关闭';
$lang->bug->assignTo = '指派';
$lang->bug->assignAction = '指派Bug';
@@ -278,8 +281,9 @@ $lang->bug->statusList['active'] = '激活';
$lang->bug->statusList['resolved'] = '已解决';
$lang->bug->statusList['closed'] = '已关闭';
-$lang->bug->confirmedList[1] = '是';
-$lang->bug->confirmedList[0] = '否';
+$lang->bug->confirmedList[''] = '';
+$lang->bug->confirmedList[1] = '是';
+$lang->bug->confirmedList[0] = '否';
$lang->bug->resolutionList[''] = '';
$lang->bug->resolutionList['bydesign'] = '设计如此';
diff --git a/module/bug/model.php b/module/bug/model.php
index 25e9413ddf..1e6d6c2c1d 100644
--- a/module/bug/model.php
+++ b/module/bug/model.php
@@ -85,7 +85,12 @@ class bugModel extends model
/* Use classic mode to replace required project. */
if($this->config->systemMode == 'classic' and strpos($this->config->bug->create->requiredFields, 'project') !== false) $this->config->bug->create->requiredFields = str_replace('project', 'execution', $this->config->bug->create->requiredFields);
- $this->dao->insert(TABLE_BUG)->data($bug)->autoCheck()->batchCheck($this->config->bug->create->requiredFields, 'notempty')->exec();
+ $this->dao->insert(TABLE_BUG)->data($bug)
+ ->autoCheck()
+ ->checkIF($bug->notifyEmail, 'notifyEmail', 'email')
+ ->batchCheck($this->config->bug->create->requiredFields, 'notempty')
+ ->exec();
+
if(!dao::isError())
{
$bugID = $this->dao->lastInsertID();
@@ -94,6 +99,8 @@ class bugModel extends model
$this->file->saveUpload('bug', $bugID);
empty($bug->case) ? $this->loadModel('score')->create('bug', 'create', $bugID) : $this->loadModel('score')->create('bug', 'createFormCase', $bug->case);
+ if($bug->execution) $this->loadModel('kanban')->updateLane($bug->execution, 'bug');
+
/* Callback the callable method to process the related data for object that is transfered to bug. */
if($from && is_callable(array($this, $this->config->bug->fromObjects[$from]['callback']))) call_user_func(array($this, $this->config->bug->fromObjects[$from]['callback']), $bugID);
@@ -249,6 +256,7 @@ class bugModel extends model
$bugID = $this->dao->lastInsertID();
$this->executeHooks($bugID);
+ if($bug->execution) $this->loadModel('kanban')->updateLane($bug->execution, 'bug');
/* When the bug is created by uploading the image, add the image to the file of the bug. */
$this->loadModel('score')->create('bug', 'create', $bugID);
@@ -530,7 +538,7 @@ class bugModel extends model
->andWhere('tostory')->eq(0)
->andWhere('toTask')->eq(0)
->beginIF(!empty($products))->andWhere('product')->in($products)->fi()
- ->beginIF($branch)->andWhere('branch')->in("0,$branch")->fi()
+ ->beginIF($branch !== '' and $branch !== 'all')->andWhere('branch')->in("0,$branch")->fi()
->beginIF(!empty($executions))->andWhere('execution')->in($executions)->fi()
->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
->andWhere('deleted')->eq(0)
@@ -661,6 +669,7 @@ class bugModel extends model
->batchCheck($this->config->bug->edit->requiredFields, 'notempty')
->checkIF($bug->resolvedBy, 'resolution', 'notempty')
->checkIF($bug->closedBy, 'resolution', 'notempty')
+ ->checkIF($bug->notifyEmail, 'notifyEmail', 'email')
->checkIF($bug->resolution == 'duplicate', 'duplicateBug', 'notempty')
->checkIF($bug->resolution == 'fixed', 'resolvedBuild','notempty')
->where('id')->eq((int)$bugID)
@@ -678,6 +687,8 @@ class bugModel extends model
if(!empty($bug->resolvedBy)) $this->loadModel('score')->create('bug', 'resolve', $bugID);
$this->file->updateObjectID($this->post->uid, $bugID, 'bug');
+ if($bug->execution and $bug->status != $oldBug->status) $this->loadModel('kanban')->updateLane($bug->execution, 'bug');
+
return common::createChanges($oldBug, $bug);
}
}
@@ -917,6 +928,7 @@ class bugModel extends model
if(!dao::isError())
{
$this->loadModel('score')->create('bug', 'confirmBug', $oldBug);
+ if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
return common::createChanges($oldBug, $bug);
}
}
@@ -1029,6 +1041,7 @@ class bugModel extends model
if(!dao::isError())
{
$this->loadModel('score')->create('bug', 'resolve', $oldBug);
+ if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
/* Link bug to build and release. */
$this->linkBugToBuild($bugID, $bug->resolvedBuild);
@@ -1096,6 +1109,35 @@ class bugModel extends model
return $allChanges;
}
+ /**
+ * Batch change the plan of bug.
+ *
+ * @param array $bugIDList
+ * @param int $planID
+ * @access public
+ * @return array
+ */
+ public function batchChangePlan($bugIDList, $planID)
+ {
+ $now = helper::now();
+ $allChanges = array();
+ $oldBugs = $this->getByList($bugIDList);
+ foreach($bugIDList as $bugID)
+ {
+ $oldBug = $oldBugs[$bugID];
+ if($planID == $oldBug->plan) continue;
+
+ $bug = new stdclass();
+ $bug->lastEditedBy = $this->app->user->account;
+ $bug->lastEditedDate = $now;
+ $bug->plan = $planID;
+
+ $this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
+ if(!dao::isError()) $allChanges[$bugID] = common::createChanges($oldBug, $bug);
+ }
+ return $allChanges;
+ }
+
/**
* Batch resolve bugs.
*
@@ -1161,6 +1203,7 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug)->where('id')->eq($bugID)->exec();
$this->executeHooks($bugID);
+ if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
$changes[$bugID] = common::createChanges($oldBug, $bug);
}
@@ -1179,7 +1222,12 @@ class bugModel extends model
*/
public function activate($bugID)
{
- $oldBug = $this->getById($bugID);
+ $bugID = (int)$bugID;
+ $oldBug = $this->getById($bugID);
+ $solveBuild = $this->dao->select('id')
+ ->from(TABLE_BUILD)
+ ->where("CONCAT(',', bugs, ',')")->like("%,{$bugID},%")
+ ->fetch('id');
$now = helper::now();
$bug = fixer::input('post')
->setDefault('assignedTo', $oldBug->resolvedBy)
@@ -1205,19 +1253,15 @@ class bugModel extends model
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
$this->dao->update(TABLE_BUG)->set('activatedCount = activatedCount + 1')->where('id')->eq((int)$bugID)->exec();
- $openedBuilds = explode(',', $oldBug->openedBuild);
- if($openedBuilds)
+ if($solveBuild)
{
$this->loadModel('build');
- foreach($openedBuilds as $openedBuild)
- {
- $build = $this->build->getByID($openedBuild);
- if(empty($build)) continue;
- $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
- $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$openedBuild)->exec();
- }
+ $build = $this->build->getByID($solveBuild);
+ $build->bugs = trim(str_replace(",$bugID,", ',', ",$build->bugs,"), ',');
+ $this->dao->update(TABLE_BUILD)->set('bugs')->eq($build->bugs)->where('id')->eq((int)$solveBuild)->exec();
}
+ if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
$bug->activatedCount += 1;
return common::createChanges($oldBug, $bug);
}
@@ -1246,6 +1290,7 @@ class bugModel extends model
->get();
$this->dao->update(TABLE_BUG)->data($bug)->autoCheck()->where('id')->eq((int)$bugID)->exec();
+ if($oldBug->execution) $this->loadModel('kanban')->updateLane($oldBug->execution, 'bug');
return common::createChanges($oldBug, $bug);
}
@@ -1583,7 +1628,9 @@ class bugModel extends model
->beginIF($type == 'noclosed')->andWhere('status')->ne('closed')->fi()
->beginIF($build)->andWhere("CONCAT(',', openedBuild, ',') like '%,$build,%'")->fi()
->beginIF($excludeBugs)->andWhere('id')->notIN($excludeBugs)->fi()
- ->orderBy($orderBy)->page($pager)->fetchAll();
+ ->orderBy($orderBy)
+ ->page($pager)
+ ->fetchAll('id');
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'bug');
@@ -1602,7 +1649,7 @@ class bugModel extends model
* @access public
* @return array
*/
- public function getProductLeftBugs($build, $productID, $branch = 0, $linkedBugs = '', $pager = null)
+ public function getProductLeftBugs($build, $productID, $branch = '', $linkedBugs = '', $pager = null)
{
$build = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->eq($build)->fetch();
if(empty($build->execution)) return array();
@@ -1625,7 +1672,7 @@ class bugModel extends model
->andWhere("(status = 'active' OR resolvedDate > '{$execution->end}')")
->andWhere('openedBuild')->notin($beforeBuilds)
->beginIF($linkedBugs)->andWhere('id')->notIN($linkedBugs)->fi()
- ->beginIF($branch)->andWhere('branch')->in("0,$branch")->fi()
+ ->beginIF($branch !== '')->andWhere('branch')->in("0,$branch")->fi()
->page($pager)
->fetchAll();
@@ -2499,7 +2546,7 @@ class bugModel extends model
}
$allBranch = "`branch` = 'all'";
- if($branch !== 'all' and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('$branch')";
+ if($branch !== 'all' and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);
$allProject = "`project` = 'all'";
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index c75c2db803..caad3f41c6 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -59,7 +59,6 @@
+ bug->notifyEmail?>
+
+
+
+ bug->feedbackBy?>
+
+ bug->notifyEmail?>
+
+
+
+
@@ -65,7 +68,9 @@
?>
printExtendFields($bug, 'div', "position=left&inForm=0&inCell=1");?>
-
+ app->getViewType() != 'xhtml'):?>
+
+
id";
$extraParams = "extras=bugID=$bug->id";
@@ -88,7 +93,7 @@
if($this->app->tab != 'product')
{
- common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='product'", $lang->bug->toStory);
+ common::printIcon('bug', 'toStory', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", $bug, 'button', $lang->icons['story'], '', '', '', "data-app='" . $this->app->tab . "'", $lang->bug->toStory);
common::printIcon('bug', 'createCase', $convertParams, $bug, 'button', 'sitemap');
}
@@ -223,6 +228,14 @@
?>
') : print($openedBuild . '
'); + foreach($openedBuilds as $openedBuild) + { + if(!$openedBuild) continue; + isset($builds[$openedBuild]) ? print($builds[$openedBuild] . '
') : print($openedBuild . '
'); + } } else { @@ -394,6 +411,9 @@ printExtendFields($bug, 'div', "position=right&inForm=0&inCell=1");?> +app->getViewType() == 'xhtml'):?> + +
diff --git a/module/build/control.php b/module/build/control.php
index 77fa967f8f..b21ca4419d 100644
--- a/module/build/control.php
+++ b/module/build/control.php
@@ -492,8 +492,8 @@ class build extends control
$this->config->product->search['actionURL'] = $this->createLink('build', 'view', "buildID=$buildID&type=story&link=true¶m=" . helper::safe64Encode("&browseType=bySearch&queryID=myQueryID"));
$this->config->product->search['queryID'] = $queryID;
$this->config->product->search['style'] = 'simple';
- $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
- $this->config->product->search['params']['module']['values'] = $this->tree->getOptionMenu($build->product, 'story', 0);
+ $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairsForStory($build->product, $build->branch, 'skipParent');
+ $this->config->product->search['params']['module']['values'] = $this->tree->getOptionMenu($build->product, 'story', 0, $build->branch);
$this->config->product->search['params']['status'] = array('operator' => '=', 'control' => 'select', 'values' => $this->lang->story->statusList);
if($product->type == 'normal')
@@ -503,9 +503,11 @@ class build extends control
}
else
{
- $this->config->product->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
- $branches = array('' => '') + $this->loadModel('branch')->getPairs($build->product, 'noempty');
- if($build->branch) $branches = array('' => '', $build->branch => $branches[$build->branch]);
+ $branchPairs = $this->loadModel('branch')->getPairs($build->product, 'noempty');
+ $branches = array('' => '') + array(BRANCH_MAIN => $this->lang->branch->main);
+ if($build->branch) $branches += array($build->branch => $branchPairs[$build->branch]);
+
+ $this->config->product->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
$this->config->product->search['params']['branch']['values'] = $branches;
}
$this->loadModel('search')->setSearchParams($this->config->product->search);
@@ -516,7 +518,7 @@ class build extends control
}
else
{
- $allStories = $this->story->getExecutionStories($build->execution, 0, 0, 't1.`order`_desc', 'byProduct', $build->product, 'story', $build->stories, $pager);
+ $allStories = $this->story->getExecutionStories($build->execution, $build->product, 0, 't1.`order`_desc', 'byBranch', $build->branch, 'story', $build->stories, $pager);
}
$this->view->allStories = $allStories;
@@ -609,8 +611,8 @@ class build extends control
$this->config->bug->search['actionURL'] = $this->createLink('build', 'view', "buildID=$buildID&type=bug&link=true¶m=" . helper::safe64Encode("&browseType=bySearch&queryID=myQueryID"));
$this->config->bug->search['queryID'] = $queryID;
$this->config->bug->search['style'] = 'simple';
- $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts(array($build->product => $build->product));
- $this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($build->product, $viewType = 'bug', $startModuleID = 0);
+ $this->config->bug->search['params']['plan']['values'] = $this->loadModel('productplan')->getPairsForStory($build->product, $build->branch, 'skipParent');
+ $this->config->bug->search['params']['module']['values'] = $this->loadModel('tree')->getOptionMenu($build->product, 'bug', 0, $build->branch);
$this->config->bug->search['params']['execution']['values'] = $this->loadModel('product')->getExecutionPairsByProduct($build->product, 0, 'id_desc', $this->session->project);
$this->config->bug->search['params']['openedBuild']['values'] = $this->build->getProductBuildPairs($build->product, $branch = 0, $params = '');
$this->config->bug->search['params']['resolvedBuild']['values'] = $this->config->bug->search['params']['openedBuild']['values'];
@@ -624,9 +626,11 @@ class build extends control
}
else
{
- $this->config->bug->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
- $branches = array('' => '') + $this->loadModel('branch')->getPairs($build->product, 'noempty');
- if($build->branch) $branches = array('' => '', $build->branch => $branches[$build->branch]);
+ $branchPairs = $this->loadModel('branch')->getPairs($build->product, 'noempty');
+ $branches = array('' => '') + array(BRANCH_MAIN => $this->lang->branch->main);
+ if($build->branch) $branches += array($build->branch => $branchPairs[$build->branch]);
+
+ $this->config->bug->search['fields']['branch'] = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
$this->config->bug->search['params']['branch']['values'] = $branches;
}
$this->loadModel('search')->setSearchParams($this->config->bug->search);
diff --git a/module/build/js/common.js b/module/build/js/common.js
index e92d9470ad..599c9cba24 100644
--- a/module/build/js/common.js
+++ b/module/build/js/common.js
@@ -15,7 +15,7 @@ function loadBranches(productID)
oldBranch = productGroups[productID]['branches'];
}
- executionID = $('#execution').val();
+ executionID = currentTab == 'execution' ? executionID : $('#execution').val();
$.get(createLink('branch', 'ajaxGetBranches', 'productID=' + productID + '&oldBranch=0¶m=active&projectID=' + executionID), function(data)
{
if(data)
diff --git a/module/build/view/create.html.php b/module/build/view/create.html.php
index 1ede2bdad7..996195e756 100644
--- a/module/build/view/create.html.php
+++ b/module/build/view/create.html.php
@@ -92,5 +92,7 @@
-
+
+
+app->tab);?>
diff --git a/module/ci/model.php b/module/ci/model.php
index d37d81d82e..9943a6fcaa 100644
--- a/module/ci/model.php
+++ b/module/ci/model.php
@@ -54,7 +54,6 @@ class ciModel extends model
*/
public function syncCompileStatus($compile)
{
- /* Max retry times is: 3. */
if($compile->times >= 3)
{
$this->dao->update(TABLE_COMPILE)->set('status')->eq('failure')->where('id')->eq($compile->id)->exec();
diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 57a3c16b1c..a633d01ce2 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -4,11 +4,15 @@ $lang->index = new stdclass();
$lang->my = new stdclass();
$lang->todo = new stdclass();
$lang->program = new stdclass();
+$lang->programplan = new stdclass();
$lang->product = new stdclass();
$lang->project = new stdclass();
+$lang->design = new stdclass();
+$lang->stage = new stdclass();
$lang->scrum = new stdclass();
$lang->waterfall = new stdclass();
$lang->execution = new stdclass();
+$lang->kanban = new stdclass();
$lang->story = new stdclass();
$lang->release = new stdclass();
$lang->branch = new stdclass();
diff --git a/module/common/lang/en.php b/module/common/lang/en.php
index adc6163ad9..e2e937bfb1 100644
--- a/module/common/lang/en.php
+++ b/module/common/lang/en.php
@@ -45,34 +45,38 @@ $lang->runInfo = " Z PUBLIC LICENSE 1.2 . Without authorization, I should not remove, hide or cover any logos/links of ZenTao.";
$lang->designedByAIUX = " AIUX";
-$lang->reset = 'Reset';
-$lang->cancel = 'Cancel';
-$lang->refresh = 'Refresh';
-$lang->edit = 'Edit';
-$lang->delete = 'Delete';
-$lang->close = 'Close';
-$lang->unlink = 'Unlink';
-$lang->import = 'Import';
-$lang->export = 'Export';
-$lang->setFileName = 'File Name';
-$lang->submitting = 'Saving...';
-$lang->save = 'Save';
-$lang->confirm = 'Confirm';
-$lang->preview = 'View';
-$lang->goback = 'Back';
-$lang->goPC = 'PC';
-$lang->more = 'More';
-$lang->moreLink = 'MORE';
-$lang->day = ' Day';
-$lang->customConfig = 'Custom Config';
-$lang->public = 'Public';
-$lang->trunk = 'Trunk';
-$lang->sort = 'Order';
-$lang->required = 'Required';
-$lang->noData = 'No data.';
-$lang->fullscreen = 'Fullscreen';
-$lang->retrack = 'Retrack';
-$lang->whitelist = 'Access whitelist';
+$lang->reset = 'Reset';
+$lang->cancel = 'Cancel';
+$lang->refresh = 'Refresh';
+$lang->create = 'Create';
+$lang->edit = 'Edit';
+$lang->delete = 'Delete';
+$lang->close = 'Close';
+$lang->unlink = 'Unlink';
+$lang->import = 'Import';
+$lang->export = 'Export';
+$lang->setFileName = 'File Name';
+$lang->submitting = 'Saving...';
+$lang->save = 'Save';
+$lang->confirm = 'Confirm';
+$lang->preview = 'View';
+$lang->goback = 'Back';
+$lang->goPC = 'PC';
+$lang->more = 'More';
+$lang->moreLink = 'MORE';
+$lang->day = ' Day';
+$lang->customConfig = 'Custom Config';
+$lang->public = 'Public';
+$lang->trunk = 'Trunk';
+$lang->sort = 'Order';
+$lang->required = 'Required';
+$lang->noData = 'No data.';
+$lang->fullscreen = 'Fullscreen';
+$lang->retrack = 'Retrack';
+$lang->whitelist = 'Access whitelist';
+$lang->globalSetting = 'Global Setting';
+$lang->waterfallModel = 'Waterfall';
+$lang->all = 'All';
$lang->actions = 'Action';
$lang->restore = 'Reset';
@@ -137,6 +141,7 @@ $lang->program->common = 'Program';
$lang->product->common = 'Product';
$lang->project->common = 'Project';
$lang->execution->common = $config->systemMode == 'new' ? 'Execution' : $lang->executionCommon;
+$lang->kanban->common = 'Kanban';
$lang->qa->common = 'QA';
$lang->devops->common = 'DevOps';
$lang->doc->common = 'Doc';
@@ -161,6 +166,13 @@ $lang->dept->common = 'Dept';
$lang->upgrade->common = 'Update';
$lang->program->list = 'Program List';
$lang->program->kanban = 'Program Kanban';
+$lang->design->common = 'Design';
+$lang->design->HLDS = 'HLDS';
+$lang->design->DDS = 'DDS';
+$lang->design->DBDS = 'DBDS';
+$lang->design->ADS = 'ADS';
+$lang->stage->common = 'Stage';
+$lang->stage->list = 'Stage List';
$lang->execution->list = "{$lang->executionCommon} List";
$lang->personnel->common = 'Member';
@@ -179,38 +191,37 @@ $lang->score->shortCommon = 'Score';
$lang->testreport->shortCommon = 'Report';
$lang->qa->shortCommon = 'QA';
-$lang->dashboard = 'Dashboard';
-$lang->contribute = 'Contribute';
-$lang->dynamic = 'Dynamic';
-$lang->contact = 'Contacts';
-$lang->whitelist = 'Whitelist';
-$lang->roadmap = 'Roadmap';
-$lang->track = 'Track';
-$lang->settings = 'Settings';
-$lang->overview = 'Overview';
-$lang->module = 'Module';
-$lang->priv = 'Privilege';
-$lang->design = 'Design';
-$lang->other = 'Other';
-$lang->estimation = 'Estimation';
-$lang->issue = 'Issue';
-$lang->risk = 'Risk';
-$lang->measure = 'Report';
-$lang->treeView = 'Tree View';
-$lang->groupView = 'Group View';
-$lang->kanban = 'Kanban';
-$lang->burn = 'Burndown';
-$lang->view = 'View';
-$lang->intro = 'Introduction';
-$lang->indexPage = 'Index';
-$lang->model = 'Model';
-$lang->redev = 'Develop';
-$lang->browser = 'Browser';
-$lang->db = 'Database';
-$lang->editor = 'Editor';
-$lang->timezone = 'Timezone';
-$lang->security = 'Security';
-$lang->calendar = 'Calendar';
+$lang->dashboard = 'Dashboard';
+$lang->contribute = 'Contribute';
+$lang->dynamic = 'Dynamic';
+$lang->contact = 'Contacts';
+$lang->whitelist = 'Whitelist';
+$lang->roadmap = 'Roadmap';
+$lang->track = 'Track';
+$lang->settings = 'Settings';
+$lang->overview = 'Overview';
+$lang->module = 'Module';
+$lang->priv = 'Privilege';
+$lang->other = 'Other';
+$lang->estimation = 'Estimation';
+$lang->issue = 'Issue';
+$lang->risk = 'Risk';
+$lang->measure = 'Report';
+$lang->treeView = 'Tree View';
+$lang->groupView = 'Group View';
+$lang->executionKanban = 'Kanban';
+$lang->burn = 'Burndown';
+$lang->view = 'View';
+$lang->intro = 'Introduction';
+$lang->indexPage = 'Index';
+$lang->model = 'Model';
+$lang->redev = 'Develop';
+$lang->browser = 'Browser';
+$lang->db = 'Database';
+$lang->editor = 'Editor';
+$lang->timezone = 'Timezone';
+$lang->security = 'Security';
+$lang->calendar = 'Calendar';
$lang->my->work = 'Work';
@@ -229,8 +240,8 @@ $lang->doc->api = 'API';
$lang->doc->execution = $lang->execution->common;
$lang->doc->custom = 'Custom';
$lang->doc->wiki = 'WIKI';
-$lang->doc->apiDoc = 'Doc';
-$lang->doc->apiStruct = 'Struct';
+$lang->doc->apiDoc = 'API Docuemnt';
+$lang->doc->apiStruct = 'Data Structure';
$lang->product->list = $lang->productCommon . ' List';
$lang->product->kanban = $lang->productCommon . ' Kanban';
diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index edf51e6c38..0ad42439f1 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -155,7 +155,7 @@ $lang->product->menu = new stdclass();
$lang->product->menu->dashboard = array('link' => "{$lang->dashboard}|product|dashboard|productID=%s");
if($config->URAndSR) $lang->product->menu->requirement = array('link' => "$lang->URCommon|product|browse|productID=%s&branch=&browseType=unclosed¶m=0&storyType=requirement", 'alias' => 'batchedit', 'subModule' => 'story');
$lang->product->menu->story = array('link' => "$lang->SRCommon|product|browse|productID=%s", 'alias' => 'batchedit', 'subModule' => 'story');
-$lang->product->menu->plan = array('link' => "{$lang->productplan->shortCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan');
+$lang->product->menu->plan = array('link' => "{$lang->productplan->shortCommon}|productplan|browse|productID=%s", 'subModule' => 'productplan,bug');
$lang->product->menu->release = array('link' => "{$lang->release->common}|release|browse|productID=%s", 'subModule' => 'release');
$lang->product->menu->roadmap = array('link' => "{$lang->roadmap}|product|roadmap|productID=%s");
if($config->systemMode == 'new') $lang->product->menu->project = array('link' => "{$lang->project->common}|product|project|status=all&productID=%s");
@@ -239,6 +239,52 @@ $lang->scrum->menu->settings['subMenu']->whitelist = array('link' => "{$lang->
$lang->scrum->menu->settings['subMenu']->stakeholder = array('link' => "{$lang->stakeholder->common}|stakeholder|browse|project=%s", 'subModule' => 'stakeholder');
$lang->scrum->menu->settings['subMenu']->group = array('link' => "{$lang->priv}|project|group|project=%s", 'alias' => 'group,manageview,managepriv');
+/* Waterfall menu. */
+$lang->waterfall->menu = new stdclass();
+$lang->waterfall->menu->index = array('link' => "$lang->dashboard|project|index|project=%s");
+$lang->waterfall->menu->programplan = array('link' => "{$lang->productplan->shortCommon}|programplan|browse|project=%s&productID=0&type=lists", 'subModule' => 'programplan');
+$lang->waterfall->menu->execution = array('link' => "{$lang->stage->common}|project|execution|status=all&projectID=%s");
+$lang->waterfall->menu->story = array('link' => "$lang->SRCommon|projectstory|story|project=%s", 'subModule' => 'projectstory,tree', 'exclude' => 'projectstory-track');
+$lang->waterfall->menu->design = array('link' => "{$lang->design->common}|design|browse|project=%s");
+$lang->waterfall->menu->qa = array('link' => "{$lang->qa->common}|project|bug|projectID=%s", 'subModule' => 'testcase,testtask,bug', 'alias' => 'bug,testtask,testcase');
+$lang->waterfall->menu->devops = array('link' => "{$lang->repo->common}|repo|browse|repoID=0&branchID=&objectID=%s", 'subModule' => 'repo');
+$lang->waterfall->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s");
+$lang->waterfall->menu->release = array('link' => "{$lang->release->common}|projectrelease|browse|project=%s", 'subModule' => 'projectrelease');
+$lang->waterfall->menu->dynamic = array('link' => "$lang->dynamic|project|dynamic|project=%s");
+
+$lang->waterfall->menu->settings = $lang->scrum->menu->settings;
+$lang->waterfall->dividerMenu = ',programplan,build,dynamic,';
+
+/* Waterfall menu order. */
+$lang->waterfall->menuOrder[5] = 'index';
+$lang->waterfall->menuOrder[15] = 'programplan';
+$lang->waterfall->menuOrder[20] = 'execution';
+$lang->waterfall->menuOrder[25] = 'story';
+$lang->waterfall->menuOrder[30] = 'design';
+$lang->waterfall->menuOrder[35] = 'devops';
+$lang->waterfall->menuOrder[55] = 'qa';
+$lang->waterfall->menuOrder[60] = 'doc';
+$lang->waterfall->menuOrder[65] = 'build';
+$lang->waterfall->menuOrder[70] = 'release';
+$lang->waterfall->menuOrder[80] = 'dynamic';
+
+$lang->waterfall->menu->doc['subMenu'] = new stdclass();
+
+$lang->waterfall->menu->programplan['subMenu'] = new stdclass();
+$lang->waterfall->menu->programplan['subMenu']->lists = array('link' => "{$lang->stage->list}|programplan|browse|projectID=%s&productID=0&type=lists", 'alias' => 'create');
+
+$lang->waterfall->menu->qa['subMenu'] = new stdclass();
+$lang->waterfall->menu->qa['subMenu']->bug = array('link' => "{$lang->bug->common}|project|bug|projectID=%s", 'subModule' => 'bug');
+$lang->waterfall->menu->qa['subMenu']->testcase = array('link' => "{$lang->testcase->shortCommon}|project|testcase|projectID=%s", 'subModule' => 'testsuite,testcase,caselib,tree');
+$lang->waterfall->menu->qa['subMenu']->testtask = array('link' => "{$lang->testtask->common}|project|testtask|projectID=%s", 'subModule' => 'testtask', 'class' => 'dropdown dropdown-hover');
+
+$lang->waterfall->menu->design['subMenu'] = new stdclass();
+$lang->waterfall->menu->design['subMenu']->all = array('link' => "$lang->all|design|browse|projectID=%s&productID=0&browseType=all");
+$lang->waterfall->menu->design['subMenu']->hlds = array('link' => "{$lang->design->HLDS}|design|browse|projectID=%s&productID=0&browseType=HLDS");
+$lang->waterfall->menu->design['subMenu']->dds = array('link' => "{$lang->design->DDS}|design|browse|projectID=%s&productID=0&browseType=DDS");
+$lang->waterfall->menu->design['subMenu']->dbds = array('link' => "{$lang->design->DBDS}|design|browse|projectID=%s&productID=0&browseType=DBDS");
+$lang->waterfall->menu->design['subMenu']->ads = array('link' => "{$lang->design->ADS}|design|browse|projectID=%s&productID=0&browseType=ADS");
+$lang->waterfall->menu->design['subMenu']->bysearch = array('link' => ' ' . $lang->searchAB . '');
/* Execution menu. */
$lang->execution->homeMenu = new stdclass();
@@ -247,7 +293,7 @@ if($config->systemMode == 'new') $lang->execution->homeMenu->executionkanban = a
$lang->execution->menu = new stdclass();
$lang->execution->menu->task = array('link' => "{$lang->task->common}|execution|task|executionID=%s", 'subModule' => 'task,tree', 'alias' => 'importtask,importbug');
-$lang->execution->menu->kanban = array('link' => "$lang->kanban|execution|kanban|executionID=%s");
+$lang->execution->menu->kanban = array('link' => "$lang->executionKanban|execution|kanban|executionID=%s");
$lang->execution->menu->burn = array('link' => "$lang->burn|execution|burn|executionID=%s");
$lang->execution->menu->view = array('link' => "$lang->view|execution|grouptask|executionID=%s", 'alias' => 'grouptask,tree,taskeffort,gantt,calendar,relation,maintainrelation');
$lang->execution->menu->story = array('link' => "$lang->SRCommon|execution|story|executionID=%s", 'subModule' => 'story', 'alias' => 'batchcreate,linkstory,storykanban');
@@ -415,13 +461,24 @@ $lang->company->menuOrder[30] = 'addUser';
$lang->admin->menu = new stdclass();
$lang->admin->menu->index = array('link' => "$lang->indexPage|admin|index", 'alias' => 'register,certifytemail,certifyztmobile,ztcompany');
$lang->admin->menu->company = array('link' => "{$lang->personnel->common}|company|browse|", 'subModule' => ',user,dept,group,');
-$lang->admin->menu->model = array('link' => "$lang->model|custom|browsestoryconcept|", 'subModule' => 'holiday');
+$lang->admin->menu->model = array('link' => "$lang->model|custom|browsestoryconcept|", 'class' => 'dropdown dropdown-hover', 'exclude' => 'custom-index,custom-set,custom-product,custom-execution,custom-required,custom-flow,custom-score,custom-feedback,custom-timezone,custom-mode');
$lang->admin->menu->custom = array('link' => "{$lang->custom->common}|custom|index", 'exclude' => 'custom-browsestoryconcept,custom-timezone,custom-estimate');
$lang->admin->menu->extension = array('link' => "{$lang->extension->common}|extension|browse", 'subModule' => 'extension');
$lang->admin->menu->dev = array('link' => "$lang->redev|dev|api", 'alias' => 'db', 'subModule' => 'dev,editor,entry');
$lang->admin->menu->message = array('link' => "{$lang->message->common}|message|index", 'subModule' => 'message,mail,webhook');
$lang->admin->menu->system = array('link' => "{$lang->admin->system}|backup|index", 'subModule' => 'cron,backup,action,admin,search', 'exclude' => 'admin-index,admin-xuanxuan,admin-register,admin-ztcompany');
+$lang->admin->menu->model['dropMenu'] = new stdclass();
+$lang->admin->menu->model['dropMenu']->allModel = array('link' => "{$lang->globalSetting}|custom|browsestoryconcept|", 'subModule' => 'measurement,report,sqlbuilder,subject,custom,meetingroom,baseline');
+$lang->admin->menu->model['dropMenu']->waterfall = array('link' => "{$lang->waterfallModel}|stage|setType|", 'subModule' => 'stage,auditcl,cmcl,process,activity,zoutput,classify,reviewcl,reviewsetting');
+
+$lang->admin->menu->allModel['subMenu'] = new stdclass();
+$lang->admin->menu->allModel['subMenu']->storyConcept = array('link' => "{$lang->storyConcept}|custom|browsestoryconcept|");
+$lang->admin->menu->allModel['menuOrder'][5] = 'storyConcept';
+
+$lang->admin->menu->waterfall['subMenu'] = new stdclass();
+$lang->admin->menu->waterfall['subMenu']->stage = array('link' => '阶段|stage|setType|', 'subModule' => 'stage');
+
/* Admin menu order. */
$lang->admin->menuOrder[5] = 'index';
$lang->admin->menuOrder[10] = 'company';
@@ -432,11 +489,6 @@ $lang->admin->menuOrder[30] = 'extension';
$lang->admin->menuOrder[35] = 'dev';
$lang->admin->menuOrder[40] = 'system';
-$lang->admin->menu->model['subMenu'] = new stdclass();
-$lang->admin->menu->model['subMenu']->storyConcept = array('link' => "{$lang->storyConcept}|custom|browsestoryconcept|");
-
-$lang->admin->menu->model['menuOrder'][5] = 'storyConcept';
-
$lang->admin->menu->message['subMenu'] = new stdclass();
$lang->admin->menu->message['subMenu']->message = new stdclass();
$lang->admin->menu->message['subMenu']->mail = array('link' => "{$lang->mail->common}|mail|index", 'subModule' => 'mail');
@@ -507,6 +559,8 @@ $lang->navGroup->story = 'product';
$lang->navGroup->project = 'project';
$lang->navGroup->deploy = 'project';
+$lang->navGroup->programplan = 'project';
+$lang->navGroup->design = 'project';
$lang->navGroup->stakeholder = 'project';
$lang->navGroup->projectbuild = 'project';
@@ -522,10 +576,13 @@ $lang->navGroup->build = 'project';
$lang->navGroup->measrecord = 'project';
$lang->navGroup->milestone = 'project';
-$lang->navGroup->execution = 'execution';
-$lang->navGroup->task = 'execution';
-$lang->navGroup->build = 'execution';
-$lang->navGroup->team = 'execution';
+$lang->navGroup->kanban = 'execution';
+$lang->navGroup->execution = 'execution';
+$lang->navGroup->task = 'execution';
+$lang->navGroup->build = 'execution';
+$lang->navGroup->team = 'execution';
+$lang->navGroup->kanbancolumn = 'execution';
+$lang->navGroup->kanbanlane = 'execution';
$lang->navGroup->doc = 'doc';
$lang->navGroup->doclib = 'doc';
diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 1584f48ac4..8a25586e23 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -45,34 +45,38 @@ $lang->runInfo = "id == $docID ? ' class="active"' : ' class="independent"') . '>';
+ $treeMenu[0] .= 'id == $docID ? ' class="active"' : ' class="independent"') . " data-id=$doc->id>";
if($currentMethod == 'tablecontents')
{
$treeMenu[0] .= '' . zget($users, $doc->editedBy) . ' ' . $doc->editedDate . '';
}
-
- $treeMenu[0] .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), " " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'");
+ if($currentMethod == 'objectlibs')
+ {
+ $treeMenu[0] .= "id == $docID ? ' class="active"' : ' class="doc"') . '>';
+ $treeMenu[$module->id] .= 'id == $docID ? ' class="active"' : ' class="doc"') . " data-id=$doc->id>";
if($currentMethod == 'tablecontents')
{
$treeMenu[$module->id] .= '' . zget($users, $doc->editedBy) . ' ' . $doc->editedDate . '';
}
- $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($currentMethod == 'objectlibs')
+ {
+ $treeMenu[$module->id] .= "' . $li . ' ';
+ $treeMenu[$module->parent] .= '' . $li . ' ';
}
/**
diff --git a/module/doc/view/side.html.php b/module/doc/view/side.html.php
index 837b2e8027..98fda2cc23 100644
--- a/module/doc/view/side.html.php
+++ b/module/doc/view/side.html.php
@@ -15,149 +15,109 @@ if(empty($type)) $type = 'product';
$sideWidth = common::checkNotCN() ? '270' : '238';
?>
';
-
- $kanban.before(fixedSide);
-
- $('.fixedSide').width(tableWidth);
- $('.fixedSide').css('top', $kanban.offset());
-
- /* Reset height. */
- var index = 1;
- $('.fixedSide tbody tr').each(function()
- {
- var $td = $kanban.find('table tbody tr:nth-child(' + index + ') td:first');
-
- if($(this).find('td:first div:first').length == 0) $(this).find('td:first').html('');
- $(this).find('td:first div:first').height($td.height());
-
- index++;
- })
- }
- if($fixedSide.length > 0 && kanbanOffset >= $kanban.scrollLeft()) $fixedSide.remove();
- }
- function fixSideInit()
- {
- $fixedSide = $kanban.parent().find('.fixedSide');
- if($fixedSide.length > 0) $fixedSide.remove();
- fixSide();
}
}
+
+/**
+ * Exit full screen.
+ *
+ * @access public
+ * @return void
+ */
+function exitFullScreen()
+{
+ $('#kanbanContainer').removeClass('scrollbar-hover');
+ $('.actions').show();
+ $('#kanbanContainer a').each(function()
+ {
+ var hrefBak = $(this).attr('href-bak');
+ if(hrefBak)
+ {
+ $(this).addClass('iframe');
+ $(this).attr('href', hrefBak);
+ }
+ })
+ $.cookie('isFullScreen', 0);
+}
+
+document.addEventListener('fullscreenchange', function (e)
+{
+ if(!document.fullscreenElement) exitFullScreen();
+});
+
+document.addEventListener('webkitfullscreenchange', function (e)
+{
+ if(!document.webkitFullscreenElement) exitFullScreen();
+});
+
+document.addEventListener('mozfullscreenchange', function (e)
+{
+ if(!document.mozFullScreenElement) exitFullScreen();
+});
+
+document.addEventListener('msfullscreenChange', function (e)
+{
+ if(!document.msfullscreenElement) exitFullScreen();
+});
+
+/* Define drag and drop rules */
+if(!window.kanbanDropRules)
+{
+ window.kanbanDropRules =
+ {
+ story:
+ {
+ blacklog: true,
+ ready: ['blacklog', 'dev-doing'],
+ 'dev-doing': ['dev-done'],
+ 'dev-done': ['test-doing'],
+ 'test-doing': ['test-done'],
+ 'test-done': ['accepted'],
+ 'accepted': ['published'],
+ 'published': false,
+ }
+ }
+}
+
+/*
+ * Find drop columns
+ * @param {JQuery} $element Drag element
+ * @param {JQuery} $root Dnd root element
+ */
+function findDropColumns($element, $root)
+{
+ var $col = $element.closest('.kanban-col');
+ var col = $col.data();
+ var kanbanID = $root.data('id');
+ var kanbanRules = window.kanbanDropRules ? window.kanbanDropRules[kanbanID] : null;
+
+ if(!kanbanRules) return $root.find('.kanban-lane-col:not([data-type="' + col.type + '"])');
+
+ var colRules = kanbanRules[col.type];
+ var lane = $col.closest('.kanban-lane').data('lane');
+ return $root.find('.kanban-lane-col').filter(function()
+ {
+ if(!colRules) return false;
+ if(colRules === true) return true;
+
+ var $newCol = $(this);
+ var newCol = $newCol.data();
+ if(newCol.id === col.id) return false;
+
+ var $newLane = $newCol.closest('.kanban-lane');
+ var newLane = $newLane.data('lane');
+ var canDropHere = colRules.indexOf(newCol.type) > -1 && newLane.id === lane.id;
+ if(canDropHere) $newCol.addClass('can-drop-here');
+ return canDropHere;
+ });
+}
+
+/**
+ * Change column type for a card
+ * 变更卡片类型
+ * @param {Object} card Card object
+ * @param {String} fromColType The column type before change
+ * @param {String} toColType The column type after change
+ * @param {String} kanbanID Kanban ID
+ */
+function changeCardColType(card, fromColType, toColType, kanbanID)
+{
+ if(typeof card == 'undefined') return false;
+ var objectID = card.id;
+ var showIframe = false;
+
+ if(kanbanID == 'task')
+ {
+ if(toColType == 'developed')
+ {
+ if((fromColType == 'developing' || fromColType == 'wait') && priv.canFinishTask)
+ {
+ var link = createLink('task', 'finish', 'taskID=' + objectID, '', true);
+ showIframe = true;
+ }
+ }
+ else if(toColType == 'pause')
+ {
+ if(fromColType == 'developing' && priv.canPauseTask)
+ {
+ var link = createLink('task', 'pause', 'taskID=' + objectID, '', true);
+ showIframe = true;
+ }
+ }
+ else if(toColType == 'developing')
+ {
+ if((fromColType == 'pause' || fromColType == 'cancel' || fromColType == 'closed' || fromColType == 'developed') && priv.canActivateTask)
+ {
+ var link = createLink('task', 'activate', 'taskID=' + objectID, '', true);
+ showIframe = true;
+ }
+ if(fromColType == 'wait' && priv.canStartTask)
+ {
+ var link = createLink('task', 'start', 'taskID=' + objectID, '', true);
+ showIframe = true;
+ }
+ }
+ else if(toColType == 'canceled')
+ {
+ if((fromColType == 'developing' || fromColType == 'wait' || fromColType == 'pause') && priv.canCancelTask)
+ {
+ var link = createLink('task', 'cancel', 'taskID=' + objectID, '', true);
+ showIframe = true;
+ }
+ }
+ else if(toColType == 'closed')
+ {
+ if((fromColType == 'developed' || fromColType == 'canceled') && priv.canCloseTask)
+ {
+ var link = createLink('task', 'close', 'taskID=' + objectID, '', true);
+ showIframe = true;
+ }
+ }
+ }
+
+ if(showIframe)
+ {
+ var modalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: '80%', url: link});
+ modalTrigger.show();
+ }
+
+ /*
+ // TODO: The server must return a updated kanban data 服务器返回更新后的看板数据
+
+ // 调用 updateKanban 更新看板数据
+ updateKanban(kanbanID, newKanbanData);
+ */
+}
+
+/**
+ * Handle finish drop task
+ * @param {Object} event Event object
+ * @returns {void}
+ */
+function handleFinishDrop(event)
+{
+ var $card = $(event.element); // The drag card
+ var $dragCol = $card.closest('.kanban-lane-col');
+ var $dropCol = $(event.target);
+
+ /* Get d-n-d(drag and drop) infos 获取拖放操作相关信息 */
+ var card = $card.data('item');
+ var fromColType = $dragCol.data('type');
+ var toColType = $dropCol.data('type');
+ var kanbanID = $card.closest('.kanban').data('id');
+
+ changeCardColType(card, fromColType, toColType, kanbanID);
+
+ $('#kanbans').find('.can-drop-here').removeClass('can-drop-here');
+}
+
+/**
+ * Handle sort cards in column 处理对列卡片进行排序
+ */
+function handleSortColCards()
+{
+ /* TODO: handle sort cards from column contextmenu */
+ return false;
+}
+
+/**
+ * Create column menu 创建列操作菜单
+ * @returns {Object[]}
+ */
+function createColumnMenu(options)
+{
+ var $col = options.$trigger.closest('.kanban-col');
+ var col = $col.data('col');
+ var kanbanID = options.kanban;
+
+ var items = [];
+ if(priv.canEditName) items.push({label: executionLang.editName, url: $.createLink('kanban', 'setColumn', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe', attrs: {'data-width': '500px'}})
+ if(priv.canSetWIP) items.push({label: executionLang.setWIP, url: $.createLink('kanban', 'setWIP', 'col=' + col.columnID + '&executionID=' + executionID), className: 'iframe', attrs: {'data-width': '500px'}})
+ if(priv.canSortCards) items.push({label: executionLang.sortColumn, items: ['按ID倒序', '按ID顺序'], className: 'iframe', onClick: handleSortColCards})
+ return items;
+}
+
+/**
+ * Create column create button menu 创建列添加按钮操作菜单
+ * @returns {Object[]}
+ */
+function createColumnCreateMenu(options)
+{
+ var $col = options.$trigger.closest('.kanban-col');
+ var col = $col.data('col');
+ var items = [];
+
+ if(col.laneType == 'story')
+ {
+ if(priv.canCreateStory) items.push({label: storyLang.create, url: $.createLink('story', 'create', 'productID=' + productID, '', true), className: 'iframe'});
+ if(priv.canBatchCreateStory) items.push({label: executionLang.batchCreateStroy, url: $.createLink('story', 'batchcreate', 'productID=' + productID + '&branch=0&moduleID=0&storyID=0&executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
+ if(priv.canLinkStory) items.push({label: executionLang.linkStory, url: $.createLink('execution', 'linkStory', 'executionID=' + executionID, '', true), className: 'iframe', attrs: {'data-width': '90%'}});
+ if(priv.canLinkStoryByPlane) items.push({label: executionLang.linkStoryByPlan, url: '#linkStoryByPlan', 'attrs' : {'data-toggle': 'modal'}});
+ }
+ else if(col.laneType == 'bug')
+ {
+ if(priv.canCreateBug) items.push({label: bugLang.create, url: $.createLink('bug', 'create', 'productID=0&moduleID=0&extra=executionID=' + executionID, '', true), className: 'iframe'});
+ if(priv.canBatchCreateBug) items.push({label: bugLang.batchCreate, url: $.createLink('bug', 'batchcreate', 'productID=' + productID + '&moduleID=0&executionID=' + executionID, '', true), className: 'iframe'});
+ }
+ else
+ {
+ if(priv.canCreateTask) items.push({label: taskLang.create, url: $.createLink('task', 'create', 'executionID=' + executionID, '', true), className: 'iframe'});
+ if(priv.canBatchCreateTask) items.push({label: taskLang.batchCreate, url: $.createLink('task', 'batchcreate', 'executionID=' + executionID, '', true), className: 'iframe'});
+ }
+ return items;
+}
+
+/**
+ * Create lane menu 创建泳道操作菜单
+ * @returns {Object[]}
+ */
+function createLaneMenu(options)
+{
+ var $lane = options.$trigger.closest('.kanban-lane');
+ var $kanban = $lane.closest('.kanban');
+ var lane = $lane.data('lane');
+ var kanbanID = options.kanban;
+ var upTargetKanban = $kanban.prev('.kanban').length ? $kanban.prev('.kanban').data('id') : '';
+ var downTargetKanban = $kanban.next('.kanban').length ? $kanban.next('.kanban').data('id') : '';
+
+ var items = [];
+ if(priv.canSetLane) items.push({label: kanbanLang.setLane, icon: 'edit', url: $.createLink('kanban', 'setLane', 'lane=' + lane.laneID + '&executionID=' + executionID), className: 'iframe'});
+ if(priv.canMoveLane) items.push(
+ {label: kanbanLang.moveUp, icon: 'arrow-up', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '¤tLane=' + lane.id + '&targetLane=' + upTargetKanban), className: 'iframe', disabled: !$kanban.prev('.kanban').length},
+ {label: kanbanLang.moveDown, icon: 'arrow-down', url: $.createLink('kanban', 'laneMove', 'executionID=' + executionID + '¤tLane=' + lane.id + '&targetLane=' + downTargetKanban), className: 'iframe', disabled: !$kanban.next('.kanban').length}
+ );
+
+ var bounds = options.$trigger[0].getBoundingClientRect();
+ items.$options = {x: bounds.right, y: bounds.top};
+ return items;
+}
+
+/**
+ * Create story menu 创建需求卡片操作菜单
+ * @returns {Object[]}
+ */
+function createStoryMenu(options)
+{
+ var $card = options.$trigger.closest('.kanban-item');
+ var story = $card.data('item');
+
+ var items = [];
+ $.each(story.menus, function()
+ {
+ var item = {label: this.label, icon: this.icon, url: this.url, attrs: {'data-toggle': 'modal', 'data-type': 'iframe'}};
+ if(this.size) item.attrs['data-width'] = this.size;
+
+ if(this.icon == 'unlink') item = {label: this.label, icon: this.icon, url: this.url, attrs: {'target': 'hiddenwin'}};
+ items.push(item);
+ });
+
+ return items;
+}
+
+/**
+ * Create bug menu 创建 Bug 卡片操作菜单
+ * @returns {Object[]}
+ */
+function createBugMenu(options)
+{
+ var $card = options.$trigger.closest('.kanban-item');
+ var bug = $card.data('item');
+
+ var items = [];
+ $.each(bug.menus, function()
+ {
+ var item = {label: this.label, icon: this.icon, url: this.url, attrs: {'data-toggle': 'modal', 'data-type': 'iframe'}};
+ if(this.size) item.attrs['data-width'] = this.size;
+
+ items.push(item);
+ });
+
+ return items;
+}
+
+ /**
+ * Create task menu 创建任务卡片操作菜单
+ * @returns {Object[]}
+ */
+function createTaskMenu(options)
+{
+ var $card = options.$trigger.closest('.kanban-item');
+ var task = $card.data('item');
+
+ var items = [];
+ $.each(task.menus, function()
+ {
+ var item = {label: this.label, icon: this.icon, url: this.url, attrs: {'data-toggle': 'modal', 'data-type': 'iframe'}};
+ if(this.size) item.attrs['data-width'] = this.size;
+
+ items.push(item);
+ });
+
+ return items;
+}
+
+/** Resize kanban container size */
+function resizeKanbanContainer()
+{
+ var $container = $('#kanbanContainer');
+ var maxHeight = window.innerHeight - 98 - 15;
+ if($.cookie('isFullScreen') == 1) maxHeight = window.innerHeight - 15;
+ $container.children('.panel-body').css('max-height', maxHeight);
+}
+
+/* Define menu creators */
+window.menuCreators =
+{
+ column: createColumnMenu,
+ columnCreate: createColumnCreateMenu,
+ lane: createLaneMenu,
+ story: createStoryMenu,
+ bug: createBugMenu,
+ task: createTaskMenu,
+};
+
+/* Set kanban affix container */
+window.kanbanAffixContainer = '#kanbanContainer>.panel-body';
+
+/* Overload kanban default options */
+$.extend($.fn.kanban.Constructor.DEFAULTS,
+{
+ onRender: function()
+ {
+ var maxWidth = 0;
+ $('#kanbans .kanban-board').each(function()
+ {
+ maxWidth = Math.max(maxWidth, $(this).outerWidth());
+ });
+ $('#kanbans').css('min-width', maxWidth);
+ }
+});
+
+/* Example code: */
+$(function()
+{
+ $.cookie('isFullScreen', 0);
+
+ /* Common options 用于初始化看板的通用选项 */
+ var commonOptions =
+ {
+ maxColHeight: 'auto',
+ minColWidth: 240,
+ maxColWidth: 240,
+ showCount: true,
+ showZeroCount: true,
+ fluidBoardWidth: true,
+ droppable:
+ {
+ target: findDropColumns,
+ finish: handleFinishDrop,
+ mouseButton: 'left'
+ },
+ onRenderHeaderCol: renderHeaderCol,
+ onRenderLaneName: renderLaneName,
+ onRenderCount: renderColumnCount
+ };
+
+ /* Create kanban 创建看板 */
+ if(groupBy == 'default')
+ {
+ var kanbanLane = '';
+ for(var i in kanbanList)
+ {
+ if(kanbanList[i] == 'story') kanbanLane = kanbanGroup.story;
+ if(kanbanList[i] == 'bug') kanbanLane = kanbanGroup.bug;
+ if(kanbanList[i] == 'task') kanbanLane = kanbanGroup.task;
+
+ if(browseType == kanbanList[i] || browseType == 'all') createKanban(kanbanList[i], kanbanLane, commonOptions);
+ }
+ }
+ else
+ {
+ /* Create kanban by group. 分泳道创建看板. */
+ createKanban(browseType, kanbanGroup[groupBy], commonOptions);
+ }
+
+ /* Init iframe modals */
+ $(document).on('click', '#kanbans .iframe,.contextmenu-menu .iframe', function(event)
+ {
+ var $link = $(this);
+ if($link.data('zui.modaltrigger')) return;
+ $link.modalTrigger({show: true});
+ event.preventDefault();
+ });
+
+ /* Init contextmenu */
+ $('#kanbans').on('click', '[data-contextmenu]', function(event)
+ {
+ var $trigger = $(this);
+ var menuType = $trigger.data('contextmenu');
+
+ var menuCreator = window.menuCreators[menuType];
+ if(!menuCreator) return;
+
+ var options = $.extend({event, $trigger: $trigger}, $trigger.data());
+ var items = menuCreator(options);
+ if(!items || !items.length) return;
+
+ $.zui.ContextMenu.show(items, items.$options || {event: event});
+ });
+
+ /* Resize kanban container on window resize */
+ resizeKanbanContainer();
+ $(window).on('resize', resizeKanbanContainer);
+
+ /* Hide contextmenu when page scroll */
+ $(window).on('scroll', function()
+ {
+ $.zui.ContextMenu.hide();
+ });
+
+ $('#toStoryButton').on('click', function()
+ {
+ var planID = $('#plan').val();
+ if(planID)
+ {
+ location.href = createLink('execution', 'importPlanStories', 'executionID=' + executionID + '&planID=' + planID + '&productID=0&fromMethod=kanban');
+ }
+ })
+
+ $('#type_chosen .chosen-single span').prepend('');
+ $('#group_chosen .chosen-single span').prepend(kanbanLang.laneGroup + ': ');
+
+ /* Ajax update kanban. */
+ setInterval(function()
+ {
+ $.get(createLink('execution', 'ajaxUpdateKanban', "executionID=" + executionID + "&entertime=" + entertime + "&browseType=" + browseType + "&groupBy=" + groupBy), function(data)
+ {
+ if(data)
+ {
+ kanbanGroup = $.parseJSON(data);
+ if(groupBy == 'default')
+ {
+ var kanbanLane = '';
+ for(var i in kanbanList)
+ {
+ if(kanbanList[i] == 'story') kanbanLane = kanbanGroup.story;
+ if(kanbanList[i] == 'bug') kanbanLane = kanbanGroup.bug;
+ if(kanbanList[i] == 'task') kanbanLane = kanbanGroup.task;
+
+ if(browseType == kanbanList[i] || browseType == 'all') updateKanban(kanbanList[i], kanbanLane);
+ }
+ }
+ else
+ {
+ updateKanban(browseType, kanbanGroup[groupBy]);
+ }
+ }
+ });
+ }, 10000);
+});
+
+$('#type').change(function()
+{
+ var type = $('#type').val();
+ if(type != 'all')
+ {
+ $('.c-group').show();
+ $.get(createLink('execution', 'ajaxGetGroup', 'type=' + type), function(data)
+ {
+ $('#group_chosen').remove();
+ $('#group').replaceWith(data);
+ $('#group').chosen();
+ })
+ }
+
+ var link = createLink('execution', 'kanban', "executionID=" + executionID + '&type=' + type);
+ location.href = link;
+});
+
+$('.c-group').change(function()
+{
+ $('.c-group').show();
+
+ var type = $('#type').val();
+ var group = $('#group').val();
+ var link = createLink('execution', 'kanban', 'executionID=' + executionID + '&type=' + type + '&orderBy=order_asc' + '&groupBy=' + group);
+ location.href = link;
+});
diff --git a/module/execution/lang/de.php b/module/execution/lang/de.php
index 8e7837fbd6..4d0a8a8d43 100644
--- a/module/execution/lang/de.php
+++ b/module/execution/lang/de.php
@@ -376,6 +376,11 @@ $lang->execution->kanbanHideCols = 'Geschlossene und abgebrochene Spalten in K
$lang->execution->kanbanShowOption = 'Aufklappen';
$lang->execution->kanbanColsColor = 'Spaltenfarben';
+$lang->execution->kanbanViewList['all'] = 'All';
+$lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
+$lang->execution->kanbanViewList['bug'] = 'Bug';
+$lang->execution->kanbanViewList['task'] = 'Task';
+
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Möchten Sie die Einstellungen des Kanbans zurücksetzen?';
$lang->kanbanSetting->optionList['0'] = 'Verstecken';
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index cbfca1a77d..e0ee3196dd 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -10,97 +10,104 @@
* @link http://www.zentao.net
*/
/* Fields. */
-$lang->execution->allExecutions = 'All ' . $lang->execution->common . 's';
-$lang->execution->allExecutionAB = 'Execution List';
-$lang->execution->id = $lang->executionCommon . ' ID';
-$lang->execution->type = $lang->executionCommon . 'Type';
-$lang->execution->name = $lang->executionCommon . 'Name';
-$lang->execution->code = $lang->executionCommon . 'Code';
-$lang->execution->project = 'Project';
-$lang->execution->execName = 'Execution Name';
-$lang->execution->execCode = 'Execution Code';
-$lang->execution->execType = 'Execution Type';
-$lang->execution->stage = 'Stage';
-$lang->execution->pri = 'Priority';
-$lang->execution->openedBy = 'OpenedBy';
-$lang->execution->openedDate = 'OpenedDate';
-$lang->execution->closedBy = 'ClosedBy';
-$lang->execution->closedDate = 'ClosedDate';
-$lang->execution->canceledBy = 'CanceledBy';
-$lang->execution->canceledDate = 'CanceledDate';
-$lang->execution->begin = 'Begin';
-$lang->execution->end = 'End';
-$lang->execution->dateRange = 'Duration';
-$lang->execution->realBegan = 'Actual start';
-$lang->execution->realEnd = 'Actual end';
-$lang->execution->to = 'To';
-$lang->execution->days = 'Available Days';
-$lang->execution->day = ' Days';
-$lang->execution->workHour = ' Hours';
-$lang->execution->workHourUnit = 'H';
-$lang->execution->totalHours = 'Available Hours';
-$lang->execution->totalDays = 'Available Days';
-$lang->execution->status = $lang->executionCommon . 'Status';
-$lang->execution->execStatus = 'Status';
-$lang->execution->subStatus = 'Sub Status';
-$lang->execution->desc = $lang->executionCommon . 'Description';
-$lang->execution->execDesc = 'Description';
-$lang->execution->owner = 'Owner';
-$lang->execution->PO = "{$lang->executionCommon} Owner";
-$lang->execution->PM = "{$lang->executionCommon} Manager";
-$lang->execution->execPM = "Execution Manager";
-$lang->execution->QD = 'Test Manager';
-$lang->execution->RD = 'Release Manager';
-$lang->execution->release = 'Release';
-$lang->execution->acl = 'Access Control';
-$lang->execution->teamname = 'Team Name';
-$lang->execution->updateOrder = 'Rank';
-$lang->execution->order = "Rank {$lang->executionCommon}";
-$lang->execution->orderAB = "Rank";
-$lang->execution->products = "Link {$lang->productCommon}";
-$lang->execution->whitelist = 'Whitelist';
-$lang->execution->addWhitelist = 'Add Whitelist';
-$lang->execution->unbindWhitelist = 'Remove Whitelist';
-$lang->execution->totalEstimate = 'Estimates';
-$lang->execution->totalConsumed = 'Cost';
-$lang->execution->totalLeft = 'Left';
-$lang->execution->progress = ' Progress';
-$lang->execution->hours = 'Estimates: %s, Cost: %s, Left: %s.';
-$lang->execution->viewBug = 'Bugs';
-$lang->execution->noProduct = "No {$lang->productCommon} yet.";
-$lang->execution->createStory = "Create Story";
-$lang->execution->storyTitle = "Story Name";
-$lang->execution->all = "All {$lang->executionCommon}s";
-$lang->execution->undone = 'Unfinished ';
-$lang->execution->unclosed = 'Unclosed';
-$lang->execution->typeDesc = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features.";
-$lang->execution->mine = 'Mine: ';
-$lang->execution->involved = 'Mine';
-$lang->execution->other = 'Others';
-$lang->execution->deleted = 'Deleted';
-$lang->execution->delayed = 'Delayed';
-$lang->execution->product = $lang->execution->products;
-$lang->execution->readjustTime = "Adjust {$lang->executionCommon} Begin and End";
-$lang->execution->readjustTask = 'Adjust Task Begin and End';
-$lang->execution->effort = 'Effort';
-$lang->execution->storyEstimate = 'Story Estimate';
-$lang->execution->newEstimate = 'New Estimate';
-$lang->execution->reestimate = 'Reestimate';
-$lang->execution->selectRound = 'Select Round';
-$lang->execution->average = 'Average';
-$lang->execution->relatedMember = 'Team';
-$lang->execution->watermark = 'Exported by ZenTao';
-$lang->execution->burnXUnit = '(Date)';
-$lang->execution->burnYUnit = '(Hours)';
-$lang->execution->waitTasks = 'Waiting Tasks';
-$lang->execution->viewByUser = 'By User';
-$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}";
-$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}";
-$lang->execution->recent = 'Recent visits: ';
-$lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.';
-$lang->execution->noTeam = 'No team members at the moment';
-$lang->execution->or = ' or ';
-$lang->execution->selectProject = 'Please select project';
+$lang->execution->allExecutions = 'All ' . $lang->execution->common . 's';
+$lang->execution->allExecutionAB = 'Execution List';
+$lang->execution->id = $lang->executionCommon . ' ID';
+$lang->execution->type = $lang->executionCommon . 'Type';
+$lang->execution->name = $lang->executionCommon . 'Name';
+$lang->execution->code = $lang->executionCommon . 'Code';
+$lang->execution->project = 'Project';
+$lang->execution->execName = 'Execution Name';
+$lang->execution->execCode = 'Execution Code';
+$lang->execution->execType = 'Execution Type';
+$lang->execution->stage = 'Stage';
+$lang->execution->pri = 'Priority';
+$lang->execution->openedBy = 'OpenedBy';
+$lang->execution->openedDate = 'OpenedDate';
+$lang->execution->closedBy = 'ClosedBy';
+$lang->execution->closedDate = 'ClosedDate';
+$lang->execution->canceledBy = 'CanceledBy';
+$lang->execution->canceledDate = 'CanceledDate';
+$lang->execution->begin = 'Begin';
+$lang->execution->end = 'End';
+$lang->execution->dateRange = 'Duration';
+$lang->execution->realBeganAB = 'Actual Begin';
+$lang->execution->realEndAB = 'Actual End';
+$lang->execution->realBegan = 'Actual Begin';
+$lang->execution->realEnd = 'Actual End';
+$lang->execution->to = 'To';
+$lang->execution->days = ' Days';
+$lang->execution->day = ' Days';
+$lang->execution->workHour = ' Hours';
+$lang->execution->workHourUnit = 'H';
+$lang->execution->totalHours = ' Hours';
+$lang->execution->totalDays = ' Days';
+$lang->execution->status = $lang->executionCommon . 'Status';
+$lang->execution->execStatus = 'Status';
+$lang->execution->subStatus = 'Sub Status';
+$lang->execution->desc = $lang->executionCommon . 'Description';
+$lang->execution->execDesc = 'Description';
+$lang->execution->owner = 'Owner';
+$lang->execution->PO = "{$lang->executionCommon} Owner";
+$lang->execution->PM = "{$lang->executionCommon} Manager";
+$lang->execution->execPM = "Execution Manager";
+$lang->execution->QD = 'Test Manager';
+$lang->execution->RD = 'Release Manager';
+$lang->execution->release = 'Release';
+$lang->execution->acl = 'Access Control';
+$lang->execution->teamname = 'Team Name';
+$lang->execution->updateOrder = 'Rank';
+$lang->execution->order = "Rank {$lang->executionCommon}";
+$lang->execution->orderAB = "Rank";
+$lang->execution->products = "Link {$lang->productCommon}";
+$lang->execution->whitelist = 'Whitelist';
+$lang->execution->addWhitelist = 'Add Whitelist';
+$lang->execution->unbindWhitelist = 'Remove Whitelist';
+$lang->execution->totalEstimate = 'Estimates';
+$lang->execution->totalConsumed = 'Cost';
+$lang->execution->totalLeft = 'Left';
+$lang->execution->progress = ' Progress';
+$lang->execution->hours = 'Estimates: %s, Cost: %s, Left: %s.';
+$lang->execution->viewBug = 'Bugs';
+$lang->execution->noProduct = "No {$lang->productCommon} yet.";
+$lang->execution->createStory = "Create Story";
+$lang->execution->storyTitle = "Story Name";
+$lang->execution->all = "All {$lang->executionCommon}s";
+$lang->execution->undone = 'Unfinished ';
+$lang->execution->unclosed = 'Unclosed';
+$lang->execution->typeDesc = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features.";
+$lang->execution->mine = 'Mine: ';
+$lang->execution->involved = 'Mine';
+$lang->execution->other = 'Others';
+$lang->execution->deleted = 'Deleted';
+$lang->execution->delayed = 'Delayed';
+$lang->execution->product = $lang->execution->products;
+$lang->execution->readjustTime = "Adjust {$lang->executionCommon} Begin and End";
+$lang->execution->readjustTask = 'Adjust Task Begin and End';
+$lang->execution->effort = 'Effort';
+$lang->execution->storyEstimate = 'Story Estimate';
+$lang->execution->newEstimate = 'New Estimate';
+$lang->execution->reestimate = 'Reestimate';
+$lang->execution->selectRound = 'Select Round';
+$lang->execution->average = 'Average';
+$lang->execution->relatedMember = 'Team';
+$lang->execution->watermark = 'Exported by ZenTao';
+$lang->execution->burnXUnit = '(Date)';
+$lang->execution->burnYUnit = '(Hours)';
+$lang->execution->waitTasks = 'Waiting Tasks';
+$lang->execution->viewByUser = 'By User';
+$lang->execution->oneProduct = "Only one stage can be linked {$lang->productCommon}";
+$lang->execution->noLinkProduct = "Stage not linked {$lang->productCommon}";
+$lang->execution->recent = 'Recent visits: ';
+$lang->execution->copyNoExecution = 'There are no ' . $lang->executionCommon . 'available to copy.';
+$lang->execution->noTeam = 'No team members at the moment';
+$lang->execution->or = ' or ';
+$lang->execution->selectProject = 'Please select project';
+$lang->execution->editName = 'Edit Name';
+$lang->execution->setWIP = 'WIP Settings';
+$lang->execution->sortColumn = 'Kanban Card Sorting';
+$lang->execution->batchCreateStroy = "Batch create {$lang->SRCommon}";
+$lang->execution->batchCreateTask = 'Batch create task';
/* Fields of zt_team. */
$lang->execution->root = 'Root';
@@ -311,6 +318,7 @@ $lang->execution->byPeriod = 'By Time';
$lang->execution->byUser = 'By User';
$lang->execution->noExecution = "No {$lang->executionCommon}. ";
$lang->execution->noExecutions = "No {$lang->execution->common}.";
+$lang->execution->noPrintData = "No data can be printed.";
$lang->execution->noMembers = 'No team members yet. ';
$lang->execution->workloadTotal = "The cumulative workload ratio should not exceed 100, and the total workload under the current product is: %s";
// $lang->execution->linkProjectStoryTip = "(Link {$lang->SRCommon} comes from {$lang->SRCommon} linked under the execution)";
@@ -347,6 +355,10 @@ $lang->execution->unfinishedTask = "[%s] unfinished tasks. ";
$lang->execution->unresolvedBug = "[%s] unresolved bugs. ";
$lang->execution->projectNotEmpty = 'Project cannot be empty.';
$lang->execution->confirmStoryToTask = $lang->SRCommon . '%s are converted to tasks in the current. Do you want to convert them anyways?';
+$lang->execution->realBeganNotEmpty = 'Actual Begin should not be empty.';
+$lang->execution->realBeganNotFuture = 'Actual Begin should be < = today.';
+$lang->execution->realEndNotEmpty = 'Actual End should not be empty.';
+$lang->execution->realEndNotFuture = 'Actual End should be < = today.';
/* Statistics. */
$lang->execution->charts = new stdclass();
@@ -381,12 +393,18 @@ $lang->execution->kanban = "Kanban";
$lang->execution->kanbanSetting = "Settings";
$lang->execution->resetKanban = "Reset";
$lang->execution->printKanban = "Print";
+$lang->execution->fullScreen = "Full Screen";
$lang->execution->bugList = "Bugs";
$lang->execution->kanbanHideCols = 'Closed & Cancelled Columns';
$lang->execution->kanbanShowOption = 'Unfold';
$lang->execution->kanbanColsColor = 'Customize Column Color';
+$lang->execution->kanbanViewList['all'] = 'All';
+$lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
+$lang->execution->kanbanViewList['bug'] = 'Bug';
+$lang->execution->kanbanViewList['task'] = 'Task';
+
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Do you want to reset Kanban?';
$lang->kanbanSetting->optionList['0'] = 'Hide';
@@ -427,7 +445,7 @@ $lang->execution->doingProject = 'Ongoing Projects';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . ' ' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . ' ' . $lang->execution->common;
-$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . ' ' . $lang->execution->common;
+$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . ' ' . $lang->execution->common . '(The recent two executions)';
$lang->execution->treeLevel = array();
$lang->execution->treeLevel['all'] = 'Expand All';
diff --git a/module/execution/lang/fr.php b/module/execution/lang/fr.php
index bb698b546b..5d769daf4f 100644
--- a/module/execution/lang/fr.php
+++ b/module/execution/lang/fr.php
@@ -376,6 +376,11 @@ $lang->execution->kanbanHideCols = 'Colonnes masquées';
$lang->execution->kanbanShowOption = 'Déplier';
$lang->execution->kanbanColsColor = 'Personnalisation Couleurs';
+$lang->execution->kanbanViewList['all'] = 'All';
+$lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
+$lang->execution->kanbanViewList['bug'] = 'Bug';
+$lang->execution->kanbanViewList['task'] = 'Task';
+
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Voulez-vous réinitialiser le tableau Kanban ?';
$lang->kanbanSetting->optionList['0'] = 'Masquer';
diff --git a/module/execution/lang/vi.php b/module/execution/lang/vi.php
index c6bfcd7051..865839cfd3 100644
--- a/module/execution/lang/vi.php
+++ b/module/execution/lang/vi.php
@@ -377,6 +377,11 @@ $lang->execution->kanbanHideCols = 'Cột Đã đóng & đã hủy';
$lang->execution->kanbanShowOption = 'Mở ra';
$lang->execution->kanbanColsColor = 'Tùy biến màu cột';
+$lang->execution->kanbanViewList['all'] = 'All';
+$lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}";
+$lang->execution->kanbanViewList['bug'] = 'Bug';
+$lang->execution->kanbanViewList['task'] = 'Task';
+
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = 'Bạn có muốn thiết lập lại Kanban?';
$lang->kanbanSetting->optionList['0'] = 'Ẩn';
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 4c4b5436eb..ff3f9d29b5 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -10,98 +10,105 @@
* @link http://www.zentao.net
*/
/* 字段列表。*/
-$lang->execution->allExecutions = '所有' . $lang->execution->common;
-$lang->execution->allExecutionAB = "{$lang->execution->common}列表";
-$lang->execution->id = $lang->executionCommon . '编号';
-$lang->execution->type = $lang->executionCommon . '类型';
-$lang->execution->name = $lang->executionCommon . '名称';
-$lang->execution->code = $lang->executionCommon . '代号';
-$lang->execution->project = '所属项目';
-$lang->execution->execName = "{$lang->execution->common}名称";
-$lang->execution->execCode = "{$lang->execution->common}代号";
-$lang->execution->execType = "{$lang->execution->common}类型";
-$lang->execution->stage = '阶段';
-$lang->execution->pri = '优先级';
-$lang->execution->openedBy = '由谁创建';
-$lang->execution->openedDate = '创建日期';
-$lang->execution->closedBy = '由谁关闭';
-$lang->execution->closedDate = '关闭日期';
-$lang->execution->canceledBy = '由谁取消';
-$lang->execution->canceledDate = '取消日期';
-$lang->execution->begin = '开始日期';
-$lang->execution->end = '截止日期';
-$lang->execution->dateRange = '起始日期';
-$lang->execution->realBegan = '实际开始';
-$lang->execution->realEnd = '实际结束';
-$lang->execution->to = '至';
-$lang->execution->days = '可用工作日';
-$lang->execution->day = '天';
-$lang->execution->workHour = '工时';
-$lang->execution->workHourUnit = 'h';
-$lang->execution->totalHours = '可用工时';
-$lang->execution->totalDays = '可用工日';
-$lang->execution->status = $lang->executionCommon . '状态';
-$lang->execution->execStatus = "{$lang->execution->common}状态";
-$lang->execution->subStatus = '子状态';
-$lang->execution->desc = $lang->executionCommon . '描述';
-$lang->execution->execDesc = "{$lang->execution->common}描述";
-$lang->execution->owner = '负责人';
-$lang->execution->PO = $lang->productCommon . '负责人';
-$lang->execution->PM = $lang->executionCommon . '负责人';
-$lang->execution->execPM = "{$lang->execution->common}负责人";
-$lang->execution->QD = '测试负责人';
-$lang->execution->RD = '发布负责人';
-$lang->execution->release = '发布';
-$lang->execution->acl = '访问控制';
-$lang->execution->teamname = '团队名称';
-$lang->execution->updateOrder = '排序';
-$lang->execution->order = $lang->executionCommon . '排序';
-$lang->execution->orderAB = '排序';
-$lang->execution->products = '相关' . $lang->productCommon;
-$lang->execution->whitelist = '白名单';
-$lang->execution->addWhitelist = '添加白名单';
-$lang->execution->unbindWhitelist = '删除白名单';
-$lang->execution->totalEstimate = '预计';
-$lang->execution->totalConsumed = '消耗';
-$lang->execution->totalLeft = '剩余';
-$lang->execution->progress = '进度';
-$lang->execution->hours = '预计 %s 消耗 %s 剩余 %s';
-$lang->execution->viewBug = '查看bug';
-$lang->execution->noProduct = "无{$lang->executionCommon}";
-$lang->execution->createStory = "提{$lang->SRCommon}";
-$lang->execution->storyTitle = "{$lang->SRCommon}名称";
-$lang->execution->all = '所有';
-$lang->execution->undone = '未完成';
-$lang->execution->unclosed = '未关闭';
-$lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。";
-$lang->execution->mine = '我负责：';
-$lang->execution->involved = '我参与';
-$lang->execution->other = '其他';
-$lang->execution->deleted = '已删除';
-$lang->execution->delayed = '已延期';
-$lang->execution->product = $lang->execution->products;
-$lang->execution->readjustTime = "调整{$lang->executionCommon}起止时间";
-$lang->execution->readjustTask = '顺延任务的起止时间';
-$lang->execution->effort = '日志';
-$lang->execution->storyEstimate = '需求估算';
-$lang->execution->newEstimate = '新一轮估算';
-$lang->execution->reestimate = '重新估算';
-$lang->execution->selectRound = '选择轮次';
-$lang->execution->average = '平均值';
-$lang->execution->relatedMember = '相关成员';
-$lang->execution->watermark = '由禅道导出';
-$lang->execution->burnXUnit = '(日期)';
-$lang->execution->burnYUnit = '(工时)';
-$lang->execution->waitTasks = '待处理';
-$lang->execution->viewByUser = '按用户查看';
-$lang->execution->oneProduct = "阶段只能关联一个{$lang->productCommon}";
-$lang->execution->noLinkProduct = "阶段没有关联{$lang->productCommon}";
-$lang->execution->recent = '近期访问：';
-$lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制';
-$lang->execution->noTeam = '暂时没有团队成员';
-$lang->execution->or = '或';
-$lang->execution->selectProject = '请选择项目';
-$lang->execution->unfoldClosed = '展开已结束';
+$lang->execution->allExecutions = '所有' . $lang->execution->common;
+$lang->execution->allExecutionAB = "{$lang->execution->common}列表";
+$lang->execution->id = $lang->executionCommon . '编号';
+$lang->execution->type = $lang->executionCommon . '类型';
+$lang->execution->name = $lang->executionCommon . '名称';
+$lang->execution->code = $lang->executionCommon . '代号';
+$lang->execution->project = '所属项目';
+$lang->execution->execName = "{$lang->execution->common}名称";
+$lang->execution->execCode = "{$lang->execution->common}代号";
+$lang->execution->execType = "{$lang->execution->common}类型";
+$lang->execution->stage = '阶段';
+$lang->execution->pri = '优先级';
+$lang->execution->openedBy = '由谁创建';
+$lang->execution->openedDate = '创建日期';
+$lang->execution->closedBy = '由谁关闭';
+$lang->execution->closedDate = '关闭日期';
+$lang->execution->canceledBy = '由谁取消';
+$lang->execution->canceledDate = '取消日期';
+$lang->execution->begin = '计划开始';
+$lang->execution->end = '计划完成';
+$lang->execution->dateRange = '起始日期';
+$lang->execution->realBeganAB = '实际开始';
+$lang->execution->realEndAB = '实际完成';
+$lang->execution->realBegan = '实际开始日期';
+$lang->execution->realEnd = '实际完成日期';
+$lang->execution->to = '至';
+$lang->execution->days = '可用工作日';
+$lang->execution->day = '天';
+$lang->execution->workHour = '工时';
+$lang->execution->workHourUnit = 'h';
+$lang->execution->totalHours = '可用工时';
+$lang->execution->totalDays = '可用工日';
+$lang->execution->status = $lang->executionCommon . '状态';
+$lang->execution->execStatus = "{$lang->execution->common}状态";
+$lang->execution->subStatus = '子状态';
+$lang->execution->desc = $lang->executionCommon . '描述';
+$lang->execution->execDesc = "{$lang->execution->common}描述";
+$lang->execution->owner = '负责人';
+$lang->execution->PO = $lang->productCommon . '负责人';
+$lang->execution->PM = $lang->executionCommon . '负责人';
+$lang->execution->execPM = "{$lang->execution->common}负责人";
+$lang->execution->QD = '测试负责人';
+$lang->execution->RD = '发布负责人';
+$lang->execution->release = '发布';
+$lang->execution->acl = '访问控制';
+$lang->execution->teamname = '团队名称';
+$lang->execution->updateOrder = '排序';
+$lang->execution->order = $lang->executionCommon . '排序';
+$lang->execution->orderAB = '排序';
+$lang->execution->products = '相关' . $lang->productCommon;
+$lang->execution->whitelist = '白名单';
+$lang->execution->addWhitelist = '添加白名单';
+$lang->execution->unbindWhitelist = '删除白名单';
+$lang->execution->totalEstimate = '预计';
+$lang->execution->totalConsumed = '消耗';
+$lang->execution->totalLeft = '剩余';
+$lang->execution->progress = '进度';
+$lang->execution->hours = '预计 %s 消耗 %s 剩余 %s';
+$lang->execution->viewBug = '查看bug';
+$lang->execution->noProduct = "无{$lang->executionCommon}";
+$lang->execution->createStory = "提{$lang->SRCommon}";
+$lang->execution->storyTitle = "{$lang->SRCommon}名称";
+$lang->execution->all = '所有';
+$lang->execution->undone = '未完成';
+$lang->execution->unclosed = '未关闭';
+$lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。";
+$lang->execution->mine = '我负责：';
+$lang->execution->involved = '我参与';
+$lang->execution->other = '其他';
+$lang->execution->deleted = '已删除';
+$lang->execution->delayed = '已延期';
+$lang->execution->product = $lang->execution->products;
+$lang->execution->readjustTime = "调整{$lang->executionCommon}起止时间";
+$lang->execution->readjustTask = '顺延任务的起止时间';
+$lang->execution->effort = '日志';
+$lang->execution->storyEstimate = '需求估算';
+$lang->execution->newEstimate = '新一轮估算';
+$lang->execution->reestimate = '重新估算';
+$lang->execution->selectRound = '选择轮次';
+$lang->execution->average = '平均值';
+$lang->execution->relatedMember = '相关成员';
+$lang->execution->watermark = '由禅道导出';
+$lang->execution->burnXUnit = '(日期)';
+$lang->execution->burnYUnit = '(工时)';
+$lang->execution->waitTasks = '待处理';
+$lang->execution->viewByUser = '按用户查看';
+$lang->execution->oneProduct = "阶段只能关联一个{$lang->productCommon}";
+$lang->execution->noLinkProduct = "阶段没有关联{$lang->productCommon}";
+$lang->execution->recent = '近期访问：';
+$lang->execution->copyNoExecution = '没有可用的' . $lang->executionCommon . '来复制';
+$lang->execution->noTeam = '暂时没有团队成员';
+$lang->execution->or = '或';
+$lang->execution->selectProject = '请选择项目';
+$lang->execution->unfoldClosed = '展开已结束';
+$lang->execution->editName = '编辑名称';
+$lang->execution->setWIP = '在制品数量设置（WIP）';
+$lang->execution->sortColumn = '看板列卡片排序';
+$lang->execution->batchCreateStroy = "批量新建{$lang->SRCommon}";
+$lang->execution->batchCreateTask = '批量建任务';
/* Fields of zt_team. */
$lang->execution->root = '源ID';
@@ -312,6 +319,7 @@ $lang->execution->byPeriod = '按时间段';
$lang->execution->byUser = '按用户';
$lang->execution->noExecution = "暂时没有{$lang->executionCommon}。";
$lang->execution->noExecutions = "暂时没有{$lang->execution->common}。";
+$lang->execution->noPrintData = "暂无数据可打印";
$lang->execution->noMembers = '暂时没有团队成员。';
$lang->execution->workloadTotal = "工作量占比累计不应当超过100, 当前产品下的工作量之和为%s";
// $lang->execution->linkProjectStoryTip = "(关联{$lang->SRCommon}来源于项目下所关联的{$lang->SRCommon})";
@@ -348,6 +356,10 @@ $lang->execution->unfinishedTask = "[%s]个未完成的任务，";
$lang->execution->unresolvedBug = "[%s]个未解决的bug，";
$lang->execution->projectNotEmpty = '所属项目不能为空。';
$lang->execution->confirmStoryToTask = '%s' . $lang->SRCommon . '已经在当前' . $lang->execution->common . '中转了任务，请确认是否重复转任务。';
+$lang->execution->realBeganNotEmpty = "实际开始不能为空。";
+$lang->execution->realBeganNotFuture = "实际开始不能大于当前日期。";
+$lang->execution->realEndNotEmpty = "实际完成不能为空。";
+$lang->execution->realEndNotFuture = "实际完成不能大于当前日期。";
/* 统计。*/
$lang->execution->charts = new stdclass();
@@ -382,12 +394,18 @@ $lang->execution->kanban = "看板";
$lang->execution->kanbanSetting = "看板设置";
$lang->execution->resetKanban = "恢复默认";
$lang->execution->printKanban = "打印看板";
+$lang->execution->fullScreen = "看板全屏展示";
$lang->execution->bugList = "Bug列表";
$lang->execution->kanbanHideCols = '看板隐藏已关闭、已取消列';
$lang->execution->kanbanShowOption = '显示折叠信息';
$lang->execution->kanbanColsColor = '看板列自定义颜色';
+$lang->execution->kanbanViewList['all'] = '综合看板';
+$lang->execution->kanbanViewList['story'] = "{$lang->SRCommon}看板";
+$lang->execution->kanbanViewList['bug'] = 'Bug看板';
+$lang->execution->kanbanViewList['task'] = '任务看板';
+
$lang->kanbanSetting = new stdclass();
$lang->kanbanSetting->noticeReset = '是否恢复看板默认设置？';
$lang->kanbanSetting->optionList['0'] = '隐藏';
@@ -428,7 +446,7 @@ $lang->execution->doingProject = '进行中的项目';
$lang->execution->kanbanColType['wait'] = $lang->execution->statusList['wait'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['doing'] = $lang->execution->statusList['doing'] . '的' . $lang->execution->common;
$lang->execution->kanbanColType['suspended'] = $lang->execution->statusList['suspended'] . '的' . $lang->execution->common;
-$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . '的' . $lang->execution->common;
+$lang->execution->kanbanColType['closed'] = $lang->execution->statusList['closed'] . '的' . $lang->execution->common . '(最近2期)';
$lang->execution->treeLevel = array();
$lang->execution->treeLevel['all'] = '全部展开';
diff --git a/module/execution/model.php b/module/execution/model.php
index 48d3a3c477..bdbdca88a0 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -381,6 +381,8 @@ class executionModel extends model
$creatorExists = false;
$teamMembers = array();
+ $this->loadModel('kanban')->createLanes($executionID);
+
/* Save order. */
$this->dao->update(TABLE_EXECUTION)->set('`order`')->eq($executionID * 5)->where('id')->eq($executionID)->exec();
$this->file->updateObjectID($this->post->uid, $executionID, 'execution');
@@ -710,14 +712,24 @@ class executionModel extends model
$now = helper::now();
$execution = fixer::input('post')
- ->add('realBegan', helper::today())
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->remove('comment')->get();
+
+ if($execution->realBegan == '')
+ {
+ dao::$errors['realBegan'] = $this->lang->execution->realBeganNotEmpty;
+ return false;
+ }
+ if($execution->realBegan > helper::today())
+ {
+ dao::$errors['realBegan'] = $this->lang->execution->realBeganNotFuture;
+ return false;
+ }
$this->dao->update(TABLE_EXECUTION)->data($execution)->autoCheck()->where('id')->eq((int)$executionID)->exec();
-
+
if(!dao::isError()) return common::createChanges($oldExecution, $execution);
}
@@ -789,6 +801,7 @@ class executionModel extends model
$now = helper::now();
$execution = fixer::input('post')
+ ->setDefault('realEnd', '')
->setDefault('status', 'doing')
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
@@ -858,18 +871,30 @@ class executionModel extends model
$execution = fixer::input('post')
->setDefault('status', 'closed')
- ->setDefault('realEnd', helper::today())
->setDefault('closedBy', $this->app->user->account)
->setDefault('closedDate', $now)
->setDefault('lastEditedBy', $this->app->user->account)
->setDefault('lastEditedDate', $now)
->remove('comment')
->get();
+
+ if($execution->realEnd == '')
+ {
+ dao::$errors['realEnd'] = $this->lang->execution->realEndNotEmpty;
+ return false;
+ }
+
+ if($execution->realEnd > helper::today())
+ {
+ dao::$errors['realEnd'] = $this->lang->execution->realEndNotFuture;
+ return false;
+ }
$this->dao->update(TABLE_EXECUTION)->data($execution)
->autoCheck()
->where('id')->eq((int)$executionID)
->exec();
+
if(!dao::isError())
{
$this->loadModel('score')->create('execution', 'close', $oldExecution);
@@ -1340,6 +1365,10 @@ class executionModel extends model
{
$link = helper::createLink('doc', $method, "type=execution&objectID=%s&from=execution");
}
+ elseif(in_array($module, array('issue', 'risk', 'opportunity', 'pssp', 'auditplan', 'nc', 'meeting')))
+ {
+ $link = helper::createLink($module, 'browse', "executionID=%s&from=execution");
+ }
else
{
$link = helper::createLink($module, $method, "executionID=%s");
@@ -1711,7 +1740,8 @@ class executionModel extends model
*/
public function buildStorySearchForm($products, $branchGroups, $modules, $queryID, $actionURL, $type = 'executionStory', $objectID = 0)
{
- $branchPairs = array();
+ $this->app->loadLang('branch');
+ $branchPairs = array(BRANCH_MAIN => $this->lang->branch->main);
$productType = 'normal';
$productNum = count($products);
$productPairs = array(0 => '');
@@ -1727,18 +1757,9 @@ class executionModel extends model
foreach($branches[$product->id] as $branchID => $branch)
{
if(!isset($branchGroups[$product->id][$branchID])) continue;
- $branchPairs[$branchID] = ((count($products) > 1) ? $product->name . '/' : '') . $branchGroups[$product->id][$branchID];
+ if($branchID != BRANCH_MAIN) $branchPairs[$branchID] = ((count($products) > 1) ? $product->name . '/' : '') . $branchGroups[$product->id][$branchID];
}
}
- else
- {
- $productBranches = isset($branchGroups[$product->id]) ? $branchGroups[$product->id] : array(0);
- if(count($products) > 1)
- {
- foreach($productBranches as $branchID => $branchName) $productBranches[$branchID] = $product->name . '/' . $branchName;
- }
- $branchPairs += $productBranches;
- }
}
}
@@ -1752,7 +1773,16 @@ class executionModel extends model
$this->config->product->search['actionURL'] = $actionURL;
$this->config->product->search['queryID'] = $queryID;
$this->config->product->search['params']['product']['values'] = $productPairs + array('all' => $this->lang->product->allProductsOfProject);
- $this->config->product->search['params']['plan']['values'] = $this->loadModel('productplan')->getForProducts($products);
+
+ $this->loadModel('productplan');
+ $plans = array();
+ $planPairs = array('' => '');
+ foreach($products as $productID => $product)
+ {
+ $plans = $this->productplan->getBranchPlanPairs($productID, array(BRANCH_MAIN) + $product->branches, true);
+ foreach($plans as $plan) $planPairs += $plan;
+ }
+ $this->config->product->search['params']['plan']['values'] = $planPairs;
$this->config->product->search['params']['module']['values'] = $modules;
if($productType == 'normal')
{
@@ -3186,7 +3216,7 @@ class executionModel extends model
->andWhere('t1.parent')->ge(0)
->orderBy($orderBy)
->page($pager)
- ->fetchAll();
+ ->fetchAll('id');
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'task');
@@ -3657,14 +3687,15 @@ class executionModel extends model
* Get plans by $productID.
*
* @param int|array $productID
- *
+ * @param string $param withMainPlan|skipParent
* @return mixed
*/
- public function getPlans($products)
+ public function getPlans($products, $param = '')
{
$this->loadModel('productplan');
- $branchIDList = array();
+ $param = strtolower($param);
+ $branchIDList = strpos($param, 'withmainplan') !== false ? array(BRANCH_MAIN => BRANCH_MAIN) : array();
foreach($products as $product)
{
foreach($product->branches as $branchID) $branchIDList[$branchID] = $branchID;
@@ -3674,6 +3705,7 @@ class executionModel extends model
->where('product')->in(array_keys($products))
->andWhere('deleted')->eq(0)
->andWhere('branch')->in($branchIDList)->fi()
+ ->beginIF(strpos($param, 'skipparent') !== false)->andWhere('parent')->ne(-1)->fi()
->orderBy('begin desc')
->fetchAll('id');
diff --git a/module/execution/view/activate.html.php b/module/execution/view/activate.html.php
index d8f34124cc..7cb5cd726b 100644
--- a/module/execution/view/activate.html.php
+++ b/module/execution/view/activate.html.php
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang
- * @package execution
+ * @package execution
* @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
* @link http://www.zentao.net
*/
@@ -59,7 +59,7 @@
《Z PUBLIC LICENSE授权协议1.2》。未经许可，不得去除、隐藏或遮掩禅道软件的任何标志及链接。";
$lang->designedByAIUX = " 艾体验设计";
-$lang->reset = '重填';
-$lang->cancel = '取消';
-$lang->refresh = '刷新';
-$lang->edit = '编辑';
-$lang->delete = '删除';
-$lang->close = '关闭';
-$lang->unlink = '移除';
-$lang->import = '导入';
-$lang->export = '导出';
-$lang->setFileName = '文件名：';
-$lang->submitting = '稍候...';
-$lang->save = '保存';
-$lang->confirm = '确认';
-$lang->preview = '查看';
-$lang->goback = '返回';
-$lang->goPC = 'PC版';
-$lang->more = '更多';
-$lang->moreLink = 'More';
-$lang->day = '天';
-$lang->customConfig = '自定义';
-$lang->public = '公共';
-$lang->trunk = '主干';
-$lang->sort = '排序';
-$lang->required = '必填';
-$lang->noData = '暂无';
-$lang->fullscreen = '全屏';
-$lang->retrack = '收起';
-$lang->whitelist = '访问白名单';
+$lang->reset = '重填';
+$lang->cancel = '取消';
+$lang->refresh = '刷新';
+$lang->create = '新建';
+$lang->edit = '编辑';
+$lang->delete = '删除';
+$lang->close = '关闭';
+$lang->unlink = '移除';
+$lang->import = '导入';
+$lang->export = '导出';
+$lang->setFileName = '文件名：';
+$lang->submitting = '稍候...';
+$lang->save = '保存';
+$lang->confirm = '确认';
+$lang->preview = '查看';
+$lang->goback = '返回';
+$lang->goPC = 'PC版';
+$lang->more = '更多';
+$lang->moreLink = 'More';
+$lang->day = '天';
+$lang->customConfig = '自定义';
+$lang->public = '公共';
+$lang->trunk = '主干';
+$lang->sort = '排序';
+$lang->required = '必填';
+$lang->noData = '暂无';
+$lang->fullscreen = '全屏';
+$lang->retrack = '收起';
+$lang->whitelist = '访问白名单';
+$lang->globalSetting = '全局设置';
+$lang->waterfallModel = '瀑布模型';
+$lang->all = '所有';
$lang->actions = '操作';
$lang->restore = '恢复默认';
@@ -106,6 +110,9 @@ $lang->lineNumber = '行号';
$lang->tutorialConfirm = '检测到你尚未退出新手教程模式，是否现在退出？';
$lang->levelExceeded = '层级已超过显示范围，更多信息请前往网页端查看或者是通过搜索方式查看。';
+$lang->serviceAgreement = "服务协议";
+$lang->privacyPolicy = "隐私政策";
+
$lang->preShortcutKey = '[快捷键:←]';
$lang->nextShortcutKey = '[快捷键:→]';
$lang->backShortcutKey = '[快捷键:Alt+↑]';
@@ -138,6 +145,7 @@ $lang->program->common = '项目集';
$lang->product->common = '产品';
$lang->project->common = '项目';
$lang->execution->common = $config->systemMode == 'new' ? '执行' : $lang->executionCommon;
+$lang->kanban->common = '看板';
$lang->qa->common = '测试';
$lang->devops->common = 'DevOps';
$lang->doc->common = '文档';
@@ -162,6 +170,13 @@ $lang->dept->common = '部门';
$lang->upgrade->common = '升级';
$lang->program->list = '项目集列表';
$lang->program->kanban = '项目集看板';
+$lang->design->common = '设计';
+$lang->design->HLDS = '概要设计';
+$lang->design->DDS = '详细设计';
+$lang->design->DBDS = '数据库设计';
+$lang->design->ADS = '接口设计';
+$lang->stage->common = '阶段';
+$lang->stage->list = '阶段列表';
$lang->execution->list = "{$lang->executionCommon}列表";
$lang->personnel->common = '人员';
@@ -180,38 +195,37 @@ $lang->score->shortCommon = '积分';
$lang->testreport->shortCommon = '报告';
$lang->qa->shortCommon = 'QA';
-$lang->dashboard = '仪表盘';
-$lang->contribute = '贡献';
-$lang->dynamic = '动态';
-$lang->contact = '联系人';
-$lang->whitelist = '白名单';
-$lang->roadmap = '路线图';
-$lang->track = '矩阵';
-$lang->settings = '设置';
-$lang->overview = '概况';
-$lang->module = '模块';
-$lang->priv = '权限';
-$lang->design = '设计';
-$lang->other = '其他';
-$lang->estimation = '估算';
-$lang->issue = '问题';
-$lang->risk = '风险';
-$lang->measure = '度量';
-$lang->treeView = '树状图';
-$lang->groupView = '分组视图';
-$lang->kanban = '看板';
-$lang->burn = '燃尽图';
-$lang->view = '视图';
-$lang->intro = '介绍';
-$lang->indexPage = '首页';
-$lang->model = '模型';
-$lang->redev = '二次开发';
-$lang->browser = '浏览器';
-$lang->db = '数据库';
-$lang->editor = '编辑器';
-$lang->timezone = '时区';
-$lang->security = '安全';
-$lang->calendar = '日程';
+$lang->dashboard = '仪表盘';
+$lang->contribute = '贡献';
+$lang->dynamic = '动态';
+$lang->contact = '联系人';
+$lang->whitelist = '白名单';
+$lang->roadmap = '路线图';
+$lang->track = '矩阵';
+$lang->settings = '设置';
+$lang->overview = '概况';
+$lang->module = '模块';
+$lang->priv = '权限';
+$lang->other = '其他';
+$lang->estimation = '估算';
+$lang->issue = '问题';
+$lang->risk = '风险';
+$lang->measure = '度量';
+$lang->treeView = '树状图';
+$lang->groupView = '分组视图';
+$lang->executionKanban = '看板';
+$lang->burn = '燃尽图';
+$lang->view = '视图';
+$lang->intro = '介绍';
+$lang->indexPage = '首页';
+$lang->model = '模型';
+$lang->redev = '二次开发';
+$lang->browser = '浏览器';
+$lang->db = '数据库';
+$lang->editor = '编辑器';
+$lang->timezone = '时区';
+$lang->security = '安全';
+$lang->calendar = '日程';
$lang->my->work = '待处理';
diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php
index bde2294f99..7234171ad3 100644
--- a/module/common/lang/zh-tw.php
+++ b/module/common/lang/zh-tw.php
@@ -179,37 +179,37 @@ $lang->score->shortCommon = '積分';
$lang->testreport->shortCommon = '報告';
$lang->qa->shortCommon = 'QA';
-$lang->dashboard = '儀表盤';
-$lang->contribute = '貢獻';
-$lang->dynamic = '動態';
-$lang->contact = '聯繫人';
-$lang->whitelist = '白名單';
-$lang->roadmap = '路線圖';
-$lang->track = '矩陣';
-$lang->settings = '設置';
-$lang->overview = '概況';
-$lang->module = '模組';
-$lang->priv = '權限';
-$lang->design = '設計';
-$lang->other = '其他';
-$lang->estimation = '估算';
-$lang->issue = '問題';
-$lang->risk = '風險';
-$lang->measure = '度量';
-$lang->treeView = '樹狀圖';
-$lang->groupView = '分組視圖';
-$lang->kanban = '看板';
-$lang->burn = '燃盡圖';
-$lang->view = '視圖';
-$lang->intro = '介紹';
-$lang->indexPage = '首頁';
-$lang->model = '模型';
-$lang->redev = '二次開發';
-$lang->browser = '瀏覽器';
-$lang->db = '資料庫';
-$lang->editor = '編輯器';
-$lang->timezone = '時區';
-$lang->security = '安全';
+$lang->dashboard = '儀表盤';
+$lang->contribute = '貢獻';
+$lang->dynamic = '動態';
+$lang->contact = '聯繫人';
+$lang->whitelist = '白名單';
+$lang->roadmap = '路線圖';
+$lang->track = '矩陣';
+$lang->settings = '設置';
+$lang->overview = '概況';
+$lang->module = '模組';
+$lang->priv = '權限';
+$lang->design = '設計';
+$lang->other = '其他';
+$lang->estimation = '估算';
+$lang->issue = '問題';
+$lang->risk = '風險';
+$lang->measure = '度量';
+$lang->treeView = '樹狀圖';
+$lang->groupView = '分組視圖';
+$lang->executionKanban = '看板';
+$lang->burn = '燃盡圖';
+$lang->view = '視圖';
+$lang->intro = '介紹';
+$lang->indexPage = '首頁';
+$lang->model = '模型';
+$lang->redev = '二次開發';
+$lang->browser = '瀏覽器';
+$lang->db = '資料庫';
+$lang->editor = '編輯器';
+$lang->timezone = '時區';
+$lang->security = '安全';
$lang->calendar = '日程';
$lang->my->work = '待處理';
diff --git a/module/common/model.php b/module/common/model.php
index a752ccf8c8..ab3e1d7e8f 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -320,7 +320,6 @@ class commonModel extends model
if($module == 'block' and $method == 'main') return true;
if($module == 'block' and $method == 'delete') return true;
if($module == 'product' and $method == 'showerrornone') return true;
- if($module == 'report' and $method == 'annualdata') return true;
}
return false;
}
@@ -848,6 +847,9 @@ class commonModel extends model
$linkPart = explode('|', $menu['link']);
if(!isset($linkPart[2])) continue;
$method = $linkPart[2];
+
+ if($currentModule == 'report' and $method == 'annualData') continue; // Skip some pages that do not require permissions.
+
if(common::hasPriv($currentModule, $method))
{
$display = true;
@@ -1843,13 +1845,18 @@ EOD;
$typeOnlyCondition = $type . 'OnlyCondition';
$queryCondition = $this->session->$queryCondition;
+ $preAndNextObject = new stdClass();
+ $preAndNextObject->pre = '';
+ $preAndNextObject->next = '';
+ if(empty($queryCondition)) return $preAndNextObject;
+
$table = $this->config->objectTables[$type];
$orderBy = $type . 'OrderBy';
$orderBy = $this->session->$orderBy;
- if(empty($queryCondition) or $this->session->$typeOnlyCondition)
+ if($this->session->$typeOnlyCondition)
{
$sql = $this->dao->select('*')->from($table)
- ->beginIF($queryCondition != false)->where($queryCondition)->fi()
+ ->where($queryCondition)
->beginIF($orderBy != false)->orderBy($orderBy)->fi()
->get();
}
@@ -1877,10 +1884,6 @@ EOD;
$existsObjectList = $this->session->$objectIdListKey;
}
- $preAndNextObject = new stdClass();
- $preAndNextObject->pre = '';
- $preAndNextObject->next = '';
-
$preObj = false;
if(isset($existsObjectList['objectList']))
{
@@ -2150,8 +2153,6 @@ EOD;
$rights = $app->user->rights['rights'];
$acls = $app->user->rights['acls'];
- if((($app->user->account != 'guest') or ($app->company->guest and $app->user->account == 'guest')) and $module == 'report' and $method == 'annualdata') return true;
-
if(isset($rights[$module][$method]))
{
if(!commonModel::hasDBPriv($object, $module, $method)) return false;
@@ -2854,15 +2855,13 @@ EOD;
{
if(empty($markdown)) return false;
- $markdown = str_replace('&', '&', $markdown);
-
global $app;
- $hyperdown = $app->loadClass('hyperdown');
- $content = $hyperdown->makeHtml($markdown);
-
- $content = htmlspecialchars_decode($content);
- $content = fixer::stripDataTags($content);
- return $content;
+ $app->loadClass('parsedown', true);
+ return parsedown::instance()
+ ->setSafeMode(true)
+ ->setBreaksEnabled(true)
+ ->setMarkupEscaped(true)
+ ->text($markdown);
}
}
diff --git a/module/common/view/datatable.fix.html.php b/module/common/view/datatable.fix.html.php
index cf7801bc0b..33a4c28c46 100644
--- a/module/common/view/datatable.fix.html.php
+++ b/module/common/view/datatable.fix.html.php
@@ -1,5 +1,5 @@
-moduleName;?>
-methodName;?>
+app->rawModule;?>
+app->rawMethod;?>
moduleName . ucfirst($this->methodName);?>
+
+
+
diff --git a/module/design/view/viewcommit.html.php b/module/design/view/viewcommit.html.php
new file mode 100644
index 0000000000..883dcd88b5
--- /dev/null
+++ b/module/design/view/viewcommit.html.php
@@ -0,0 +1,63 @@
+
+ * @package design
+ * @version $Id: viewcommit.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $
+ * @link http://www.zentao.net
+ */
+?>
+
+
+
+
+
+
diff --git a/module/design/view/create.html.php b/module/design/view/create.html.php
new file mode 100644
index 0000000000..4a0be47622
--- /dev/null
+++ b/module/design/view/create.html.php
@@ -0,0 +1,60 @@
+
+ * @package design
+ * @version $Id: create.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $
+ * @link http://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+
+
+design->noDesign;?>
+
+
+
diff --git a/module/design/view/edit.html.php b/module/design/view/edit.html.php
new file mode 100644
index 0000000000..06afd43ef0
--- /dev/null
+++ b/module/design/view/edit.html.php
@@ -0,0 +1,98 @@
+
+ * @package design
+ * @version $Id: edit.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $
+ * @link http://www.zentao.net
+ */
+?>
+
+
+type);?>
+
+
+
+
+
+ design->create;?>
+
+
+
diff --git a/module/design/view/linkcommit.html.php b/module/design/view/linkcommit.html.php
new file mode 100644
index 0000000000..540e59b1f8
--- /dev/null
+++ b/module/design/view/linkcommit.html.php
@@ -0,0 +1,88 @@
+
+ * @package design
+ * @version $Id: linkcommit.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $
+ * @link http://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+ design->edit;?>
+
+
+
+design->errorDate);?>
+
diff --git a/module/design/view/view.html.php b/module/design/view/view.html.php
new file mode 100644
index 0000000000..e7b71d3a08
--- /dev/null
+++ b/module/design/view/view.html.php
@@ -0,0 +1,92 @@
+
+ * @package design
+ * @version $Id: view.html.php 4903 2020-09-02 09:32:59Z tianshujie@easycorp.ltd $
+ * @link http://www.zentao.net
+ */
+?>
+
+type);?>
+
+
+
+ + id;?> + name?> + arrow . $lang->design->linkCommit;?> +
+
+
+
+ design->noCommit;?>
+
+
+
+
+
+
+repo->maintain . ': ';?> |
+ + |
+ design->commitDate . '：';?>+ + ~ + + |
+
+
+
+
+
+
+
+
+
+
+
+
+ fetch('file', 'printFiles', array('files' => $design->files, 'fieldset' => 'true'));?>
+ design->desc;?>
+
+ desc;?>
+
+
+ ";?>
+ deleted):?>
+ id", $design, 'button', '', '', 'iframe showinonlybody', true);
+ common::printIcon('design', 'linkCommit', "designID=$design->id", $design, 'button', 'link', '', 'iframe showinonlybody', true);
+ common::printIcon('design', 'edit', "designID=$design->id", $design, 'button', 'alter');
+ common::printIcon('design', 'delete', "designID=$design->id", $design, 'button', 'trash', 'hiddenwin');
+ ?>
+
+
+
+
+
+
+
+
+ design->basicInfo;?>
+
+
+
+
+ | design->type;?> | +design->typeList, $design->type);?> | +
|---|---|
| design->product;?> | +productName;?> | +
| design->story;?> | +story ? html::a($this->createLink('story', 'view', "id=$design->story"), zget($stories, $design->story)) : '';?> | +
| design->submission;?> | +commit;?> | +
| design->createdBy;?> | +createdBy);?> | +
| design->createdDate;?> | +createdDate, 0, 11);?> | +
+
+
+
+
+
+
+
diff --git a/module/doc/css/common.css b/module/doc/css/common.css
index 6e3ba241d8..abf19b59c7 100644
--- a/module/doc/css/common.css
+++ b/module/doc/css/common.css
@@ -96,3 +96,6 @@ ol, ul {margin-bottom: 0}
.c-product, .c-execution, .c-lib {width: 80px !important;}
.header-btn .btn > .text {text-overflow: unset !important;}
+
+.tree li.active > .tree-group a {font-weight: 700; color: #0c64eb;}
+.tree li>.list-toggle {left: -4px; top: 0;}
diff --git a/module/doc/css/objectlibs.css b/module/doc/css/objectlibs.css
index e78f8ac770..8ced76e32c 100644
--- a/module/doc/css/objectlibs.css
+++ b/module/doc/css/objectlibs.css
@@ -2,7 +2,7 @@
.addbtn {padding-top: 22px; height: 63px; border: 1px dashed #ddd; width: 60px;}
.addbtn .icon-plus {font-size: 18px; display: block; opacity: 0.5; transition: opacity .2s; text-shadow: 1px 1px 3px rgba(0,0,0,.2);}
.addbtn:hover .icon-plus {opacity: .9; animation: flash-icon 1s linear alternate infinite;}
-#subHeader #dropMenu {min-width: 250px; box-sizing: inhert; max-height: inherit;}
+#subHeader #dropMenu {min-width: 250px; box-sizing: inherit; max-height: inherit;}
#subHeader #dropMenu .table-col .list-group {padding-top: 10px;}
.main-col .block-files .panel-heading {padding-right: 20px;}
.main-col .block-files .panel-heading .panel-title {height: 35px; line-height: 30px;}
@@ -41,3 +41,9 @@
.title {font-size: 20px !important;}
.article-content.comment {width: 100% !important;}
+
+.tree-group {position: relative;}
+.tree-group > .module-name {white-space: nowrap; overflow: hidden; text-overflow: ellipsis; width: 100%; display: block;}
+.tree-group .tree-actions {display: none; position: absolute; right: 0; top: 0; background-color: #fff; white-space: nowrap;}
+.tree-group:hover > .module-name {width: calc(100% - 20px);}
+.tree-group:hover .tree-actions {display: block}
diff --git a/module/doc/js/objectlibs.js b/module/doc/js/objectlibs.js
index 8830c91235..992cb3cae6 100644
--- a/module/doc/js/objectlibs.js
+++ b/module/doc/js/objectlibs.js
@@ -133,7 +133,7 @@ $(function()
$('#content').on('click', '.outline .outline-toggle i.icon-angle-right', function()
{
- $('.article-content').css('width', '85%');
+ $('.article-content').width('85%');
$('.outline').css({'min-width' : '180px', 'border-left' : '2px solid #efefef'});
$(this).removeClass('icon-angle-right').addClass('icon-angle-left').css('left', '-9px');
$('.outline-content').show();
diff --git a/module/doc/lang/en.php b/module/doc/lang/en.php
index b282541b4b..f57d7a6036 100644
--- a/module/doc/lang/en.php
+++ b/module/doc/lang/en.php
@@ -29,12 +29,12 @@ $lang->doc->files = 'Files';
$lang->doc->addedBy = 'Author';
$lang->doc->addedDate = 'Added';
$lang->doc->editedBy = 'UpdatedBy';
-$lang->doc->editedDate = 'UpdatedDate';
+$lang->doc->editedDate = 'Updated';
$lang->doc->version = 'Version';
-$lang->doc->basicInfo = 'Basic Info';
+$lang->doc->basicInfo = 'Basic Information';
$lang->doc->deleted = 'Deleted';
$lang->doc->fileObject = 'Dependent Item';
-$lang->doc->whiteList = 'White List';
+$lang->doc->whiteList = 'Whitelist';
$lang->doc->contentType = 'Format';
$lang->doc->separator = "";
$lang->doc->fileTitle = 'File Name';
@@ -51,7 +51,7 @@ $lang->doc->item = ' Items';
$lang->doc->num = 'Documents';
$lang->doc->searchResult = 'Search Result';
$lang->doc->mailto = 'Mailto';
-$lang->doc->noModule = 'No document in this lib, please create it';
+$lang->doc->noModule = 'No document in this library. Create one.';
$lang->doc->noChapter = 'No chapters or articles in this book. Please add chapters and articles.';
$lang->doc->views = 'Views';
$lang->doc->draft = 'Draft';
@@ -73,7 +73,7 @@ $lang->doc->todayEdited = 'Updated Today';
$lang->doc->pastEdited = 'Total Updated';
$lang->doc->myDoc = 'My Documents';
$lang->doc->myCollection = 'My Favorites';
-$lang->doc->tableContents = 'Catalog';
+$lang->doc->tableContents = 'Directory';
/* Methods list */
$lang->doc->index = 'Document Home';
@@ -91,12 +91,12 @@ $lang->doc->manageType = 'Manage Category';
$lang->doc->editType = 'Edit';
$lang->doc->deleteType = 'Delete';
$lang->doc->addType = 'Add';
-$lang->doc->childType = 'Catalog';
-$lang->doc->catalogName = 'Catalog Name';
+$lang->doc->childType = 'Directory';
+$lang->doc->catalogName = 'Name';
$lang->doc->collect = 'Add Favorite';
$lang->doc->cancelCollection = 'Remove Favorite';
$lang->doc->deleteFile = 'Delete File';
-$lang->doc->menuTitle = 'Menu';
+$lang->doc->menuTitle = 'Direcotory';
$lang->doc->collectAction = 'Add Favorite';
diff --git a/module/doc/model.php b/module/doc/model.php
index ef211b0820..bcf3982815 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -737,7 +737,7 @@ class docModel extends model
}
unset($doc->contentType);
- $doc->draft = $doc->content;
+ $doc->draft = isset($doc->content) ? $doc->content : '';
$this->dao->update(TABLE_DOC)->data($doc, 'content')
->autoCheck()
->batchCheck($requiredFields, 'notempty')
@@ -2274,7 +2274,7 @@ EOT;
if($startModule) $startModulePath = $startModule->path . '%';
}
- $docs = $this->dao->select('*')->from(TABLE_DOC)
+ $docs = $this->dao->select('*')->from(TABLE_DOC)
->where('lib')->eq($rootID)
->andWhere('deleted')->eq(0)
->fetchAll();
@@ -2308,14 +2308,26 @@ EOT;
{
if(!$docID and $currentMethod != 'tablecontents') $docID = $doc->id;
- $treeMenu[0] .= '
+
+
+ commit)):?>
+ + id;?> + name?> + arrow . $lang->design->submission;?> +
+
+
+
+ design->noCommit;?>
+| design->submission;?> | +design->commitBy;?> | +design->commitDate;?> | +design->comment;?> | +design->actions;?> | +
|---|---|---|---|---|
| id"), "#$commit->id", '_blank');?> | +committer, $commit->committer);?> | +time, 0, 11);?> | +comment;?> | ++ id&commitID=$commit->id", $design, 'list', 'unlink', 'hiddenwin', 'iframe showinonlybody', true);?> + | +
" . html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), " " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'") . '';
+ if(common::hasPriv('doc', 'edit'))
+ {
+ $treeMenu[0] .= "
';
+ }
+ }
+ else
+ {
+ $treeMenu[0] .= html::a(inlink('objectLibs', "type=$type&objectID=$objectID&libID=$rootID&docID={$doc->id}"), " " . $doc->title, '', "data-app='{$this->app->tab}' class='doc-title' title='{$doc->title}'");
+ }
$treeMenu[0] .= '';
}
@@ -2362,13 +2374,28 @@ EOT;
else
{
if(!$docID and $currentMethod != 'tablecontents') $docID = $doc->id;
- $treeMenu[$module->id] .= '";
+ $treeMenu[0] .= html::a(helper::createLink('doc', 'edit', "docID={$doc->id}&comment=false&objectType=$type&objectID=$objectID&libID=$rootID"), "", '', "title={$this->lang->doc->edit}");
+ $treeMenu[0] .= '
" . 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'))
+ {
+ $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}'");
+ }
$treeMenu[$module->id] .= '';
}
@@ -2381,7 +2408,22 @@ EOT;
}
else
{
- $li = "" . $module->name . '';
+ if($currentMethod == 'tablecontents')
+ {
+ $li = "" . $module->name . '';
+ }
+ else
+ {
+ $li = "";
+ $treeMenu[$module->id] .= html::a(helper::createLink('doc', 'edit', "docID=$docID&comment=false&objectType=$type&objectID=$objectID&libID=$libID"), "", '', "title={$this->lang->doc->edit}");
+ $treeMenu[$module->id] .= '
';
+ }
+ $treeMenu[$module->id] .= '" . $module->name . '';
+ if(common::hasPriv('tree', 'edit') or common::hasPriv('tree', 'browse'))
+ {
+ $li .= "
';
+ }
}
if($treeMenu[$module->id])
{
@@ -2410,7 +2452,7 @@ EOT;
}
}
- $treeMenu[$module->parent] .= '";
+ 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->editType}");
+ $li .= '
';
+ }
+ $li .= '
-
diff --git a/module/execution/control.php b/module/execution/control.php
index ad7086de69..fbd5b4af95 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -40,6 +40,7 @@ class execution extends control
$this->loadModel('project');
+ if(defined('IN_UPGRADE') and IN_UPGRADE) return false;
$this->executions = $this->execution->getPairs(0, 'all', 'nocode');
$skipCreateStep = array('computeburn', 'ajaxgetdropmenu', 'executionkanban', 'ajaxgetteammembers');
if(!in_array($this->methodName, $skipCreateStep) and $this->app->tab == 'execution')
@@ -137,6 +138,7 @@ class execution extends control
$this->loadModel('task');
$this->loadModel('datatable');
$this->loadModel('setting');
+ $this->loadModel('product');
if(common::hasPriv('execution', 'create')) $this->lang->TRActions = html::a($this->createLink('execution', 'create'), " " . $this->lang->execution->create, '', "class='btn btn-primary'");
@@ -148,7 +150,7 @@ class execution extends control
/* Get products by execution. */
$execution = $this->commonAction($executionID, $status);
$executionID = $execution->id;
- $products = $this->loadModel('product')->getProductPairsByProject($executionID);
+ $products = $this->product->getProductPairsByProject($executionID);
setcookie('preExecutionID', $executionID, $this->config->cookieLife, $this->config->webRoot, '', false, true);
/* Save the recently five executions visited in the cookie. */
@@ -216,6 +218,19 @@ class execution extends control
$tasks = $this->execution->getTasks($productID, $executionID, $this->executions, $browseType, $queryID, $moduleID, $sort, $pager);
}
+ /* Get product. */
+ if(empty($productID))
+ {
+ $productModule = $this->tree->getById($moduleID);
+ if(!empty($productModule) and $productModule->type != 'task') $product = $this->product->getById($productModule->root);
+ }
+ if(empty($product)) $product = $this->product->getById($productID);
+
+ if(!empty($product) and $product->type != 'normal')
+ {
+ $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+ }
+
/* Build the search form. */
$actionURL = $this->createLink('execution', 'task', "executionID=$executionID&status=bySearch¶m=myQueryID");
$this->config->execution->search['onMenuBar'] = 'yes';
@@ -245,6 +260,7 @@ class execution extends control
$this->view->executionID = $executionID;
$this->view->execution = $execution;
$this->view->productID = $productID;
+ $this->view->product = $product;
$this->view->modules = $this->tree->getTaskOptionMenu($executionID, 0, 0, $showAllModule ? 'allModule' : '');
$this->view->moduleID = $moduleID;
$this->view->moduleTree = $this->tree->getTaskTreeMenu($executionID, $productID, $startModuleID = 0, array('treeModel', 'createTaskLink'), $extra);
@@ -671,6 +687,7 @@ class execution extends control
$this->loadModel('story');
$this->loadModel('user');
$this->loadModel('datatable');
+ $this->app->loadLang('datatable');
$this->app->loadLang('testcase');
$type = strtolower($type);
@@ -771,15 +788,29 @@ class execution extends control
$storyBugs = $this->loadModel('bug')->getStoryBugCounts($storyIdList, $executionID);
$storyCases = $this->loadModel('testcase')->getStoryCaseCounts($storyIdList);
- $plans = $this->execution->getPlans($products);
+ $plans = $this->execution->getPlans($products, 'skipParent|withMainPlan');
$allPlans = array('' => '');
if(!empty($plans))
{
foreach($plans as $plan) $allPlans += $plan;
}
- if($this->cookie->storyModuleParam) $this->view->module = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
- if($this->cookie->storyProductParam) $this->view->product = $this->loadModel('product')->getById($this->cookie->storyProductParam);
+ if($this->cookie->storyModuleParam)
+ {
+ $module = $this->loadModel('tree')->getById($this->cookie->storyModuleParam);
+ $this->view->module = $module;
+
+ $product = $this->product->getById($module->root);
+ $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+ }
+
+ if($this->cookie->storyProductParam)
+ {
+ $product = $this->loadModel('product')->getById($this->cookie->storyProductParam);
+ $this->view->product = $product;
+ $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]);
+ }
+
if($this->cookie->storyBranchParam)
{
$branchID = $this->cookie->storyBranchParam;
@@ -806,7 +837,7 @@ class execution extends control
$this->view->orderBy = $orderBy;
$this->view->type = $this->session->executionStoryBrowseType;
$this->view->param = $param;
- $this->view->moduleTree = $this->loadModel('tree')->getProjectStoryTreeMenu($executionID, $startModuleID = 0, array('treeModel', 'createStoryLink'));
+ $this->view->moduleTree = $this->loadModel('tree')->getProjectStoryTreeMenu($executionID, 0, array('treeModel', 'createStoryLink'));
$this->view->modulePairs = $modulePairs;
$this->view->tabID = 'story';
$this->view->storyTasks = $storyTasks;
@@ -1236,6 +1267,8 @@ class execution extends control
unset($this->lang->doc->menu->execution['subMenu']);
}
+ $project = $this->project->getByID($projectID);
+
$extra = str_replace(array(',', ' '), array('&', ''), $extra);
parse_str($extra, $output);
@@ -1285,7 +1318,7 @@ class execution extends control
$projectID = $copyExecution->project;
$products = $this->loadModel('product')->getProducts($copyExecutionID);
$branches = $this->project->getBranchesByProject($copyExecutionID);
- $plans = $this->loadModel('productplan')->getGroupByProduct(array_keys($products));
+ $plans = $this->loadModel('productplan')->getGroupByProduct(array_keys($products), 'skipParent|unexpired');
$branchGroups = $this->execution->getBranchByProduct(array_keys($products), $projectID);
$linkedBranches = array();
@@ -1310,7 +1343,11 @@ class execution extends control
->where('t1.id')->eq($plan->product)
->fetchAll('id');
- $productPlan = $this->loadModel('productplan')->getPairs($plan->product, $plan->branch, 'unexpired');
+ $productPlan = $this->loadModel('productplan')->getPairsForStory($plan->product, $plan->branch, 'skipParent|unexpired|withMainPlan');
+ $linkedBranches = array();
+ $linkedBranches[$plan->product][$plan->branch] = $plan->branch;
+
+ $this->view->linkedBranches = $linkedBranches;
}
if(!empty($_POST))
@@ -1482,7 +1519,8 @@ class execution extends control
$executions = array('' => '') + $this->executions;
$execution = $this->execution->getById($executionID);
- $managers = $this->execution->getDefaultManagers($executionID);
+ $managers = $this->execution->getDefaultManagers($executionID);
+
/* Remove current execution from the executions. */
unset($executions[$executionID]);
@@ -1498,7 +1536,7 @@ class execution extends control
$linkedBranches = array();
$linkedProducts = $this->product->getProducts($executionID);
$branches = $this->project->getBranchesByProject($executionID);
- $plans = $this->productplan->getGroupByProduct(array_keys($linkedProducts));
+ $plans = $this->productplan->getGroupByProduct(array_keys($linkedProducts), 'skipParent');
$executionStories = $this->project->getStoriesByProject($executionID);
/* If the story of the product which linked the execution, you don't allow to remove the product. */
@@ -1511,6 +1549,7 @@ class execution extends control
{
$linkedBranches[$productID][$branchID] = $branchID;
$productPlans[$productID][$branchID] = isset($plans[$productID][$branchID]) ? $plans[$productID][$branchID] : array();
+ if($branchID != BRANCH_MAIN and isset($plans[$productID][BRANCH_MAIN])) $productPlans[$productID][$branchID] += $plans[$productID][BRANCH_MAIN];
if(!empty($executionStories[$productID][$branchID]))
{
array_push($unmodifiableProducts, $productID);
@@ -1891,50 +1930,81 @@ class execution extends control
* Kanban.
*
* @param int $executionID
- * @param string $type
+ * @param string $browseType story|bug|task|all
* @param string $orderBy
+ * @param string $groupBy
* @access public
* @return void
*/
- public function kanban($executionID, $type = 'story', $orderBy = 'order_asc')
+ public function kanban($executionID, $browseType = '', $orderBy = 'order_asc', $groupBy = '')
{
+ if(empty($browseType)) $browseType = $this->session->kanbanType ? $this->session->kanbanType : 'all';
+ if(empty($groupBy) and $browseType != 'all') $groupBy = $this->session->{'kanbanGroupBy' . $browseType} ? $this->session->{'kanbanGroupBy' . $browseType} : 'default';
+ if(empty($groupBy) and $browseType == 'all') $groupBy = 'default';
+
/* Save to session. */
$uri = $this->app->getURI(true);
- $this->app->session->set('taskList', $uri, 'execution');
- $this->app->session->set('bugList', $uri, 'qa');
+ $this->app->session->set('taskList', $uri, 'execution');
+ $this->app->session->set('bugList', $uri, 'qa');
+ $this->app->session->set('kanbanType', $browseType, 'execution');
+ $this->app->session->set('kanbanGroupBy' . $browseType, $groupBy, 'execution');
- /* Compatibility IE8*/
+ /* Load language. */
+ $this->app->loadLang('story');
+ $this->app->loadLang('task');
+ $this->app->loadLang('bug');
+
+ /* Compatibility IE8. */
if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
+ $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy);
+ if(empty($kanbanGroup))
+ {
+ $this->kanban->createLanes($executionID, $browseType, $groupBy);
+ $kanbanGroup = $this->kanban->getExecutionKanban($executionID, $browseType, $groupBy);
+ }
+
$this->execution->setMenu($executionID);
$execution = $this->loadModel('execution')->getById($executionID);
- $tasks = $this->execution->getKanbanTasks($executionID, "id");
- $bugs = $this->loadModel('bug')->getExecutionBugs($executionID);
- $stories = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, $orderBy);
/* Determines whether an object is editable. */
$canBeChanged = common::canModify('execution', $execution);
- $kanbanGroup = $this->execution->getKanbanGroupData($stories, $tasks, $bugs, $type);
- $kanbanSetting = $this->execution->getKanbanSetting();
+ /* Get execution's product. */
+ $productID = 0;
+ $products = $this->loadModel('product')->getProducts($executionID);
+ if($products) $productID = key($products);
+
+ $plans = $this->execution->getPlans($products);
+ $allPlans = array('' => '');
+ if(!empty($plans))
+ {
+ foreach($plans as $plan) $allPlans += $plan;
+ }
+
+ $userList = array();
+ $avatarPairs = $this->dao->select('account, avatar')->from(TABLE_USER)->where('deleted')->eq(0)->fetchPairs();
+ foreach($avatarPairs as $account => $avatar)
+ {
+ if(!$avatar) continue;
+ $userList[$account]['avatar'] = $avatar;
+ }
$this->view->title = $this->lang->execution->kanban;
$this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
$this->view->position[] = $this->lang->execution->kanban;
- $this->view->stories = $stories;
$this->view->realnames = $this->loadModel('user')->getPairs('noletter');
$this->view->storyOrder = $orderBy;
$this->view->orderBy = 'id_asc';
$this->view->executionID = $executionID;
- $this->view->browseType = '';
- $this->view->execution = $execution;
- $this->view->type = $type;
+ $this->view->productID = $productID;
+ $this->view->allPlans = $allPlans;
+ $this->view->browseType = $browseType;
$this->view->kanbanGroup = $kanbanGroup;
- $this->view->kanbanColumns = $this->execution->getKanbanColumns($kanbanSetting);
- $this->view->statusMap = $canBeChanged ? $this->execution->getKanbanStatusMap($kanbanSetting) : array();
- $this->view->statusList = $this->execution->getKanbanStatusList($kanbanSetting);
- $this->view->colorList = $this->execution->getKanbanColorList($kanbanSetting);
+ $this->view->execution = $execution;
+ $this->view->groupBy = $groupBy;
$this->view->canBeChanged = $canBeChanged;
+ $this->view->userList = $userList;
$this->display();
}
@@ -1949,7 +2019,7 @@ class execution extends control
{
$this->loadModel('project');
$projects = $this->project->getPairsByProgram(0, 'noclosed');
- $executions = $this->project->getStats(0, 'all');
+ $executions = $this->project->getStats(0, 'all', 0, 0, 30, 'id_desc');
$teams = $this->dao->select('root,account')->from(TABLE_TEAM)
->where('root')->in($this->app->user->view->sprints)
@@ -1977,18 +2047,38 @@ class execution extends control
$statusCount[$status] += isset($kanbanGroup[$projectID][$status]) ? count($kanbanGroup[$projectID][$status]) : 0;
- /* Max 5 closed executions. */
+ /* Max 2 closed executions. */
if($status == 'closed')
{
- if(isset($myExecutions[$status]) and count($myExecutions[$status]) >= 5) $myExecutions[$status] = array_slice($myExecutions[$status], 0, 5, true);
- if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) >= 5) $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 5, true);
+ if(isset($myExecutions[$status]) and count($myExecutions[$status]) > 2)
+ {
+ foreach($myExecutions[$status] as $executionID => $execution)
+ {
+ unset($myExecutions[$status][$executionID]);
+ $myExecutions[$status][$execution->closedDate] = $execution;
+ }
+
+ krsort($myExecutions[$status]);
+ $myExecutions[$status] = array_slice($myExecutions[$status], 0, 2, true);
+ }
+
+ if(isset($kanbanGroup[$projectID][$status]) and count($kanbanGroup[$projectID][$status]) > 2)
+ {
+ foreach($kanbanGroup[$projectID][$status] as $executionID => $execution)
+ {
+ unset($kanbanGroup[$projectID][$status][$executionID]);
+ $kanbanGroup[$projectID][$status][$execution->closedDate] = $execution;
+ }
+
+ krsort($kanbanGroup[$projectID][$status]);
+ $kanbanGroup[$projectID][$status] = array_slice($kanbanGroup[$projectID][$status], 0, 2);
+ }
}
}
if(empty($kanbanGroup[$projectID])) continue;
$projectCount++;
}
- krsort($kanbanGroup);
$this->view->title = $this->lang->execution->executionKanban;
$this->view->kanbanGroup = empty($myExecutions) ? $kanbanGroup : array($myExecutions) + $kanbanGroup;
@@ -2114,6 +2204,14 @@ class execution extends control
}
}
+ /* Close the page when there is no data. */
+ $hasData = false;
+ foreach($datas as $data)
+ {
+ if(!empty($data)) $hasData = true;
+ }
+ if(!$hasData) die(js::alert($this->lang->execution->noPrintData) . js::close());
+
$this->execution->saveKanbanData($executionID, $originalDatas);
$hasBurn = $this->post->content == 'all';
@@ -2139,8 +2237,7 @@ class execution extends control
$this->execution->setMenu($executionID);
$execution = $this->execution->getById($executionID);
- $this->view->position[] = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
- $this->view->position[] = $this->lang->execution->printKanban;
+ $this->view->executionID = $executionID;
$this->display();
}
@@ -2466,6 +2563,8 @@ class execution extends control
{
$this->execution->linkStory($objectID);
if($object->type != 'project' and $object->project != 0) $this->execution->linkStory($object->project);
+
+ if(isonlybody()) die(js::reload('parent'));
die(js::locate($browseLink));
}
@@ -2481,22 +2580,25 @@ class execution extends control
$queryID = ($browseType == 'bySearch') ? (int)$param : 0;
/* Set modules and branches. */
- $modules = array();
- $branchPairs = array();
- $branches = $this->project->getBranchesByProject($objectID);
- $productType = 'normal';
+ $modules = array();
+ $branchIDList = array(BRANCH_MAIN);
+ $branches = $this->project->getBranchesByProject($objectID);
+ $productType = 'normal';
$this->loadModel('tree');
$this->loadModel('branch');
foreach($products as $product)
{
- $productModules = $this->tree->getOptionMenu($product->id);
- foreach($productModules as $moduleID => $moduleName) $modules[$moduleID] = ((count($products) >= 2 and $moduleID != 0) ? $product->name : '') . $moduleName;
+ $productModules = $this->tree->getOptionMenu($product->id, 'story', 0, array_keys($branches[$product->id]));
+ foreach($productModules as $branch => $branchModules)
+ {
+ foreach($branchModules as $moduleID => $moduleName) $modules[$moduleID] = ((count($products) >= 2 and $moduleID != 0) ? $product->name : '') . $moduleName;
+ }
if($product->type != 'normal')
{
$productType = $product->type;
if(isset($branches[$product->id]))
{
- foreach($branches[$product->id] as $branchID => $branch) $branchPairs[$branchID] = $branchID;
+ foreach($branches[$product->id] as $branchID => $branch) $branchIDList[$branchID] = $branchID;
}
}
}
@@ -2508,11 +2610,11 @@ class execution extends control
if($browseType == 'bySearch')
{
- $allStories = $this->story->getBySearch('', 0, $queryID, 'id', $objectID);
+ $allStories = $this->story->getBySearch('', '', $queryID, 'id', $objectID);
}
else
{
- $allStories = $this->story->getProductStories(array_keys($products), $branchPairs, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
+ $allStories = $this->story->getProductStories(array_keys($products), $branchIDList, $moduleID = '0', $status = 'active', 'story', 'id_desc', $hasParent = false, '', $pager = null);
}
$linkedStories = $this->story->getExecutionStoryPairs($objectID);
@@ -2938,7 +3040,7 @@ class execution extends control
* @access public
* @return void
*/
- public function all($status = 'all', $projectID = 0, $orderBy = 'id_desc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
+ public function all($status = 'all', $projectID = 0, $orderBy = 'order_asc', $productID = 0, $recTotal = 0, $recPerPage = 10, $pageID = 1)
{
$this->app->loadLang('my');
$this->app->loadLang('product');
@@ -3182,13 +3284,14 @@ class execution extends control
/**
* Import stories by plan.
*
- * @param int $executionID
- * @param int $planID
- * @param int $productID
+ * @param int $executionID
+ * @param int $planID
+ * @param int $productID
+ * @param string $fromMethod
* @access public
* @return void
*/
- public function importPlanStories($executionID, $planID, $productID = 0)
+ public function importPlanStories($executionID, $planID, $productID = 0, $fromMethod = 'story')
{
$planStories = $planProducts = array();
$planStory = $this->loadModel('story')->getPlanStories($planID);
@@ -3223,7 +3326,7 @@ class execution extends control
$param = "projectID=$executionID";
}
if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, 'story', $param));
- die(js::locate(helper::createLink($moduleName, 'story', $param), 'parent'));
+ die(js::locate(helper::createLink($moduleName, $fromMethod, $param)));
}
/**
@@ -3309,4 +3412,62 @@ class execution extends control
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->display();
}
+
+ /**
+ *Ajax get group menu of lanes.
+ *
+ * @param string $type all|syory|task|bug
+ * @param string $group
+ * @access public
+ * @return void
+ */
+ public function ajaxGetGroup($type, $group = 'default')
+ {
+ $this->app->loadLang('kanban');
+ $groups = array();
+ $groups = $this->lang->kanban->group->$type;
+ die(html::select("group", $groups, $group, 'class="form-control chosen" data-max_drop_width="215"'));
+ }
+
+ /**
+ * Ajax update kanban.
+ *
+ * @param int $executionID
+ * @param string $enterTime
+ * @param string $browseType
+ * @param string $groupBy
+ * @access public
+ * @return void
+ */
+ public function ajaxUpdateKanban($executionID = 0, $enterTime = '', $browseType = '', $groupBy = '')
+ {
+ $enterTime = date('Y-m-d H:i:s', $enterTime);
+ $lastEditedTime = $this->dao->select("max(lastEditedTime) as lastEditedTime")->from(TABLE_KANBANLANE)->where('execution')->eq($executionID)->fetch('lastEditedTime');
+
+ if($lastEditedTime > $enterTime)
+ {
+ $kanbanGroup = $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy);
+ die(json_encode($kanbanGroup));
+ }
+ else
+ {
+ die('');
+ }
+ }
+
+ /**
+ * AJAX: Update the execution name.
+ *
+ * @param int $executionID
+ * @param string $newExecutionName
+ * @access public
+ * @return bool
+ */
+ public function ajaxUpdateExecutionName($executionID, $newExecutionName)
+ {
+ $this->dao->update(TABLE_EXECUTION)->set('name')->eq($newExecutionName)->where('id')->eq($executionID)->exec();
+ if(dao::isError()) echo false;
+
+ echo true;
+ }
}
diff --git a/module/execution/css/executionkanban.css b/module/execution/css/executionkanban.css
index f941cab7f2..9fa5db2f43 100644
--- a/module/execution/css/executionkanban.css
+++ b/module/execution/css/executionkanban.css
@@ -1,23 +1,8 @@
-.main-table .table {cursor: default; border-collapse: unset;}
-
-.boards {display: table; table-layout: fixed; width: 100%; min-width: 140px;}
-.board {display: table-cell; width: 25%; padding: 10px;}
-.board > div {max-height: 230px; overflow: auto;}
-.board:not(:last-child), .board-project {border-right: 2px solid #fff;}
-.board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: default; border-radius: 2px; background-color: #fff;}
-.board-item:hover {border-color: #ccc;}
-.board-item + .board-item {margin-top: 10px;}
-
-#kanban {overflow-y: auto;}
-#kanban thead > tr > th:not(:last-child) {border-right: 2px solid #efefef;}
-#kanban tbody > tr > td {line-height: 24px;}
-#kanban tbody > tr > td {background-color: #F5F5F5;}
-#kanban tbody > tr:not(:last-child) > td {border-bottom: 5px solid #fff !important;}
-
-.s-doing .table-row .table-col:last-child, .c-progress {width: 30px; padding-left: 3px; padding-top: 1px;}
-.table-row .table-col:first-child, .board-project {overflow: hidden; white-space: nowrap;}
-
-.table-grouped > tbody > tr,
-.table-grouped > tbody > tr:hover {background: #fff !important;}
-
-.projectColor {width: 5px; padding: 0px !important; border-right: unset !important}
+#kanbanList .panel-body {padding: 10px!important;}
+#kanbanList .kanban-header {min-height: 32px!important;}
+#kanbanList .kanban-header-col {height: 32px!important; padding: 0!important;}
+#kanbanList .kanban-header-col > .title {padding: 0 5px!important;}
+#kanbanList .kanban-col[data-type="project"] .kanban-lane-items {height: 100%; display: flex; flex-direction: column; justify-content: center;}
+#kanbanList .kanban-lane-name {width: 5px; margin-right: 15px;}
+#kanbanList .kanban-lane-name > .text {display: none;}
+#kanbanList .kanban-item.link-block > a {cursor: move;}
diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index a00e56c37d..daa4d7b0d7 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -1,65 +1,45 @@
-.boards {display: table; table-layout: fixed; width: auto; min-height: 50px; min-width: 140px;}
-.boards .board:not(:last-child) {border-right: 1px solid #ddd;}
-.board {display: table-cell; width: 16.666666667%; padding: 10px; border: 1px solid transparent; transition: background-color .2s, opacity .2s; vertical-align: top;}
-.board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: move; border-radius: 2px; background-color: #fff; transition: border .2s, opacity .2s; overflow: hidden;}
-.board-item.disabled {cursor: not-allowed;}
-.board-item:hover {border-color: #ccc;}
-.board-item > .title {line-height: 20px; max-height: 40px; display: -webkit-box; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; text-overflow: ellipsis; word-break: break-all;}
-.board-item > .info {line-height: 22px; margin-top: 6px;}
-.board-item + .board-item {margin-top: 10px;}
-.board-item .task-left {float: right; font-size: 12px; color: #a6aab8;}
-.boards-wrapper {overflow: auto;}
-.board.can-drop-in {background-color: #fff !important; opacity: 1 !important;}
-.c-board.dragging {color: #006af1;}
-.board.drop-to {background-color: #fff0d5 !important;}
-.board-drag-holder {background: #ccc; background: rgba(0, 0, 0, .1); border-radius: 2px; border: 1px solid rgba(0,0,0,.05); display: none;}
-.board.drop-to .board-drag-holder {display: block;}
-.board-item + .board-drag-holder {margin-top: 10px;}
-.board-item.dragging {opacity: .35;}
-.board-item .btn {padding: 2px 10px 2px 23px; font-size: 12px; position: relative; left: -2px; height: 24px;}
-.board-item .btn-icon-left > .icon {width: 22px; height: 22px; line-height: 20px; font-size: 14px; opacity: 1; top: 1px;}
-.board-item .btn-icon-left > span {max-width: 80px; white-space: nowrap; text-overflow: ellipsis; overflow: hidden; display: inline-block;}
-.board-title {padding-right: 20px;}
-.board-actions {position: absolute; right: 3px; top: 3px;}
-.board-actions.nav > li > a {padding: 3px 3px;}
+#main {padding-bottom: 10px;}
+#main > .container {max-width: 1960px!important; padding: 0 10px}
-#kanban {overflow-y: auto; min-height: 350px;}
-#kanban > .table {min-width: 1100px; table-layout: auto;}
-#kanban.dragging .boards.dragging .board {background: #eee; opacity: .35; border-color: #f1f1f1;}
-#kanban thead > tr > th {padding-left: 0; padding-right: 0;}
-#kanban thead .c-side {padding: 5px; max-width: 15%; min-width: 200px;}
-#kanban .label-pri {width: 16px; height: 16px; line-height: 12px; min-width: 16px; font-size: 12px; padding: 0;}
-#kanban tbody > tr > td {line-height: 24px;}
-#kanban .c-board {border-bottom: 4px #EAF3FC solid; min-width: 140px;}
-#kanban .c-board.s-wait {border-color: #7EC5FF;}
-#kanban .c-board.s-doing {border-color: #0991FF;}
-#kanban .c-board.s-pause {border-color: #fdc137;}
-#kanban .c-board.s-done {border-color: #0BD986;}
-#kanban .c-board.s-cancel {border-color: #CBD0DB;}
-#kanban .c-board.s-closed {border-color: #838A9D;}
-#kanban .table-grouped tbody > tr:hover {background: transparent;}
-#kanban .c-boards, #kanban td.c-side {border-bottom: 1px solid #eee;}
-#kanban .group-info > span + span {display: inline-block; margin-left: 8px;}
-#kanban th.c-board {color: #3c4353; font-weight: bold;}
-#kanban .fix-table-copy-wrapper {overflow: visible !important;}
-#kanban .fix-table-copy-wrapper th.c-board {color: #eee;}
-#kanban .fix-table-copy-wrapper th.c-board .btn-link {color: #fff;}
-#kanban .group-title {word-break: break-all; line-height: 16px; padding: 3px 0; display: block;}
+.kanban + .kanban {margin-top: 15px}
+.kanban-item {position: relative;}
+.kanban-item > .title { display: block;white-space: nowrap; overflow: hidden; text-overflow: ellipsis}
+.kanban-item > .infos {position: relative; margin-top: 5px}
+.kanban-item > .infos > .info + .info {margin-left: 8px}
+.kanban-item > .infos > .info-id,
+.kanban-item > .infos > .info-deadline,
+.kanban-item > .infos > .info-estimate {font-size: 12px; position: relative; top: 2px}
+.kanban-item > .infos > .label-pri {min-width: 16px; line-height: 14px; height: 16px; padding: 0}
+.kanban-item > .infos > .label-severity {transform: scale(.75)}
+.kanban-item > .infos > .avatar {position: absolute; right: 0; top: 0}
+.kanban-item > .actions {position: absolute; top: 4px; right: 4px; opacity: 0;}
+.kanban-item:hover > .actions {opacity: 1;}
+.kanban-item > .actions > a {display: block; float: left; width: 20px; height: 20px; line-height: 20px; text-align: center; border-radius: 4px; opacity: .7;}
+.kanban-item > .actions > a:hover {background-color: rgba(0,0,0,.075); opacity: 1;}
-.table-grouped > tbody > tr,
-.table-grouped > tbody > tr:hover {background: #fff !important;}
+.kanban-header-col > .actions {padding-top: 22px}
+.kanban-header-parent-col .kanban-header-col > .actions {padding-top: 6px; padding-right: 2px;}
+.kanban-header-col > .actions > a {display: block; float: left; width: 20px; height: 20px; line-height: 20px; text-align: center; border-radius: 4px; opacity: .7;}
+.kanban-header-col > .actions > a:hover {background-color: rgba(0,0,0,.075); opacity: 1;}
-.fixedSide {position: fixed; background-color: rgb(75, 75, 75, .85); color: #eee; z-index: 999;}
-.fixedSide .dropdown-menu {background-color: rgb(75, 75, 75, .85);}
-.fixedSide .dropdown-menu > li > a {color: #eee;}
-.fixedSide .btn-link, .fixedSide a , .fixedSide .text-muted {color: #eee;}
-.fixedSide .c-board {border-bottom: 4px #EAF3FC solid; min-width: 140px;}
-.fixedSide th.c-board {color: #3c4353; font-weight: bold;}
-.fixedSide td.c-side {border-bottom: 1px solid #eee;}
-.fixedSide thead .c-side {padding: 5px !important; max-width: 15%; min-width: 200px;}
-.fixedSide thead > tr > th {padding-left: 0; padding-right: 0;}
-.fixedSide tbody > tr > td {line-height: 24px;}
-.fixedSide thead > tr > th, .fixedSide tbody > tr > td {min-height: 36px; padding: 2px 8px !important;}
-.fixedSide .group-title {word-break: break-all; line-height: 16px; padding: 3px 0; display: block;}
-.fixedSide .group-info > span + span {display: inline-block; margin-left: 8px;}
-.fixedSide .label-pri {width: 16px; height: 16px; line-height: 12px; min-width: 16px; font-size: 12px; padding: 0;}
+.kanban-lane-name > .actions {position: absolute; top: 0; left: 0; right: 0; opacity: 0;}
+.kanban-lane-name:hover > .actions {opacity: 1;}
+.kanban-lane-name > .actions > a {display: block; width: 20px; height: 20px; line-height: 20px; text-align: center; opacity: .7; color: #fff;}
+.kanban-lane-name > .actions > a:hover {background-color: rgba(0,0,0,.2); opacity: 1;}
+
+.kanban-affixed .kanban-header-col > .title > .text,
+.kanban-affixed .kanban-header-col > .title > .count {color: #fff!important;}
+
+#kanbanContainer {margin: 0;}
+#kanbanContainer > .panel-body {overflow: auto;}
+#kanbans .kanban {min-height: initial;}
+#kanbans .kanban-lane {min-height: 150px;}
+#kanbans .kanban-affixed > .kanban-header {top: 100px;}
+
+#type_chosen .icon-kanban {padding-right: 10px; font-size: 15px;}
+
+.dropdown-menu a {text-align: left;}
+.scrollbar-hover {max-height: 2000px; overflow: scroll !important;}
+.c-type {width: 150px !important; overflow: unset;}
+.c-group {width: 190px !important; overflow: unset;}
+.c-type {margin-left: 0px !important;}
diff --git a/module/execution/css/linkstory.css b/module/execution/css/linkstory.css
index cb2a740d7a..bbabdce486 100644
--- a/module/execution/css/linkstory.css
+++ b/module/execution/css/linkstory.css
@@ -1 +1,2 @@
+.c-object {width: 160px;}
.c-branch, .c-estimate {width: 80px;}
diff --git a/module/execution/js/all.js b/module/execution/js/all.js
index 057d4360c4..be30acdd24 100644
--- a/module/execution/js/all.js
+++ b/module/execution/js/all.js
@@ -1,10 +1,10 @@
$(function()
{
- $('#projectTableList').on('sort.sortable', function(e, data)
+ $('#executionTableList').on('sort.sortable', function(e, data)
{
var list = '';
for(i = 0; i < data.list.length; i++) list += $(data.list[i].item).attr('data-id') + ',';
- $.post(createLink('project', 'updateOrder'), {'projects' : list, 'orderBy' : orderBy});
+ $.post(createLink('execution', 'updateOrder'), {'executions' : list, 'orderBy' : orderBy});
});
});
diff --git a/module/execution/js/common.js b/module/execution/js/common.js
index a5c97acf63..66f811f18b 100644
--- a/module/execution/js/common.js
+++ b/module/execution/js/common.js
@@ -162,11 +162,20 @@ function loadBranches(product)
$inputgroup.addClass('has-branch').append(data);
$inputgroup.find('select:last').attr('name', 'branch[' + index + ']').attr('id', 'branch' + index).attr('onchange', "loadPlans('#products" + index + "', this.value)").chosen();
}
- });
- loadPlans(product);
+ var branchID = $('#branch' + index).val();
+ loadPlans(product, branchID);
+ });
}
+/**
+ * Load plans by product id.
+ *
+ * @param int $product
+ * @param int $branchID
+ * @access public
+ * @return void
+ */
function loadPlans(product, branchID)
{
if($('#plansBox').size() == 0) return false;
@@ -177,7 +186,7 @@ function loadPlans(product, branchID)
if(typeof(planID) == 'undefined') planID = 0;
planID = $("select#plans" + productID).val() != '' ? $("select#plans" + productID).val() : planID;
- $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=' + branchID + '&planID=' + planID + '&fieldID&needCreate=&expired=' + ((config.currentMethod == 'create' || config.currentMethod == 'edit') ? 'unexpired' : '')), function(data)
+ $.get(createLink('product', 'ajaxGetPlans', "productID=" + productID + '&branch=0,' + branchID + '&planID=' + planID + '&fieldID&needCreate=&expired=' + (config.currentMethod == 'create' ? 'unexpired' : '') + '¶m=skipParent'), function(data)
{
if(data)
{
@@ -189,7 +198,12 @@ function loadPlans(product, branchID)
});
}
-
+/**
+ * Adjust product box margin.
+ *
+ * @access public
+ * @return void
+ */
function adjustProductBoxMargin()
{
var productRows = Math.ceil($('#productsBox > .row > .col-sm-4').length / 3);
@@ -202,6 +216,12 @@ function adjustProductBoxMargin()
}
}
+/**
+ * Adjust plan box margin.
+ *
+ * @access public
+ * @return void
+ */
function adjustPlanBoxMargin()
{
var planRows = Math.ceil($('#plansBox > .row > .col-sm-4').length / 3);
diff --git a/module/execution/js/executionkanban.js b/module/execution/js/executionkanban.js
new file mode 100644
index 0000000000..373b92e045
--- /dev/null
+++ b/module/execution/js/executionkanban.js
@@ -0,0 +1,170 @@
+/**
+ * Process kanban data
+ * @returns {Object} kanban data
+ */
+function processKanbanData()
+{
+ /* Generate columns */
+ var columns = [{id: 'project', type: 'project', name: window.langDoingProject, cardType: 'span'}];
+ $.each(kanbanColumns, function(type, name)
+ {
+ columns.push({id: type, type: type, name: name, cardType: 'execution'});
+ });
+
+ /* Format lanes data */
+ var lanes = [];
+ $.each(kanbanGroup, function(projectID, statusMap)
+ {
+ var projectName = +projectID ? projectNames[projectID] : langMyExecutions;
+ var cards = {project: [{id: projectID, name: projectName}]};
+
+ $.each(kanbanColumns, function(type)
+ {
+ var cardList = [];
+ var executions = statusMap[type];
+
+ if(!executions) return;
+
+ $.each(executions, function(index, execution)
+ {
+ var executionCard = $.extend({}, execution, {id: projectID + '-' + execution.id, _id: execution.id});
+ cardList.push(executionCard);
+ });
+ cards[type] = cardList;
+ });
+
+ lanes.push({id: projectID, name: projectName, cards: cards});
+ });
+
+ return {id: 'executions', columns: columns, lanes: lanes};
+}
+
+/*
+* Find drop columns
+* @param {JQuery} $element Drag element
+* @param {JQuery} $root Dnd root element
+*/
+function findDropColumns($element, $root)
+{
+ var $col = $element.closest('.kanban-col');
+ var col = $col.data();
+ var lane = $col.closest('.kanban-lane').data();
+ var kanbanID = $root.data('id');
+ var kanbanRules = window.kanbanDropRules ? window.kanbanDropRules[kanbanID] : null;
+
+ if(!kanbanRules) return $root.find('.kanban-lane[data-id="' + lane.id + '"] .kanban-lane-col:not([data-type="project"],[data-type="' + col.type + '"])');
+
+ var colRules = kanbanRules[col.type];
+ var lane = $col.closest('.kanban-lane').data('lane');
+ return $root.find('.kanban-lane-col').filter(function()
+ {
+ if(!colRules) return false;
+ if(colRules === true) return true;
+
+ var $newCol = $(this);
+ var newCol = $newCol.data();
+ if(newCol.id === col.id) return false;
+
+ var $newLane = $newCol.closest('.kanban-lane');
+ var newLane = $newLane.data('lane');
+ return colRules.indexOf(newCol.type) > -1 && newLane.id === lane.id;
+ });
+}
+
+/**
+ * Change column type for a card
+
+ * @param {Object} card Card object
+ * @param {String} fromColType The column type before change
+ * @param {String} toColType The column type after change
+ * @param {String} kanbanID Kanban ID
+ */
+function changeCardColType(card, fromColType, toColType, kanbanID)
+{
+ if(typeof card == 'undefined') return false;
+ var cardID = card.id;
+ var executionID = cardID.substr(cardID.indexOf("-") + 1);;
+ var showIframe = false;
+
+ if(toColType == 'doing')
+ {
+ if(fromColType == 'wait' && priv.canStart)
+ {
+ var link = createLink('execution', 'start', 'executionID=' + executionID, '', true);
+ showIframe = true;
+ }
+ if((fromColType == 'suspended' || fromColType == 'closed') && priv.canActivate)
+ {
+ var link = createLink('execution', 'activate', 'executionID=' + executionID, '', true);
+ showIframe = true;
+ }
+ }
+ else if(toColType == 'suspended')
+ {
+ if((fromColType == 'wait' || fromColType == 'doing') && priv.canSuspend)
+ {
+ var link = createLink('execution', 'suspend', 'executionID=' + executionID, '', true);
+ showIframe = true;
+ }
+ }
+ else if(toColType == 'closed')
+ {
+ if(priv.canClose)
+ {
+ var link = createLink('execution', 'close', 'executionID=' + executionID, '', true);
+ showIframe = true;
+ }
+ }
+
+ if(showIframe)
+ {
+ var modalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: '80%', url: link});
+ modalTrigger.show();
+ }
+
+ /*
+ // TODO: The server must return a updated kanban data 服务器返回更新后的看板数据
+
+ // 调用 updateKanban 更新看板数据
+ updateKanban(kanbanID, newKanbanData);
+ */
+}
+
+/**
+ * Handle finish drop task
+ * @param {Object} event Event object
+ * @returns {void}
+ */
+function handleFinishDrop(event)
+{
+ var $card = $(event.element); // The drag card
+ var $dragCol = $card.closest('.kanban-lane-col');
+ var $dropCol = $(event.target);
+
+ /* Get d-n-d(drag and drop) infos 获取拖放操作相关信息 */
+ var card = $card.data('item');
+ var fromColType = $dragCol.data('type');
+ var toColType = $dropCol.data('type');
+ var kanbanID = $card.closest('.kanban').data('id');
+
+ changeCardColType(card, fromColType, toColType, kanbanID);
+}
+
+$(function()
+{
+ var kanbanGroup = window.kanbanGroup;
+ if(!kanbanGroup) return;
+
+ $('#kanban').kanban(
+ {
+ data: processKanbanData(),
+ // noLaneName: true,
+ droppable:
+ {
+ selector: '.kanban-item:not(.kanban-item-span)',
+ target: findDropColumns,
+ finish: handleFinishDrop,
+ mouseButton: 'left'
+ },
+ });
+});
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 001ec4c5df..8ce3c9e1f3 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1,253 +1,886 @@
-$(function()
+function changeView(view)
{
- var isFirefox = $.zui.browser.firefox;
- var adjustBoardsHeight = function()
+ var link = createLink('execution', 'kanban', "executionID=" + executionID + '&type=' + view);
+ location.href = link;
+}
+
+/**
+ * Render user avatar
+ * @param {String|{account: string, avatar: string}} user User account or user object
+ * @returns {string}
+ */
+function renderUserAvatar(user, objectType, objectID)
+{
+ var $noPrivAndNoAssigned = $('
-
-
- - - - - - + if($type == 'book' and ($canEditLib or $canManageBook)) + { + echo "'; + } + ?>
-
+ var link = '' == 'book' ? createLink('doc', 'sortBookOrder') : createLink('tree', 'updateOrder');
+ $.post(link, orders, function(data){}).error(function()
+ {
+ bootbox.alert(lang.timeout);
+ });
+ }
+ });
+ });
+
- lang->doc->menuTitle;?>
- ";
- echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'");
- echo "
';
- }
+
+
-
-
+ lang->doc->menuTitle;?>
+ ";
+ echo html::a('javascript:;', "", '', "data-toggle='dropdown' class='btn btn-link'");
+ echo "
';
+ }
- if($type == 'book' and ($canEditLib or $canManageBook))
- {
- echo "';
- }
- ?>
- -
- doc->noChapter : $lang->doc->noModule;?>
-
- - - - - - - + if($type == 'book' and ($canEditLib or $canManageBook)) + { + echo "'; + } + ?>
');
+ if(objectType == 'task')
{
- var $cBoards = $('.c-boards');
- var viewHeight = $(window).height() - $('#header').height() - $('#footer').height() - 111;
- if ($cBoards.length === 1)
+ if(!priv.canAssignTask && !user) return $noPrivAndNoAssigned;
+ var link = createLink('task', 'assignto', 'executionID=' + executionID + '&id=' + objectID, '', true);
+ }
+ if(objectType == 'story')
+ {
+ if(!priv.canAssignStory && !user) return $noPrivAndNoAssigned;
+ var link = createLink('story', 'assignto', 'id=' + objectID, '', true);
+ }
+ if(objectType == 'bug')
+ {
+ if(!priv.canAssignBug && !user) return $noPrivAndNoAssigned;
+ var link = createLink('bug', 'assignto', 'id=' + objectID, '', true);
+ }
+
+ if(!user) return $('');
+
+ if(typeof user === 'string') user = {account: user};
+ if(!user.avatar && window.userList && window.userList[user.account]) user = window.userList[user.account];
+
+ var $noPrivAvatar = $('').avatar({user: user});
+ if(objectType == 'task' && !priv.canAssignTask) return $noPrivAvatar;
+ if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar;
+ if(objectType == 'bug' && !priv.canAssignBug) return $noPrivAvatar;
+
+ return $('').avatar({user: user});
+}
+
+/**
+ * Render deadline
+ * @param {String|Date} deadline Deadline
+ * @returns {JQuery}
+ */
+function renderDeadline(deadline)
+{
+ if(deadline == '0000-00-00') return;
+
+ var date = $.zui.createDate(deadline);
+ var now = new Date();
+ now.setHours(0);
+ now.setMinutes(0);
+ now.setSeconds(0);
+ now.setMilliseconds(0);
+ var isEarlyThanToday = date.getTime() < now.getTime();
+ var deadlineDate = $.zui.formatDate(date, 'MM-dd');
+
+ return $('').text(deadlineLang + ' ' + deadlineDate).addClass(isEarlyThanToday ? 'text-red' : 'text-muted');
+}
+
+/**
+ * Render story item 提供方法渲染看板中的需求卡片
+ * @param {Object} item Story item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderStoryItem(item, $item, col)
+{
+ var $title = $item.find('.title');
+ if(!$title.length)
+ {
+ $title = $(' ')
+ .attr('href', $.createLink('story', 'view', 'storyID=' + item.id, '', true));
+ $title.appendTo($item);
+ }
+ $title.attr('title', item.title).find('.text').text(item.title);
+
+ var $infos = $item.find('.infos');
+ if(!$infos.length)
+ {
+ $infos = $('').appendTo($item);
+ }
+ $infos.html(
+ [
+ '#' + item.id + '',
+ '' + item.pri + '',
+ item.estimate ? '' + item.estimate + 'h' : '',
+ ].join(''));
+ $infos.append(renderUserAvatar(item.assignedTo, 'story', item.id));
+
+ var $actions = $item.find('.actions');
+ if(!$actions.length && item.menus.length)
+ {
+ $actions = $([
+ '
',
+ '',
+ '',
+ '',
+ '
'
+ ].join('')).appendTo($item);
+ }
+
+ $item.attr('data-type', 'story').addClass('kanban-item-story');
+
+ return $item;
+}
+
+/**
+ * Render bug item 提供方法渲染看板中的 Bug 卡片
+ * @param {Object} item Bug item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderBugItem(item, $item, col)
+{
+ var $title = $item.find('.title');
+ if(!$title.length)
+ {
+ $title = $(' ')
+ .attr('href', $.createLink('bug', 'view', 'bugID=' + item.id, '', true));
+ $title.appendTo($item);
+ }
+ $title.attr('title', item.title).find('.text').text(item.title);
+
+ var $infos = $item.find('.infos');
+ if(!$infos.length)
+ {
+ $infos = $('').appendTo($item);
+ }
+ $infos.html(
+ [
+ '#' + item.id + '',
+ '',
+ '' + item.pri + '',
+ ].join(''));
+ if(item.deadline) $infos.append(renderDeadline(item.deadline));
+ $infos.append(renderUserAvatar(item.assignedTo, 'bug', item.id));
+
+ var $actions = $item.find('.actions');
+ if(!$actions.length && item.menus.length)
+ {
+ $actions = $([
+ '',
+ '',
+ '',
+ '',
+ '
'
+ ].join('')).appendTo($item);
+ }
+
+ $item.attr('data-type', 'bug').addClass('kanban-item-bug');
+
+ return $item;
+}
+
+/**
+ * Render task item 提供方法渲染看板中的任务卡片
+ * @param {Object} item Task item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderTaskItem(item, $item, col)
+{
+ var $title = $item.find('.title');
+ if(!$title.length)
+ {
+ $title = $(' ')
+ .attr('href', $.createLink('task', 'view', 'taskID=' + item.id, '', true));
+ $title.appendTo($item);
+ }
+ $title.attr('title', item.name).find('.text').text(item.name);
+
+ var $infos = $item.find('.infos');
+ if(!$infos.length)
+ {
+ $infos = $('').appendTo($item);
+ }
+ $infos.html(
+ [
+ '#' + item.id + '',
+ '' + item.pri + '',
+ item.estimate ? '' + item.estimate + 'h' : '',
+ ].join(''));
+ if(item.deadline) $infos.append(renderDeadline(item.deadline));
+ $infos.append(renderUserAvatar(item.assignedTo, 'task', item.id));
+
+ var $actions = $item.find('.actions');
+ if(!$actions.length && item.menus.length)
+ {
+ $actions = $([
+ '',
+ '',
+ '',
+ '',
+ '
'
+ ].join('')).appendTo($item);
+ }
+
+ $item.attr('data-type', 'task').addClass('kanban-item-task');
+
+ return $item;
+}
+
+/* Add column renderer/ 添加特定列类型或列条目类型渲染方法 */
+addColumnRenderer('story', renderStoryItem);
+addColumnRenderer('bug', renderBugItem);
+addColumnRenderer('task', renderTaskItem);
+
+/**
+ * Render column count 渲染看板列头上的卡片数目
+ * @param {JQuery} $count Kanban count element
+ * @param {number} count Column cards count
+ * @param {number} col Column object
+ * @param {Object} kanban Kanban intance
+ */
+function renderColumnCount($count, count, col)
+{
+ var text = count + '/' + (col.limit < 0 ? '' : col.limit);
+ $count.html(text + '');
+}
+
+/**
+ * Render header column 渲染看板列头部
+ * @param {JQuery} $col Header column element
+ * @param {Object} col Header column object
+ * @param {JQuery} $header Header element
+ * @param {Object} kanban Kanban object
+ */
+function renderHeaderCol($col, col, $header, kanban)
+{
+ if(col.asParent) $col = $col.children('.kanban-header-col');
+ if(!$col.children('.actions').length)
+ {
+ var $actions = $('');
+ var printStoryButton = printTaskButton = printBugButton = false;
+ if(priv.canCreateStory || priv.canBatchCreateStory || priv.canLinkStory || priv.canLinkStoryByPlane) printStoryButton = true;
+ if(priv.canCreateTask || priv.canBatchCreateTask) printTaskButton = true;
+ if(priv.canCreateBug || priv.canBatchCreateBug) printBugButton = true;
+
+ if((col.type === 'backlog' && printStoryButton) || (col.type === 'wait' && printTaskButton) || (col.type == 'unconfirmed' && printBugButton))
{
- var $boardsWrapper = $cBoards.find('.boards-wrapper');
- $boardsWrapper.css('min-height', viewHeight);
- if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
- {
- $boardsWrapper.find('.boards').css(isFirefox ? 'height' : 'min-height', $boardsWrapper.height() - 1);
- }
- return
+ $actions.append([
+ '',
+ '',
+ ''
+ ].join(''));
}
- $cBoards.each(function()
- {
- var $theBoards = $(this);
+ $actions.append([
+ '',
+ '',
+ ''
+ ].join(''));
+ $actions.appendTo($col);
+ }
+}
- var $boardsWrapper = $theBoards.find('.boards-wrapper');
- var minHeight = Math.min($theBoards.prev().find('.board-story').outerHeight() + 4, viewHeight);
- $boardsWrapper.css({maxHeight: viewHeight, minHeight: minHeight});
- if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
+/**
+ * Render lane name 渲染看板泳道名称
+ * @param {JQuery} $name Name element
+ * @param {Object} lane Lane object
+ * @param {JQuery} $kanban $kanban element
+ * @param {Object} columns Kanban columns
+ * @param {Object} kanban Kanban object
+ */
+function renderLaneName($name, lane, $kanban, columns, kanban)
+{
+ if(lane.id != 'story' && lane.id != 'task' && lane.id != 'bug') return false;
+ if(!$name.children('.actions').length && (priv.canSetLane || priv.canMoveLane))
+ {
+ $([
+ '',
+ '',
+ '',
+ '',
+ '
'
+ ].join('')).appendTo($name);
+ }
+}
+
+/**
+ * Updata kanban data
+ * 更新看板上的数据
+ * @param {string} kanbanID Kanban id 看板 ID
+ * @param {Object} data Kanban data 看板数据
+ */
+function updateKanban(kanbanID, data)
+{
+ var $kanban = $('#kanban-' + kanbanID);
+ if(!$kanban.length) return;
+
+ $kanban.data('zui.kanban').render(data);
+}
+
+/**
+ * Create kanban in page
+ * 在界面上创建一个看板界面
+ * @param {string} kanbanID Kanban id 看板 ID
+ * @param {Object} data Kanban data 看板数据
+ * @param {Object} options Kanban options 组件初始化数据 看板名称
+ */
+function createKanban(kanbanID, data, options)
+{
+ var $kanban = $('#kanban-' + kanbanID);
+ if($kanban.length) return updateKanban(kanbanID, data);
+
+ $kanban = $('').appendTo('#kanbans');
+ $kanban.kanban($.extend({data: data}, options));
+}
+
+function fullScreen()
+{
+ var element = document.getElementById('kanbanContainer');
+ var requestMethod = element.requestFullScreen || element.webkitRequestFullScreen || element.mozRequestFullScreen || element.msRequestFullScreen;
+ if(requestMethod)
+ {
+ var afterEnterFullscreen = function()
+ {
+ $('#kanbanContainer').addClass('scrollbar-hover');
+ $('.actions').hide();
+ $('#kanbanContainer a.iframe').each(function()
{
- var $boards = $boardsWrapper.find('.boards');
- $boards.css({maxHeight: $theBoards.height(), minHeight: minHeight});
- if ($boards.outerHeight() < minHeight) $boards.css('height', minHeight);
- }
- });
- };
- adjustBoardsHeight();
-
- var boardID = '';
- var onlybody = config.requestType == 'GET' ? "&onlybody=yes" : "?onlybody=yes";
- $.cookie('selfClose', 0, {expires:config.cookieLife, path:config.webRoot});
- var $kanban = $('#kanban');
-
- // Get scrollbar width
- var getScrollbarWidth = function ()
- {
- var outer = document.createElement("div");
- outer.style.visibility = "hidden";
- outer.style.width = "100px";
- outer.style.msOverflowStyle = "scrollbar"; // needed for WinJS apps
-
- document.body.appendChild(outer);
-
- var widthNoScroll = outer.offsetWidth;
- // force scrollbars
- outer.style.overflow = "scroll";
-
- // add innerdiv
- var inner = document.createElement("div");
- inner.style.width = "100%";
- outer.appendChild(inner);
-
- var widthWithScroll = inner.offsetWidth;
-
- // remove divs
- outer.parentNode.removeChild(outer);
-
- return widthNoScroll - widthWithScroll;
- };
-
- var scrollbarWidth = getScrollbarWidth();
- var fixBoardWidth = function()
- {
- var $table = $kanban.children('.table:first');
- var kanbanWidth = $table.width();
- var $cBoards = $table.find('thead>tr>th.c-board:not(.c-side)');
- var boardCount = $cBoards.length;
- var $cSide = $table.find('thead>tr>th.c-board.c-side');
- var totalWidth = kanbanWidth - scrollbarWidth - 1;
- if ($cSide.length) totalWidth = totalWidth - ($cSide.outerWidth() + 5);
- var cBoardWidth = Math.floor(totalWidth/boardCount);
- $cBoards.not(':last').width(cBoardWidth);
- if ($cSide.length) $cBoards.first().width(cBoardWidth + (isFirefox ? 0 : 5));
- $kanban.find('.boards > .board').width(cBoardWidth - (isFirefox ? 21 : 22));
- };
- fixBoardWidth();
-
- var updateUI = function()
- {
- fixBoardWidth();
- adjustBoardsHeight();
- $kanban.data('zui.table').updateFixUI();
- };
-
- $(window).on('resize', updateUI);
-
- var refresh = function(force)
- {
- var selfClose = $.cookie('selfClose');
- $.cookie('selfClose', 0, {expires:config.cookieLife, path:config.webRoot});
- if(selfClose == 1 || force)
- {
- $kanban.load(location.href + ' #kanban>*', updateUI);
- }
- };
- window.refreshKanban = refresh;
-
- var kanbanModalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: 800});
- var dropTo = function(id, from, to, type)
- {
- if(statusMap[type][from] && statusMap[type][from][to])
- {
- var method = statusMap[type][from][to];
- var link = $.createLink(type, method, 'id=' + id + '&subStatus=' + to);
- if(method == 'ajaxChangeSubStatus')
- {
- $.getJSON(link, function(response)
+ if($(this).hasClass('iframe'))
{
- if(response.result == 'fail' && response.message)
- {
- bootAlert(response.message);
- setTimeout(function(){location.reload();}, 1000);
- }
- });
+ var href = $(this).attr('href');
+ $(this).removeClass('iframe');
+ $(this).attr('href', 'javascript:void(0)');
+ $(this).attr('href-bak', href);
+ }
+ })
+ $.cookie('isFullScreen', 1);
+ }
+
+ var whenFailEnterFullscreen = function()
+ {
+ exitFullScreen();
+ }
+
+ try
+ {
+ var result = requestMethod.call(element);
+ if(result && (typeof result.then === 'function' || result instanceof window.Promise))
+ {
+ result.then(afterEnterFullscreen).catch(whenFailEnterFullscreen);
}
else
{
- kanbanModalTrigger.show(
- {
- url: link + onlybody,
- shown: function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
- width: 900,
- hidden: refresh
- });
+ afterEnterFullscreen();
}
}
-
- /* Keep the draged element stay in the new place. */
- return true;
- };
-
- $kanban.droppable(
- {
- selector: '.board-item:not(.disabled)',
- target: function($ele)
+ catch (error)
{
- var itemType = $ele.data('type');
- var $board = $ele.closest('.board');
- var type = $board.data('type');
- return $board.siblings('.board').filter(function()
- {
- var typeMap = statusMap[itemType];
- var actionMap = typeMap && typeMap[type];
- return !!actionMap && actionMap[$(this).data('type')];
- });
- },
- start: function(e)
- {
- $kanban.addClass('dragging');
- e.targets.addClass('can-drop-in');
- var $item = $(e.element).addClass('dragging');
- $item.closest('.boards').addClass('dragging');
- },
- drag: function(e)
- {
- var $item = $(e.element);
- var $target = $(e.target);
- var $holder = $target.find('.board-drag-holder');
- if (!$holder.length) $holder = $('').appendTo($target);
- $kanban.find('.c-board.dragging').removeClass('dragging');
- $kanban.find('.c-board.s-' + $target.data('type')).addClass('dragging');
- $holder.height($item.outerHeight());
- },
- drop: function(e)
- {
- var result = dropTo(e.element.data('id'), e.element.closest('.board').data('type'), e.target.data('type'), e.element.data('type'));
- if(result !== false)
- {
- e.element.insertBefore(e.target.find('.board-drag-holder'));
- }
- },
- finish: function()
- {
- $kanban.removeClass('dragging').find('.can-drop-in').removeClass('can-drop-in');
- $kanban.find('.dragging').removeClass('dragging');
+ whenFailEnterFullscreen(error);
}
- });
-
- $kanban.on('click', '.kanbaniframe', function(e)
- {
- var $link = $(this);
- kanbanModalTrigger.show(
- {
- url: $link.attr('href'),
- shown: function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
- hidden: refresh,
- width: $(this).is('.task-assignedTo,.bug-assignedTo') ? 800 : 1100
- });
- return false;
- });
-
- fixKanbanSide($kanban);
-});
-
-function fixKanbanSide($kanban)
-{
- if($kanban.length == 0) return false;
-
- fixSideInit();
- $kanban.scroll(fixSide);//Fix kanban side when scrolling.
-
- var tableWidth, kanbanOffset, fixedSide, $fixedSide;
- function fixSide()
- {
- kanbanOffset = $kanban.offset().left;
- $fixedSide = $kanban.parent().find('.fixedSide');
- if($fixedSide.length <= 0 && kanbanOffset < $kanban.scrollLeft())
- {
- var $th = $kanban.find('table thead tr th:first');
-
- tableWidth = $th.width();
-
- fixedSide = "| " + $th.html()+ ' |
|---|
| " + $td.html() + ' |
+ realEnd) && $execution->realEnd != '0000-00-00' ? $execution->realEnd : date('Y-m-d')), "class='form-control form-date' required");?>
+
+ execution->typeDesc;?>
+
+ %
+
+
begin)):?>
-
execution->type;?>
- execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");?>
+ type != 'stage')
+ {
+ echo html::select('lifetime', $lang->execution->lifeTimeList, $execution->lifetime, "class='form-control' onchange='showLifeTimeTips()'");
+ }
+ else
+ {
+ echo html::select('attribute', $lang->stage->typeList, $execution->attribute, "class='chosen form-control'");
+ }
+ ?>
@@ -109,6 +118,17 @@
+ type == 'stage'):?>
+
+ stage->percent;?>
+
+
+
+
execution->manageProducts;?>
diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php
index a3a98c4559..121ab6fb94 100644
--- a/module/execution/view/executionkanban.html.php
+++ b/module/execution/view/executionkanban.html.php
@@ -9,94 +9,37 @@
*/
?>
-
- goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?>
+ execution->suspend . $lang->executionCommon) . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?>
-
+
diff --git a/module/execution/view/task.html.php b/module/execution/view/task.html.php
index 6da2ab904f..b8254cc885 100644
--- a/module/execution/view/task.html.php
+++ b/module/execution/view/task.html.php
@@ -37,7 +37,6 @@ body {margin-bottom: 25px;}
product->getById($productID);
$removeLink = $browseType == 'byproduct' ? inlink('task', "executionID=$executionID&browseType=$status¶m=0&orderBy=$orderBy&recTotal=0&recPerPage={$pager->recPerPage}") : 'javascript:removeCookieByKey("productBrowseParam")';
$moduleName = $product->name;
$html = $moduleName . html::a($removeLink, "", '', "class='text-muted'");
diff --git a/module/execution/view/view.html.php b/module/execution/view/view.html.php
index c7d41c996e..ce6b3cf02b 100644
--- a/module/execution/view/view.html.php
+++ b/module/execution/view/view.html.php
@@ -242,24 +242,30 @@
product . "]", $productPlan, $plan->id, "class='form-control chosen'");?>
+ product}][{$plan->branch}]", $productPlan, $plan->id, "class='form-control chosen'");?>
id)?>
diff --git a/module/execution/view/edit.html.php b/module/execution/view/edit.html.php
index 97ad55a0d4..eb78f42961 100644
--- a/module/execution/view/edit.html.php
+++ b/module/execution/view/edit.html.php
@@ -69,7 +69,16 @@
+ percent, "class='form-control'");?>
+ %
+
+
-
-
-
+
diff --git a/module/execution/view/printkanban.html.php b/module/execution/view/printkanban.html.php
index c25968ed51..371f13c44b 100644
--- a/module/execution/view/printkanban.html.php
+++ b/module/execution/view/printkanban.html.php
@@ -3,13 +3,14 @@
* The kanban view file of execution module of ZenTaoPMS.
*
* @copyright Copyright 2009-2012 青岛易软天创网络科技有限公司 (QingDao Nature Easy Soft Network Technology Co,LTD www.cnezsoft.com)
- * @author Wang Yidong, Zhu Jinyong
+ * @author Wang Yidong, Zhu Jinyong
* @package execution
* @version $Id: kanban.html.php $
*/
?>
+
-
-
-
-
-
+
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 5db8444efb..534de79bca 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -9,17 +9,25 @@
*/
?>
-
+
- execution->noExecutions;?> -
+ + +
+
+
+execution->noExecutions;?>
+
+
-
-
+
+
| - | execution->doingProject . ' (' . $projectCount . ')';?> | - execution->kanbanColType as $status => $colName):?> -- - | |||
|---|---|---|---|---|---|
| - |
-
-
-
- execution->myExecutions : zget($projects, $projectID);?>
-
-
- |
-
-
-
-
- execution->kanbanColType as $colStatus => $colName):?>
-
-
-
-
-
-
-
-
- status == 'doing' and isset($execution->delay)) echo "style='border-left: 3px solid red';";?>>
-
-
-
-
-
-
- project) . ' / ' . $execution->name : $execution->name;
-
- if(common::hasPriv('execution', 'task'))
- {
- echo html::a($this->createLink('execution', 'task', "executionID=$execution->id"), $executionName, '', "title='{$executionName}'");
- }
- else
- {
- echo "{$executionName}";
- }
- ?>
-
-
-
-
-
-
-
-
-
- hours->progress);?>
- |
- |||
+
-
-
- 0)
- {
- $hasTask = true;
- break;
- }
- }
- ?>
-
-
-
-
+
- task->noTask;?> - - createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), " " . $lang->task->create, '', "class='btn btn-info'");?> - -
+ +
+
-
-
-
-
+
+
+
-
- |
-
- execution->orderList[$storyOrder] : $lang->task->$type;?>
-
-
-
- |
-
- - - |
|---|---|
|
-
-
-
-
-
-
-
-
-
-
- createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');
- }
- else
- {
- echo "{$story->title}";
- }
- ?>
-
-
-
-
-
- #id?>
- story->priList, $story->pri);?>
- story->stageList[$story->stage];?>
-
- estimate . 'h ';?>
- |
-
-
-
-
-
-
-
- tasks[$col])):?>
- tasks[$col] as $task):?>
-
-
-
-
- parent > 0 ? "" . $lang->task->childrenAB . ' ' : '';
- if(common::hasPriv('task', 'view'))
- {
- echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), "{$childrenAB}{$task->name}", '', 'class="title kanbaniframe" title="' . $task->name . '"');
- }
- else
- {
- echo "{$childrenAB}{$task->name}";
- }
- ?>
-
-
-
- bugs[$col])):?>
- bugs[$col] as $bug):?>
-
- " . zget($realnames, $task->assignedTo) . "";
- if(empty($task->assignedTo)) $assignedToRealName = "{$lang->task->noAssigned}";
- if(common::hasPriv('task', 'assignTo', $task))
- {
- echo html::a($this->createLink('task', 'assignTo', "executionID={$task->execution}&taskID={$task->id}", '', true), ' ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe task-assignedTo"');
- }
- else
- {
- echo "";
- }
- ?>
- delay)):?>
- task->delayed;?>
-
- left;?>h
-
-
- createLink('bug', 'view', "bugID=$bug->id", '', true), " #{$bug->id}{$bug->title}", '', 'class="title kanbaniframe" title="' . $bug->title . '"');
- }
- else
- {
- echo " #{$bug->id}{$bug->title}";
- }
- ?>
-
-
-
-
- " . zget($realnames, $bug->assignedTo) . "";
- if(empty($bug->assignedTo)) $assignedToRealName = "{$lang->task->noAssigned}";
- if(common::hasPriv('bug', 'assignTo', $bug))
- {
- echo html::a($this->createLink('bug', 'assignTo', "bugID={$bug->id}", '', true), ' ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe bug-assignedTo"');
- }
- else
- {
- echo "";
- }
- ?>
- bug->statusList, $bug->status);?>
-
- |
-
+
+
+
+
+
+
+
+ common::hasPriv('kanban', 'setColumn'),
+ 'canSetWIP' => common::hasPriv('kanban', 'setWIP'),
+ 'canSetLane' => common::hasPriv('kanban', 'setLane'),
+ 'canMoveLane' => common::hasPriv('kanban', 'laneMove'),
+ 'canSortCards' => common::hasPriv('kanban', 'cardsSort'),
+ 'canCreateTask' => $canCreateTask,
+ 'canBatchCreateTask' => $canBatchCreateTask,
+ 'canCreateBug' => $canCreateBug,
+ 'canBatchCreateBug' => $canBatchCreateBug,
+ 'canCreateStory' => $canCreateStory,
+ 'canBatchCreateStory' => $canBatchCreateStory,
+ 'canLinkStory' => $canLinkStory,
+ 'canLinkStoryByPlane' => $canLinkStoryByPlane,
+ 'canAssignTask' => common::hasPriv('task', 'assignto'),
+ 'canAssignStory' => common::hasPriv('story', 'assignto'),
+ 'canAssignBug' => common::hasPriv('bug', 'assignto'),
+ 'canFinishTask' => common::hasPriv('task', 'finish'),
+ 'canPauseTask' => common::hasPriv('task', 'pause'),
+ 'canCancelTask' => common::hasPriv('task', 'cancel'),
+ 'canCloseTask' => common::hasPriv('task', 'close'),
+ 'canActivateTask' => common::hasPriv('task', 'activate'),
+ 'canStartTask' => common::hasPriv('task', 'start')
+ )
+);
+?>
+execution);?>
+story);?>
+task);?>
+bug);?>
+execution->editName);?>
+execution->setWIP);?>
+execution->sortColumn);?>
+kanban);?>
+task->deadlineAB);?>
+task->noAssigned);?>
+
+
diff --git a/module/execution/view/manageproducts.html.php b/module/execution/view/manageproducts.html.php
index 775536c289..433deed8dd 100644
--- a/module/execution/view/manageproducts.html.php
+++ b/module/execution/view/manageproducts.html.php
@@ -38,11 +38,11 @@
";?>
+
+
+
diff --git a/module/execution/view/start.html.php b/module/execution/view/start.html.php
index 73137af125..8a67e8954b 100644
--- a/module/execution/view/start.html.php
+++ b/module/execution/view/start.html.php
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang
- * @package execution
+ * @package execution
* @version $Id: start.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
* @link http://www.zentao.net
*/
@@ -26,12 +26,20 @@
printExtendFields($execution, 'table', 'columns=2');?>
+
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 5361f817f5..0f9f4c76f9 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -220,7 +220,8 @@
pri?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?>
- product][$story->branch])) echo "" . $branchGroups[$story->product][$story->branch] . '';?>
+ config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;?>
+ product][$story->branch]) and $showBranch) echo "" . $branchGroups[$story->product][$story->branch] . '';?>
module) and isset($modulePairs[$story->module])) echo "{$modulePairs[$story->module]} ";?>
parent > 0) echo "{$lang->story->childrenAB}";?>
title, null, "style='color: $story->color' data-app='execution'");?>
diff --git a/module/execution/view/suspend.html.php b/module/execution/view/suspend.html.php
index 1581055615..b061a5e683 100644
--- a/module/execution/view/suspend.html.php
+++ b/module/execution/view/suspend.html.php
@@ -5,7 +5,7 @@
* @copyright Copyright 2009-2015 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL (http://zpl.pub/page/zplv12.html)
* @author Chunsheng Wang
- * @package execution
+ * @package execution
* @version $Id: suspend.html.php 935 2013-01-16 07:49:24Z wwccss@gmail.com $
* @link http://www.zentao.net
*/
@@ -34,11 +34,11 @@
| execution->realBegan;?> | +
+
+ realBeganDate) && $execution->realBegan != '0000-00-00' ? $execution->realBegan : date('Y-m-d')), "class='form-control form-date' required");?>
+
+ |
+ ||
|---|---|---|---|
| comment;?> | |||
| execution->start) . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> | +execution->start . $lang->executionCommon) . ' ' . html::linkButton($lang->goback, $this->session->taskList, 'self', '', 'btn btn-wide'); ?> | ||
+
+
+
+
+ " . $lang->holiday->create, '', "class='btn btn-primary iframe'", '', true)?>
+
+
+
+
diff --git a/module/holiday/view/create.html.php b/module/holiday/view/create.html.php
new file mode 100644
index 0000000000..f764d14933
--- /dev/null
+++ b/module/holiday/view/create.html.php
@@ -0,0 +1,54 @@
+
+ * @package holiday
+ * @version $Id$
+ * @link https://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+
+
+ -
+
+
- '> + + + +
+
+
+
+
+
+
+| holiday->name;?> | +holiday->holiday;?> | +holiday->type;?> | +holiday->desc;?> | +actions;?> | +
|---|---|---|---|---|
| name;?> | +begin, DT_DATE1) . ' ~ ' . formatTime($holiday->end, DT_DATE1);?> | +holiday->typeList, $holiday->type);?> | +desc;?> | ++ id", $holiday, 'list', '', '', 'iframe', 'yes');?> + id", $holiday, 'list', '', 'hiddenwin');?> + | +
+
+
+ + holiday->emptyTip;?> +
+
+
+
diff --git a/module/holiday/view/edit.html.php b/module/holiday/view/edit.html.php
new file mode 100644
index 0000000000..bcb7e739f6
--- /dev/null
+++ b/module/holiday/view/edit.html.php
@@ -0,0 +1,54 @@
+
+ * @package holiday
+ * @version $Id$
+ * @link https://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+
+ + holiday->create;?> +
+
+
+
diff --git a/module/holiday/view/index.html b/module/holiday/view/index.html
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/module/index/js/index.js b/module/index/js/index.js
index af88f8f157..b78e3700f3 100644
--- a/module/index/js/index.js
+++ b/module/index/js/index.js
@@ -121,6 +121,11 @@
{
return (link.params.from || link.params.$3) == 'project' ? 'project' : 'execution';
}
+ if(moduleName === 'issue' || moduleName === 'risk' || moduleName === 'opportunity' || moduleName === 'pssp' || moduleName === 'auditplan' || moduleName === 'meeting' || moduleName === 'nc')
+ {
+ if(link.params.$2 == 'project') return 'project';
+ if(link.params.$2 == 'execution') return 'execution';
+ }
if(moduleName === 'product')
{
if(methodLowerCase === 'create' && (link.params.programID || link.params.$1)) return 'program';
@@ -148,7 +153,7 @@
if(methodLowerCase === 'browse')
{
var viewType = link.params.view || link.params.$2;
- if(['bug', 'case', 'caselib'].includes(viewType)) return link.params.from === 'project' ? 'project' : 'qa';
+ if(['bug', 'case', 'caselib'].includes(viewType)) return link.params.$5 === 'project' ? 'project' : 'qa';
if(viewType === 'doc' && (link.params.from === 'product' || link.params.$5 == 'product')) return 'product';
if(viewType === 'doc' && (link.params.from === 'project' || link.params.$5 == 'project')) return 'project';
@@ -859,3 +864,4 @@ function getLatestVersion()
$('#globalSearchInput').click();
$('#upgradeContent').toggle();
}
+
diff --git a/module/job/control.php b/module/job/control.php
index b17d81e552..a206bac9f7 100644
--- a/module/job/control.php
+++ b/module/job/control.php
@@ -120,7 +120,7 @@ class job extends control
$this->view->repoTypes = $repoTypes;
$this->view->products = array(0 => '') + $this->loadModel('product')->getProductPairsByProject($this->projectID);
- $this->view->jenkinsServerList = array('' => '') + $this->loadModel('jenkins')->getPairs();
+ $this->view->jenkinsServerList = $this->loadModel('jenkins')->getPairs();
$this->display();
}
@@ -352,7 +352,7 @@ class job extends control
if($productLeft == $productRight) $matchedProducts[$productName] = $productRight;
}
}
- die(json_encode($matchedProducts));
+ die(json_encode($matchedProduct));
}
$productName = $this->loadModel('product')->getByID($repo->product)->name;
diff --git a/module/job/model.php b/module/job/model.php
index ecd520b333..c9344e89a4 100644
--- a/module/job/model.php
+++ b/module/job/model.php
@@ -364,7 +364,7 @@ class jobModel extends model
if($job->triggerType == 'tag')
{
- $lastTag = $this->getLastTagByRepo($repo, $job);
+ $lastTag = $this->getLastTagByRepo($repo);
if($lastTag)
{
$build->tag = $lastTag;
@@ -430,7 +430,7 @@ class jobModel extends model
/**
* Exec gitlab pipeline.
*
- * @param object $job
+ * @param int $job
* @access public
* @return void
*/
@@ -473,11 +473,10 @@ class jobModel extends model
* Get last tag of one repo.
*
* @param object $repo
- * @param object $job
* @access public
* @return void
*/
- public function getLastTagByRepo($repo, $job)
+ public function getLastTagByRepo($repo)
{
if($repo->SCM == 'Subversion')
{
diff --git a/module/kanban/config.php b/module/kanban/config.php
new file mode 100644
index 0000000000..f077fab4ef
--- /dev/null
+++ b/module/kanban/config.php
@@ -0,0 +1,67 @@
+kanban = new stdclass();
+
+$config->kanban->setwip = new stdclass();
+$config->kanban->setlane = new stdclass();
+$config->kanban->setlaneColumn = new stdclass();
+$config->kanban->setwip->requiredFields = 'limit';
+$config->kanban->setlane->requiredFields = 'name,type';
+$config->kanban->setlaneColumn->requiredFields = 'name';
+
+$config->kanban->default = new stdclass();
+$config->kanban->default->story = new stdclass();
+$config->kanban->default->story->name = $lang->SRCommon;
+$config->kanban->default->story->color = '#7ec5ff';
+$config->kanban->default->story->order = '5';
+
+$config->kanban->default->bug = new stdclass();
+$config->kanban->default->bug->name = $lang->bug->common;
+$config->kanban->default->bug->color = '#ba55d3';
+$config->kanban->default->bug->order = '10';
+
+$config->kanban->default->task = new stdclass();
+$config->kanban->default->task->name = $lang->task->common;
+$config->kanban->default->task->color = '#4169e1';
+$config->kanban->default->task->order = '15';
+
+$config->kanban->storyColumnStageList = array();
+$config->kanban->storyColumnStageList['backlog'] = 'projected';
+$config->kanban->storyColumnStageList['ready'] = 'projected';
+$config->kanban->storyColumnStageList['developing'] = 'developing';
+$config->kanban->storyColumnStageList['developed'] = 'developed';
+$config->kanban->storyColumnStageList['testing'] = 'testing';
+$config->kanban->storyColumnStageList['tested'] = 'tested';
+$config->kanban->storyColumnStageList['verified'] = 'verified';
+$config->kanban->storyColumnStageList['released'] = 'released';
+$config->kanban->storyColumnStageList['closed'] = 'closed';
+
+$config->kanban->storyColumnStatusList = array();
+$config->kanban->storyColumnStatusList['backlog'] = 'active';
+$config->kanban->storyColumnStatusList['ready'] = 'active';
+$config->kanban->storyColumnStatusList['developing'] = 'active';
+$config->kanban->storyColumnStatusList['developed'] = 'active';
+$config->kanban->storyColumnStatusList['testing'] = 'active';
+$config->kanban->storyColumnStatusList['tested'] = 'active';
+$config->kanban->storyColumnStatusList['verified'] = 'active';
+$config->kanban->storyColumnStatusList['released'] = 'active';
+$config->kanban->storyColumnStatusList['closed'] = 'closed';
+
+$config->kanban->bugColumnStatusList = array();
+$config->kanban->bugColumnStatusList['unconfirmed'] = 'active';
+$config->kanban->bugColumnStatusList['confirmed'] = 'active';
+$config->kanban->bugColumnStatusList['fixing'] = 'active';
+$config->kanban->bugColumnStatusList['fixed'] = 'resolved';
+$config->kanban->bugColumnStatusList['testing'] = 'resolved';
+$config->kanban->bugColumnStatusList['tested'] = 'resolved';
+$config->kanban->bugColumnStatusList['closed'] = 'closed';
+
+$config->kanban->taskColumnStatusList = array();
+$config->kanban->taskColumnStatusList['wait'] = 'wait';
+$config->kanban->taskColumnStatusList['developing'] = 'doing';
+$config->kanban->taskColumnStatusList['developed'] = 'done';
+$config->kanban->taskColumnStatusList['pause'] = 'pause';
+$config->kanban->taskColumnStatusList['canceled'] = 'cancel';
+$config->kanban->taskColumnStatusList['closed'] = 'closed';
+
+$config->kanban->laneColorList = array('#7ec5ff', '#333', '#2b529c', '#e48600', '#d2323d', '#229f24', '#777', '#d2691e', '#008b8b', '#2e8b57', '#4169e1', '#4b0082', '#fa8072', '#ba55d3', '#2e8b57', '#6b8e23');
diff --git a/module/kanban/control.php b/module/kanban/control.php
new file mode 100644
index 0000000000..73f7a3ccfd
--- /dev/null
+++ b/module/kanban/control.php
@@ -0,0 +1,180 @@
+
+ * @package kanban
+ * @version $Id: control.php 4460 2021-10-26 11:03:02Z chencongzhi520@gmail.com $
+ * @link https://www.zentao.net
+ */
+class kanban extends control
+{
+ /**
+ * Set WIP.
+ *
+ * @param int $columnID
+ * @param int $executionID
+ * @access public
+ * @return void
+ */
+ public function setWIP($columnID, $executionID = 0)
+ {
+ if($_POST)
+ {
+ $this->kanban->setWIP($columnID);
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
+ $this->loadModel('action')->create('kanbancolumn', $columnID, 'Edited', '', $executionID);
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+ }
+
+ $this->app->loadLang('story');
+
+ $column = $this->kanban->getColumnById($columnID);
+ if(!$column) die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
+
+ $status = zget($this->config->kanban->{$column->laneType . 'ColumnStatusList'}, $column->type);
+ $title = isset($column->parentName) ? $column->parentName . '/' . $column->name : $column->name;
+
+ $this->view->title = $title . $this->lang->colon . $this->lang->kanban->setWIP . '(' . $this->lang->kanban->WIP . ')';
+ $this->view->column = $column;
+ $this->view->status = $status;
+ $this->display();
+ }
+
+ /**
+ * Set lane info.
+ *
+ * @param int $laneID
+ * @param int $executionID
+ * @access public
+ * @return void
+ */
+ public function setLane($laneID, $executionID = 0)
+ {
+ if($_POST)
+ {
+ $this->kanban->setLane($laneID);
+ if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
+ $this->loadModel('action')->create('kanbanlane', $laneID, 'Edited', '', $executionID);
+
+ return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+ }
+
+ $lane = $this->kanban->getLaneById($laneID);
+ if(!$lane) die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
+
+ $this->view->title = zget($this->lang->kanban->laneTypeList, $lane->type) . $this->lang->colon . $this->lang->kanban->setLane;
+ $this->view->lane = $lane;
+
+ $this->display();
+ }
+
+ /**
+ * Set lane column info.
+ *
+ * @param int $columnID
+ * @param int $executionID
+ * @access public
+ * @return void
+ */
+ public function setColumn($columnID, $executionID = 0)
+ {
+ $column = $this->kanban->getColumnById($columnID);
+
+ if($_POST)
+ {
+ /* Check lane column name is unique. */
+ $exist = $this->kanban->getColumnByName($this->post->name, $column->lane);
+ if($exist and $exist->id != $columnID)
+ {
+ return $this->sendError($this->lang->kanban->noColumnUniqueName);
+ }
+
+ $changes = $this->kanban->updateLaneColumn($columnID, $column);
+ if(dao::isError()) return $this->sendError(dao::getError());
+ if($changes)
+ {
+ $actionID = $this->loadModel('action')->create('kanbancolumn', $columnID, 'Edited', '', $executionID);
+ $this->action->logHistory($actionID, $changes);
+ }
+
+ return $this->sendSuccess(array('locate' => 'parent'));
+ }
+
+ $this->view->column = $column;
+ $this->view->title = $column->name . $this->lang->colon . $this->lang->kanban->setColumn;
+ $this->display();
+ }
+
+ /**
+ * AJAX: Update the cards sorting of the lane column.
+ *
+ * @param string $laneType story|bug|task
+ * @param int $columnID
+ * @param string $orderBy id_desc|id_asc|pri_desc|pri_asc|lastEditedDate_desc|lastEditedDate_asc|deadline_desc|deadline_asc|assignedTo_asc
+ * @access public
+ * @return void
+ */
+ public function ajaxCardsSort($laneType, $columnID, $orderBy = 'id_desc')
+ {
+ $oldCards = array();
+ $column = $this->dao->select('parent,cards')->from(TABLE_KANBANCOLUMN)->where('id')->eq($columnID)->fetch();
+
+ /* Get the cards of the kanban column. */
+ if($column->parent == -1)
+ {
+ $childColumns = $this->dao->select('id,cards')->from(TABLE_KANBANCOLUMN)->where('parent')->eq($columnID)->fetchAll();
+ foreach($childColumns as $childColumn)
+ {
+ $oldCards[$childColumn->id] = $childColumn->cards;
+ }
+ }
+ else
+ {
+ $oldCards[$columnID] = $column->cards;
+ }
+
+ /* Update Kanban column card order. */
+ $table = $this->config->objectTables[$laneType];
+ foreach($oldCards as $colID => $cards)
+ {
+ if(empty($cards)) continue;
+ $objects = $this->dao->select('id')->from($table)
+ ->where('id')->in($cards)
+ ->orderBy($orderBy)
+ ->fetchPairs('id');
+
+ $objectIdList = ',' . implode(',', $objects) . ',';
+ $this->dao->update(TABLE_KANBANCOLUMN)->set('cards')->eq($objectIdList)->where('id')->eq($colID)->exec();
+ }
+ echo true;
+ }
+
+ /**
+ * Change the order through the lane move up and down.
+ *
+ * @param int $executionID
+ * @param string $currentType
+ * @param string $targetType
+ * @access public
+ * @return void
+ */
+ public function laneMove($executionID, $currentType, $targetType)
+ {
+ if(empty($targetType)) return false;
+
+ $this->kanban->updateLaneOrder($executionID, $currentType, $targetType);
+
+ if(!dao::isError())
+ {
+ $laneID = $this->dao->select('id')->from(TABLE_KANBANLANE)->where('execution')->eq($executionID)->andWhere('type')->eq($currentType)->fetch('id');
+ $this->loadModel('action')->create('kanbanlane', $laneID, 'Moved');
+ }
+
+ die(js::locate($this->createLink('execution', 'kanban', 'executionID=' . $executionID . '&type=all'), 'parent'));
+ }
+}
diff --git a/module/kanban/css/setcolumn.css b/module/kanban/css/setcolumn.css
new file mode 100644
index 0000000000..38087ed055
--- /dev/null
+++ b/module/kanban/css/setcolumn.css
@@ -0,0 +1,5 @@
+td>ul {padding-left: 0;}
+li {display: block; float: left; padding: 5px; width: 28px; height: 28px;}
+li>a { position: relative; display: block; width: 100%; height: 100%; padding: 0; margin: 0; font-family: ZentaoIcon; font-size: 14px; font-style: normal; font-weight: 400; font-variant: normal; line-height: 1; text-align: center; text-transform: none; border: 1px solid transparent; border-radius: 50%; speak: none; -webkit-font-smoothing: antialiased; }
+li>a.active:before {font-size: 14px; content: "\e5ca"}
+
diff --git a/module/kanban/css/setlane.css b/module/kanban/css/setlane.css
new file mode 100644
index 0000000000..1ae9a01187
--- /dev/null
+++ b/module/kanban/css/setlane.css
@@ -0,0 +1,4 @@
+td>ul {padding-left: 0;}
+li {display: block; float: left; padding: 5px; width: 28px; height: 28px;}
+li>a { position: relative; display: block; width: 100%; height: 100%; padding: 0; margin: 0; font-family: ZentaoIcon; font-size: 14px; font-style: normal; font-weight: 400; font-variant: normal; line-height: 1; text-align: center; text-transform: none; border: 1px solid transparent; border-radius: 50%; speak: none; -webkit-font-smoothing: antialiased; }
+li>a.active:before {font-size: 14px; content: "\e5ca"}
diff --git a/module/kanban/js/setcolumn.js b/module/kanban/js/setcolumn.js
new file mode 100644
index 0000000000..a01570f547
--- /dev/null
+++ b/module/kanban/js/setcolumn.js
@@ -0,0 +1,13 @@
+/**
+ * Set lane color.
+ *
+ * @param string $color
+ * @access public
+ * @return void
+ */
+function setColor(color)
+{
+ $('.cp-tile').removeClass('active');
+ $('.cp-tile[data-color="' + color + '"]').addClass('active');
+ $('#color').val(color);
+}
diff --git a/module/kanban/js/setlane.js b/module/kanban/js/setlane.js
new file mode 100644
index 0000000000..a01570f547
--- /dev/null
+++ b/module/kanban/js/setlane.js
@@ -0,0 +1,13 @@
+/**
+ * Set lane color.
+ *
+ * @param string $color
+ * @access public
+ * @return void
+ */
+function setColor(color)
+{
+ $('.cp-tile').removeClass('active');
+ $('.cp-tile[data-color="' + color + '"]').addClass('active');
+ $('#color').val(color);
+}
diff --git a/module/kanban/js/setwip.js b/module/kanban/js/setwip.js
new file mode 100644
index 0000000000..cf7b4a0563
--- /dev/null
+++ b/module/kanban/js/setwip.js
@@ -0,0 +1,28 @@
+$(function()
+{
+ $('#noLimit').click(function()
+ {
+ if($(this).attr('checked') == 'checked')
+ {
+ $('#WIPCount').attr('disabled', true);
+ }
+ else
+ {
+ $('#WIPCount').removeAttr('disabled');
+ }
+ })
+})
+
+/**
+ * Set WIP count.
+ *
+ * @access public
+ * @return void
+ */
+function setWIPLimit()
+{
+ var count = $('#WIPCount').val();
+ if($('#noLimit').attr('checked') == 'checked') count = -1;;
+
+ $('#limit').val(count);
+}
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
new file mode 100644
index 0000000000..5f49e1f9b5
--- /dev/null
+++ b/module/kanban/lang/en.php
@@ -0,0 +1,105 @@
+kanban->type = array();
+$lang->kanban->type['all'] = "All KanBan";
+$lang->kanban->type['story'] = "Story KanBan";
+$lang->kanban->type['task'] = "Task KanBan";
+$lang->kanban->type['bug'] = "Bug KanBan";
+
+$lang->kanban->group = new stdClass();
+
+$lang->kanban->group->all = array();
+$lang->kanban->group->story = array();
+$lang->kanban->group->story['default'] = "Default";
+$lang->kanban->group->story['pri'] = "Story Priority";
+$lang->kanban->group->story['category'] = "Story Category";
+$lang->kanban->group->story['module'] = "Story Module";
+$lang->kanban->group->story['source'] = "Story Source";
+$lang->kanban->group->story['assignedTo'] = "Assigned To";
+
+$lang->kanban->group->task = array();
+$lang->kanban->group->task['default'] = "Default";
+$lang->kanban->group->task['pri'] = "Task Priority";
+$lang->kanban->group->task['type'] = "Task Type";
+$lang->kanban->group->task['module'] = "Task Module";
+$lang->kanban->group->task['story'] = "Story";
+$lang->kanban->group->task['assignedTo'] = "Assigned To";
+
+$lang->kanban->group->bug = array();
+$lang->kanban->group->bug['default'] = "Default";
+$lang->kanban->group->bug['pri'] = "Bug Priority";
+$lang->kanban->group->bug['type'] = "Bug Type";
+$lang->kanban->group->bug['module'] = "Bug Module";
+$lang->kanban->group->bug['severity'] = "Bug Severity";
+$lang->kanban->group->bug['assignedTo'] = "Assigned To";
+
+$lang->kanban->WIP = 'WIP';
+$lang->kanban->setWIP = 'WIP Settings';
+$lang->kanban->WIPStatus = 'WIP Status';
+$lang->kanban->WIPStage = 'WIP Stage';
+$lang->kanban->WIPType = 'WIP Type';
+$lang->kanban->WIPCount = 'WIP Count';
+$lang->kanban->noLimit = 'No Limit ∞';
+$lang->kanban->setLane = 'Lane Settings';
+$lang->kanban->laneName = 'Lane Name';
+$lang->kanban->laneColor = 'Lane Color';
+$lang->kanban->setColumn = 'Column Settings';
+$lang->kanban->columnName = 'Column Name';
+$lang->kanban->columnColor = 'Column Color';
+$lang->kanban->noColumnUniqueName = 'The Kanban column name already exists.';
+$lang->kanban->moveUp = 'Swimlane Up';
+$lang->kanban->moveDown = 'Swimlane Down';
+$lang->kanban->laneMove = 'Swimlane Sorting';
+$lang->kanban->laneGroup = 'Lane Group';
+$lang->kanban->cardsSort = 'Cards Sortting';
+$lang->kanban->moreAction = 'More Action';
+$lang->kanban->noGroup = 'None';
+
+$lang->kanban->error = new stdclass();
+$lang->kanban->error->mustBeInt = 'The WIPs must be positive integer.';
+$lang->kanban->error->parentLimitNote = 'The WIPs in the parent column cannot be < the sum of the WIPs in the child column.';
+$lang->kanban->error->childLimitNote = 'The sum of products in the child column cannot be > the number of products in the parent column.';
+
+$this->lang->kanban->laneTypeList = array();
+$this->lang->kanban->laneTypeList['story'] = $lang->SRCommon;
+$this->lang->kanban->laneTypeList['bug'] = 'Bug';
+$this->lang->kanban->laneTypeList['task'] = 'Task';
+
+$lang->kanban->storyColumn = array();
+$lang->kanban->storyColumn['backlog'] = 'Backlog';
+$lang->kanban->storyColumn['ready'] = 'Ready';
+$lang->kanban->storyColumn['develop'] = 'Development';
+$lang->kanban->storyColumn['developing'] = 'Doing';
+$lang->kanban->storyColumn['developed'] = 'Done';
+$lang->kanban->storyColumn['test'] = 'Testing';
+$lang->kanban->storyColumn['testing'] = 'Doing';
+$lang->kanban->storyColumn['tested'] = 'Done';
+$lang->kanban->storyColumn['verified'] = 'Verified';
+$lang->kanban->storyColumn['released'] = 'Released';
+$lang->kanban->storyColumn['closed'] = 'Closed';
+
+$lang->kanban->bugColumn = array();
+$lang->kanban->bugColumn['unconfirmed'] = 'Unconfirmed';
+$lang->kanban->bugColumn['confirmed'] = 'Confirmed';
+$lang->kanban->bugColumn['resolving'] = 'Resolving';
+$lang->kanban->bugColumn['fixing'] = 'Doing';
+$lang->kanban->bugColumn['fixed'] = 'Done';
+$lang->kanban->bugColumn['test'] = 'Test';
+$lang->kanban->bugColumn['testing'] = 'Doing';
+$lang->kanban->bugColumn['tested'] = 'Done';
+$lang->kanban->bugColumn['closed'] = 'Closed';
+
+$lang->kanban->taskColumn = array();
+$lang->kanban->taskColumn['wait'] = 'Wait';
+$lang->kanban->taskColumn['develop'] = 'Develop';
+$lang->kanban->taskColumn['developing'] = 'Developing';
+$lang->kanban->taskColumn['developed'] = 'Developed';
+$lang->kanban->taskColumn['pause'] = 'Pause';
+$lang->kanban->taskColumn['canceled'] = 'Canceled';
+$lang->kanban->taskColumn['closed'] = 'Closed';
+
+$lang->kanbancolumn = new stdclass();
+$lang->kanbancolumn->name = $lang->kanban->columnName;
+$lang->kanbancolumn->limit = $lang->kanban->WIPCount;
+
+$lang->kanbanlane = new stdclass();
+$lang->kanbanlane->name = $lang->kanban->laneName;
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
new file mode 100644
index 0000000000..2e99a20b90
--- /dev/null
+++ b/module/kanban/lang/zh-cn.php
@@ -0,0 +1,105 @@
+kanban->type = array();
+$lang->kanban->type['all'] = "综合看板";
+$lang->kanban->type['story'] = "{$lang->SRCommon}看板";
+$lang->kanban->type['task'] = "任务看板";
+$lang->kanban->type['bug'] = "Bug看板";
+
+$lang->kanban->group = new stdClass();
+
+$lang->kanban->group->all = array();
+$lang->kanban->group->story = array();
+$lang->kanban->group->story['default'] = "默认方式";
+$lang->kanban->group->story['pri'] = "需求优先级";
+$lang->kanban->group->story['category'] = "需求类别";
+$lang->kanban->group->story['module'] = "需求模块";
+$lang->kanban->group->story['source'] = "需求来源";
+$lang->kanban->group->story['assignedTo'] = "指派人员";
+
+$lang->kanban->group->task = array();
+$lang->kanban->group->task['default'] = "默认方式";
+$lang->kanban->group->task['pri'] = "任务优先级";
+$lang->kanban->group->task['type'] = "任务类型";
+$lang->kanban->group->task['module'] = "任务所属模块";
+$lang->kanban->group->task['assignedTo'] = "指派人员";
+$lang->kanban->group->task['story'] = "{$lang->SRCommon}";
+
+$lang->kanban->group->bug = array();
+$lang->kanban->group->bug['default'] = "默认方式";
+$lang->kanban->group->bug['pri'] = "Bug优先级";
+$lang->kanban->group->bug['severity'] = "Bug严重程度";
+$lang->kanban->group->bug['module'] = "Bug模块";
+$lang->kanban->group->bug['type'] = "Bug类型";
+$lang->kanban->group->bug['assignedTo'] = "指派人员";
+
+$lang->kanban->WIP = 'WIP';
+$lang->kanban->setWIP = '在制品设置';
+$lang->kanban->WIPStatus = '在制品状态';
+$lang->kanban->WIPStage = '在制品阶段';
+$lang->kanban->WIPType = '在制品类型';
+$lang->kanban->WIPCount = '在制品数量';
+$lang->kanban->noLimit = '不限制∞';
+$lang->kanban->setLane = '泳道设置';
+$lang->kanban->laneName = '泳道名称';
+$lang->kanban->laneColor = '泳道颜色';
+$lang->kanban->setColumn = '看板列设置';
+$lang->kanban->columnName = '看板列名称';
+$lang->kanban->columnColor = '看板列颜色';
+$lang->kanban->noColumnUniqueName = '看板列名称已存在';
+$lang->kanban->moveUp = '泳道上移';
+$lang->kanban->moveDown = '泳道下移';
+$lang->kanban->laneMove = '泳道排序';
+$lang->kanban->laneGroup = '泳道分组';
+$lang->kanban->cardsSort = '卡片排序';
+$lang->kanban->moreAction = '更多操作';
+$lang->kanban->noGroup = '无';
+
+$lang->kanban->error = new stdclass();
+$lang->kanban->error->mustBeInt = '在制品数量必须是正整数。';
+$lang->kanban->error->parentLimitNote = '父列的在制品数量不能小于子列在制品数量之和';
+$lang->kanban->error->childLimitNote = '子列在制品数量之和不能大于父列的在制品数量';
+
+$this->lang->kanban->laneTypeList = array();
+$this->lang->kanban->laneTypeList['story'] = $lang->SRCommon;
+$this->lang->kanban->laneTypeList['bug'] = 'Bug';
+$this->lang->kanban->laneTypeList['task'] = '任务';
+
+$lang->kanban->storyColumn = array();
+$lang->kanban->storyColumn['backlog'] = 'Backlog';
+$lang->kanban->storyColumn['ready'] = '准备好';
+$lang->kanban->storyColumn['develop'] = '开发';
+$lang->kanban->storyColumn['developing'] = '进行中';
+$lang->kanban->storyColumn['developed'] = '完成';
+$lang->kanban->storyColumn['test'] = '测试';
+$lang->kanban->storyColumn['testing'] = '进行中';
+$lang->kanban->storyColumn['tested'] = '完成';
+$lang->kanban->storyColumn['verified'] = '已验收';
+$lang->kanban->storyColumn['released'] = '已发布';
+$lang->kanban->storyColumn['closed'] = '已关闭';
+
+$lang->kanban->bugColumn = array();
+$lang->kanban->bugColumn['unconfirmed'] = '待确认';
+$lang->kanban->bugColumn['confirmed'] = '已确认';
+$lang->kanban->bugColumn['resolving'] = '解决中';
+$lang->kanban->bugColumn['fixing'] = '进行中';
+$lang->kanban->bugColumn['fixed'] = '完成';
+$lang->kanban->bugColumn['test'] = '测试';
+$lang->kanban->bugColumn['testing'] = '测试中';
+$lang->kanban->bugColumn['tested'] = '测试完毕';
+$lang->kanban->bugColumn['closed'] = '已关闭';
+
+$lang->kanban->taskColumn = array();
+$lang->kanban->taskColumn['wait'] = '未开始';
+$lang->kanban->taskColumn['develop'] = '开发';
+$lang->kanban->taskColumn['developing'] = '研发中';
+$lang->kanban->taskColumn['developed'] = '研发完毕';
+$lang->kanban->taskColumn['pause'] = '已暂停';
+$lang->kanban->taskColumn['canceled'] = '已取消';
+$lang->kanban->taskColumn['closed'] = '已关闭';
+
+$lang->kanbancolumn = new stdclass();
+$lang->kanbancolumn->name = $lang->kanban->columnName;
+$lang->kanbancolumn->limit = $lang->kanban->WIPCount;
+
+$lang->kanbanlane = new stdclass();
+$lang->kanbanlane->name = $lang->kanban->laneName;
diff --git a/module/kanban/model.php b/module/kanban/model.php
new file mode 100644
index 0000000000..b9df8bd351
--- /dev/null
+++ b/module/kanban/model.php
@@ -0,0 +1,915 @@
+
+ * @package kanban
+ * @version $Id: model.php 5118 2021-10-22 10:18:41Z $
+ * @link https://www.zentao.net
+ */
+?>
+updateGroupLanes($executionID, $browseType, $groupBy);
+
+ $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
+ ->where('execution')->eq($executionID)
+ ->andWhere('deleted')->eq(0)
+ ->beginIF($browseType != 'all')->andWhere('type')->eq($browseType)->fi()
+ ->beginIF($groupBy == 'default')->andWhere('groupby')->eq('')->fi()
+ ->beginIF($groupBy != 'default')->andWhere('groupby')->eq($groupBy)->fi()
+ ->orderBy('order_asc')
+ ->fetchAll('id');
+
+ if(empty($lanes)) return array();
+
+ foreach($lanes as $lane) $this->updateCards($lane);
+
+ $columns = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)
+ ->where('deleted')->eq(0)
+ ->andWhere('lane')->in(array_keys($lanes))
+ ->orderBy('id_asc')
+ ->fetchGroup('lane', 'id');
+
+ /* Get parent column type pairs. */
+ $parentTypes = $this->dao->select('id, type')->from(TABLE_KANBANCOLUMN)
+ ->where('deleted')->eq(0)
+ ->andWhere('lane')->in(array_keys($lanes))
+ ->andWhere('parent')->eq(-1)
+ ->fetchPairs('id', 'type');
+
+ /* Get group objects. */
+ if($browseType == 'all' or $browseType == 'story') $objectGroup['story'] = $this->loadModel('story')->getExecutionStories($executionID);
+ if($browseType == 'all' or $browseType == 'bug') $objectGroup['bug'] = $this->loadModel('bug')->getExecutionBugs($executionID);
+ if($browseType == 'all' or $browseType == 'task') $objectGroup['task'] = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
+
+ /* Get objects cards menus. */
+ if($browseType == 'all' or $browseType == 'story') $storyCardMenu = $this->getKanbanCardMenu($executionID, $objectGroup['story'], 'story');
+ if($browseType == 'all' or $browseType == 'bug') $bugCardMenu = $this->getKanbanCardMenu($executionID, $objectGroup['bug'], 'bug');
+ if($browseType == 'all' or $browseType == 'task') $taskCardMenu = $this->getKanbanCardMenu($executionID, $objectGroup['task'], 'task');
+
+ /* Build kanban group data. */
+ $kanbanGroup = array();
+ foreach($lanes as $laneID => $lane)
+ {
+ $laneData = array();
+ $columnData = array();
+ $laneType = $groupBy == 'default' ? $lane->type : $lane->groupby;
+
+ $laneData['id'] = $groupBy == 'default' ? $lane->type : $lane->groupby . '-' . $lane->extra;
+ $laneData['laneID'] = $laneID;
+ $laneData['name'] = $lane->name;
+ $laneData['color'] = $lane->color;
+ $laneData['order'] = $lane->order;
+ $laneData['defaultCardType'] = $lane->type;
+
+ foreach($columns[$laneID] as $columnID => $column)
+ {
+ $columnData[$column->id]['id'] = $laneType . '-' . $column->type;
+ $columnData[$column->id]['columnID'] = $columnID;
+ $columnData[$column->id]['type'] = $column->type;
+ $columnData[$column->id]['name'] = $column->name;
+ $columnData[$column->id]['color'] = $column->color;
+ $columnData[$column->id]['limit'] = $column->limit;
+ $columnData[$column->id]['laneType'] = $lane->type;
+ $columnData[$column->id]['asParent'] = $column->parent == -1 ? true : false;
+
+ if($column->parent > 0)
+ {
+ $columnData[$column->id]['parentType'] = zget($parentTypes, $column->parent, '');
+ }
+
+ $cardOrder = 1;
+ $cardIdList = array_filter(explode(',', $column->cards));
+ foreach($cardIdList as $cardID)
+ {
+ $cardData = array();
+ $objects = zget($objectGroup, $lane->type, array());
+ $object = zget($objects, $cardID, array());
+
+ if(empty($object)) continue;
+
+ $cardData['id'] = $object->id;
+ $cardData['order'] = $cardOrder;
+ $cardData['pri'] = $object->pri ? $object->pri : '';
+ $cardData['estimate'] = $lane->type == 'bug' ? '' : $object->estimate;
+ $cardData['assignedTo'] = $object->assignedTo;
+ $cardData['deadline'] = $lane->type == 'story' ? '' : $object->deadline;
+ $cardData['severity'] = $lane->type == 'bug' ? $object->severity : '';
+
+ if($lane->type == 'task')
+ {
+ $cardData['name'] = $object->name;
+ }
+ else
+ {
+ $cardData['title'] = $object->title;
+ }
+
+ if($lane->type == 'story') $cardData['menus'] = $storyCardMenu[$object->id];
+ if($lane->type == 'bug') $cardData['menus'] = $bugCardMenu[$object->id];
+ if($lane->type == 'task') $cardData['menus'] = $taskCardMenu[$object->id];
+
+ $laneData['cards'][$column->type][] = $cardData;
+ $cardOrder ++;
+ }
+ if(!isset($laneData['cards'][$column->type])) $laneData['cards'][$column->type] = array();
+ }
+
+ $kanbanGroup[$laneType]['id'] = $laneType;
+ $kanbanGroup[$laneType]['columns'] = array_values($columnData);
+ $kanbanGroup[$laneType]['lanes'][] = $laneData;
+ $kanbanGroup[$laneType]['defaultCardType'] = $lane->type;
+ }
+
+ return $kanbanGroup;
+ }
+
+ /**
+ * Add execution Kanban lanes and columns.
+ *
+ * @param int $executionID
+ * @param string $type all|story|bug|task
+ * @param string $groupBy default
+ * @access public
+ * @return void
+ */
+ public function createLanes($executionID, $type = 'all', $groupBy = 'default')
+ {
+ if($groupBy == 'default' or $type == 'all')
+ {
+ foreach($this->config->kanban->default as $type => $lane)
+ {
+ $lane->type = $type;
+ $lane->execution = $executionID;
+ $this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec();
+
+ $laneID = $this->dao->lastInsertId();
+ $this->createColumns($laneID, $type, $executionID);
+ }
+ }
+ else
+ {
+ $this->loadModel($type);
+ $groupList = $this->getObjectGroup($executionID, $type, $groupBy);
+
+ $objectPairs = array();
+ if($groupBy == 'module') $objectPairs = $this->dao->select('id,name')->from(TABLE_MODULE)->where('type')->in('story,bug,task')->andWhere('deleted')->eq('0')->fetchPairs();
+ if($groupBy == 'story') $objectPairs = $this->dao->select('id,title')->from(TABLE_STORY)->where('deleted')->eq(0)->fetchPairs();
+ if($groupBy == 'assignedTo') $objectPairs = $this->loadModel('user')->getPairs('noletter');
+
+ $laneName = '';
+ $laneOrder = 5;
+ $colorIndex = 0;
+ foreach($groupList as $groupKey)
+ {
+ if($groupKey)
+ {
+ if(strpos('module,story,assignedTo', $groupBy) !== false)
+ {
+ $laneName = zget($objectPairs, $groupKey);
+ }
+ else
+ {
+ $laneName = zget($this->lang->$type->{$groupBy . 'List'}, $groupKey);
+ }
+ }
+ else
+ {
+ $laneName = $this->lang->kanban->noGroup;
+ }
+
+ $lane = new stdClass();
+ $lane->execution = $executionID;
+ $lane->type = $type;
+ $lane->groupby = $groupBy;
+ $lane->extra = $groupKey;
+ $lane->name = $laneName;
+ $lane->color = $this->config->kanban->laneColorList[$colorIndex];
+ $lane->order = $laneOrder;
+
+ $laneOrder += 5;
+ $colorIndex += 1;
+ if($colorIndex == count($this->config->kanban->laneColorList) + 1) $colorIndex = 0;
+ $this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec();
+
+ $laneID = $this->dao->lastInsertId();
+ $this->createColumns($laneID, $type, $executionID, $groupBy, $groupKey);
+ }
+ }
+ }
+
+ /**
+ * createColumn
+ *
+ * @param int $laneID
+ * @param string $type story|bug|task
+ * @param int $executionID
+ * @param string $groupBy
+ * @param string $groupValue
+ * @access public
+ * @return void
+ */
+ public function createColumns($laneID, $type, $executionID, $groupBy = '', $groupValue = '')
+ {
+ $objects = array();
+
+ if($type == 'story') $objects = $this->loadModel('story')->getExecutionStories($executionID, 0, 0, 't2.id_desc');
+ if($type == 'bug') $objects = $this->loadModel('bug')->getExecutionBugs($executionID);
+ if($type == 'task') $objects = $this->loadModel('execution')->getKanbanTasks($executionID);
+
+ if(!empty($groupBy))
+ {
+ foreach($objects as $objectID => $object)
+ {
+ if($object->$groupBy != $groupValue) unset($objects[$objectID]);
+ }
+ }
+
+ $devColumnID = $testColumnID = $resolvingColumnID = 0;
+ if($type == 'story')
+ {
+ foreach($this->lang->kanban->storyColumn as $colType => $name)
+ {
+ $data = new stdClass();
+ $data->lane = $laneID;
+ $data->name = $name;
+ $data->color = '#333';
+ $data->type = $colType;
+ $data->cards = '';
+
+ if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
+ if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
+ if(strpos(',develop,test,', $colType) !== false) $data->parent = -1;
+ if(strpos(',ready,develop,test,', $colType) === false)
+ {
+ $storyStatus = $this->config->kanban->storyColumnStatusList[$colType];
+ $storyStage = $this->config->kanban->storyColumnStageList[$colType];
+ foreach($objects as $storyID => $story)
+ {
+ if($story->status == $storyStatus and $story->stage == $storyStage) $data->cards .= $storyID . ',';
+ }
+ if(!empty($data->cards)) $data->cards = ',' . $data->cards;
+ }
+
+ $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
+ if($colType == 'develop') $devColumnID = $this->dao->lastInsertId();
+ if($colType == 'test') $testColumnID = $this->dao->lastInsertId();
+ }
+ }
+ elseif($type == 'bug')
+ {
+ foreach($this->lang->kanban->bugColumn as $colType => $name)
+ {
+ $data = new stdClass();
+ $data->lane = $laneID;
+ $data->name = $name;
+ $data->color = '#333';
+ $data->type = $colType;
+ $data->cards = '';
+ if(strpos(',fixing,fixed,', $colType) !== false) $data->parent = $resolvingColumnID;
+ if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
+ if(strpos(',resolving,test,', $colType) !== false) $data->parent = -1;
+ if(strpos(',resolving,fixing,test,testing,tested,', $colType) === false)
+ {
+ $bugStatus = $this->config->kanban->bugColumnStatusList[$colType];
+ foreach($objects as $bugID => $bug)
+ {
+ if($colType == 'unconfirmed' and $bug->status == $bugStatus and $bug->confirmed == 0)
+ {
+ $data->cards .= $bugID . ',';
+ }
+ elseif($colType == 'confirmed' and $bug->status == $bugStatus and $bug->confirmed == 1)
+ {
+ $data->cards .= $bugID . ',';
+ }
+ elseif(strpos(',unconfirmed,confirmed,', $colType) === false and $bug->status == $bugStatus)
+ {
+ $data->cards .= $bugID . ',';
+ }
+ }
+ if(!empty($data->cards)) $data->cards = ',' . $data->cards;
+ }
+ $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
+ if($colType == 'resolving') $resolvingColumnID = $this->dao->lastInsertId();
+ if($colType == 'test') $testColumnID = $this->dao->lastInsertId();
+ }
+ }
+ elseif($type == 'task')
+ {
+ foreach($this->lang->kanban->taskColumn as $colType => $name)
+ {
+ $data = new stdClass();
+ $data->lane = $laneID;
+ $data->name = $name;
+ $data->color = '#333';
+ $data->type = $colType;
+ $data->cards = '';
+ if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
+ if($colType == 'develop') $data->parent = -1;
+ if(strpos(',develop,', $colType) === false)
+ {
+ $taskStatus = $this->config->kanban->taskColumnStatusList[$colType];
+ foreach($objects as $taskID => $task)
+ {
+ if($task->status == $taskStatus) $data->cards .= $taskID . ',';
+
+ }
+ if(!empty($data->cards)) $data->cards = ',' . $data->cards;
+ }
+ $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
+ if($colType == 'develop') $devColumnID = $this->dao->lastInsertId();
+ }
+ }
+ }
+
+ /**
+ * Update kanban lane.
+ *
+ * @param int $executionID
+ * @param string $laneType
+ * @access public
+ * @return void
+ */
+ public function updateLane($executionID, $laneType)
+ {
+ $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
+ ->where('execution')->eq($executionID)
+ ->andWhere('type')->eq($laneType)
+ ->fetchAll('id');
+
+ foreach($lanes as $lane) $this->updateCards($lane);
+ }
+
+ /**
+ * Update column cards.
+ *
+ * @param object $lane
+ * @access public
+ * @return void
+ */
+ public function updateCards($lane)
+ {
+ $laneType = $lane->type;
+ $executionID = $lane->execution;
+ $cardPairs = $this->dao->select('*')->from(TABLE_KANBANCOLUMN)
+ ->where('deleted')->eq(0)
+ ->andWhere('lane')->eq($lane->id)
+ ->fetchPairs('type' ,'cards');
+
+ if($laneType == 'story')
+ {
+ $stories = $this->loadModel('story')->getExecutionStories($executionID);
+ foreach($stories as $storyID => $story)
+ {
+ foreach($this->config->kanban->storyColumnStageList as $colType => $stage)
+ {
+ if(strpos(',ready,develop,test,', $colType) !== false) continue;
+
+ if($lane->groupby and $story->{$lane->groupby} != $lane->extra)
+ {
+ $cardPairs[$colType] = str_replace(",$storyID,", ',', $cardPairs[$colType]);
+ }
+ elseif($colType == 'backlog' and $story->stage == $stage and strpos($cardPairs['ready'], ",$storyID,") === false and strpos($cardPairs['backlog'], ",$storyID,") === false)
+ {
+ $cardPairs['backlog'] = empty($cardPairs['backlog']) ? ",$storyID," : ",$storyID" . $cardPairs['backlog'];
+ }
+ elseif($story->stage == $stage and strpos($cardPairs[$colType], ",$storyID,") === false)
+ {
+ $cardPairs[$colType] = empty($cardPairs[$colType]) ? ",$storyID," : ",$storyID" . $cardPairs[$colType];
+ }
+ elseif($story->stage != $stage and strpos($cardPairs[$colType], ",$storyID,") !== false)
+ {
+ $cardPairs[$colType] = str_replace(",$storyID,", ',', $cardPairs[$colType]);
+ }
+ }
+ }
+ }
+ elseif($laneType == 'bug')
+ {
+ $bugs = $this->loadModel('bug')->getExecutionBugs($executionID);
+ foreach($bugs as $bugID => $bug)
+ {
+ foreach($this->config->kanban->bugColumnStatusList as $colType => $status)
+ {
+ if(strpos(',resolving,fixing,test,testing,tested,', $colType) !== false) continue;
+
+ if($lane->groupby and $bug->{$lane->groupby} != $lane->extra)
+ {
+ $cardPairs[$colType] = str_replace(",$bugID,", ',', $cardPairs[$colType]);
+ }
+ elseif($colType == 'unconfirmed' and $bug->status == $status and $bug->confirmed == 0 and strpos($cardPairs['unconfirmed'], ",$bugID,") === false and strpos($cardPairs['fixing'], ",$bugID,") === false)
+ {
+ $cardPairs['unconfirmed'] = empty($cardPairs['unconfirmed']) ? ",$bugID," : ",$bugID" . $cardPairs['unconfirmed'];
+ if(strpos($cardPairs['closed'], ",$bugID,") !== false) $cardPairs['closed'] = str_replace(",$bugID,", ',', $cardPairs['closed']);
+ }
+ elseif($colType == 'confirmed' and $bug->status == $status and $bug->confirmed == 1 and strpos($cardPairs['confirmed'], ",$bugID,") === false and strpos($cardPairs['fixing'], ",$bugID,") === false)
+ {
+ $cardPairs['confirmed'] = empty($cardPairs['confirmed']) ? ",$bugID," : ",$bugID" . $cardPairs['confirmed'];
+ if(strpos($cardPairs['unconfirmed'], ",$bugID,") !== false) $cardPairs['unconfirmed'] = str_replace(",$bugID,", ',', $cardPairs['unconfirmed']);
+ }
+ elseif($colType == 'fixed' and $bug->status == $status and strpos($cardPairs['fixed'], ",$bugID,") === false and strpos($cardPairs['testing'], ",$bugID,") === false and strpos($cardPairs['tested'], ",$bugID,") === false)
+ {
+ $cardPairs['fixed'] = empty($cardPairs['fixed']) ? ",$bugID," : ",$bugID" . $cardPairs['fixed'];
+ }
+ elseif($colType == 'closed' and $bug->status == 'closed' and strpos($cardPairs[$colType], ",$bugID,") === false)
+ {
+ $cardPairs[$colType] = empty($cardPairs[$colType]) ? ",$bugID," : ",$bugID". $cardPairs[$colType];
+ }
+ elseif($bug->status != $status and strpos($cardPairs[$colType], ",$bugID,") !== false)
+ {
+ $cardPairs[$colType] = str_replace(",$bugID,", ',', $cardPairs[$colType]);
+ }
+ }
+ }
+ }
+ elseif($laneType == 'task')
+ {
+ $tasks = $this->loadModel('execution')->getKanbanTasks($executionID);
+ foreach($tasks as $taskID => $task)
+ {
+ foreach($this->config->kanban->taskColumnStatusList as $colType => $status)
+ {
+ if($colType == 'develop') continue;
+
+ if($lane->groupby and $task->{$lane->groupby} != $lane->extra)
+ {
+ $cardPairs[$colType] = str_replace(",$taskID,", ',', $cardPairs[$colType]);
+ }
+ elseif($task->status == $status and strpos($cardPairs[$colType], ",$taskID,") === false)
+ {
+ $cardPairs[$colType] = empty($cardPairs[$colType]) ? ",$taskID," : ",$taskID". $cardPairs[$colType];
+ }
+ elseif($task->status != $status and strpos($cardPairs[$colType], ",$taskID,") !== false)
+ {
+ $cardPairs[$colType] = str_replace(",$taskID,", ',', $cardPairs[$colType]);
+ }
+ }
+ }
+ }
+
+ foreach($cardPairs as $colType => $cards)
+ {
+ $this->dao->update(TABLE_KANBANCOLUMN)->set('cards')->eq($cards)->where('lane')->eq($lane->id)->andWhere('type')->eq($colType)->exec();
+ }
+
+ $this->dao->update(TABLE_KANBANLANE)->set('lastEditedTime')->eq(helper::now())->where('id')->eq($lane->id)->exec();
+ }
+
+ /**
+ * Update group lanes.
+ *
+ * @param int $executionID
+ * @param string $type
+ * @param string $groupBy
+ * @access public
+ * @return array
+ */
+ public function updateGroupLanes($executionID, $type, $groupBy)
+ {
+ $this->loadModel($type);
+
+ $lanes = $this->dao->select('*')->from(TABLE_KANBANLANE)
+ ->where('execution')->eq($executionID)
+ ->andWhere('deleted')->eq(0)
+ ->andWhere('type')->eq($type)->fi()
+ ->andWhere('groupby')->eq($groupBy)->fi()
+ ->orderBy('order_asc')
+ ->fetchAll('id');
+
+ /* Get old group list of kanban lane. */
+ $oldGroupList = array();
+ foreach($lanes as $lane) $oldGroupList[] = $lane->extra;
+
+ /* Get new group list of kanban lane. */
+ $groupList = $this->getObjectGroup($executionID, $type, $groupBy);
+
+ $removeGroupList = array_diff($oldGroupList, $groupList);
+ $addGroupList = array_diff($groupList, $oldGroupList);
+
+ $objectPairs = array();
+ if($groupBy == 'module') $objectPairs = $this->dao->select('id,name')->from(TABLE_MODULE)->where('type')->in('story,bug,task')->andWhere('deleted')->eq('0')->fetchPairs();
+ if($groupBy == 'story') $objectPairs = $this->dao->select('id,title')->from(TABLE_STORY)->where('deleted')->eq(0)->fetchPairs();
+ if($groupBy == 'assignedTo') $objectPairs = $this->loadModel('user')->getPairs('noletter');
+
+ $colorIndex = 0;
+
+ foreach($lanes as $laneID => $lane)
+ {
+ if(in_array($lane->extra, $removeGroupList))
+ {
+ /* Remove lane and cloumns by laneID. */
+ $this->dao->delete()->from(TABLE_KANBANLANE)->where('id')->eq($laneID)->exec();
+ $this->dao->delete()->from(TABLE_KANBANCOLUMN)->where('lane')->eq($laneID)->exec();
+ }
+ else
+ {
+ /* Update kanban lanes by group. */
+ $laneName = $this->lang->$type->$groupBy . ': ' . $this->lang->kanban->noGroup;
+ if($lane->extra)
+ {
+ $namePairs = strpos('module,story,assignedTo', $groupBy) !== false ? $objectPairs : $this->lang->$type->{$groupBy . 'List'};
+ $laneName = $this->lang->$type->$groupBy . ': ' . zget($namePairs, $lane->extra);
+ }
+
+ $this->dao->update(TABLE_KANBANLANE)->set('name')->eq($laneName)->where('id')->eq($laneID)->exec();
+ $this->updateCards($lane);
+
+ $colorIndex += 1;
+ if($colorIndex == count($this->config->kanban->laneColorList)) $colorIndex = 0;
+ }
+ }
+
+ /* Add new lanes by group. */
+ foreach($addGroupList as $groupKey)
+ {
+ $laneName = $this->lang->kanban->noGroup;
+ if($groupKey)
+ {
+ $namePairs = strpos('module,story,assignedTo', $groupBy) !== false ? $objectPairs : $this->lang->$type->{$groupBy . 'List'};
+ $laneName = zget($namePairs, $groupKey);
+ }
+
+ $lane = new stdClass();
+ $lane->execution = $executionID;
+ $lane->type = $type;
+ $lane->groupby = $groupBy;
+ $lane->extra = $groupKey;
+ $lane->name = $this->lang->$type->$groupBy . ": " . $laneName;
+ $lane->color = $this->config->kanban->laneColorList[$colorIndex];
+
+ $colorIndex += 1;
+ if($colorIndex == count($this->config->kanban->laneColorList)) $colorIndex = 0;
+ $this->dao->insert(TABLE_KANBANLANE)->data($lane)->exec();
+
+ $laneID = $this->dao->lastInsertId();
+ $this->createColumns($laneID, $type, $executionID, $groupBy, $groupKey);
+ }
+
+ $this->resetLaneOrder($executionID, $type, $groupBy);
+ }
+
+ /**
+ * Update lane column.
+ *
+ * @param int $columnID
+ * @param object $column
+ * @access public
+ * @return array
+ */
+ public function updateLaneColumn($columnID, $column)
+ {
+ $data = fixer::input('post')->get();
+
+ $this->dao->update(TABLE_KANBANCOLUMN)->data($data)
+ ->autoCheck()
+ ->batchcheck($this->config->kanban->setlaneColumn->requiredFields, 'notempty')
+ ->where('id')->eq($columnID)
+ ->exec();
+
+ if(dao::isError()) return;
+
+ $changes = common::createChanges($column, $data);
+ return $changes;
+ }
+
+ /**
+ * Change the order through the lane move up and down.
+ *
+ * @param int $executionID
+ * @param string $currentType
+ * @param string $targetType
+ * @access public
+ * @return void
+ */
+ public function updateLaneOrder($executionID, $currentType, $targetType)
+ {
+ $orderList = $this->dao->select('id,type,`order`')->from(TABLE_KANBANLANE)
+ ->where('execution')->eq($executionID)
+ ->andWhere('type')->in(array($currentType, $targetType))
+ ->andWhere('groupby')->eq('')
+ ->fetchAll('type');
+
+ $this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$targetType]->order)
+ ->where('id')->eq($orderList[$currentType]->id)
+ ->andWhere('groupby')->eq('')
+ ->exec();
+
+ $this->dao->update(TABLE_KANBANLANE)->set('`order`')->eq($orderList[$currentType]->order)
+ ->where('id')->eq($orderList[$targetType]->id)
+ ->andWhere('groupby')->eq('')
+ ->exec();
+ }
+
+ /**
+ * Set WIP limit.
+ *
+ * @param int $columnID
+ * @access public
+ * @return bool
+ */
+ public function setWIP($columnID)
+ {
+ $oldColumn = $this->getColumnById($columnID);
+ $column = fixer::input('post')->remove('WIPCount,noLimit')->get();
+ if(!preg_match("/^-?\d+$/", $column->limit))
+ {
+ dao::$errors['limit'] = $this->lang->kanban->error->mustBeInt;
+ return false;
+ }
+ $column->limit = (int)$column->limit;
+
+ /* Check column limit. */
+ $sumChildLimit = 0;
+ if($oldColumn->parent == -1 and $column->limit != -1)
+ {
+ $childColumns = $this->dao->select('id,`limit`')->from(TABLE_KANBANCOLUMN)->where('parent')->eq($columnID)->fetchAll();
+ foreach($childColumns as $childColumn)
+ {
+ if($childColumn->limit == -1)
+ {
+ dao::$errors['limit'] = $this->lang->kanban->error->parentLimitNote;
+ return false;
+ }
+
+ $sumChildLimit += $childColumn->limit;
+ }
+
+ if($sumChildLimit > $column->limit)
+ {
+ dao::$errors['limit'] = $this->lang->kanban->error->parentLimitNote;
+ return false;
+ }
+ }
+ elseif($oldColumn->parent > 0)
+ {
+ $parentColumn = $this->getColumnByID($oldColumn->parent);
+ if($parentColumn->limit != -1)
+ {
+ $siblingLimit = $this->dao->select('`limit`')->from(TABLE_KANBANCOLUMN)
+ ->where('`parent`')->eq($oldColumn->parent)
+ ->andWhere('id')->ne($columnID)
+ ->fetch('limit');
+
+ $sumChildLimit = $siblingLimit + $column->limit;
+
+ if($column->limit == -1 or $siblingLimit == -1 or $sumChildLimit > $parentColumn->limit)
+ {
+ dao::$errors['limit'] = $this->lang->kanban->error->childLimitNote;
+ return false;
+ }
+ }
+ }
+
+ $this->dao->update(TABLE_KANBANCOLUMN)->data($column)
+ ->autoCheck()
+ ->checkIF($column->limit != -1, 'limit', 'gt', 0)
+ ->batchcheck($this->config->kanban->setwip->requiredFields, 'notempty')
+ ->where('id')->eq($columnID)
+ ->exec();
+
+ return dao::isError();
+ }
+
+ /**
+ * Set lane info.
+ *
+ * @param int $laneID
+ * @access public
+ * @return bool
+ */
+ public function setLane($laneID)
+ {
+ $lane = fixer::input('post')->get();
+
+ $this->dao->update(TABLE_KANBANLANE)->data($lane)
+ ->autoCheck()
+ ->batchcheck($this->config->kanban->setlane->requiredFields, 'notempty')
+ ->where('id')->eq($laneID)
+ ->exec();
+
+ return dao::isError();
+ }
+
+ /**
+ * Reset order of lane.
+ *
+ * @param int $executionID
+ * @param int $type
+ * @param int $groupBy
+ * @access public
+ * @return void
+ */
+ public function resetLaneOrder($executionID, $type, $groupBy)
+ {
+ $lanes = $this->dao->select('id,extra')->from(TABLE_KANBANLANE)
+ ->where('execution')->eq($executionID)
+ ->andWhere('type')->eq($type)
+ ->andWhere('groupBy')->eq($groupBy)
+ ->orderBy('extra_asc')
+ ->fetchPairs();
+
+ $laneOrder = 5;
+ $noExtra = 0;
+
+ foreach($lanes as $laneID => $extra)
+ {
+ if(!$extra)
+ {
+ $noExtra = $laneID;
+ continue;
+ }
+
+ $this->dao->update(TABLE_KANBANLANE)->set('order')->eq($laneOrder)->where('id')->eq($laneID)->exec();
+ $laneOrder += 5;
+ }
+
+ if($noExtra) $this->dao->update(TABLE_KANBANLANE)->set('order')->eq($laneOrder)->where('id')->eq($noExtra)->exec();
+ }
+
+ /**
+ * Get column by id.
+ *
+ * @param int $columnID
+ * @access public
+ * @return object
+ */
+ public function getColumnById($columnID)
+ {
+ $column = $this->dao->select('t1.*, t2.type as laneType')->from(TABLE_KANBANCOLUMN)->alias('t1')
+ ->leftjoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane=t2.id')
+ ->where('t1.id')->eq($columnID)
+ ->andWhere('t1.deleted')->eq(0)
+ ->fetch();
+
+ if($column->parent > 0) $column->parentName = $this->dao->findById($column->parent)->from(TABLE_KANBANCOLUMN)->fetch('name');
+
+ return $column;
+ }
+
+ /**
+ * Get Column by column name.
+ *
+ * @param string $name
+ * @param int $laneID
+ * @access public
+ * @return object
+ */
+ public function getColumnByName($name, $laneID)
+ {
+ return $this->dao->select('*')
+ ->from(TABLE_KANBANCOLUMN)
+ ->where('name')->eq($name)
+ ->andWhere('lane')->eq($laneID)
+ ->fetch();
+ }
+
+
+ /**
+ * Get lane by id.
+ *
+ * @param int $laneID
+ * @access public
+ * @return object
+ */
+ public function getLaneById($laneID)
+ {
+ return $this->dao->findById($laneID)->from(TABLE_KANBANLANE)->fetch();
+ }
+
+ /**
+ * Get object group list.
+ *
+ * @param int $executionID
+ * @param string $type
+ * @param string $groupBy
+ * @access public
+ * @return array
+ */
+ public function getObjectGroup($executionID, $type, $groupBy)
+ {
+ $table = zget($this->config->objectTables, $type);
+
+ if($groupBy == 'story' or $type == 'story')
+ {
+ $selectField = $groupBy == 'story' ? "t1.$groupBy" : "t2.$groupBy";
+ $groupList = $this->dao->select($selectField)->from(TABLE_PROJECTSTORY)->alias('t1')
+ ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+ ->where('t1.project')->eq($executionID)
+ ->andWhere('t2.deleted')->eq(0)
+ ->orderBy($groupBy . '_desc')
+ ->fetchPairs();
+
+ if($type == 'task')
+ {
+ $unlinkedTask = $this->dao->select('id')->from(TABLE_TASK)
+ ->where('execution')->eq($executionID)
+ ->andWhere('parent')->ge(0)
+ ->andWhere('story')->eq(0)
+ ->andWhere('deleted')->eq(0)
+ ->fetch('id');
+ if($unlinkedTask) $groupList[0] = 0;
+ }
+ }
+ else
+ {
+ $groupList = $this->dao->select($groupBy)->from($table)
+ ->where('execution')->eq($executionID)
+ ->beginIF($type == 'task')->andWhere('parent')->ge(0)->fi()
+ ->andWhere('deleted')->eq(0)
+ ->orderBy($groupBy . '_desc')
+ ->fetchPairs();
+ }
+
+ return $groupList;
+ }
+
+ /**
+ * Get Kanban cards menus by execution id.
+ *
+ * @param int $executionID
+ * @param array $objects
+ * @param string $objecType story|bug|task
+ * @access public
+ * @return array
+ */
+ public function getKanbanCardMenu($executionID, $objects, $objecType)
+ {
+ $menus = array();
+ switch ($objecType)
+ {
+ case 'story':
+ if(!isset($this->story)) $this->loadModel('story');
+
+ $objects = $this->story->mergeReviewer($objects);
+ foreach($objects as $story)
+ {
+ $menu = array();
+
+ $toTaskPriv = strpos('draft,closed', $story->status) !== false ? false : true;
+ if(common::hasPriv('story', 'edit') and $this->story->isClickable($story, 'edit')) $menu[] = array('label' => $this->lang->story->edit, 'icon' => 'edit', 'url' => helper::createLink('story', 'edit', "storyID=$story->id", '', true), 'size' => '95%');
+ if(common::hasPriv('story', 'change') and $this->story->isClickable($story, 'change')) $menu[] = array('label' => $this->lang->story->change, 'icon' => 'alter', 'url' => helper::createLink('story', 'change', "storyID=$story->id", '', true), 'size' => '95%');
+ if(common::hasPriv('story', 'review') and $this->story->isClickable($story, 'review')) $menu[] = array('label' => $this->lang->story->review, 'icon' => 'search', 'url' => helper::createLink('story', 'review', "storyID=$story->id", '', true), 'size' => '95%');
+ if(common::hasPriv('task', 'create') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->wbs, 'icon' => 'plus', 'url' => helper::createLink('task', 'create', "executionID=$executionID&storyID=$story->id&moduleID=$story->module", '', true), 'size' => '95%');
+ if(common::hasPriv('task', 'batchCreate') and $toTaskPriv) $menu[] = array('label' => $this->lang->execution->batchWBS, 'icon' => 'pluses', 'url' => helper::createLink('task', 'batchCreate', "executionID=$executionID&storyID=$story->id&moduleID=0&taskID=0&iframe=true", '', true), 'size' => '95%');
+ if(common::hasPriv('story', 'activate') and $this->story->isClickable($story, 'activate')) $menu[] = array('label' => $this->lang->story->activate, 'icon' => 'magic', 'url' => helper::createLink('story', 'activate', "storyID=$story->id", '', true));
+ if(common::hasPriv('execution', 'unlinkStory')) $menu[] = array('label' => $this->lang->execution->unlinkStory, 'icon' => 'unlink', 'url' => helper::createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no", '', true));
+
+ $menus[$story->id] = $menu;
+ }
+ break;
+ case 'bug':
+ if(!isset($this->bug)) $this->loadModel('bug');
+
+ foreach($objects as $bug)
+ {
+ $menu = array();
+
+ if(common::hasPriv('bug', 'edit') and $this->bug->isClickable($bug, 'edit')) $menu[] = array('label' => $this->lang->bug->edit, 'icon' => 'edit', 'url' => helper::createLink('bug', 'edit', "bugID=$bug->id", '', true), 'size' => '95%');
+ if(common::hasPriv('bug', 'confirmBug') and $this->bug->isClickable($bug, 'confirmBug')) $menu[] = array('label' => $this->lang->bug->confirmBug, 'icon' => 'ok', 'url' => helper::createLink('bug', 'confirmBug', "bugID=$bug->id", '', true));
+ if(common::hasPriv('bug', 'resolve') and $this->bug->isClickable($bug, 'resolve')) $menu[] = array('label' => $this->lang->bug->resolve, 'icon' => 'checked', 'url' => helper::createLink('bug', 'resolve', "bugID=$bug->id", '', true));
+ if(common::hasPriv('bug', 'close') and $this->bug->isClickable($bug, 'close')) $menu[] = array('label' => $this->lang->bug->close, 'icon' => 'plus', 'url' => helper::createLink('bug', 'close', "bugID=$bug->id", '', true));
+ if(common::hasPriv('bug', 'create') and $this->bug->isClickable($bug, 'create')) $menu[] = array('label' => $this->lang->bug->copy, 'icon' => 'pluses', 'url' => helper::createLink('bug', 'create', "productID=$bug->product&branch=$bug->branch&extras=bugID=$bug->id", '', true), 'size' => '95%');
+ if(common::hasPriv('bug', 'activate') and $this->bug->isClickable($bug, 'activate')) $menu[] = array('label' => $this->lang->bug->activate, 'icon' => 'magic', 'url' => helper::createLink('bug', 'activate', "bugID=$bug->id", '', true));
+ if(common::hasPriv('story', 'create') and $bug->status != 'closed') $menu[] = array('label' => $this->lang->bug->toStory, 'icon' => 'unlink', 'url' => helper::createLink('story', 'create', "product=$bug->product&branch=$bug->branch&module=0&story=0&execution=0&bugID=$bug->id", '', true), 'size' => '95%');
+
+ $menus[$bug->id] = $menu;
+ }
+ break;
+ case 'task':
+ if(!isset($this->task)) $this->loadModel('task');
+
+ foreach($objects as $task)
+ {
+ $menu = array();
+
+ if(common::hasPriv('task', 'edit') and $this->task->isClickable($task, 'edit')) $menu[] = array('label' => $this->lang->task->edit, 'icon' => 'edit', 'url' => helper::createLink('task', 'edit', "taskID=$task->id", '', true), 'size' => '95%');
+ if(common::hasPriv('task', 'pause') and $this->task->isClickable($task, 'pause')) $menu[] = array('label' => $this->lang->task->pause, 'icon' => 'ok', 'url' => helper::createLink('task', 'pause', "taskID=$task->id", '', true));
+ if(common::hasPriv('task', 'restart') and $this->task->isClickable($task, 'restart')) $menu[] = array('label' => $this->lang->task->restart, 'icon' => 'play', 'url' => helper::createLink('task', 'restart', "taskID=$task->id", '', true));
+ if(common::hasPriv('task', 'recordEstimate') and $this->task->isClickable($task, 'recordEstimate')) $menu[] = array('label' => $this->lang->task->recordEstimate, 'icon' => 'time', 'url' => helper::createLink('task', 'recordEstimate', "taskID=$task->id", '', true));
+ if(common::hasPriv('task', 'activate') and $this->task->isClickable($task, 'activate')) $menu[] = array('label' => $this->lang->task->activate, 'icon' => 'magic', 'url' => helper::createLink('task', 'activate', "taskID=$task->id", '', true));
+ if(common::hasPriv('task', 'batchCreate') and $this->task->isClickable($task, 'batchCreate')) $menu[] = array('label' => $this->lang->task->children, 'icon' => 'split', 'url' => helper::createLink('task', 'batchCreate', "execution=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id", '', true), 'size' => '95%');
+ if(common::hasPriv('task', 'create') and $this->task->isClickable($task, 'create')) $menu[] = array('label' => $this->lang->task->copy, 'icon' => 'copy', 'url' => helper::createLink('task', 'create', "projctID=$task->execution&storyID=$task->story&moduleID=$task->module&taskID=$task->id", '', true), 'size' => '95%');
+ if(common::hasPriv('task', 'cancel') and $this->task->isClickable($task, 'cancel')) $menu[] = array('label' => $this->lang->task->cancel, 'icon' => 'ban-circle', 'url' => helper::createLink('task', 'cancel', "taskID=$task->id", '', true));
+
+ $menus[$task->id] = $menu;
+ }
+ break;
+ }
+ return $menus;
+ }
+}
diff --git a/module/kanban/view/setcolumn.html.php b/module/kanban/view/setcolumn.html.php
new file mode 100644
index 0000000000..002ca7fef5
--- /dev/null
+++ b/module/kanban/view/setcolumn.html.php
@@ -0,0 +1,52 @@
+
+ * @package kanban
+ * @version $Id: setcolumn.html.php 935 2021-10-26 16:24:24Z xiawenlong@easycorp.ltd $
+ * @link https://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+ + holiday->edit;?> +
+
+
+
diff --git a/module/kanban/view/setlane.html.php b/module/kanban/view/setlane.html.php
new file mode 100644
index 0000000000..980c88f6f3
--- /dev/null
+++ b/module/kanban/view/setlane.html.php
@@ -0,0 +1,58 @@
+
+ * @package kanban
+ * @version $Id: setlane.html.php 935 2021-10-26 16:24:24Z liyuchun@easycorp.ltd $
+ * @link https://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+ + " . $title . '';?> +
+
+
+
diff --git a/module/kanban/view/setwip.html.php b/module/kanban/view/setwip.html.php
new file mode 100644
index 0000000000..512a50c232
--- /dev/null
+++ b/module/kanban/view/setwip.html.php
@@ -0,0 +1,69 @@
+
+ * @package kanban
+ * @version $Id: setwip.html.php 935 2021-10-25 10:56:24Z liyuchun@easycorp.ltd $
+ * @link https://www.zentao.net
+ */
+?>
+
+
+
+
+
+
+
+ + " . $title . '';?> +
+
+
+
diff --git a/module/mail/model.php b/module/mail/model.php
index 67ef56e317..4ed410325f 100644
--- a/module/mail/model.php
+++ b/module/mail/model.php
@@ -266,41 +266,47 @@ class mailModel extends model
* @param string $body
* @param array $ccList
* @param bool $includeMe
+ * @param array $emails
* @access public
* @return void
*/
- public function send($toList, $subject, $body = '', $ccList = '', $includeMe = false)
+ public function send($toList, $subject, $body = '', $ccList = '', $includeMe = false, $emails = array())
{
if(!$this->config->mail->turnon) return;
if(!empty($this->config->mail->async)) return $this->addQueue($toList, $subject, $body, $ccList, $includeMe);
ob_start();
- $toList = $toList ? explode(',', str_replace(' ', '', $toList)) : array();
- $ccList = $ccList ? explode(',', str_replace(' ', '', $ccList)) : array();
- /* Process toList and ccList, remove current user from them. If toList is empty, use the first cc as to. */
- if($includeMe == false)
+ if(empty($emails))
{
- $account = isset($this->app->user->account) ? $this->app->user->account : '';
+ $toList = $toList ? explode(',', str_replace(' ', '', $toList)) : array();
+ $ccList = $ccList ? explode(',', str_replace(' ', '', $ccList)) : array();
- foreach($toList as $key => $to) if(trim($to) == $account or !trim($to)) unset($toList[$key]);
- foreach($ccList as $key => $cc) if(trim($cc) == $account or !trim($cc)) unset($ccList[$key]);
+ /* Process toList and ccList, remove current user from them. If toList is empty, use the first cc as to. */
+ if($includeMe == false)
+ {
+ $account = isset($this->app->user->account) ? $this->app->user->account : '';
+
+ foreach($toList as $key => $to) if(trim($to) == $account or !trim($to)) unset($toList[$key]);
+ foreach($ccList as $key => $cc) if(trim($cc) == $account or !trim($cc)) unset($ccList[$key]);
+ }
+
+ /* Remove deleted users. */
+ $users = $this->loadModel('user')->getPairs('nodeleted|all');
+ $blockUsers = isset($this->config->message->blockUser) ? explode(',', $this->config->message->blockUser) : array();
+ foreach($toList as $key => $to) if(!isset($users[trim($to)]) or in_array(trim($to), $blockUsers)) unset($toList[$key]);
+ foreach($ccList as $key => $cc) if(!isset($users[trim($cc)]) or in_array(trim($cc), $blockUsers)) unset($ccList[$key]);
+
+ if(!$toList and !$ccList) return;
+ if(!$toList and $ccList) $toList = array(array_shift($ccList));
+ $toList = join(',', $toList);
+ $ccList = join(',', $ccList);
+
+ /* Get realname and email of users. */
+ $this->loadModel('user');
+ $emails = $this->user->getRealNameAndEmails(str_replace(' ', '', $toList . ',' . $ccList));
}
- /* Remove deleted users. */
- $users = $this->loadModel('user')->getPairs('nodeleted|all');
- foreach($toList as $key => $to) if(!isset($users[trim($to)])) unset($toList[$key]);
- foreach($ccList as $key => $cc) if(!isset($users[trim($cc)])) unset($ccList[$key]);
-
- if(!$toList and !$ccList) return;
- if(!$toList and $ccList) $toList = array(array_shift($ccList));
- $toList = join(',', $toList);
- $ccList = join(',', $ccList);
-
- /* Get realname and email of users. */
- $this->loadModel('user');
- $emails = $this->user->getRealNameAndEmails(str_replace(' ', '', $toList . ',' . $ccList));
-
$this->clear();
/* Replace full webPath image for mail. */
@@ -691,7 +697,7 @@ class mailModel extends model
{
if($object->contentType == 'markdown')
{
- $object->content = $this->app->loadClass('hyperdown')->makeHtml($object->content);
+ $object->content = commonModel::processMarkdown($object->content);
$object->content = str_replace("
+
+
+
+
+ + " . $title . '';?> +
+| ", " | ", $object->content); $object->content = str_replace(" | ", " | ", $object->content); @@ -741,7 +747,12 @@ class mailModel extends model } else { - $sendUsers = $this->{$objectType}->getToAndCcList($object); + $sendUsers = $this->{$objectType}->getToAndCcList($object); + } + + if($objectType == 'release' and strpos(",{$object->notify},", ',FB,') !== false) + { + $this->release->sendMail2Feedback($object, $subject); } if(!$sendUsers) return; diff --git a/module/message/control.php b/module/message/control.php index dc63edc9d6..f791f5e9aa 100644 --- a/module/message/control.php +++ b/module/message/control.php @@ -84,7 +84,9 @@ class message extends control { $data = fixer::input('post')->get(); $data->messageSetting = !empty($data->messageSetting) ? json_encode($data->messageSetting) : ''; + $data->blockUser = !empty($data->blockUser) ? implode(',', $data->blockUser) : ''; $this->loadModel('setting')->setItem('system.message.setting', $data->messageSetting); + $this->loadModel('setting')->setItem('system.message.blockUser', $data->blockUser); return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload')); } @@ -95,7 +97,7 @@ class message extends control $this->view->position[] = $this->lang->message->common; $this->view->position[] = $this->lang->message->setting; - $users = $this->loadModel('user')->getPairs('noletter'); + $users = $this->loadModel('user')->getPairs('noletter,noclosed'); unset($users['']); $this->view->users = $users; diff --git a/module/message/lang/de.php b/module/message/lang/de.php index 3363605bdb..2074f33b10 100644 --- a/module/message/lang/de.php +++ b/module/message/lang/de.php @@ -16,28 +16,3 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals $lang->message->browserSetting->turnonList[1] = 'On'; $lang->message->browserSetting->turnonList[0] = 'Off'; - -$lang->message->label = new stdclass(); -$lang->message->label->created = 'create'; -$lang->message->label->opened = 'open'; -$lang->message->label->changed = 'change'; -$lang->message->label->edited = 'edit'; -$lang->message->label->assigned = 'assign'; -$lang->message->label->closed = 'close'; -$lang->message->label->deleted = 'delete'; -$lang->message->label->undeleted = 'restore'; -$lang->message->label->commented = 'comment'; -$lang->message->label->activated = 'activate'; -$lang->message->label->resolved = 'resolve'; -$lang->message->label->reviewed = 'review'; -$lang->message->label->confirmed = 'confirm Story'; -$lang->message->label->frombug = 'convert from Bug'; -$lang->message->label->started = 'start'; -$lang->message->label->delayed = 'delay'; -$lang->message->label->suspended = 'suspend'; -$lang->message->label->finished = 'finish'; -$lang->message->label->paused = 'pause'; -$lang->message->label->canceled = 'cancel'; -$lang->message->label->restarted = 'continue'; -$lang->message->label->blocked = 'block'; -$lang->message->label->bugconfirmed = 'confirm'; diff --git a/module/message/lang/en.php b/module/message/lang/en.php index f3d02119da..88fa9bf34e 100644 --- a/module/message/lang/en.php +++ b/module/message/lang/en.php @@ -1,8 +1,9 @@ message->common = 'Notification'; -$lang->message->index = 'Home'; -$lang->message->setting = 'Settings'; -$lang->message->browser = 'Browser Notification'; +$lang->message->common = 'Notification'; +$lang->message->index = 'Home'; +$lang->message->setting = 'Settings'; +$lang->message->browser = 'Browser Notification'; +$lang->message->blockUser = 'Block User'; $lang->message->typeList['mail'] = 'Email'; $lang->message->typeList['message'] = 'Browser Notifications'; @@ -16,28 +17,3 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notify the time intervals $lang->message->browserSetting->turnonList[1] = 'On'; $lang->message->browserSetting->turnonList[0] = 'Off'; - -$lang->message->label = new stdclass(); -$lang->message->label->created = 'create'; -$lang->message->label->opened = 'open'; -$lang->message->label->changed = 'change'; -$lang->message->label->edited = 'edit'; -$lang->message->label->assigned = 'assign'; -$lang->message->label->closed = 'close'; -$lang->message->label->deleted = 'delete'; -$lang->message->label->undeleted = 'restore'; -$lang->message->label->commented = 'comment'; -$lang->message->label->activated = 'activate'; -$lang->message->label->resolved = 'resolve'; -$lang->message->label->reviewed = 'review'; -$lang->message->label->confirmed = 'confirm Story'; -$lang->message->label->frombug = 'convert from Bug'; -$lang->message->label->started = 'start'; -$lang->message->label->delayed = 'delay'; -$lang->message->label->suspended = 'suspend'; -$lang->message->label->finished = 'finish'; -$lang->message->label->paused = 'pause'; -$lang->message->label->canceled = 'cancel'; -$lang->message->label->restarted = 'continue'; -$lang->message->label->blocked = 'block'; -$lang->message->label->bugconfirmed = 'confirm'; diff --git a/module/message/lang/fr.php b/module/message/lang/fr.php index 87894cd7d4..6bb0757fb4 100644 --- a/module/message/lang/fr.php +++ b/module/message/lang/fr.php @@ -16,28 +16,3 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Notifier les intervalles $lang->message->browserSetting->turnonList[1] = 'On'; $lang->message->browserSetting->turnonList[0] = 'Off'; - -$lang->message->label = new stdclass(); -$lang->message->label->created = 'create'; -$lang->message->label->opened = 'open'; -$lang->message->label->changed = 'change'; -$lang->message->label->edited = 'edit'; -$lang->message->label->assigned = 'assign'; -$lang->message->label->closed = 'close'; -$lang->message->label->deleted = 'delete'; -$lang->message->label->undeleted = 'restore'; -$lang->message->label->commented = 'comment'; -$lang->message->label->activated = 'activate'; -$lang->message->label->resolved = 'resolve'; -$lang->message->label->reviewed = 'review'; -$lang->message->label->confirmed = 'confirm Story'; -$lang->message->label->frombug = 'convert from Bug'; -$lang->message->label->started = 'start'; -$lang->message->label->delayed = 'delay'; -$lang->message->label->suspended = 'suspend'; -$lang->message->label->finished = 'finish'; -$lang->message->label->paused = 'pause'; -$lang->message->label->canceled = 'cancel'; -$lang->message->label->restarted = 'continue'; -$lang->message->label->blocked = 'block'; -$lang->message->label->bugconfirmed = 'confirm'; diff --git a/module/message/lang/vi.php b/module/message/lang/vi.php index c528464c99..2cd0c2e551 100644 --- a/module/message/lang/vi.php +++ b/module/message/lang/vi.php @@ -16,28 +16,3 @@ $lang->message->browserSetting->pollTimePlaceholder = 'Thông báo khoảng th $lang->message->browserSetting->turnonList[1] = 'On'; $lang->message->browserSetting->turnonList[0] = 'Off'; - -$lang->message->label = new stdclass(); -$lang->message->label->created = 'create'; -$lang->message->label->opened = 'open'; -$lang->message->label->changed = 'change'; -$lang->message->label->edited = 'edit'; -$lang->message->label->assigned = 'assign'; -$lang->message->label->closed = 'close'; -$lang->message->label->deleted = 'delete'; -$lang->message->label->undeleted = 'restore'; -$lang->message->label->commented = 'comment'; -$lang->message->label->activated = 'activate'; -$lang->message->label->resolved = 'resolve'; -$lang->message->label->reviewed = 'review'; -$lang->message->label->confirmed = 'confirm Story'; -$lang->message->label->frombug = 'convert from Bug'; -$lang->message->label->started = 'start'; -$lang->message->label->delayed = 'delay'; -$lang->message->label->suspended = 'suspend'; -$lang->message->label->finished = 'finish'; -$lang->message->label->paused = 'pause'; -$lang->message->label->canceled = 'cancel'; -$lang->message->label->restarted = 'continue'; -$lang->message->label->blocked = 'block'; -$lang->message->label->bugconfirmed = 'confirm'; diff --git a/module/message/lang/zh-cn.php b/module/message/lang/zh-cn.php index 3edad2389b..600d5ff70c 100644 --- a/module/message/lang/zh-cn.php +++ b/module/message/lang/zh-cn.php @@ -1,8 +1,9 @@ message->common = '消息'; -$lang->message->index = '首页'; -$lang->message->setting = '设置'; -$lang->message->browser = '浏览器通知'; +$lang->message->common = '消息'; +$lang->message->index = '首页'; +$lang->message->setting = '设置'; +$lang->message->browser = '浏览器通知'; +$lang->message->blockUser = '不通知人员'; $lang->message->typeList['mail'] = '邮件'; $lang->message->typeList['message'] = '浏览器通知'; @@ -16,28 +17,3 @@ $lang->message->browserSetting->pollTimePlaceholder = '通知的时间间隔， $lang->message->browserSetting->turnonList[1] = '打开'; $lang->message->browserSetting->turnonList[0] = '关闭'; - -$lang->message->label = new stdclass(); -$lang->message->label->created = '创建'; -$lang->message->label->opened = '创建'; -$lang->message->label->changed = '变更'; -$lang->message->label->edited = '编辑'; -$lang->message->label->assigned = '指派'; -$lang->message->label->closed = '关闭'; -$lang->message->label->deleted = '删除'; -$lang->message->label->undeleted = '还原'; -$lang->message->label->commented = '评论'; -$lang->message->label->activated = '激活'; -$lang->message->label->resolved = '解决'; -$lang->message->label->reviewed = '评审'; -$lang->message->label->confirmed = "确认{$lang->SRCommon}"; -$lang->message->label->frombug = "转{$lang->SRCommon}"; -$lang->message->label->started = '开始'; -$lang->message->label->delayed = '延期'; -$lang->message->label->suspended = '挂起'; -$lang->message->label->finished = '完成'; -$lang->message->label->paused = '暂停'; -$lang->message->label->canceled = '取消'; -$lang->message->label->restarted = '继续'; -$lang->message->label->blocked = '阻塞'; -$lang->message->label->bugconfirmed = '确认'; diff --git a/module/message/lang/zh-tw.php b/module/message/lang/zh-tw.php index eee89461a9..a3d30d6c0c 100644 --- a/module/message/lang/zh-tw.php +++ b/module/message/lang/zh-tw.php @@ -16,28 +16,3 @@ $lang->message->browserSetting->pollTimePlaceholder = '通知的時間間隔， $lang->message->browserSetting->turnonList[1] = '打開'; $lang->message->browserSetting->turnonList[0] = '關閉'; - -$lang->message->label = new stdclass(); -$lang->message->label->created = '創建'; -$lang->message->label->opened = '創建'; -$lang->message->label->changed = '變更'; -$lang->message->label->edited = '編輯'; -$lang->message->label->assigned = '指派'; -$lang->message->label->closed = '關閉'; -$lang->message->label->deleted = '刪除'; -$lang->message->label->undeleted = '還原'; -$lang->message->label->commented = '評論'; -$lang->message->label->activated = '激活'; -$lang->message->label->resolved = '解決'; -$lang->message->label->reviewed = '評審'; -$lang->message->label->confirmed = "確認{$lang->SRCommon}"; -$lang->message->label->frombug = "轉{$lang->SRCommon}"; -$lang->message->label->started = '開始'; -$lang->message->label->delayed = '延期'; -$lang->message->label->suspended = '掛起'; -$lang->message->label->finished = '完成'; -$lang->message->label->paused = '暫停'; -$lang->message->label->canceled = '取消'; -$lang->message->label->restarted = '繼續'; -$lang->message->label->blocked = '阻塞'; -$lang->message->label->bugconfirmed = '確認'; diff --git a/module/message/model.php b/module/message/model.php index cdb2e3a35e..bae3422d26 100644 --- a/module/message/model.php +++ b/module/message/model.php @@ -49,7 +49,7 @@ class messageModel extends model { foreach($actions as $action) { - $objectActions[$objectType][$action] = $this->lang->message->label->$action; + $objectActions[$objectType][$action] = str_replace($this->lang->webhook->trimWords, '', $this->lang->action->label->$action); } } return $objectActions; diff --git a/module/message/view/setting.html.php b/module/message/view/setting.html.php index 6b062ae12d..d059b229d7 100644 --- a/module/message/view/setting.html.php +++ b/module/message/view/setting.html.php @@ -74,6 +74,10 @@ + | |||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| message->blockUser;?> | +message->blockUser) ? $config->message->blockUser: '', "class='form-control chosen' multiple");?> | +|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| createLink('project', 'index', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'");?> | ++ projectName) ? html::a($this->createLink('project', 'index', "id=$execution->project", '', '', $execution->project), $execution->projectName, '', "title='$execution->projectName'") : '';?> + | begin;?> | end;?> | diff --git a/module/my/view/task.html.php b/module/my/view/task.html.php index dc4d1c5d5f..3fa6265c48 100644 --- a/module/my/view/task.html.php +++ b/module/my/view/task.html.php @@ -166,7 +166,7 @@pri;?>' title='task->priList, $child->pri);?>'>task->priList, $child->pri);?> | parent > 0) echo '' . $this->lang->task->childrenAB . ' ';?> - createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color' data-group='project'");?> + createLink('task', 'view', "taskID=$child->id", '', '', $child->project), $child->name, null, "style='color: $child->color'");?> | systemMode == 'new'):?>createLink('project', 'view', "projectID=$child->project"), $child->projectName);?> | diff --git a/module/my/view/testcase.html.php b/module/my/view/testcase.html.php index 1fc94723f8..ca9fd9f131 100644 --- a/module/my/view/testcase.html.php +++ b/module/my/view/testcase.html.php @@ -116,7 +116,7 @@ createLink('testcase', 'batchEdit'); + $actionLink = $this->createLink('testcase', 'batchEdit', "productID=0&branch=all"); $misc = "data-form-action='$actionLink'"; echo html::commonButton($lang->edit, $misc); } diff --git a/module/personnel/model.php b/module/personnel/model.php index 6f0e94e0c0..da8114ed23 100644 --- a/module/personnel/model.php +++ b/module/personnel/model.php @@ -607,7 +607,7 @@ class personnelModel extends model if($oldWhitelist) $accounts = array_unique(array_merge($accounts, $oldWhitelist)); } } - $whitelist = ',' . implode(',', $accounts); + $whitelist = !empty($accounts) ? ',' . implode(',', $accounts) : ''; $this->dao->update($objectTable)->set('whitelist')->eq($whitelist)->where('id')->eq($objectID)->exec(); $deletedAccounts = array(); diff --git a/module/product/control.php b/module/product/control.php index 2c1e861032..c1d38e293b 100644 --- a/module/product/control.php +++ b/module/product/control.php @@ -218,10 +218,17 @@ class product extends control $this->lang->datatable->showBranch = sprintf($this->lang->datatable->showBranch, $this->lang->product->branchName[$product->type]); } - /* Get stories. */ + /* Get stories and branches. */ if($this->app->rawModule == 'projectstory') { - if(!empty($product)) $this->session->set('currentProductType', $product->type); + $branches = array(); + if(!empty($product)) + { + $this->session->set('currentProductType', $product->type); + $productBranches = $product->type != 'normal' ? $this->loadModel('execution')->getBranchByProduct($product->id, $projectID) : array(); + $branches = isset($productBranches[$product->id]) ? $productBranches[$product->id] : array(); + } + $this->products = $this->product->getProducts($projectID, 'all', '', false); $projectProducts = $this->product->getProducts($projectID); $productPlans = $this->execution->getPlans($projectProducts); @@ -231,7 +238,7 @@ class product extends control } else { - $branchID = $browseType == 'bymodule' ? 'all' : $branchID; + $branches = $this->loadModel('branch')->getPairs($productID); $stories = $this->product->getStories($productID, $branchID, $browseType, $queryID, $moduleID, $storyType, $sort, $pager); } @@ -301,7 +308,7 @@ class product extends control $this->view->moduleName = ($moduleID and $moduleID !== 'all') ? $this->tree->getById($moduleID)->name : $this->lang->tree->all; $this->view->branch = $branch; $this->view->branchID = $branchID; - $this->view->branches = $this->loadModel('branch')->getPairs($productID); + $this->view->branches = $branches; $this->view->storyStages = $this->product->batchGetStoryStage($stories); $this->view->setModule = true; $this->view->storyTasks = $storyTasks; @@ -727,6 +734,7 @@ class product extends control $this->view->users = $this->user->getPairs('noletter'); $this->view->groups = $this->loadModel('group')->getPairs(); $this->view->branches = $this->loadModel('branch')->getPairs($productID); + $this->view->reviewers = explode(',', $product->reviewer); $this->display(); } @@ -973,65 +981,25 @@ class product extends control * @param int $planID * @param bool $needCreate * @param string $expired - * @param string $from * @param string $param * @access public * @return void */ - public function ajaxGetPlans($productID, $branch = 0, $planID = 0, $fieldID = '', $needCreate = false, $expired = '', $from = '', $param = '') + public function ajaxGetPlans($productID, $branch = 0, $planID = 0, $fieldID = '', $needCreate = false, $expired = '', $param = '') { - $this->loadModel('productplan'); - if($from == 'story' and $branch == BRANCH_MAIN) + $param = strtolower($param); + $plans = $this->loadModel('productplan')->getPairs($productID, $branch, $expired, strpos($param, 'skipparent') !== false); + $field = $fieldID ? "plans[$fieldID]" : 'plan'; + $output = ''; + $output .= html::select($field, $plans, $planID, "class='form-control chosen'"); + if(count($plans) == 1 and $needCreate and $needCreate !== 'false') { - $plans = $this->productplan->getPairs($productID); - } - elseif($from == 'story' and $branch) - { - $plans = $this->productplan->getPairs($productID, 0); - $plans += $this->productplan->getPairs($productID, $branch); - } - else - { - $plans = $this->productplan->getPairs($productID, $branch, $expired); - } - - $field = $fieldID ? "plans[$fieldID]" : 'plan'; - - $output = ''; - if(strpos($param, 'batchEdit') !== false) - { - $output = "||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
| story->requirement;?> | +story->requirement;?> | story->story;?> | bug->common;?> | product->plan;?> | product->release;?> | -actions;?> | +actions;?> | |||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
| story->draft;?> | story->activate;?> | story->change;?> | -story->completeRate;?> | +story->completeRate;?> |
story->draft;?> | story->activate;?> | story->change;?> | -story->completeRate;?> | +story->completeRate;?> |
bug->activate;?> | close;?> | bug->fixedRate;?> | @@ -83,9 +83,9 @@ $trAttrs .= " class='$trClass'"; ?> systemMode == 'new'):?> -||||||
| + | @@ -127,9 +127,9 @@ $trAttrs .= " class='$trClass'"; } ?> - | |||||||||||||||||
| + | @@ -183,9 +183,9 @@ } $trAttrs .= " class='$trClass'"; ?> - | |||||||||||||||||
| id => '')) : '';?> | +id => ''));?> | id", $product, 'list', 'edit');?> - + | ||||||||||||||||
| productplan->project?> | -+ | |
|---|---|---|
@@ -202,5 +202,4 @@
-productplan->projectNotEmpty)?>
diff --git a/module/productplan/view/create.html.php b/module/productplan/view/create.html.php
index 8c42ea6126..c131aa5f34 100644
--- a/module/productplan/view/create.html.php
+++ b/module/productplan/view/create.html.php
@@ -22,15 +22,12 @@
productplan->createChildren : $lang->productplan->create;?> | ||