|
- model == 'waterfall' ? $this->project->getWaterfallProgress($project->id) : (((float)$workhour->totalConsumed + (float)$workhour->totalLeft) ? floor($workhour->totalConsumed / ((float)$workhour->totalConsumed + (float)$workhour->totalLeft) * 1000) / 1000 * 100 : 0);?>
- project->progress;?> percent;?>
+ project->progress;?> progress . $lang->percent;?>
-
+
|
testtask->execution);?> | statusAB);?> | testtask->owner);?> | +testtask->members);?> | testtask->begin);?> | testtask->end);?> | owner);?> | + + members) as $member) $members[] = zget($users, $member);?> + +begin?> | end?> | " . $this->loadModel('flow')->getFieldValue($extendField, $task) . "";?> diff --git a/module/testtask/view/create.html.php b/module/testtask/view/create.html.php index 2360aecfa9..6c47bc9d5a 100644 --- a/module/testtask/view/create.html.php +++ b/module/testtask/view/create.html.php @@ -73,6 +73,10 @@ +
|---|---|---|---|
| testtask->members;?> | ++ | ||
| testtask->begin;?> | diff --git a/module/testtask/view/edit.html.php b/module/testtask/view/edit.html.php index 670e466275..d138517023 100644 --- a/module/testtask/view/edit.html.php +++ b/module/testtask/view/edit.html.php @@ -56,6 +56,12 @@ | ||
| testtask->members;?> | ++ members, "class='form-control picker-select' multiple");?> + | +||
| testtask->begin;?> |
diff --git a/module/transfer/control.php b/module/transfer/control.php
index c6e3f0b892..51f45e797d 100755
--- a/module/transfer/control.php
+++ b/module/transfer/control.php
@@ -152,6 +152,11 @@ class transfer extends control
{
$filter = '';
if($model == 'task') $filter = 'estimate';
+ if($model == 'bug')
+ {
+ $this->loadModel('bug');
+ $this->config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'product', 'method' =>'getAllExecutionPairsByProduct', 'params' => '$productID&$branch');
+ }
if($model == 'story' and $this->session->storyType == 'requirement') $this->loadModel('story')->replaceUserRequirementLang();
$this->loadModel($model);
@@ -198,6 +203,7 @@ class transfer extends control
{
$this->loadModel($model);
$fields = $this->config->$model->templateFields;
+ if($model == 'bug') $this->config->bug->datatable->fieldList['execution']['dataSource'] = array('module' => 'product', 'method' =>'getAllExecutionPairsByProduct', 'params' => '$productID&$branch');
if($this->config->edition != 'open')
{
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index a62cc027f0..d5dc7b36db 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -707,6 +707,11 @@ class upgradeModel extends model
$this->processHistoryDataForMetric();
$this->loadModel('metric')->updateMetricDate();
break;
+ case '18_8':
+ /* Upgrade members for testtask. */
+ $this->upgradeTesttaskMembers();
+ $this->loadModel('program')->refreshStats(true);
+ break;
}
$this->deletePatch();
@@ -9878,4 +9883,23 @@ class upgradeModel extends model
}
$this->dao->commit();
}
+
+ /**
+ * Upgrade testtask members.
+ *
+ * @access public
+ * @return void
+ */
+ public function upgradeTesttaskMembers()
+ {
+ $memberGroup = $this->dao->select('task,lastRunner')->from(TABLE_TESTRUN)
+ ->where('lastRunner')->ne('')
+ ->fetchGroup('task', 'lastRunner');
+
+ foreach($memberGroup as $taskID => $members)
+ {
+ $members = implode(',', array_keys($members));
+ $this->dao->update(TABLE_TESTTASK)->set('members')->eq($members)->where('id')->eq($taskID)->exec();
+ }
+ }
}
diff --git a/module/weekly/lang/de.php b/module/weekly/lang/de.php
index 459e38dc3c..940594866d 100644
--- a/module/weekly/lang/de.php
+++ b/module/weekly/lang/de.php
@@ -90,15 +90,15 @@ EOD;
$lang->weekly->blockHelpNotice = << 1) Progress of this week=total consumed man hours/(total consumed man hours+remaining man hours) + 1) Project progress = consumed task hours / (consumed task hours + remaining task hours) * 100% Statistical range: -1) The total consumed man hours include task, demand, bug, use case, version, test sheet, problem, risk, document and review time -2) To avoid repeated calculation, the task only contains child tasks, not parent tasks - 3) Including deleted tasks, requirements, bugs, use cases, versions, test sheets, problems, risks, documents, and consumed man hours in reviews - 4) This includes the work hours consumed by deleted tasks, requirements, bugs, use cases, versions, test sheets, and documents - 5) Including work hours consumed by cancelled tasks, problems and risks - 6) Exclude remaining work on canceled tasks - 7) Exclude remaining work for deleted tasks in progress +1) Only the working hour consumption data of the task is counted + 2) To avoid repeated calculation, the task working hours only include child tasks, not parent tasks + 3) Including the working hours consumed by canceled tasks + 4) Excluding the working hours consumed in deleted tasks + 5) Excluding the working hours consumed in deleted tasks in progress + 6) Excluding the remaining working hours of canceled tasks + 7) Excluding the remaining working hours of deleted tasks in progress PV Planned ValueCalculation method:1) The estimated start date and end date of the task are within the range of the start and end dates of this week, and the estimated work hours are accumulated diff --git a/module/weekly/lang/en.php b/module/weekly/lang/en.php index 459e38dc3c..940594866d 100644 --- a/module/weekly/lang/en.php +++ b/module/weekly/lang/en.php @@ -90,15 +90,15 @@ EOD; $lang->weekly->blockHelpNotice = << 1) Progress of this week=total consumed man hours/(total consumed man hours+remaining man hours) + 1) Project progress = consumed task hours / (consumed task hours + remaining task hours) * 100% Statistical range: -1) The total consumed man hours include task, demand, bug, use case, version, test sheet, problem, risk, document and review time -2) To avoid repeated calculation, the task only contains child tasks, not parent tasks - 3) Including deleted tasks, requirements, bugs, use cases, versions, test sheets, problems, risks, documents, and consumed man hours in reviews - 4) This includes the work hours consumed by deleted tasks, requirements, bugs, use cases, versions, test sheets, and documents - 5) Including work hours consumed by cancelled tasks, problems and risks - 6) Exclude remaining work on canceled tasks - 7) Exclude remaining work for deleted tasks in progress +1) Only the working hour consumption data of the task is counted + 2) To avoid repeated calculation, the task working hours only include child tasks, not parent tasks + 3) Including the working hours consumed by canceled tasks + 4) Excluding the working hours consumed in deleted tasks + 5) Excluding the working hours consumed in deleted tasks in progress + 6) Excluding the remaining working hours of canceled tasks + 7) Excluding the remaining working hours of deleted tasks in progress PV Planned ValueCalculation method:1) The estimated start date and end date of the task are within the range of the start and end dates of this week, and the estimated work hours are accumulated diff --git a/module/weekly/lang/fr.php b/module/weekly/lang/fr.php index 459e38dc3c..940594866d 100644 --- a/module/weekly/lang/fr.php +++ b/module/weekly/lang/fr.php @@ -90,15 +90,15 @@ EOD; $lang->weekly->blockHelpNotice = << 1) Progress of this week=total consumed man hours/(total consumed man hours+remaining man hours) + 1) Project progress = consumed task hours / (consumed task hours + remaining task hours) * 100% Statistical range: -1) The total consumed man hours include task, demand, bug, use case, version, test sheet, problem, risk, document and review time -2) To avoid repeated calculation, the task only contains child tasks, not parent tasks - 3) Including deleted tasks, requirements, bugs, use cases, versions, test sheets, problems, risks, documents, and consumed man hours in reviews - 4) This includes the work hours consumed by deleted tasks, requirements, bugs, use cases, versions, test sheets, and documents - 5) Including work hours consumed by cancelled tasks, problems and risks - 6) Exclude remaining work on canceled tasks - 7) Exclude remaining work for deleted tasks in progress +1) Only the working hour consumption data of the task is counted + 2) To avoid repeated calculation, the task working hours only include child tasks, not parent tasks + 3) Including the working hours consumed by canceled tasks + 4) Excluding the working hours consumed in deleted tasks + 5) Excluding the working hours consumed in deleted tasks in progress + 6) Excluding the remaining working hours of canceled tasks + 7) Excluding the remaining working hours of deleted tasks in progress PV Planned ValueCalculation method:1) The estimated start date and end date of the task are within the range of the start and end dates of this week, and the estimated work hours are accumulated diff --git a/module/weekly/lang/zh-cn.php b/module/weekly/lang/zh-cn.php index a5508a2bc4..aabc2de79d 100644 --- a/module/weekly/lang/zh-cn.php +++ b/module/weekly/lang/zh-cn.php @@ -90,13 +90,13 @@ EOD; $lang->weekly->blockHelpNotice = << 1）本周进度=总消耗工时/（总消耗工时+剩余工时） + 1）项目进度=已消耗任务工时 /（已消耗任务工时 + 剩余任务工时）*100% 统计范围： -1）总消耗的工时包括任务、需求、Bug、用例、版本、测试单、问题、风险、文档、评审的耗时 -2）为避免重复计算，任务只包含子任务，不包括父任务 - 3）包括已删除任务、需求、Bug、用例、版本、测试单、问题、风险、文档、评审中已消耗的工时 - 4）包括已删除执行中任务、需求、Bug、用例、版本、测试单、文档已消耗的工时 - 5）包括已取消任务、问题、风险已消耗的工时 +1）只统计任务的工时消耗数据。 + 2）为避免重复计算，任务工时只包含子任务，不包括父任务 + 3）包括已取消任务消耗的工时 + 4）不包括已删除任务中消耗的工时 + 5）不包括已删除执行中任务消耗的工时 6）不包括已取消任务的剩余工时 7）不包括已删除执行中任务的剩余工时 PV 计划完成的工作 | ||