* Finish task #38171.

This commit is contained in:
hufangzhou
2021-05-13 16:07:09 +08:00
parent 39c2c6b267
commit 0d0d85c9ff
10 changed files with 66 additions and 0 deletions
+11
View File
@@ -1,3 +1,14 @@
-- DROP TABLE IF EXISTS `zt_storyreview`;
CREATE TABLE IF NOT EXISTS `zt_storyreview` (
`story` mediumint(9) NOT NULL,
`version` smallint(6) NOT NULL,
`reviewer` varchar(30) NOT NULL,
`result` varchar(30) NOT NULL,
`reivewDate` datetime NOT NULL,
UNIQUE KEY `story` (`story`,`version`,`reviewer`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
ALTER TABLE `zt_project` CHANGE `lifetime` `lifetime` char(30) NOT NULL DEFAULT '';
ALTER TABLE `zt_story` ADD `category` varchar(30) NOT NULL DEFAULT 'feature' AFTER `type`;
ALTER TABLE `zt_testtask` ADD `type` varchar(255) NOT NULL DEFAULT '' AFTER `build`;
+9
View File
@@ -863,6 +863,15 @@ CREATE TABLE IF NOT EXISTS `zt_storyspec` (
`verify` text NOT NULL,
UNIQUE KEY `story` (`story`,`version`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `zt_storyreview`;
CREATE TABLE IF NOT EXISTS `zt_storyreview` (
`story` mediumint(9) NOT NULL,
`version` smallint(6) NOT NULL,
`reviewer` varchar(30) NOT NULL,
`result` varchar(30) NOT NULL,
`reivewDate` datetime NOT NULL,
UNIQUE KEY `story` (`story`,`version`,`reviewer`)
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-- DROP TABLE IF EXISTS `zt_storystage`;
CREATE TABLE IF NOT EXISTS `zt_storystage` (
`story` mediumint(8) unsigned NOT NULL,
+10
View File
@@ -59,6 +59,11 @@ class custom extends control
$this->view->unitList = explode(',', $unitList);
$this->view->defaultCurrency = zget($this->config->$module, 'defaultCurrency', 'CNY');
}
if($module == 'story' and $field == 'reviewRules')
{
$this->app->loadConfig($module);
$this->view->reviewRule = zget($this->config->$module, 'reviewRules', '1');
}
if(($module == 'story' or $module == 'testcase') and $field == 'review')
{
$this->app->loadConfig($module);
@@ -106,6 +111,11 @@ class custom extends control
$data = fixer::input('post')->join('forceReview', ',')->get();
$this->loadModel('setting')->setItems("system.$module", $data);
}
elseif($module == 'story' and $field == 'reviewRules')
{
$data = fixer::input('post')->get();
$this->loadModel('setting')->setItems("system.$module", $data);
}
elseif($module == 'testcase' and $field == 'review')
{
$review = fixer::input('post')->get();
+4
View File
@@ -43,6 +43,7 @@ $lang->custom->browseStoryConcept = "List of story concepts";
$lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->reviewRule = 'Review Rules';
$lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
@@ -247,3 +248,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
$lang->custom->scrum = new stdclass();
$lang->custom->scrum->setConcept = 'Set concept';
$lang->custom->reviewRules[1] = 'All passed';
$lang->custom->reviewRules[0] = 'More than half passed';
+4
View File
@@ -43,6 +43,7 @@ $lang->custom->browseStoryConcept = "List of story concepts";
$lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->reviewRule = 'Review Rules';
$lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
@@ -248,3 +249,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
$lang->custom->scrum = new stdclass();
$lang->custom->scrum->setConcept = 'Set concept';
$lang->custom->reviewRules[1] = 'All passed';
$lang->custom->reviewRules[0] = 'More than half passed';
+4
View File
@@ -43,6 +43,7 @@ $lang->custom->browseStoryConcept = "List of story concepts";
$lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->reviewRule = 'Review Rules';
$lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
@@ -247,3 +248,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
$lang->custom->scrum = new stdclass();
$lang->custom->scrum->setConcept = 'Set concept';
$lang->custom->reviewRules[1] = 'All passed';
$lang->custom->reviewRules[0] = 'More than half passed';
+4
View File
@@ -43,6 +43,7 @@ $lang->custom->browseStoryConcept = "List of story concepts";
$lang->custom->deleteStoryConcept = "Delete story Concept";
$lang->custom->URConcept = "UR Concept";
$lang->custom->SRConcept = "SR Concept";
$lang->custom->reviewRule = 'Review Rules';
$lang->custom->switch = "Switch";
$lang->custom->oneUnit = "One {$lang->hourCommon}";
$lang->custom->convertRelationTitle = "Please set the conversion factor of {$lang->hourCommon} to %s first";
@@ -247,3 +248,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = 'Function Point';
$lang->custom->scrum = new stdclass();
$lang->custom->scrum->setConcept = 'Set concept';
$lang->custom->reviewRules[1] = 'All passed';
$lang->custom->reviewRules[0] = 'More than half passed';
+5
View File
@@ -43,6 +43,7 @@ $lang->custom->browseStoryConcept = "需求概念列表";
$lang->custom->deleteStoryConcept = "删除需求概念";
$lang->custom->URConcept = "用需概念";
$lang->custom->SRConcept = "软需概念";
$lang->custom->reviewRule = "评审规则";
$lang->custom->switch = "切换";
$lang->custom->oneUnit = "一个{$lang->hourCommon}";
$lang->custom->convertRelationTitle = "请先设置{$lang->hourCommon}转换为%s的换算系数";
@@ -102,6 +103,7 @@ $lang->custom->story->fields['sourceList'] = '来源';
$lang->custom->story->fields['reasonList'] = '关闭原因';
$lang->custom->story->fields['stageList'] = '阶段';
$lang->custom->story->fields['statusList'] = '状态';
$lang->custom->story->fields['reviewRules'] = '评审规则';
$lang->custom->story->fields['reviewResultList'] = '评审结果';
$lang->custom->story->fields['review'] = '评审流程';
@@ -248,3 +250,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = '功能点';
$lang->custom->scrum = new stdclass();
$lang->custom->scrum->setConcept = '设置项目概念';
$lang->custom->reviewRules[1] = '全部通过通过';
$lang->custom->reviewRules[0] = '半数以上通过通过';
+4
View File
@@ -43,6 +43,7 @@ $lang->custom->browseStoryConcept = "需求概念列表";
$lang->custom->deleteStoryConcept = "刪除需求概念";
$lang->custom->URConcept = "用需概念";
$lang->custom->SRConcept = "軟需概念";
$lang->custom->reviewRule = '評審規則';
$lang->custom->switch = "切換";
$lang->custom->oneUnit = "一個{$lang->hourCommon}";
$lang->custom->convertRelationTitle = "請先設置{$lang->hourCommon}轉換為%s的換算係數";
@@ -248,3 +249,6 @@ $lang->custom->conceptOptions->hourPoint['2'] = '功能點';
$lang->custom->scrum = new stdclass();
$lang->custom->scrum->setConcept = '設置項目概念';
$lang->custom->reviewRules[1] = '全部通過通過';
$lang->custom->reviewRules[0] = '半數以上通過通過';
+11
View File
@@ -70,6 +70,17 @@ EOT;
<td colspan='4' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
<?php elseif($module == 'story' and $field == 'reviewRules'):?>
<table class='table table-form mw-700px'>
<tr>
<th class='thWidth'><?php echo $lang->custom->reviewRule;?></th>
<td><?php echo html::radio('reviewRules', $lang->custom->reviewRules, $reviewRule);?></td>
<td></td>
</tr>
<tr>
<td colspan='2' class='text-center'><?php echo html::submitButton();?></td>
</tr>
</table>
<?php elseif(($module == 'story' or $module == 'testcase') and $field == 'review'):?>
<table class='table table-form mw-800px'>
<tr>