diff --git a/module/execution/js/testtask.js b/module/execution/js/testtask.js new file mode 100644 index 0000000000..cb4ee2d5cc --- /dev/null +++ b/module/execution/js/testtask.js @@ -0,0 +1,22 @@ +$(function() +{ + $('#testtaskForm').table( + { + replaceId: 'taskIdList', + statisticCreator: function(table) + { + var $table = table.getTable(); + var $checkedRows = $table.find('tbody>tr.checked'); + var checkedTotal = $checkedRows.length; + 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 checkedStatistics = checkedAllSummary.replace('%total%', checkedTotal) + .replace('%wait%', checkedWait) + .replace('%testing%', checkedTesting) + .replace('%blocked%', checkedBlocked); + + return checkedTotal ? checkedStatistics : pageSummary; + } + }); +}); diff --git a/module/execution/view/testtask.html.php b/module/execution/view/testtask.html.php index 66cc3b0dbc..1a70b062ee 100644 --- a/module/execution/view/testtask.html.php +++ b/module/execution/view/testtask.html.php @@ -33,6 +33,11 @@ +
@@ -44,7 +49,7 @@

-
+ recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> @@ -72,7 +77,10 @@ $productTasks):?> - > + status == 'wait') $waitCount ++;?> + status == 'doing') $testingCount ++;?> + status == 'blocked') $blockedCount ++;?> + data-status='status;?>'>
@@ -136,9 +144,12 @@ ?> +
testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount);?>
show('right', 'pagerjs');?> +testtask->allSummary, $total, $waitCount, $testingCount, $blockedCount));?> +testtask->checkedAllSummary);?> diff --git a/module/testtask/lang/de.php b/module/testtask/lang/de.php index ff147f50dc..1580a0ebd4 100644 --- a/module/testtask/lang/de.php +++ b/module/testtask/lang/de.php @@ -65,48 +65,49 @@ $lang->testtask->startAction = "Start Request"; $lang->testtask->resultsAction = "Case Result"; $lang->testtask->reportAction = 'Case Report'; -$lang->testtask->id = 'ID'; -$lang->testtask->common = 'Testaufgabe'; -$lang->testtask->product = $lang->productCommon; -$lang->testtask->project = 'Project'; -$lang->testtask->execution = $lang->execution->common; -$lang->testtask->type = 'Typ'; -$lang->testtask->build = 'Build'; -$lang->testtask->owner = 'Besitzer'; -$lang->testtask->executor = 'Executor'; -$lang->testtask->execTime = 'Exec Time'; -$lang->testtask->pri = 'Priorität'; -$lang->testtask->name = 'Name'; -$lang->testtask->begin = 'Start'; -$lang->testtask->end = 'Ende'; -$lang->testtask->realFinishedDate = 'Actual Finished Date'; -$lang->testtask->desc = 'Beschreibung'; -$lang->testtask->mailto = 'Mail an'; -$lang->testtask->status = 'Status'; -$lang->testtask->subStatus = 'Sub Status'; -$lang->testtask->testreport = 'Test Report'; -$lang->testtask->assignedTo = 'Zugeordnet'; -$lang->testtask->linkVersion = 'Version'; -$lang->testtask->lastRunAccount = 'Ausgeführt von'; -$lang->testtask->lastRunTime = 'Ausgeführt am'; -$lang->testtask->lastRunResult = 'Ergebnis'; -$lang->testtask->reportField = 'Bericht'; -$lang->testtask->files = 'Upload'; -$lang->testtask->case = 'Fall'; -$lang->testtask->version = 'Version'; -$lang->testtask->caseResult = 'Test Ergebnis'; -$lang->testtask->stepResults = 'Schritt Ergebnis'; -$lang->testtask->lastRunner = 'Ausgeführt von'; -$lang->testtask->lastRunDate = 'Ausgeführt am'; -$lang->testtask->date = 'Datum'; -$lang->testtask->deleted = "Deleted"; -$lang->testtask->resultFile = "Result File"; -$lang->testtask->caseCount = 'Case Count'; -$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->id = 'ID'; +$lang->testtask->common = 'Testaufgabe'; +$lang->testtask->product = $lang->productCommon; +$lang->testtask->project = 'Project'; +$lang->testtask->execution = $lang->execution->common; +$lang->testtask->type = 'Typ'; +$lang->testtask->build = 'Build'; +$lang->testtask->owner = 'Besitzer'; +$lang->testtask->executor = 'Executor'; +$lang->testtask->execTime = 'Exec Time'; +$lang->testtask->pri = 'Priorität'; +$lang->testtask->name = 'Name'; +$lang->testtask->begin = 'Start'; +$lang->testtask->end = 'Ende'; +$lang->testtask->realFinishedDate = 'Actual Finished Date'; +$lang->testtask->desc = 'Beschreibung'; +$lang->testtask->mailto = 'Mail an'; +$lang->testtask->status = 'Status'; +$lang->testtask->subStatus = 'Sub Status'; +$lang->testtask->testreport = 'Test Report'; +$lang->testtask->assignedTo = 'Zugeordnet'; +$lang->testtask->linkVersion = 'Version'; +$lang->testtask->lastRunAccount = 'Ausgeführt von'; +$lang->testtask->lastRunTime = 'Ausgeführt am'; +$lang->testtask->lastRunResult = 'Ergebnis'; +$lang->testtask->reportField = 'Bericht'; +$lang->testtask->files = 'Upload'; +$lang->testtask->case = 'Fall'; +$lang->testtask->version = 'Version'; +$lang->testtask->caseResult = 'Test Ergebnis'; +$lang->testtask->stepResults = 'Schritt Ergebnis'; +$lang->testtask->lastRunner = 'Ausgeführt von'; +$lang->testtask->lastRunDate = 'Ausgeführt am'; +$lang->testtask->date = 'Datum'; +$lang->testtask->deleted = "Deleted"; +$lang->testtask->resultFile = "Result File"; +$lang->testtask->caseCount = 'Case Count'; +$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->beginAndEnd = 'Datum'; $lang->testtask->to = 'An'; diff --git a/module/testtask/lang/en.php b/module/testtask/lang/en.php index 225ffaa1af..42a1b628b2 100644 --- a/module/testtask/lang/en.php +++ b/module/testtask/lang/en.php @@ -65,48 +65,49 @@ $lang->testtask->startAction = "Start Request"; $lang->testtask->resultsAction = "Case Result"; $lang->testtask->reportAction = 'Report'; -$lang->testtask->id = 'ID'; -$lang->testtask->common = 'Request'; -$lang->testtask->product = $lang->productCommon; -$lang->testtask->project = 'Project'; -$lang->testtask->execution = $lang->execution->common; -$lang->testtask->type = 'Type'; -$lang->testtask->build = 'Build'; -$lang->testtask->owner = 'Owner'; -$lang->testtask->executor = 'Executor'; -$lang->testtask->execTime = 'Exec Time'; -$lang->testtask->pri = 'Priority'; -$lang->testtask->name = 'Request Name'; -$lang->testtask->begin = 'Begin'; -$lang->testtask->end = 'End'; -$lang->testtask->realFinishedDate = 'Actual Finished Date'; -$lang->testtask->desc = 'Description'; -$lang->testtask->mailto = 'Mailto'; -$lang->testtask->status = 'Status'; -$lang->testtask->subStatus = 'Sub Status'; -$lang->testtask->testreport = 'Test Report'; -$lang->testtask->assignedTo = 'Assigned'; -$lang->testtask->linkVersion = 'Build'; -$lang->testtask->lastRunAccount = 'RunBy'; -$lang->testtask->lastRunTime = 'Last Run'; -$lang->testtask->lastRunResult = 'Result'; -$lang->testtask->reportField = 'Report'; -$lang->testtask->files = 'Upload'; -$lang->testtask->case = 'Case List'; -$lang->testtask->version = 'Version'; -$lang->testtask->caseResult = 'Test Result'; -$lang->testtask->stepResults = 'Step Result'; -$lang->testtask->lastRunner = 'RunBy'; -$lang->testtask->lastRunDate = 'Last Run'; -$lang->testtask->date = 'Tested on';; -$lang->testtask->deleted = "Deleted"; -$lang->testtask->resultFile = "Result File"; -$lang->testtask->caseCount = 'Case Count'; -$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->id = 'ID'; +$lang->testtask->common = 'Request'; +$lang->testtask->product = $lang->productCommon; +$lang->testtask->project = 'Project'; +$lang->testtask->execution = $lang->execution->common; +$lang->testtask->type = 'Type'; +$lang->testtask->build = 'Build'; +$lang->testtask->owner = 'Owner'; +$lang->testtask->executor = 'Executor'; +$lang->testtask->execTime = 'Exec Time'; +$lang->testtask->pri = 'Priority'; +$lang->testtask->name = 'Request Name'; +$lang->testtask->begin = 'Begin'; +$lang->testtask->end = 'End'; +$lang->testtask->realFinishedDate = 'Actual Finished Date'; +$lang->testtask->desc = 'Description'; +$lang->testtask->mailto = 'Mailto'; +$lang->testtask->status = 'Status'; +$lang->testtask->subStatus = 'Sub Status'; +$lang->testtask->testreport = 'Test Report'; +$lang->testtask->assignedTo = 'Assigned'; +$lang->testtask->linkVersion = 'Build'; +$lang->testtask->lastRunAccount = 'RunBy'; +$lang->testtask->lastRunTime = 'Last Run'; +$lang->testtask->lastRunResult = 'Result'; +$lang->testtask->reportField = 'Report'; +$lang->testtask->files = 'Upload'; +$lang->testtask->case = 'Case List'; +$lang->testtask->version = 'Version'; +$lang->testtask->caseResult = 'Test Result'; +$lang->testtask->stepResults = 'Step Result'; +$lang->testtask->lastRunner = 'RunBy'; +$lang->testtask->lastRunDate = 'Last Run'; +$lang->testtask->date = 'Tested on';; +$lang->testtask->deleted = "Deleted"; +$lang->testtask->resultFile = "Result File"; +$lang->testtask->caseCount = 'Case Count'; +$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->beginAndEnd = 'Duration'; $lang->testtask->to = 'To'; diff --git a/module/testtask/lang/fr.php b/module/testtask/lang/fr.php index f5aea60bec..760cbd57c5 100644 --- a/module/testtask/lang/fr.php +++ b/module/testtask/lang/fr.php @@ -65,48 +65,49 @@ $lang->testtask->startAction = "Démarrer Campagne"; $lang->testtask->resultsAction = "Résultats CasTest"; $lang->testtask->reportAction = 'Rapport CasTests'; -$lang->testtask->id = 'ID'; -$lang->testtask->common = 'Recette'; -$lang->testtask->product = $lang->productCommon; -$lang->testtask->project = 'Project'; -$lang->testtask->execution = $lang->execution->common; -$lang->testtask->type = 'Type'; -$lang->testtask->build = 'Build'; -$lang->testtask->owner = 'Owner'; -$lang->testtask->executor = 'Executeur'; -$lang->testtask->execTime = 'Durée Exec'; -$lang->testtask->pri = 'Priorité'; -$lang->testtask->name = 'Nom Campagne'; -$lang->testtask->begin = 'Début'; -$lang->testtask->end = 'Fin'; -$lang->testtask->realFinishedDate = 'Actual Finished Date'; -$lang->testtask->desc = 'Description'; -$lang->testtask->mailto = 'Mailto'; -$lang->testtask->status = 'Statut'; -$lang->testtask->subStatus = 'Sous-statut'; -$lang->testtask->testreport = 'Test Report'; -$lang->testtask->assignedTo = 'Affecté'; -$lang->testtask->linkVersion = 'Build'; -$lang->testtask->lastRunAccount = 'Jouée par'; -$lang->testtask->lastRunTime = 'Dernier Run'; -$lang->testtask->lastRunResult = 'Résultat'; -$lang->testtask->reportField = 'Rapport'; -$lang->testtask->files = 'Upload'; -$lang->testtask->case = 'Liste CasTests'; -$lang->testtask->version = 'Version'; -$lang->testtask->caseResult = 'Résultat Test'; -$lang->testtask->stepResults = 'Etape Résultat'; -$lang->testtask->lastRunner = 'Joué par'; -$lang->testtask->lastRunDate = 'Dernier Run'; -$lang->testtask->date = 'Testé sur';; -$lang->testtask->deleted = "Supprimé"; -$lang->testtask->resultFile = "Fichier Résultats"; -$lang->testtask->caseCount = 'Compteur CasTest'; -$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->id = 'ID'; +$lang->testtask->common = 'Recette'; +$lang->testtask->product = $lang->productCommon; +$lang->testtask->project = 'Project'; +$lang->testtask->execution = $lang->execution->common; +$lang->testtask->type = 'Type'; +$lang->testtask->build = 'Build'; +$lang->testtask->owner = 'Owner'; +$lang->testtask->executor = 'Executeur'; +$lang->testtask->execTime = 'Durée Exec'; +$lang->testtask->pri = 'Priorité'; +$lang->testtask->name = 'Nom Campagne'; +$lang->testtask->begin = 'Début'; +$lang->testtask->end = 'Fin'; +$lang->testtask->realFinishedDate = 'Actual Finished Date'; +$lang->testtask->desc = 'Description'; +$lang->testtask->mailto = 'Mailto'; +$lang->testtask->status = 'Statut'; +$lang->testtask->subStatus = 'Sous-statut'; +$lang->testtask->testreport = 'Test Report'; +$lang->testtask->assignedTo = 'Affecté'; +$lang->testtask->linkVersion = 'Build'; +$lang->testtask->lastRunAccount = 'Jouée par'; +$lang->testtask->lastRunTime = 'Dernier Run'; +$lang->testtask->lastRunResult = 'Résultat'; +$lang->testtask->reportField = 'Rapport'; +$lang->testtask->files = 'Upload'; +$lang->testtask->case = 'Liste CasTests'; +$lang->testtask->version = 'Version'; +$lang->testtask->caseResult = 'Résultat Test'; +$lang->testtask->stepResults = 'Etape Résultat'; +$lang->testtask->lastRunner = 'Joué par'; +$lang->testtask->lastRunDate = 'Dernier Run'; +$lang->testtask->date = 'Testé sur';; +$lang->testtask->deleted = "Supprimé"; +$lang->testtask->resultFile = "Fichier Résultats"; +$lang->testtask->caseCount = 'Compteur CasTest'; +$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->checkedAllSummary = 'Seleted: %total%, Wait: %wait%, Testing: %testing%, Blocked: %blocked%.'; $lang->testtask->beginAndEnd = 'Durée'; $lang->testtask->to = 'à'; diff --git a/module/testtask/lang/zh-cn.php b/module/testtask/lang/zh-cn.php index 694fcf816d..51068da86b 100644 --- a/module/testtask/lang/zh-cn.php +++ b/module/testtask/lang/zh-cn.php @@ -107,6 +107,7 @@ $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->beginAndEnd = '起止时间'; $lang->testtask->to = '至';