diff --git a/db/update15.9.sql b/db/update15.9.sql index a4c6ad8742..4efcfcac48 100644 --- a/db/update15.9.sql +++ b/db/update15.9.sql @@ -77,3 +77,20 @@ CREATE TABLE IF NOT EXISTS `zt_holiday` ( KEY `year` (`year`), KEY `name` (`name`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`editedBy`,`editedDate`,`deleted`) VALUES +('需求','10','request','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('设计','10','design','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('开发','50','dev','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('测试','15','qa','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('发布','10','release','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('总结评审','5','review','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0'); + +INSERT INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) VALUES +('all','stage','typeList','request','需求', '1'), +('all','stage','typeList','design','设计', '1'), +('all','stage','typeList','dev','开发', '1'), +('all','stage','typeList','qa','测试', '1'), +('all','stage','typeList','release','发布', '1'), +('all','stage','typeList','review','总结评审','1'), +('all','stage','typeList','other','其他','1'); diff --git a/db/zentao.sql b/db/zentao.sql index 957418f640..acc2fcfde7 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -5792,7 +5792,22 @@ REPLACE INTO `zt_lang` (`lang`, `module`, `section`, `key`, `value`, `system`) V ('zh-cn', 'custom', 'URSRList', '3', '{\"SRName\":\"\\u8f6f\\u9700\",\"URName\":\"\\u7528\\u9700\"}', '1'),('zh-cn', 'custom', 'URSRList', '4', '{\"SRName\":\"\\u6545\\u4e8b\",\"URName\":\"\\u53f2\\u8bd7\"}', '1'), ('zh-cn', 'custom', 'URSRList', '5', '{\"SRName\":\"\\u9700\\u6c42\",\"URName\":\"\\u7528\\u6237\\u9700\\u6c42\"}', '1'), ('en', 'custom', 'URSRList', '1', '{\"SRName\":\"Story\",\"URName\":\"Epic\"}', '0'), -('en', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0'); +('en', 'custom', 'URSRList', '2', '{\"SRName\":\"Software Requirement\",\"URName\":\"User Requirement\"}', '0'), +('all','stage','typeList','request','需求', '1'), +('all','stage','typeList','design','设计', '1'), +('all','stage','typeList','dev','开发', '1'), +('all','stage','typeList','qa','测试', '1'), +('all','stage','typeList','release','发布', '1'), +('all','stage','typeList','review','总结评审','1'), +('all','stage','typeList','other','其他','1'); + +REPLACE INTO `zt_stage` (`name`,`percent`,`type`,`createdBy`,`createdDate`,`editedBy`,`editedDate`,`deleted`) VALUES +('需求','10','request','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('设计','10','design','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('开发','50','dev','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('测试','15','qa','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('发布','10','release','admin','2020-02-08 21:08:30','admin','2020-02-12 13:50:27','0'), +('总结评审','5','review','admin','2020-02-08 21:08:45','admin','2020-02-12 13:50:27','0'); INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'custom', '', 'hourPoint', '0'); INSERT INTO `zt_config` (`owner`, `module`, `section`, `key`, `value`) VALUES ('system', 'common', '', 'CRProduct', '1'); diff --git a/module/execution/control.php b/module/execution/control.php index e7e4d2b3fb..ae716858cd 100644 --- a/module/execution/control.php +++ b/module/execution/control.php @@ -1877,6 +1877,13 @@ class execution extends control 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) + { + $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; @@ -1891,6 +1898,7 @@ class execution extends control $this->view->execution = $execution; $this->view->groupBy = $groupBy; $this->view->canBeChanged = $canBeChanged; + $this->view->userList = $userList; $this->display(); } diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php index 24b0fa64b2..422ae7163a 100644 --- a/module/execution/view/kanban.html.php +++ b/module/execution/view/kanban.html.php @@ -149,4 +149,5 @@ js::set('priv', execution->sortColumn);?> kanban);?> task->deadlineAB);?> +