diff --git a/module/execution/js/testtask.js b/module/execution/js/testtask.js
index cb4ee2d5cc..7b904e5b23 100644
--- a/module/execution/js/testtask.js
+++ b/module/execution/js/testtask.js
@@ -11,10 +11,12 @@ $(function()
var checkedWait = $checkedRows.filter("[data-status=wait]").length;
var checkedTesting = $checkedRows.filter("[data-status=doing]").length;
var checkedBlocked = $checkedRows.filter("[data-status=blocked]").length;
+ var checkedDone = $checkedRows.filter("[data-status=done]").length;
var checkedStatistics = checkedAllSummary.replace('%total%', checkedTotal)
.replace('%wait%', checkedWait)
.replace('%testing%', checkedTesting)
- .replace('%blocked%', checkedBlocked);
+ .replace('%blocked%', checkedBlocked)
+ .replace('%done%', checkedDone);
return checkedTotal ? checkedStatistics : pageSummary;
}
diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php
index feb078964d..934c4e3ca7 100644
--- a/module/execution/view/testtask.html.php
+++ b/module/execution/view/testtask.html.php
@@ -37,6 +37,7 @@
$waitCount = 0;
$testingCount = 0;
$blockedCount = 0;
+$doneCount = 0;
?>
@@ -80,6 +81,7 @@ $blockedCount = 0;
status == 'wait') $waitCount ++;?>
status == 'doing') $testingCount ++;?>
status == 'blocked') $blockedCount ++;?>
+ status == 'done') $doneCount ++;?>
data-status='status;?>'>
|
@@ -144,12 +146,12 @@ $blockedCount = 0;
?>
- testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount);?>
+ testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount, $doneCount);?>
show('right', 'pagerjs');?>
-testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount));?>
+testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount, $doneCount));?>
testtask->checkedAllSummary);?>
diff --git a/module/my/view/testtask.html.php b/module/my/view/testtask.html.php
index 8bf8ac97e4..395c064bb9 100644
--- a/module/my/view/testtask.html.php
+++ b/module/my/view/testtask.html.php
@@ -80,7 +80,7 @@
diff --git a/module/project/view/testtask.html.php b/module/project/view/testtask.html.php
index 40943f8e67..00f5400a4f 100644
--- a/module/project/view/testtask.html.php
+++ b/module/project/view/testtask.html.php
@@ -68,6 +68,7 @@
$waitCount = 0;
$testingCount = 0;
$blockedCount = 0;
+ $doneCount = 0;
?>
$productTasks):?>
@@ -75,6 +76,7 @@
status == 'wait') $waitCount ++;?>
status == 'doing') $testingCount ++;?>
status == 'blocked') $blockedCount ++;?>
+ status == 'done') $doneCount ++;?>
|
>
|
@@ -125,7 +127,7 @@
diff --git a/module/task/css/common.css b/module/task/css/common.css
index 6ac775e840..5c6be38e22 100644
--- a/module/task/css/common.css
+++ b/module/task/css/common.css
@@ -1,2 +1,16 @@
.body-modal > .main {padding: 20px;}
.body-modal > .main .table-form {border: 1px solid #ddd;}
+
+#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
+#taskTeamEditor td .chosen-single .chosen-search input,
+#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
+#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
+#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
+.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
+#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
+#taskTeamEditor tr:last-child td:first-child .icon, #taskTeamEditor tr.member-last td:first-child .icon {display: none;}
+
+#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
+#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
diff --git a/module/task/css/create.css b/module/task/css/create.css
index 676e62d8af..06d6b03211 100644
--- a/module/task/css/create.css
+++ b/module/task/css/create.css
@@ -33,16 +33,3 @@
#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0;}
#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
#modalTeam .modal-body {padding: 12px 13px 20px; max-height: 296px!important; overflow-y: scroll!important;}
-#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
-#taskTeamEditor td .chosen-single .chosen-search input,
-#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
-#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
-#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
-.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
-#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
-#taskTeamEditor tr:last-child td:first-child .icon {display: none;}
-
-#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
diff --git a/module/task/css/edit.css b/module/task/css/edit.css
index 9eee7f882d..16a92a4e26 100644
--- a/module/task/css/edit.css
+++ b/module/task/css/edit.css
@@ -8,16 +8,3 @@
#modalTeam .modal-content {padding: 20px 13px 0; height: 340px;max-height: 296px!important; overflow-y: scroll!important;}
#modalTeam .modal-header {height: 44px; padding: 10px 20px; margin: 0; }
#modalTeam .modal-header .modal-title {font-size: 13px; line-height: 24px;}
-#taskTeamEditor tr {padding: 8px 7px 8px 7px;}
-#taskTeamEditor td .chosen-single .chosen-search input,
-#taskTeamEditor tr td .chosen-single {height: 35px; line-height: 24px;}
-#taskTeamEditor td .chosen-single .chosen-search::before {top: 10px;}
-#taskTeamEditor tr td:first-child {width: 40px; position: relative;}
-.team-number {display: inline-block; width: 20px; height: 20px; line-height: 20px; border-radius: 10px; text-align: center; background: #f4f5f7;}
-#taskTeamEditor tr td:first-child .icon { position: absolute; top: 42px; left: 10.5px; display: block; font-size: 8px; color: #9ea3bd;;}
-#taskTeamEditor tr:last-child td:first-child .icon {display: none;}
-
-#modalTeam .modal-content input[type="text"]::input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-webkit-input-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-moz-placeholder{color: #c4c4c4;text-align: left;}
-#modalTeam .modal-content input[type="text"]::-ms-input-placeholder{color: #c4c4c4;text-align: left;}
diff --git a/module/task/js/edit.js b/module/task/js/edit.js
index 9e93296521..b6ec50cd49 100644
--- a/module/task/js/edit.js
+++ b/module/task/js/edit.js
@@ -1,6 +1,7 @@
$(function()
{
$('.record-estimate-toggle').modalTrigger({width:900, type:'iframe', afterHide: function(){parent.location.href=parent.location.href;}});
+ if(!newRowCount) $('#taskTeamEditor tr.member').last().addClass('member-last');
})
/**
diff --git a/module/task/view/taskteam.html.php b/module/task/view/taskteam.html.php
index 9e62015a66..2c7995aad8 100644
--- a/module/task/view/taskteam.html.php
+++ b/module/task/view/taskteam.html.php
@@ -4,6 +4,7 @@
#taskTeamEditor .estimateBox input {background-color: #fff; border-right-width: 0px;}
#taskTeamEditor input, #taskTeamEditor span, #taskTeamEditor .chosen-container > a {border-color: #eee;}
+mode) or $task->mode == 'linear') ? '' : 'hidden';?>
team)):?>
team as $member):?>
@@ -24,10 +25,10 @@ if($task->mode == 'linear' and strpos('|closed|cancel|pause|', $task->status) !=
$hourDisabled = $memberDisabled;
if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = false;
?>
- |
+
|
-
+
|
account, "class='form-control chosen'" . ($memberDisabled ? ' disabled' : ''))?>
@@ -55,10 +56,10 @@ if($task->mode == 'multi' and $app->rawMethod == 'activate') $hourDisabled = fal
- |
+
|
-
+
|
@@ -226,6 +227,10 @@ $(document).ready(function()
{
$newRow.removeClass('highlight');
}, 1600);
+
+ var taskMode = $('#mode').val();
+ if(taskMode == 'multi') $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden');
+
disableMembers();
adjustButtons();
setLineNumber();
@@ -278,9 +283,11 @@ $(document).ready(function()
if($(this).val() == 'multi')
{
disableMembers();
+ $('#taskTeamEditor tr.member .icon-angle-down').addClass('hidden');
}
else
{
+ $('#taskTeamEditor tr.member .icon-angle-down').removeClass('hidden');
$taskTeamEditor.find('select#team').each(function()
{
$(this).find('option:disabled').removeAttr('disabled').trigger("chosen:updated");
diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php
index 1580a0ebd4..256a795308 100644
--- a/module/testtask/lang/de.php
+++ b/module/testtask/lang/de.php
@@ -106,8 +106,9 @@ $lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s cases, %s failures, %s time.';
$lang->testtask->pageSummary = 'Total testtasks: %s.';
-$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.';
-$lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.';
+$lang->testtask->mySummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.';
+$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s, Done: %s.';
+$lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%, Done: %done%.';
$lang->testtask->beginAndEnd = 'Datum';
$lang->testtask->to = 'An';
diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php
index 42a1b628b2..8fc53837ba 100644
--- a/module/testtask/lang/en.php
+++ b/module/testtask/lang/en.php
@@ -106,7 +106,8 @@ $lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s cases, %s failures, %s time.';
$lang->testtask->pageSummary = 'Total testtasks: %s.';
-$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.';
+$lang->testtask->mySummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.';
+$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s, Done: %s.';
$lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.';
$lang->testtask->beginAndEnd = 'Duration';
diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php
index 760cbd57c5..2726b92d53 100644
--- a/module/testtask/lang/fr.php
+++ b/module/testtask/lang/fr.php
@@ -106,7 +106,8 @@ $lang->testtask->passCount = 'Pass';
$lang->testtask->failCount = 'Fail';
$lang->testtask->summary = '%s CasTest, %s échecs, %s heures.';
$lang->testtask->pageSummary = 'Total testtasks: %s.';
-$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.';
+$lang->testtask->mySummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s.';
+$lang->testtask->allSummary = 'Total testtasks: %s, Wait: %s, Testing: %s, Blocked: %s, Done: %s.';
$lang->testtask->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.';
$lang->testtask->beginAndEnd = 'Durée';
diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php
index 51068da86b..89383c248e 100644
--- a/module/testtask/lang/zh-cn.php
+++ b/module/testtask/lang/zh-cn.php
@@ -65,49 +65,50 @@ $lang->testtask->startAction = "开始测试单";
$lang->testtask->resultsAction = "用例结果";
$lang->testtask->reportAction = '用例报表统计';
-$lang->testtask->id = '编号';
-$lang->testtask->common = '测试单';
-$lang->testtask->product = '所属' . $lang->productCommon;
-$lang->testtask->project = '所属项目';
-$lang->testtask->execution = '所属' . $lang->execution->common;
-$lang->testtask->type = '测试类型';
-$lang->testtask->build = '版本';
-$lang->testtask->owner = '负责人';
-$lang->testtask->executor = '执行人';
-$lang->testtask->execTime = '执行时间';
-$lang->testtask->pri = '优先级';
-$lang->testtask->name = '名称';
-$lang->testtask->begin = '开始日期';
-$lang->testtask->end = '结束日期';
-$lang->testtask->realFinishedDate = '实际完成日期';
-$lang->testtask->desc = '描述';
-$lang->testtask->mailto = '抄送给';
-$lang->testtask->status = '当前状态';
-$lang->testtask->subStatus = '子状态';
-$lang->testtask->testreport = '相关测试报告';
-$lang->testtask->assignedTo = '指派给';
-$lang->testtask->linkVersion = '版本';
-$lang->testtask->lastRunAccount = '执行人';
-$lang->testtask->lastRunTime = '执行时间';
-$lang->testtask->lastRunResult = '结果';
-$lang->testtask->reportField = '测试总结';
-$lang->testtask->files = '上传附件';
-$lang->testtask->case = '用例';
-$lang->testtask->version = '版本';
-$lang->testtask->caseResult = '测试结果';
-$lang->testtask->stepResults = '步骤结果';
-$lang->testtask->lastRunner = '最后执行人';
-$lang->testtask->lastRunDate = '最后执行时间';
-$lang->testtask->date = '测试时间';
-$lang->testtask->deleted = "已删除";
-$lang->testtask->resultFile = "结果文件";
-$lang->testtask->caseCount = '用例数';
-$lang->testtask->passCount = '成功';
-$lang->testtask->failCount = '失败';
-$lang->testtask->summary = '有%s个用例,失败%s个,耗时%s。';
-$lang->testtask->pageSummary = '本页共 %s 个测试单。';
-$lang->testtask->allSummary = '本页共 %s 个测试单, 待测试测试单 %s, 测试中测试单 %s, 被阻塞测试单 %s。';
-$lang->testtask->checkedAllSummary = '共选中 %total% 个测试单, 待测试测试单 %wait%, 测试中测试单 %testing%, 被阻塞测试单 %blocked%。';
+$lang->testtask->id = '编号';
+$lang->testtask->common = '测试单';
+$lang->testtask->product = '所属' . $lang->productCommon;
+$lang->testtask->project = '所属项目';
+$lang->testtask->execution = '所属' . $lang->execution->common;
+$lang->testtask->type = '测试类型';
+$lang->testtask->build = '版本';
+$lang->testtask->owner = '负责人';
+$lang->testtask->executor = '执行人';
+$lang->testtask->execTime = '执行时间';
+$lang->testtask->pri = '优先级';
+$lang->testtask->name = '名称';
+$lang->testtask->begin = '开始日期';
+$lang->testtask->end = '结束日期';
+$lang->testtask->realFinishedDate = '实际完成日期';
+$lang->testtask->desc = '描述';
+$lang->testtask->mailto = '抄送给';
+$lang->testtask->status = '当前状态';
+$lang->testtask->subStatus = '子状态';
+$lang->testtask->testreport = '相关测试报告';
+$lang->testtask->assignedTo = '指派给';
+$lang->testtask->linkVersion = '版本';
+$lang->testtask->lastRunAccount = '执行人';
+$lang->testtask->lastRunTime = '执行时间';
+$lang->testtask->lastRunResult = '结果';
+$lang->testtask->reportField = '测试总结';
+$lang->testtask->files = '上传附件';
+$lang->testtask->case = '用例';
+$lang->testtask->version = '版本';
+$lang->testtask->caseResult = '测试结果';
+$lang->testtask->stepResults = '步骤结果';
+$lang->testtask->lastRunner = '最后执行人';
+$lang->testtask->lastRunDate = '最后执行时间';
+$lang->testtask->date = '测试时间';
+$lang->testtask->deleted = "已删除";
+$lang->testtask->resultFile = "结果文件";
+$lang->testtask->caseCount = '用例数';
+$lang->testtask->passCount = '成功';
+$lang->testtask->failCount = '失败';
+$lang->testtask->summary = '有%s个用例,失败%s个,耗时%s。';
+$lang->testtask->pageSummary = '本页共 %s 个测试单。';
+$lang->testtask->mySummary = '本页共 %s 个测试单,待测试测试单 %s,测试中测试单 %s,被阻塞测试单 %s。';
+$lang->testtask->allSummary = '本页共 %s 个测试单,待测试测试单 %s,测试中测试单 %s,被阻塞测试单 %s,已测测试单 %s。';
+$lang->testtask->checkedAllSummary = '共选中 %total% 个测试单,待测试测试单 %wait%,测试中测试单 %testing%,被阻塞测试单 %blocked%,,已测测试单 %done%。';
$lang->testtask->beginAndEnd = '起止时间';
$lang->testtask->to = '至';
diff --git a/module/testtask/view/browse.html.php b/module/testtask/view/browse.html.php
index ce89350bef..7a83118728 100644
--- a/module/testtask/view/browse.html.php
+++ b/module/testtask/view/browse.html.php
@@ -17,8 +17,9 @@
session->testTaskVersionScope;
$status = $this->session->testTaskVersionStatus;
+$status = strtolower($status);
?>
-
+
@@ -89,11 +90,13 @@ $status = $this->session->testTaskVersionStatus;
$waitCount = 0;
$testingCount = 0;
$blockedCount = 0;
+ $doneCount = 0;
?>
status == 'wait') $waitCount ++;?>
status == 'doing') $testingCount ++;?>
status == 'blocked') $blockedCount ++;?>
+ status == 'done') $doneCount ++;?>
|
| id"), sprintf('%03d', $task->id));?> |
id"), $task->name);?> |
@@ -118,7 +121,7 @@ $status = $this->session->testTaskVersionStatus;
diff --git a/module/user/view/testtask.html.php b/module/user/view/testtask.html.php
index 6164fbb83a..d24fa5298b 100755
--- a/module/user/view/testtask.html.php
+++ b/module/user/view/testtask.html.php
@@ -41,11 +41,13 @@
$waitCount = 0;
$testingCount = 0;
$blockedCount = 0;
+ $doneCount = 0;
?>
status == 'wait') $waitCount ++;?>
status == 'doing') $testingCount ++;?>
status == 'blocked') $blockedCount ++;?>
+ status == 'done') $doneCount ++;?>
| createLink('testtask', 'view', "taskID=$task->id"), sprintf('%03d', $task->id));?> |
createLink('testtask', 'view', "taskID=$task->id"), $task->name);?> |
@@ -60,7 +62,7 @@