diff --git a/module/testtask/ui/batchrun.html.php b/module/testtask/ui/batchrun.html.php index 417f85e03b..bf3d8edec3 100644 --- a/module/testtask/ui/batchrun.html.php +++ b/module/testtask/ui/batchrun.html.php @@ -64,7 +64,7 @@ foreach($cases as $caseID => $case) set::name("steps[$caseID][$stepID]"), set::items($lang->testcase->resultList), set::required(true), - set::value('pass'), + set::value('pass') ) ) : null, $step->type != 'group' ? h::td @@ -74,7 +74,7 @@ foreach($cases as $caseID => $case) ( set::name("reals[$caseID][$stepID]") ) - ) : null, + ) : null ); $childId ++; } @@ -106,7 +106,7 @@ foreach($cases as $caseID => $case) h::span ( set::hint(true), - $case->title, + $case->title ) ), h::td @@ -115,7 +115,7 @@ foreach($cases as $caseID => $case) span ( set::hint(true), - $case->precondition, + $case->precondition ) ), h::td @@ -126,7 +126,7 @@ foreach($cases as $caseID => $case) set::name("results[$caseID]"), set::value('pass'), set::inline(false), - set::items($lang->testcase->resultList), + set::items($lang->testcase->resultList) ) ), h::td @@ -140,7 +140,7 @@ foreach($cases as $caseID => $case) empty($steps[$caseID]) ? input ( set::name("reals[$caseID][]") - ) : null, + ) : null ) ); } diff --git a/module/testtask/ui/browse.html.php b/module/testtask/ui/browse.html.php index a94e8c7ca3..848699379b 100644 --- a/module/testtask/ui/browse.html.php +++ b/module/testtask/ui/browse.html.php @@ -40,14 +40,14 @@ featureBar ( setClass('w-28'), set::name('begin'), - set::value($beginTime), + set::value($beginTime) ), $lang->testtask->to, datePicker ( setClass('w-28'), set::name('end'), - set::value($endTime), + set::value($endTime) ) ) ); diff --git a/module/testtask/ui/browseunits.html.php b/module/testtask/ui/browseunits.html.php index 625a296728..c68ec22bc7 100644 --- a/module/testtask/ui/browseunits.html.php +++ b/module/testtask/ui/browseunits.html.php @@ -37,7 +37,7 @@ featureBar dropdown ( to('trigger', btn($lang->testcase->typeList['unit'], setClass('ghost'))), - set::items($caseTypeItems), + set::items($caseTypeItems) ) ) : null, set::link(createLink('testtask', 'browseUnits', "productID={$product->id}&browseType={key}")) @@ -54,7 +54,7 @@ if($canImport && (empty($product) || $canModify)) set::className('btn primary'), set::icon('import'), set::url(createLink('testtask', 'importUnitResult', "product={$product->id}")), - $lang->testtask->importUnitResult, + $lang->testtask->importUnitResult ) ); } diff --git a/module/testtask/ui/cases.html.php b/module/testtask/ui/cases.html.php index 4cc743ae4a..554da640f3 100644 --- a/module/testtask/ui/cases.html.php +++ b/module/testtask/ui/cases.html.php @@ -84,7 +84,7 @@ toolbar set::icon('kanban') ), set::items($viewItems), - set::placement('bottom-end'), + set::placement('bottom-end') ), $canLinkCase ? btn ( @@ -92,7 +92,7 @@ toolbar set::icon('link'), set::url(inlink('linkCase', "taskID=$task->id")), set('data-app', $app->tab), - $lang->testtask->linkCase, + $lang->testtask->linkCase ) : null, $canExport ? btn ( diff --git a/module/testtask/ui/close.html.php b/module/testtask/ui/close.html.php index f69da94ee0..b12281bd59 100644 --- a/module/testtask/ui/close.html.php +++ b/module/testtask/ui/close.html.php @@ -12,13 +12,13 @@ namespace zin; modalHeader(); -form +formPanel ( formGroup ( set::label($lang->testtask->realFinishedDate), set::name('realFinishedDate'), - set::value(helper::isZeroDate($testtask->realFinishedDate) ? helper::now() : $testtask->realFinishedDate), + set::value(helper::isZeroDate($testtask->realFinishedDate) ? helper::now() : $testtask->realFinishedDate) ), formGroup ( @@ -38,14 +38,14 @@ form ( set::name('mailto'), set::items($users), - set::value($testtask->mailto ? tr_replace(' ', '', $testtask->mailto) : ''), - set::multiple(true), + set::value($testtask->mailto ? str_replace(' ', '', $testtask->mailto) : ''), + set::multiple(true) ), $contactList ? picker ( set::name('contact'), set::items($contactList), - on::change("setMailto('mailto', this.value)"), + on::change("setMailto('mailto', this.value)") ) : null ) ), diff --git a/module/testtask/ui/create.html.php b/module/testtask/ui/create.html.php index c4cfeca0cd..b6c44d14f1 100644 --- a/module/testtask/ui/create.html.php +++ b/module/testtask/ui/create.html.php @@ -33,7 +33,7 @@ formPanel ( set::type('hidden'), set::name('execution'), - set::value($noMultipleExecutionID), + set::value($noMultipleExecutionID) ) : formGroup ( set::width('1/2'), @@ -42,7 +42,7 @@ formPanel set::name('execution'), set::value($executionID), set::control('picker'), - set::items($executions), + set::items($executions) ), formGroup ( @@ -58,7 +58,7 @@ formPanel set::name('build'), set::items($builds), set::required(true), - set::value($build), + set::value($build) ), span ( @@ -67,7 +67,7 @@ formPanel ( set('href', createLink('build', 'create', "executionID=$executionID&productID={$product->id}&projectID={$projectID}")), set('data-toggle', 'modal'), - $lang->build->create, + $lang->build->create ) ), span @@ -91,7 +91,7 @@ formPanel ( set::multiple(true), set::name('type[]'), - set::items($lang->testtask->typeList), + set::items($lang->testtask->typeList) ) ), formGroup @@ -100,7 +100,7 @@ formPanel set::label($lang->testtask->owner), set::name('owner'), set::control('picker'), - set::items($users), + set::items($users) ), formGroup ( @@ -114,15 +114,15 @@ formPanel set::id('beginDate'), set::name('begin'), set::required(true), - on::change('suitEndDate'), + on::change('suitEndDate') ), $lang->testtask->end, datePicker ( set::id('endDate'), set::name('end'), - set::required(true), - ), + set::required(true) + ) ) ), formGroup @@ -132,7 +132,7 @@ formPanel set::name('status'), set::required(true), set::control('picker'), - set::items($lang->testtask->statusList), + set::items($lang->testtask->statusList) ), formGroup ( @@ -140,7 +140,7 @@ formPanel set::label($lang->testtask->testreport), set::name('testreport'), set::control('picker'), - set::items($testreports), + set::items($testreports) ), formGroup ( @@ -152,7 +152,7 @@ formPanel ( zui::width('1/2'), set::name('name'), - set::required(true), + set::required(true) ), $lang->testtask->pri, priPicker @@ -185,9 +185,9 @@ formPanel ( set::multiple(true), set::name('mailto[]'), - set::items($users), + set::items($users) ) - ), + ) ); render(); diff --git a/module/testtask/ui/edit.html.php b/module/testtask/ui/edit.html.php index 7e1820fc0e..36c2174128 100644 --- a/module/testtask/ui/edit.html.php +++ b/module/testtask/ui/edit.html.php @@ -18,7 +18,7 @@ formPanel set::width('1/2'), set::className('hidden'), set::name('product'), - set::value($productID), + set::value($productID) ), formGroup ( @@ -28,7 +28,7 @@ formPanel set::value($task->execution), set::className(((!empty($project) && !$project->multiple) || ($app->tab == 'execution' && $task->execution)) ? 'hidden' : ''), set::control('picker'), - set::items($executions), + set::items($executions) ), formGroup ( @@ -38,7 +38,7 @@ formPanel set::name('build'), set::value($task->build), set::control('picker'), - set::items($builds), + set::items($builds) ), formGroup ( @@ -48,7 +48,7 @@ formPanel set::value($task->type), set::control('picker'), set::items($lang->testtask->typeList), - set::multiple(true), + set::multiple(true) ), formGroup ( @@ -57,7 +57,7 @@ formPanel set::name('owner'), set::value($task->owner), set::control('picker'), - set::items($users), + set::items($users) ), formGroup ( @@ -72,7 +72,7 @@ formPanel set::name('begin'), set::required(true), set::value($task->begin), - on::change('suitEndDate'), + on::change('suitEndDate') ), $lang->testtask->end, datePicker @@ -80,8 +80,8 @@ formPanel set::id('endDate'), set::name('end'), set::required(true), - set::value($task->end), - ), + set::value($task->end) + ) ) ), formGroup @@ -92,7 +92,7 @@ formPanel set::required(true), set::value($task->status), set::control('picker'), - set::items($lang->testtask->statusList), + set::items($lang->testtask->statusList) ), formGroup ( @@ -101,7 +101,7 @@ formPanel set::name('testreport'), set::value($task->testreport), set::control('picker'), - set::items($testreports), + set::items($testreports) ), formGroup ( @@ -113,7 +113,7 @@ formPanel ( set::name('name'), set::required(true), - set::value($task->name), + set::value($task->name) ), $lang->testtask->pri, priPicker diff --git a/module/testtask/ui/groupcase.html.php b/module/testtask/ui/groupcase.html.php index 9de3c4492b..f7f903f049 100644 --- a/module/testtask/ui/groupcase.html.php +++ b/module/testtask/ui/groupcase.html.php @@ -54,14 +54,14 @@ toolbar set::icon('kanban') ), set::items($viewItems), - set::placement('bottom-end'), + set::placement('bottom-end') ), $canLinkCase ? btn ( set::className('ghost'), set::icon('link'), set::url(inlink('linkCase', "taskID=$task->id")), - $lang->testtask->linkCase, + $lang->testtask->linkCase ) : null, $canExport ? btn ( @@ -106,7 +106,7 @@ dtable set::data($cases), set::plugins(array('cellspan')), set::onRenderCell(jsRaw('window.onRenderCell')), - set::getCellSpan(jsRaw('window.getCellSpan')), + set::getCellSpan(jsRaw('window.getCellSpan')) ); render(); diff --git a/module/testtask/ui/importunitresult.html.php b/module/testtask/ui/importunitresult.html.php index 51336835f0..9221a22b14 100644 --- a/module/testtask/ui/importunitresult.html.php +++ b/module/testtask/ui/importunitresult.html.php @@ -25,7 +25,7 @@ formPanel picker ( set::name('execution'), - set::items($executions), + set::items($executions) ) ), formGroup @@ -47,11 +47,11 @@ formPanel ( set::url(createLink('build', 'create', "executionID=$executionID")), set('data-toggle', 'modal'), - $lang->build->create, + $lang->build->create ) - ) : null, + ) : null ) - ), + ) ), formGroup ( @@ -60,7 +60,7 @@ formPanel picker ( set::name('frame'), - set::items($lang->job->frameList), + set::items($lang->job->frameList) ) ), formGroup @@ -79,7 +79,7 @@ formPanel datePicker ( set::name('end'), - set::value(date('Y-m-d', time() + 24 * 3600)), + set::value(date('Y-m-d', time() + 24 * 3600)) ) ) ), @@ -93,14 +93,14 @@ formPanel fileInput ( set::name('resultFile') - ), + ) ), div ( $lang->testtask->unitXMLFormat, setStyle('height', '32px'), setStyle('line-height', '32px'), - setStyle('padding-left', '8px'), + setStyle('padding-left', '8px') ) ), formRow @@ -109,7 +109,7 @@ formPanel ( set::label($lang->testtask->name), set::name('name'), - set::value(sprintf($lang->testtask->titleOfAuto, date('Y-m-d H:i:s'))), + set::value(sprintf($lang->testtask->titleOfAuto, date('Y-m-d H:i:s'))) ), formGroup ( @@ -119,7 +119,7 @@ formPanel ( set::name('owner'), set::items($users), - set::value($this->app->user->account), + set::value($this->app->user->account) ) ), formGroup @@ -141,7 +141,7 @@ formPanel editor ( set::name('desc'), - set::rows(10), + set::rows(10) ) ), formGroup @@ -154,7 +154,7 @@ formPanel set::name('mailto[]'), set::items($users), set::multiple(true) - ), + ) ) ) ); diff --git a/module/testtask/ui/linkcase.html.php b/module/testtask/ui/linkcase.html.php index 0bef62b61b..05761e6e93 100644 --- a/module/testtask/ui/linkcase.html.php +++ b/module/testtask/ui/linkcase.html.php @@ -96,7 +96,7 @@ dtable set::checkable(true), set::footToolbar($footToolbar), set::onRenderCell(jsRaw('window.renderCell')), - set::footPager(usePager()), + set::footPager(usePager()) ); render(); diff --git a/module/testtask/ui/report.html.php b/module/testtask/ui/report.html.php index ed8281a724..06b4b96d59 100644 --- a/module/testtask/ui/report.html.php +++ b/module/testtask/ui/report.html.php @@ -20,7 +20,7 @@ detailHeader set::level(1), set::text($lang->testtask->report->common) ) - ), + ) ); $reports = array(); diff --git a/module/testtask/ui/results.html.php b/module/testtask/ui/results.html.php index 0c2a2f98fa..6c1a50cf26 100644 --- a/module/testtask/ui/results.html.php +++ b/module/testtask/ui/results.html.php @@ -24,13 +24,13 @@ div setClass('border-b'), div ( - h::strong($lang->testcase->precondition), + h::strong($lang->testcase->precondition) ), div ( setClass('leading-6 h-6 my-2'), - nl2br($case->precondition), - ), + nl2br($case->precondition) + ) ); $count = count($results); @@ -62,14 +62,14 @@ foreach($results as $i => $result) ) : h::strong ( setClass('text-waring'), - $lang->testtask->running, + $lang->testtask->running ), $result->node > 0 ? span ( setClass('label'), $lang->testtask->auto - ) : null, - ), + ) : null + ) ); $stepResultTrs = array(); @@ -85,27 +85,27 @@ foreach($results as $i => $result) ( setClass('text-left flex border-r'), width('calc(25% + 2px)'), - isset($stepResult['expect']) ? html(nl2br($stepResult['expect'])) : '', + isset($stepResult['expect']) ? html(nl2br($stepResult['expect'])) : '' ); $itemTds[] = !empty($stepResult['result']) ? div ( setClass("status-{$stepResult['result']} text-center flex border-r"), width('80px'), - $lang->testcase->resultList[$stepResult['result']], + $lang->testcase->resultList[$stepResult['result']] ) : div ( setClass('border-r'), - width('80px'), + width('80px') ); $itemTds[] = !empty($stepResult['result']) ? div ( setClass('text-left flex border-r'), width('240px'), - nl2br($stepResult['real']), + nl2br($stepResult['real']) ) : div ( setClass('border-r'), - width('240px'), + width('240px') ); $itemTds[] = !empty($stepResult['result']) ? div ( @@ -116,13 +116,13 @@ foreach($results as $i => $result) set::href("#stepResult{$modalID}"), set('data-toggle', 'modal'), icon('paper-clip'), - $fileCount, - ) : '', + $fileCount + ) : '' ) : div(width('56px')); $fileModals[] = modal ( set::id("stepResult{$modalID}"), - !empty($stepResult['files']) ? fileList(set::files($stepResult['files'])) : '', + !empty($stepResult['files']) ? fileList(set::files($stepResult['files'])) : '' ); $stepResultTrs[] = div @@ -140,7 +140,7 @@ foreach($results as $i => $result) on::click('toggleCheckChildItem'), set::id("stepIdList[{$stepResult['id']}]"), set('name', "stepIdList[{$stepResult['id']}]"), - set('value', $key), + set('value', $key) ) : '', div ( @@ -149,18 +149,18 @@ foreach($results as $i => $result) ( setClass('step-item-id mr-2'), setClass('ml-' . ((zget($stepResult, 'grade', 1) - 1) * 2)), - zget($stepResult, 'name', ''), + zget($stepResult, 'name', '') ), - zget($stepResult, 'desc', ''), - ), + zget($stepResult, 'desc', '') + ) ), - $itemTds, + $itemTds ); } $stepResultTrs[] = !empty($result->ZTFResult) && $result->node > 0 ? div ( h::p($lang->testtask->runningLog), - h::p($result->ZTFResult), + h::p($result->ZTFResult) ) : ''; $projectParam = $this->app->tab == 'project' ? "projectID={$this->session->project}," : ''; @@ -191,37 +191,37 @@ foreach($results as $i => $result) ( width('calc(75% - 376px)'), setClass('text-left desc border-r'), - $lang->testcase->stepDesc, + $lang->testcase->stepDesc ), div ( width('calc(25%)'), setClass('text-left border-r'), - $lang->testcase->stepExpect, + $lang->testcase->stepExpect ), div ( width('80px'), setClass('text-center border-r'), - $lang->testcase->result, + $lang->testcase->result ), div ( width('240px'), setClass('text-left border-r'), - $lang->testcase->real, + $lang->testcase->real ), div ( width('56px'), setClass('text-left'), $lang->attach - ), + ) ), div ( setClass('steps-body ml-2'), - $stepResultTrs, + $stepResultTrs ), $result->caseResult == 'fail' && common::hasPriv('testcase', 'createBug') ? div ( @@ -232,7 +232,7 @@ foreach($results as $i => $result) set::id("checkAll[{$i}]"), set('type', 'checkbox'), set('name', 'checkAll'), - set::text($lang->selectAll), + set::text($lang->selectAll) ), div ( @@ -243,24 +243,24 @@ foreach($results as $i => $result) set('data-dismiss', 'modal'), on::click('createBug'), $lang->testcase->createBug - ), - ), - ) : '', - ), - ), - ), + ) + ) + ) : '' + ) + ) + ) ); } $resultItem = array(); $resultItem[] = span ( setClass('px-3 my-1 border-r'), - html(sprintf($lang->testtask->showResult, $count)), + html(sprintf($lang->testtask->showResult, $count)) ); $resultItem[] = span ( setClass('pl-3 my-1'), - html(sprintf($lang->testtask->showFail, $failCount)), + html(sprintf($lang->testtask->showFail, $failCount)) ); div @@ -275,15 +275,15 @@ div set::items ( $resultItem - ), + ) ) : null, h::table ( setClass('table border'), - $trs, + $trs ), - $fileModals, - ), + $fileModals + ) ); render(); diff --git a/module/testtask/ui/runcase.html.php b/module/testtask/ui/runcase.html.php index 5eb9e2fc42..d79da48382 100644 --- a/module/testtask/ui/runcase.html.php +++ b/module/testtask/ui/runcase.html.php @@ -19,7 +19,7 @@ modalHeader ( set::title($lang->testtask->lblRunCase), set::entityText($run->case->title), - set::entityID($caseID), + set::entityID($caseID) ); $stepTrs = array(); @@ -54,15 +54,15 @@ if($confirm != 'yes') ( setClass('step-item-id mr-2'), setClass('ml-' . (($step->grade- 1) * 2)), - $step->name, + $step->name ), - nl2br(zget($step, 'desc', '')), - ), + nl2br(zget($step, 'desc', '')) + ) ), h::td ( setClass('text-left border'), - nl2br(zget($step, 'expect', '')), + nl2br(zget($step, 'expect', '')) ), h::td ( @@ -76,8 +76,8 @@ if($confirm != 'yes') set::value($step->type != 'group' ? 'pass' : ''), set::required($step->type != 'group'), set::disabled($step->type == 'group'), - $step->type == 'group' ? set('disabled', 'disabled') : '', - ), + $step->type == 'group' ? set('disabled', 'disabled') : '' + ) ), h::td ( @@ -97,7 +97,7 @@ if($confirm != 'yes') set('rows', '1'), set::name("real[{$step->id}]"), nl2br(zget($step, 'real', '')), - $step->type == 'group' ? set('disabled', 'disabled') : '', + $step->type == 'group' ? set('disabled', 'disabled') : '' ) ), h::td @@ -111,12 +111,12 @@ if($confirm != 'yes') $step->type != 'group' ? set('data-toggle', 'modal') : '', set('title', $lang->testtask->files), set::icon('paper-clip'), - set::disabled($step->type == 'group'), - ), - ), - ), - ), - ), + set::disabled($step->type == 'group') + ) + ) + ) + ) + ) ); $fileModals[] = modal @@ -126,7 +126,7 @@ if($confirm != 'yes') setData('position', 'center'), upload ( - set::name("files{$step->id}[]"), + set::name("files{$step->id}[]") ), div ( @@ -135,9 +135,9 @@ if($confirm != 'yes') ( setClass('btn-wide primary'), set('data-dismiss', 'modal'), - $lang->save, - ), - ), + $lang->save + ) + ) ); } } @@ -150,7 +150,7 @@ if($confirm != 'yes') h::td ( setClass('case-precondition w-16 align-top'), - $lang->testcase->precondition, + $lang->testcase->precondition ), h::td ( @@ -159,9 +159,9 @@ if($confirm != 'yes') nl2br(zget($run->case, 'precondition', '')), nl2br(zget($run->case, 'precondition', '')), nl2br(zget($run->case, 'precondition', '')), - nl2br(zget($run->case, 'precondition', '')), - ), - ), + nl2br(zget($run->case, 'precondition', '')) + ) + ) ) : ''; @@ -180,25 +180,25 @@ form h::td ( setClass('w-96'), - $lang->testcase->stepDesc, + $lang->testcase->stepDesc ), h::td ( width('cal(760px - 24rem)'), - $lang->testcase->stepExpect, + $lang->testcase->stepExpect ), h::td ( setClass('result-td'), width('96px'), - $lang->testcase->result, + $lang->testcase->result ), h::td ( width('280px'), - $lang->testcase->real, - ), - ) : '', + $lang->testcase->real + ) + ) : '' ), h::tbody ( @@ -218,13 +218,13 @@ form set::id('pre'), set::href($preLink), set('data-load', 'modal'), - $lang->testtask->pre, + $lang->testtask->pre ) : '', $run->case->status != 'wait' && $confirm != 'yes' && !empty($run->case->steps) ? btn ( setClass('primary btn-wide w-24 m-3'), set::btnType('submit'), - $lang->save, + $lang->save ) : '', $nextLink ? a ( @@ -232,26 +232,26 @@ form set::id('next'), set::href($nextLink), set('data-load', 'modal'), - $lang->testtask->next, + $lang->testtask->next ) : '', input ( setClass('hidden'), set::name('case'), - set::value($run->case->id), + set::value($run->case->id) ), input ( setClass('hidden'), set::name('version'), - set::value($run->case->currentVersion), - ), - ), - ), - ), - ), + set::value($run->case->currentVersion) + ) + ) + ) + ) + ) ), - $fileModals, + $fileModals ); div @@ -260,8 +260,8 @@ div set::id('resultsContainer'), div ( - set::id('casesResults'), - ), + set::id('casesResults') + ) ); set::id('runCaseModal'); diff --git a/module/testtask/ui/start.html.php b/module/testtask/ui/start.html.php index 994ecff7f3..894031c309 100644 --- a/module/testtask/ui/start.html.php +++ b/module/testtask/ui/start.html.php @@ -23,7 +23,7 @@ form set::rows(6) ) ), - set::actions(array('submit')), + set::actions(array('submit')) ); hr(); history(); diff --git a/module/testtask/ui/unitcases.html.php b/module/testtask/ui/unitcases.html.php index 88654011b2..0e4c4def8c 100644 --- a/module/testtask/ui/unitcases.html.php +++ b/module/testtask/ui/unitcases.html.php @@ -47,7 +47,7 @@ dtable set::data($runs), set::plugins(array('cellspan')), set::onRenderCell(jsRaw('window.onRenderCell')), - set::getCellSpan(jsRaw('window.getCellSpan')), + set::getCellSpan(jsRaw('window.getCellSpan')) ); render(); diff --git a/module/testtask/ui/view.html.php b/module/testtask/ui/view.html.php index 41fa79dc46..67f28241e1 100644 --- a/module/testtask/ui/view.html.php +++ b/module/testtask/ui/view.html.php @@ -20,7 +20,7 @@ detailHeader ( set(array('entityID' => $task->id, 'level' => 1, 'text' => $task->name)) ) - ), + ) ); $taskType = ''; @@ -74,8 +74,8 @@ detailBody ( set('href', createLink('execution', 'story', "executionID=$task->execution")), set('title', $task->executionName), - $task->executionName, - ), + $task->executionName + ) ) : null, item ( @@ -85,9 +85,9 @@ detailBody $isInModal ? $buildName :a ( set::href(createLink('build', 'view', "buildID=$task->build")), - $buildName, + $buildName ) - ), + ) ), item ( @@ -136,7 +136,7 @@ detailBody ( set('href', createLink('testreport', 'view', "reportID=$task->testreport")), zget($testreport, 'title', '') - ) : null, + ) : null ) ) )