From 9e579ed4e7b067b6d5054e85efc85d56a6187c11 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Tue, 14 Nov 2023 10:13:41 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in execution. --- module/execution/ui/activate.html.php | 18 ++-- module/execution/ui/ajaxgetburn.html.php | 16 ++-- module/execution/ui/ajaxgetcfd.html.php | 2 +- .../ui/ajaxgetcopyprojectexecutions.html.php | 4 +- module/execution/ui/all.html.php | 4 +- module/execution/ui/batchedit.html.php | 32 +++---- module/execution/ui/bug.html.php | 4 +- module/execution/ui/build.html.php | 12 +-- module/execution/ui/burn.html.php | 36 ++++---- module/execution/ui/cfd.html.php | 16 ++-- module/execution/ui/close.html.php | 6 +- module/execution/ui/create.html.php | 90 +++++++++---------- module/execution/ui/dynamic.html.php | 14 +-- module/execution/ui/edit.html.php | 86 +++++++++--------- module/execution/ui/fixfirst.html.php | 16 ++-- module/execution/ui/grouptask.html.php | 26 +++--- module/execution/ui/importbug.html.php | 4 +- module/execution/ui/importtask.html.php | 4 +- module/execution/ui/kanban.html.php | 16 ++-- module/execution/ui/linkstory.html.php | 4 +- module/execution/ui/managemembers.html.php | 60 ++++++------- module/execution/ui/manageproducts.html.php | 10 +-- module/execution/ui/putoff.html.php | 18 ++-- module/execution/ui/start.html.php | 6 +- module/execution/ui/story.html.php | 18 ++-- module/execution/ui/storyestimate.html.php | 16 ++-- module/execution/ui/suspend.html.php | 6 +- module/execution/ui/task.html.php | 10 +-- module/execution/ui/taskkanban.html.php | 26 +++--- module/execution/ui/team.html.php | 2 +- module/execution/ui/testcase.html.php | 2 +- module/execution/ui/tips.html.php | 12 +-- module/execution/ui/tree.html.php | 12 +-- module/execution/ui/treestory.html.php | 32 +++---- module/execution/ui/treetask.html.php | 36 ++++---- module/execution/ui/view.html.php | 10 +-- 36 files changed, 343 insertions(+), 343 deletions(-) diff --git a/module/execution/ui/activate.html.php b/module/execution/ui/activate.html.php index 923ee5c7c8..129f98772a 100644 --- a/module/execution/ui/activate.html.php +++ b/module/execution/ui/activate.html.php @@ -12,7 +12,7 @@ namespace zin; modalHeader ( - set::title($lang->execution->activate . $space . $lang->executionCommon), + set::title($lang->execution->activate . $space . $lang->executionCommon) ); $space = common::checkNotCN() ? ' ' : ''; @@ -30,14 +30,14 @@ formPanel datePicker ( set::name('begin'), - set::value($newBegin), + set::value($newBegin) ), $lang->execution->to, datePicker ( set::name('end'), - set::value($newEnd), - ), + set::value($newEnd) + ) ) ), formGroup @@ -48,9 +48,9 @@ formPanel set::name('readjustTask'), set::text($lang->execution->readjustTask), set::value(1), - set::rootClass('ml-4'), + set::rootClass('ml-4') ) - ), + ) ), formGroup ( @@ -58,9 +58,9 @@ formPanel editor ( set::name('comment'), - set::rows('6'), - ), - ), + set::rows('6') + ) + ) ); hr(); history(); diff --git a/module/execution/ui/ajaxgetburn.html.php b/module/execution/ui/ajaxgetburn.html.php index 32b2e0d829..c47734303f 100644 --- a/module/execution/ui/ajaxgetburn.html.php +++ b/module/execution/ui/ajaxgetburn.html.php @@ -33,7 +33,7 @@ div setClass('ghost text-gray'), set::url(createLink('execution', 'burn', "executionID={$execution->id}")), $lang->more - ) : null, + ) : null ), common::hasPriv('execution', 'burn') ? echarts ( @@ -54,7 +54,7 @@ div ( 'type' => 'value', 'name' => "({$lang->execution->workHour})", - 'axisLine' => array('show' => true), + 'axisLine' => array('show' => true) ) ), set::legend @@ -62,7 +62,7 @@ div array ( 'selectedMode' => false, - 'data' => array($lang->execution->charts->burn->graph->actuality, $lang->execution->charts->burn->graph->reference, $lang->execution->charts->burn->graph->delay), + 'data' => array($lang->execution->charts->burn->graph->actuality, $lang->execution->charts->burn->graph->reference, $lang->execution->charts->burn->graph->delay) ) ), set::tooltip @@ -95,14 +95,14 @@ div 'lineStyle' => array ( 'width' => 3, - 'color' => '#F1F1F1', + 'color' => '#F1F1F1' ) ), 'emphasis' => array ( 'color' => '#FFF', 'borderColor' => '#D8D8D8', - 'borderWidth' => 2, + 'borderWidth' => 2 ) ), 'emphasis' => array @@ -110,7 +110,7 @@ div 'lineStyle' => array ( 'width' => 3, - 'color' => '#F1F1F1', + 'color' => '#F1F1F1' ) ) ), @@ -129,7 +129,7 @@ div 'lineStyle' => array ( 'width' => 3, - 'color' => '#2B7DFE', + 'color' => '#2B7DFE' ) ), 'emphasis' => array @@ -154,7 +154,7 @@ div 'color' => '#F00', 'lineStyle' => array ( - 'color' => '#F00', + 'color' => '#F00' ) ), 'emphasis' => array diff --git a/module/execution/ui/ajaxgetcfd.html.php b/module/execution/ui/ajaxgetcfd.html.php index d86821db05..2e8644daef 100644 --- a/module/execution/ui/ajaxgetcfd.html.php +++ b/module/execution/ui/ajaxgetcfd.html.php @@ -71,7 +71,7 @@ panel setClass('ghost text-gray'), set::url(createLink('execution', 'cfd', "executionID={$execution->id}")), $lang->more - ) : null, + ) : null ), div($cfdChart) ); diff --git a/module/execution/ui/ajaxgetcopyprojectexecutions.html.php b/module/execution/ui/ajaxgetcopyprojectexecutions.html.php index 9f58695621..b44846b756 100644 --- a/module/execution/ui/ajaxgetcopyprojectexecutions.html.php +++ b/module/execution/ui/ajaxgetcopyprojectexecutions.html.php @@ -23,7 +23,7 @@ if(empty($executions)) span ( set::className('font-bold ml-2'), - $lang->execution->copyNoExecution, + $lang->execution->copyNoExecution ) ); } @@ -42,7 +42,7 @@ else setClass('text-gray'), $lang->icons[$execution->type] ), - span($execution->name), + span($execution->name) ); } } diff --git a/module/execution/ui/all.html.php b/module/execution/ui/all.html.php index a6311e5b97..b02e6d09c0 100644 --- a/module/execution/ui/all.html.php +++ b/module/execution/ui/all.html.php @@ -25,7 +25,7 @@ if($canBatchAction) $footToolbar['items'][] = array( 'type' => 'btn-group', 'items' => array( - array('text' => $lang->edit, 'className' => "btn secondary size-sm {$editClass}", 'data-url' => createLink('execution', 'batchEdit')), + array('text' => $lang->edit, 'className' => "btn secondary size-sm {$editClass}", 'data-url' => createLink('execution', 'batchEdit')) ) ); @@ -75,7 +75,7 @@ toolbar 'icon' => 'plus', 'text' => $lang->execution->createExec, 'class' => "primary create-execution-btn", - 'url' => createLink('execution', 'create'), + 'url' => createLink('execution', 'create') ))) : null ); diff --git a/module/execution/ui/batchedit.html.php b/module/execution/ui/batchedit.html.php index 314ed8ad8e..f2ae17d688 100644 --- a/module/execution/ui/batchedit.html.php +++ b/module/execution/ui/batchedit.html.php @@ -28,14 +28,14 @@ formBatchPanel set::name('id'), set::label($lang->idAB), set::control('hidden'), - set::hidden(true), + set::hidden(true) ), formBatchItem ( set::name('id'), set::label($lang->idAB), set::control('index'), - set::width('38px'), + set::width('38px') ), isset($project) && $project->model == 'scrum' ? formBatchItem ( @@ -44,7 +44,7 @@ formBatchPanel set::name("project"), set::items($allProjects), set::required(true), - set::width('136px'), + set::width('136px') ) : null, formBatchItem ( @@ -60,13 +60,13 @@ formBatchPanel set::control('picker'), set::items($lang->execution->typeList), set::disabled(true), - set::width('80px'), + set::width('80px') ) : null, $setCode ? formBatchItem ( set::name('code'), set::label($lang->execution->code), - set::width('136px'), + set::width('136px') ) : null, formBatchItem ( @@ -76,7 +76,7 @@ formBatchPanel set::ditto(true), set::defaultDitto('off'), set::items($pmUsers), - set::width('112px'), + set::width('112px') ), formBatchItem ( @@ -87,7 +87,7 @@ formBatchPanel set::defaultDitto('off'), set::items($poUsers), set::width('80px'), - set::hidden(true), + set::hidden(true) ), formBatchItem ( @@ -98,7 +98,7 @@ formBatchPanel set::defaultDitto('off'), set::items($qdUsers), set::width('80px'), - set::hidden(true), + set::hidden(true) ), formBatchItem ( @@ -109,7 +109,7 @@ formBatchPanel set::defaultDitto('off'), set::items(array()), set::width('80px'), - set::hidden(true), + set::hidden(true) ), formBatchItem ( @@ -129,9 +129,9 @@ formBatchPanel ( 'id' => 'tooltipHover', 'data-toggle' => 'tooltip', - 'data-placement' => 'right', + 'data-placement' => 'right' ) - ) : null, + ) : null ), formBatchItem ( @@ -139,7 +139,7 @@ formBatchPanel set::label($lang->execution->begin), set::control('date'), set::width('76px'), - set::required(true), + set::required(true) ), formBatchItem ( @@ -147,7 +147,7 @@ formBatchPanel set::label($lang->execution->end), set::control('date'), set::width('76px'), - set::required(true), + set::required(true) ), formBatchItem ( @@ -163,7 +163,7 @@ formBatchPanel set::label($lang->execution->desc), set::control('textarea'), set::width('160px'), - set::hidden(true), + set::hidden(true) ), formBatchItem ( @@ -178,8 +178,8 @@ formBatchPanel 'suffixWidth' => 20 ) ), - set::width('64px'), - ), + set::width('64px') + ) ); render(); diff --git a/module/execution/ui/bug.html.php b/module/execution/ui/bug.html.php index 1a34ac1a37..bdd874b315 100644 --- a/module/execution/ui/bug.html.php +++ b/module/execution/ui/bug.html.php @@ -42,7 +42,7 @@ if($canCreateBug) $createItem = array toolbar ( !empty($canExportBug) ? item(set($exportItem)) : null, - !empty($createItem) ? item(set($createItem)) : null, + !empty($createItem) ? item(set($createItem)) : null ); /* zin: Define the sidebar in main content. */ @@ -97,7 +97,7 @@ dtable set::footToolbar($footToolbar), set::customCols(true), set::footPager( - usePager(array('linkCreator' => helper::createLink('execution', 'bug', "executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy={$orderBy}&build=$buildID&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={recPerPage}&pageID={page}"))), + usePager(array('linkCreator' => helper::createLink('execution', 'bug', "executionID={$execution->id}&productID={$productID}&branch={$branchID}&orderBy={$orderBy}&build=$buildID&type=$type¶m=$param&recTotal={$pager->recTotal}&recPerPage={recPerPage}&pageID={page}"))) ), set::emptyTip($lang->bug->notice->noBug), set::createTip($lang->bug->create), diff --git a/module/execution/ui/build.html.php b/module/execution/ui/build.html.php index 4122a2f4eb..d4f55ad671 100644 --- a/module/execution/ui/build.html.php +++ b/module/execution/ui/build.html.php @@ -25,10 +25,10 @@ featureBar set::name('product'), set::value($product), set::items($products), - on::change('changeProduct'), - ), + on::change('changeProduct') + ) ), - li(searchToggle(set::module('executionBuild'))), + li(searchToggle(set::module('executionBuild'))) ); /* zin: Define the toolbar on main menu. */ @@ -57,12 +57,12 @@ dtable set::footPager( usePager ( - array('linkCreator' => helper::createLink('execution', 'build', "executionID={$execution->id}&type={$type}¶m={$param}&orderBy={$orderBy}&recTotal={recTotal}&recPerPage={page}"), 'recTotal' => $pager->recTotal, 'recPerPage' => $pager->recPerPage), - ), + array('linkCreator' => helper::createLink('execution', 'build', "executionID={$execution->id}&type={$type}¶m={$param}&orderBy={$orderBy}&recTotal={recTotal}&recPerPage={page}"), 'recTotal' => $pager->recTotal, 'recPerPage' => $pager->recPerPage) + ) ), set::emptyTip($lang->build->noBuild), set::createTip($lang->build->create), - set::createLink($canCreateBuild ? createLink('build', 'create', "executionID={$execution->id}") : ''), + set::createLink($canCreateBuild ? createLink('build', 'create', "executionID={$execution->id}") : '') ); /* ====== Render page ====== */ diff --git a/module/execution/ui/burn.html.php b/module/execution/ui/burn.html.php index 3d8d5b9eff..a1b9c5262d 100644 --- a/module/execution/ui/burn.html.php +++ b/module/execution/ui/burn.html.php @@ -28,8 +28,8 @@ featureBar ( 'class' => 'btn primary mr-5 ajax-submit', 'url' => createLink('execution', 'computeBurn', 'reload=yes'), - 'icon' => 'refresh', - ), + 'icon' => 'refresh' + ) ), $lang->execution->computeBurn ), @@ -63,8 +63,8 @@ featureBar array ( 'href' => createLink('execution', 'fixFirst', "id={$execution->id}"), - 'data-toggle' => 'modal', - ), + 'data-toggle' => 'modal' + ) ), $lang->execution->fixFirst ) @@ -83,7 +83,7 @@ featureBar set::name('burnBy'), set::items($lang->execution->burnByList), set::value($burnBy), - set::required(true), + set::required(true) ) ), $interval ? li @@ -95,7 +95,7 @@ featureBar set::name('interval'), set::items($dayList), set::value($interval), - set::required(true), + set::required(true) ) ) : null ); @@ -106,7 +106,7 @@ panel ( setClass('flex items-center justify-center'), $executionName . ' ' . $this->lang->execution->burn . '(' . zget($lang->execution->burnByList, $burnBy) . ')', - isset($execution->delay) ? label(setClass('label danger-pale ring-danger ml-3'), $lang->execution->delayed) : null, + isset($execution->delay) ? label(setClass('label danger-pale ring-danger ml-3'), $lang->execution->delayed) : null ), echarts ( @@ -127,7 +127,7 @@ panel ( 'type' => 'value', 'name' => $burnBy == 'storyPoint' ? "({$lang->execution->storyPoint})" : "({$lang->execution->workHour})", - 'axisLine' => array('show' => true), + 'axisLine' => array('show' => true) ) ), set::legend @@ -139,7 +139,7 @@ panel 'left' => 'right', 'top' => 'center', 'align' => 'left', - 'data' => array($lang->execution->charts->burn->graph->actuality, $lang->execution->charts->burn->graph->reference, $lang->execution->charts->burn->graph->delay), + 'data' => array($lang->execution->charts->burn->graph->actuality, $lang->execution->charts->burn->graph->reference, $lang->execution->charts->burn->graph->delay) ) ), set::tooltip @@ -172,14 +172,14 @@ panel 'lineStyle' => array ( 'width' => 3, - 'color' => '#F1F1F1', + 'color' => '#F1F1F1' ) ), 'emphasis' => array ( 'color' => '#FFF', 'borderColor' => '#D8D8D8', - 'borderWidth' => 2, + 'borderWidth' => 2 ) ), 'emphasis' => array @@ -187,9 +187,9 @@ panel 'lineStyle' => array ( 'width' => 3, - 'color' => '#F1F1F1', + 'color' => '#F1F1F1' ) - ), + ) ), array ( @@ -206,7 +206,7 @@ panel 'lineStyle' => array ( 'width' => 3, - 'color' => '#2B7DFE', + 'color' => '#2B7DFE' ) ), 'emphasis' => array @@ -215,7 +215,7 @@ panel 'borderColor' => '#006AF1', 'borderWidth' => 2 ) - ), + ) ), strpos($type, 'withdelay') !== false ? array ( @@ -231,7 +231,7 @@ panel 'color' => '#F00', 'lineStyle' => array ( - 'color' => '#F00', + 'color' => '#F00' ) ), 'emphasis' => array @@ -241,8 +241,8 @@ panel 'borderWidth' => 2 ) ), - ) : null, + ) : null ) - ), + ) )->size('100%', 500), ); diff --git a/module/execution/ui/cfd.html.php b/module/execution/ui/cfd.html.php index 0d0922ae5a..ceead2b6b1 100644 --- a/module/execution/ui/cfd.html.php +++ b/module/execution/ui/cfd.html.php @@ -60,7 +60,7 @@ featureBar ( set::type('date'), set::name('begin'), - set::value($begin), + set::value($begin) ), span ( @@ -71,7 +71,7 @@ featureBar ( set::type('date'), set::name('end'), - set::value($end), + set::value($end) ), btn ( @@ -79,9 +79,9 @@ featureBar set::btnType('submit'), $lang->preview ) - ), + ) ) - ), + ) ); $index = 0; @@ -97,7 +97,7 @@ foreach($chartData['line'] as $label => $set) 'color' => $chartColors[$index], 'areaStyle' => array('color' => $chartColors[$index], 'opacity' => 0.2), 'itemStyle' => array('normal' => array('lineStyle' => array('width' => 1))), - 'emphasis' => array('focus' => 'series'), + 'emphasis' => array('focus' => 'series') ); $index ++; @@ -159,7 +159,7 @@ panel ( set::headingClass('justify-center'), set::title( - $executionName . ' - ' . zget($lang->execution->cfdTypeList, $type) . $lang->execution->CFD, + $executionName . ' - ' . zget($lang->execution->cfdTypeList, $type) . $lang->execution->CFD ), to::heading ( @@ -168,8 +168,8 @@ panel 'help', setClass('mt-2 cfd-help'), set('data-toggle', 'tooltip'), - set('id', 'cfdHover'), - ), + set('id', 'cfdHover') + ) ), set::titleClass('article-h1 mt-2'), $cfdChart diff --git a/module/execution/ui/close.html.php b/module/execution/ui/close.html.php index 36f52556a3..9317bbf764 100644 --- a/module/execution/ui/close.html.php +++ b/module/execution/ui/close.html.php @@ -25,7 +25,7 @@ formPanel set::label($lang->execution->realEnd), set::name('realEnd'), set::control('date'), - set::value(!helper::isZeroDate($execution->realEnd) ? $execution->realEnd : helper::today()), + set::value(!helper::isZeroDate($execution->realEnd) ? $execution->realEnd : helper::today()) ), formGroup ( @@ -33,9 +33,9 @@ formPanel editor ( set::name('comment'), - set::rows('6'), + set::rows('6') ) - ), + ) ); hr(); history(); diff --git a/module/execution/ui/create.html.php b/module/execution/ui/create.html.php index 617560ef3d..d72cb0e212 100644 --- a/module/execution/ui/create.html.php +++ b/module/execution/ui/create.html.php @@ -33,7 +33,7 @@ if(!empty($project->model) && $project->model == 'agileplus') set::label($lang->execution->method), set::items($lang->execution->typeList), set::value($execution->type), - on::change('setType'), + on::change('setType') ), formGroup ( @@ -46,7 +46,7 @@ if(!empty($project->model) && $project->model == 'agileplus') ( 'help', set('data-toggle', 'tooltip'), - set('id', 'methodHover'), + set('id', 'methodHover') ) ) ) @@ -67,7 +67,7 @@ if((empty($project) || $project->model != 'kanban') && $execution->type != 'kanb set::name($isStage ? 'attribute' : 'lifetime'), set::items($isStage ? $lang->stage->typeList : $lang->execution->lifeTimeList), !$isStage ? on::change('showLifeTimeTips') : null, - set::required(true), + set::required(true) ) ), formGroup @@ -75,8 +75,8 @@ if((empty($project) || $project->model != 'kanban') && $execution->type != 'kanb set::width('1/2'), set::id('lifeTimeTips'), set::className('text-gray hidden'), - span($lang->execution->typeDesc), - ), + span($lang->execution->typeDesc) + ) ); } @@ -122,9 +122,9 @@ if(isset($project->hasProduct) && !empty($project->hasProduct) && $products) set::items($allProducts), set::last($product->id), set::disabled($isStage && $project->stageBy == 'project'), - $isStage && $project->stageBy == 'project' ? formHidden("products[$i]", $product->id) : null, + $isStage && $project->stageBy == 'project' ? formHidden("products[$i]", $product->id) : null ) - ), + ) ) ), formGroup @@ -144,7 +144,7 @@ if(isset($project->hasProduct) && !empty($project->hasProduct) && $products) set::multiple(true), on::change("branchChange") ) - ), + ) ), formGroup ( @@ -174,10 +174,10 @@ if(isset($project->hasProduct) && !empty($project->hasProduct) && $products) ( setClass('btn btn-link text-gray removeLine'), setClass($i == 0 ? 'hidden' : ''), - icon('trash'), - ), + icon('trash') + ) ) - ), + ) ); $i ++; @@ -199,9 +199,9 @@ elseif(!empty($project) && empty($project->hasProduct) && !in_array($project->mo set::items(isset($productPlan) ? $productPlan : array()), set::multiple(true), formHidden('products[]', $planProductID), - formHidden('branch[0][0]', 0), + formHidden('branch[0][0]', 0) ) - ), + ) ); } else @@ -218,7 +218,7 @@ else picker ( set::name('products[0]'), - set::items($allProducts), + set::items($allProducts) ) ), formGroup @@ -235,7 +235,7 @@ else set::multiple(true), on::change("branchChange") ) - ), + ) ), formGroup ( @@ -264,10 +264,10 @@ else ( setClass('btn btn-link text-gray removeLine'), setClass('hidden'), - icon('trash'), - ), - ), - ), + icon('trash') + ) + ) + ) ); } @@ -306,7 +306,7 @@ formPanel set::name('project'), set::items($allProjects), set::value($projectID), - on::change('refreshPage'), + on::change('refreshPage') ) ), $methodBox, @@ -315,14 +315,14 @@ formPanel set::width('1/2'), set::name('name'), set::label($showExecutionExec ? $lang->execution->execName : $lang->execution->name), - set::value($execution->name), + set::value($execution->name) ), isset($config->setCode) && $config->setCode == 1 ? formGroup ( set::width('1/2'), set::name('code'), set::label($showExecutionExec ? $lang->execution->execCode : $lang->execution->code), - set::value($execution->code), + set::value($execution->code) ) : null, formRow ( @@ -338,7 +338,7 @@ formPanel set::name('begin'), set('id', 'begin'), set::value((isset($plan) && !empty($plan->begin) ? $plan->begin : date('Y-m-d'))), - set::placeholder($lang->execution->begin), + set::placeholder($lang->execution->begin) ), $lang->project->to, datePicker @@ -346,9 +346,9 @@ formPanel set::name('end'), set('id', 'end'), set::value((isset($plan) && !empty($plan->end)) ? $plan->end : ''), - set::placeholder($lang->execution->end), + set::placeholder($lang->execution->end) ) - ), + ) ), formGroup ( @@ -357,9 +357,9 @@ formPanel set::name('delta'), set::inline(true), set::items($lang->execution->endList), - on::change('computeEndDate'), + on::change('computeEndDate') ) - ), + ) ), formGroup ( @@ -371,7 +371,7 @@ formPanel input ( set::name('days'), - set::value(isset($plan) && !empty($plan->begin) ? (helper::workDays($plan->begin, $plan->end) + 1) : ''), + set::value(isset($plan) && !empty($plan->begin) ? (helper::workDays($plan->begin, $plan->end) + 1) : '') ), div ( @@ -386,7 +386,7 @@ formPanel set::width('1/2'), set::name('percent'), set::label($lang->stage->percent), - set::required(true), + set::required(true) ) : null, $productsBox, formRowGroup(set::title($lang->execution->teamSetting)), @@ -395,7 +395,7 @@ formPanel set::width('1/2'), set::name('team'), set::label($lang->execution->teamName), - set::value($execution->team), + set::value($execution->team) ), formGroup ( @@ -408,7 +408,7 @@ formPanel set::items($teams), set::value(empty($copyExecution) ? $projectID : $copyExecutionID), set('data-placeholder', $lang->execution->copyTeamTip), - on::change('loadMembers'), + on::change('loadMembers') ) ), formRow @@ -421,7 +421,7 @@ formPanel ( set::name('PM'), set::items($pmUsers), - set::value(empty($copyExecution) ? '' : $copyExecution->PM), + set::value(empty($copyExecution) ? '' : $copyExecution->PM) ) ), formGroup @@ -432,7 +432,7 @@ formPanel ( set::name('PO'), set::items($poUsers), - set::value(empty($copyExecution) ? '' : $copyExecution->PO), + set::value(empty($copyExecution) ? '' : $copyExecution->PO) ) ), formGroup @@ -443,7 +443,7 @@ formPanel ( set::name('QD'), set::items($qdUsers), - set::value(empty($copyExecution) ? '' : $copyExecution->QD), + set::value(empty($copyExecution) ? '' : $copyExecution->QD) ) ), formGroup @@ -454,9 +454,9 @@ formPanel ( set::name('RD'), set::items($rdUsers), - set::value(empty($copyExecution) ? '' : $copyExecution->RD), + set::value(empty($copyExecution) ? '' : $copyExecution->RD) ) - ), + ) ), formGroup ( @@ -465,7 +465,7 @@ formPanel ( set::name('teamMembers[]'), set::items($users), - set::multiple(true), + set::multiple(true) ) ), h::hr(), @@ -473,7 +473,7 @@ formPanel ( set::name('desc'), set::label($showExecutionExec ? $lang->execution->execDesc : $lang->execution->desc), - set::control('editor'), + set::control('editor') ), formRow ( @@ -486,7 +486,7 @@ formPanel set::control('radioList'), set::items($lang->execution->aclList), set::value($execution->acl), - on::change('setWhite(this.value)'), + on::change('setWhite(this.value)') ) ), formGroup @@ -497,9 +497,9 @@ formPanel ( set::name('whitelist[]'), set::items($users), - set::multiple(true), + set::multiple(true) ) - ), + ) ); modalTrigger @@ -525,8 +525,8 @@ modalTrigger set::items($copyProjects), set::value($projectID), set::required(true), - on::change('loadProjectExecutions'), - ), + on::change('loadProjectExecutions') + ) ), to::footer ( @@ -534,13 +534,13 @@ modalTrigger ( setClass('primary btn-wide hidden confirmBtn'), set::text($lang->confirm), - on::click('setCopyExecution'), + on::click('setCopyExecution') ) ), div ( set::id('copyExecutions'), - setClass('flex items-center flex-wrap'), + setClass('flex items-center flex-wrap') ) ) ); diff --git a/module/execution/ui/dynamic.html.php b/module/execution/ui/dynamic.html.php index 68e8bd8003..c5dd0381ca 100644 --- a/module/execution/ui/dynamic.html.php +++ b/module/execution/ui/dynamic.html.php @@ -26,9 +26,9 @@ featureBar set::placeholder($lang->execution->viewByUser), set::items($userIdPairs), set::value($param), - on::change('changeUser'), - ), - ), + on::change('changeUser') + ) + ) ); $content = null; @@ -41,7 +41,7 @@ if(empty($dateGroups)) ( setClass('text-gray'), $lang->action->noDynamic - ), + ) ); } else @@ -60,12 +60,12 @@ else setClass('cursor-pointer leading-5'), span ( - icon('angle-down text-primary border-2 rounded-full z-10 bg-canvas align-middle'), + icon('angle-down text-primary border-2 rounded-full z-10 bg-canvas align-middle') ), span ( setClass('ml-2'), - $isToday ? $lang->action->dynamic->today : $date, + $isToday ? $lang->action->dynamic->today : $date ), on::click('toggleCollapse') ), @@ -79,7 +79,7 @@ else dynamic ( set::dynamics($actions), - set::users($accountPairs), + set::users($accountPairs) ) ) ) diff --git a/module/execution/ui/edit.html.php b/module/execution/ui/edit.html.php index 30e6a3c38b..2b320faf4d 100644 --- a/module/execution/ui/edit.html.php +++ b/module/execution/ui/edit.html.php @@ -38,7 +38,7 @@ if(isset($project)) set::label($lang->execution->projectName), set::items($allProjects), set::value($execution->project), - on::change('changeProject'), + on::change('changeProject') ); } elseif($project->model == 'kanban') @@ -62,7 +62,7 @@ if(isset($project)) set::name('parent'), set::label($lang->programplan->parent), set::items($parentStageList), - set::value($execution->parent), + set::value($execution->parent) ); } } @@ -83,8 +83,8 @@ if(in_array($project->model, array('waterfall', 'waterfallplus'))) set::name('attribute'), set::items($typeList), set::value($execution->attribute), - set::required(true), - ) : span(zget($typeList, $execution->attribute)), + set::required(true) + ) : span(zget($typeList, $execution->attribute)) ), formGroup ( @@ -96,7 +96,7 @@ if(in_array($project->model, array('waterfall', 'waterfallplus'))) ( 'help', set('data-toggle', 'tooltip'), - set('id', 'typeHover'), + set('id', 'typeHover') ) ) ) @@ -126,8 +126,8 @@ elseif($execution->type != 'kanban' and $project->model != 'ipd') set::id('lifeTimeTips'), set::className('text-gray'), set::className($execution->lifetime != 'ops' ? 'hidden' : ''), - span($lang->execution->typeDesc), - ), + span($lang->execution->typeDesc) + ) ); } @@ -164,7 +164,7 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') set::items($allProducts), set::value($product->id), set::last($product->id), - $hasBranch ? set::lastBranch(implode(',', $product->branches)) : null, + $hasBranch ? set::lastBranch(implode(',', $product->branches)) : null ) ) ) @@ -186,7 +186,7 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') set::multiple(true), on::change("branchChange") ) - ), + ) ), formGroup ( @@ -216,8 +216,8 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') ( setClass('btn btn-link text-gray removeLine'), setClass($i == 0 ? 'hidden' : ''), - icon('trash'), - ), + icon('trash') + ) ) ) ); @@ -242,9 +242,9 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') set::value(isset($linkedProducts[$planProductID]) ? $linkedProducts[$planProductID]->plans : ''), set::multiple(true), formHidden('products[0]', $planProductID), - formHidden('branch[0][0]', 0), + formHidden('branch[0][0]', 0) ) - ), + ) ); } else @@ -262,7 +262,7 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') ( set::id('products0'), set::name('products[0]'), - set::items($allProducts), + set::items($allProducts) ) ), formGroup @@ -280,7 +280,7 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') set::items(array()), on::change('branchChange') ) - ), + ) ), formGroup ( @@ -309,9 +309,9 @@ if($project->model != 'waterfall' && $project->model != 'waterfallplus') ( setClass('btn btn-link text-gray removeLine'), setClass('hidden'), - icon('trash'), - ), - ), + icon('trash') + ) + ) ), ); } @@ -347,9 +347,9 @@ elseif(!empty($project) && !empty($project->hasProduct)) set::last($product->id), $hasBranch && $product->branches ? set::lastBranch(implode(',', $product->branches)) : null, set::disabled(in_array($project->model, array('waterfall', 'waterfallplus'))), - set::required(in_array($project->model, array('waterfall', 'waterfallplus'))), + set::required(in_array($project->model, array('waterfall', 'waterfallplus'))) ) - ), + ) ) ), formGroup @@ -370,7 +370,7 @@ elseif(!empty($project) && !empty($project->hasProduct)) set::multiple(true), on::change('branchChange') ) - ), + ) ), formGroup ( @@ -387,7 +387,7 @@ elseif(!empty($project) && !empty($project->hasProduct)) set::value(isset($product->plans) ? implode(',', $product->plans) : ''), set::multiple(true) ) - ), + ) ) ); @@ -403,7 +403,7 @@ elseif(!empty($project) && !empty($project->hasProduct)) set::name("branch[][]"), set::items(array()), set::value(''), - set::multiple(true), + set::multiple(true) ); } } @@ -416,7 +416,7 @@ else set::hidden(true), set::items(isset($linkedBranches[key($linkedProducts)]) ? $linkedBranches[key($linkedProducts)] : array()), set::value(isset($linkedBranches[key($linkedProducts)]) ? implode(',', $linkedBranches[key($linkedProducts)]) : ''), - set::multiple(true), + set::multiple(true) ); } @@ -434,14 +434,14 @@ formPanel set::width('1/2'), set::name('name'), set::label($lang->execution->name), - set::value($execution->name), + set::value($execution->name) ), isset($config->setCode) && $config->setCode == 1 ? formGroup ( set::width('1/2'), set::name('code'), set::label($lang->execution->code), - set::value($execution->code), + set::value($execution->code) ) : null, formRow ( @@ -469,7 +469,7 @@ formPanel set::placeholder($lang->execution->end), on::change('computeWorkDays') ) - ), + ) ), formGroup ( @@ -479,9 +479,9 @@ formPanel set::inline(true), set::items($lang->execution->endList), set::value((strtotime($execution->end) - strtotime($execution->begin)) / 3600 / 24 + 1), - on::change('computeEndDate'), + on::change('computeEndDate') ) - ), + ) ), formGroup ( @@ -493,7 +493,7 @@ formPanel input ( set::name('days'), - set::value($execution->days), + set::value($execution->days) ), div ( @@ -509,7 +509,7 @@ formPanel set::name('percent'), set::label($lang->stage->percent), set::value($execution->percent), - set::required(true), + set::required(true) ) : null, $project->model != 'ipd' ? formGroup ( @@ -520,7 +520,7 @@ formPanel set::name('status'), set::items($lang->execution->statusList), set::value($execution->status), - set::required(true), + set::required(true) ) ) : null, $productsBox, @@ -530,7 +530,7 @@ formPanel set::width('1/2'), set::name('team'), set::label($lang->execution->teamName), - set::value($execution->team), + set::value($execution->team) ), formRow ( @@ -542,7 +542,7 @@ formPanel ( set::name('PM'), set::items($pmUsers), - set::value($execution->PM), + set::value($execution->PM) ) ), formGroup @@ -553,7 +553,7 @@ formPanel ( set::name('PO'), set::items($poUsers), - set::value($execution->PO), + set::value($execution->PO) ) ), formGroup @@ -564,7 +564,7 @@ formPanel ( set::name('QD'), set::items($qdUsers), - set::value($execution->QD), + set::value($execution->QD) ) ), formGroup @@ -575,9 +575,9 @@ formPanel ( set::name('RD'), set::items($rdUsers), - set::value($execution->RD), + set::value($execution->RD) ) - ), + ) ), formGroup ( @@ -587,7 +587,7 @@ formPanel set::name('teamMembers[]'), set::items($users), set::value(array_keys($teamMembers)), - set::multiple(true), + set::multiple(true) ) ), h::hr(), @@ -597,7 +597,7 @@ formPanel editor ( set::name('desc'), - html($execution->desc), + html($execution->desc) ) ), formRow @@ -612,7 +612,7 @@ formPanel set::items($lang->execution->aclList), set::value($execution->acl), set::disabled($execution->grade == 2), - on::change('setWhite(this.value)'), + on::change('setWhite(this.value)') ) ), formGroup @@ -624,9 +624,9 @@ formPanel ( set::name('whitelist'), set::items($users), - set::multiple(true), + set::multiple(true) ) - ), + ) ); /* ====== Render page ====== */ diff --git a/module/execution/ui/fixfirst.html.php b/module/execution/ui/fixfirst.html.php index 5f63142063..991b7a25e3 100644 --- a/module/execution/ui/fixfirst.html.php +++ b/module/execution/ui/fixfirst.html.php @@ -13,7 +13,7 @@ to::header( span ( set::className('article-h2'), - $lang->execution->fixFirst, + $lang->execution->fixFirst ), span ( @@ -22,9 +22,9 @@ to::header( span ( setClass('label secondary-pale rounded-full'), - $execution->totalEstimate . $lang->execution->workHour, - ), - ), + $execution->totalEstimate . $lang->execution->workHour + ) + ) ); formPanel ( @@ -40,7 +40,7 @@ formPanel ( set::name('estimate'), set::value(!empty($firstBurn->estimate) ? $firstBurn->estimate : (!empty($firstBurn->left) ? $firstBurn->left : '')), - set::placeholder($lang->execution->placeholder->totalLeft), + set::placeholder($lang->execution->placeholder->totalLeft) ), checkbox ( @@ -48,8 +48,8 @@ formPanel set::value(1), set::checked(true), set::text($lang->execution->fixFirstWithLeft), - set::rootClass('ml-4 w-1/3 items-center'), - ), - ), + set::rootClass('ml-4 w-1/3 items-center') + ) + ) ) ); diff --git a/module/execution/ui/grouptask.html.php b/module/execution/ui/grouptask.html.php index b7f1302185..792efa007f 100644 --- a/module/execution/ui/grouptask.html.php +++ b/module/execution/ui/grouptask.html.php @@ -52,7 +52,7 @@ featureBar ( setClass('btn ghost group-collapse-all'), span(setClass('text'), $lang->execution->treeLevel['root']), - icon('fold-all'), + icon('fold-all') ) ), li @@ -62,7 +62,7 @@ featureBar ( setClass('btn ghost group-expand-all'), span(setClass('text'), $lang->execution->treeLevel['all']), - icon('unfold-all'), + icon('unfold-all') ) ), $items @@ -113,9 +113,9 @@ toolbar set::text($lang->import), ), set::items(array_filter(array($importTaskItem, $importBugItem))), - set::placement('bottom-end'), + set::placement('bottom-end') ) : null, - $canCreate ? item(set($createItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null, + $canCreate ? item(set($createItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null ); $groupList = array(); @@ -124,7 +124,7 @@ foreach($lang->execution->groups as $key => $value) $link = createLink('execution', 'grouptask', "executionID={$executionID}&groupBy={$key}"); $groupList[] = array( 'text' => $value, - 'url' => $link, + 'url' => $link ); } @@ -286,15 +286,15 @@ $tbody = function() use($tasks, $lang, $groupBy, $users, $groupByList, $executio setClass('groupBtn'), set::href('###'), icon('caret-down'), - $groupName, + $groupName ), div ( setClass('groupSummary small'), ($groupBy == 'assignedTo' and isset($members[$task->assignedTo])) ? html(sprintf($lang->execution->memberHoursAB, zget($users, $task->assignedTo), $members[$task->assignedTo]->totalHours)) : null, html(sprintf($lang->execution->groupSummaryAB, $groupSum, $groupWait, $groupDoing, $groupEstimate . $lang->execution->workHourUnit, $groupConsumed . $lang->execution->workHourUnit, $groupLeft . $lang->execution->workHourUnit)) - ), - ), + ) + ) ) : null, h::td(sprintf('%03d', (string)$task->id)), h::td @@ -408,7 +408,7 @@ $tbody = function() use($tasks, $lang, $groupBy, $users, $groupByList, $executio 'icon' => 'trash' ) ) - ) : null, + ) : null ) : h::td() ); @@ -433,9 +433,9 @@ $tbody = function() use($tasks, $lang, $groupBy, $users, $groupByList, $executio setClass('summaryBtn'), set::href('###'), icon('caret-right'), - $groupName, + $groupName ) - ), + ) ), h::td ( @@ -463,7 +463,7 @@ $tbody = function() use($tasks, $lang, $groupBy, $users, $groupByList, $executio ) ) : null, html(sprintf($lang->execution->countSummary, $groupSum, $groupDoing, $groupWait)), - html(sprintf($lang->execution->timeSummary, $groupEstimate . $lang->execution->workHourUnit, $groupConsumed . $lang->execution->workHourUnit, $groupLeft . $lang->execution->workHourUnit)), + html(sprintf($lang->execution->timeSummary, $groupEstimate . $lang->execution->workHourUnit, $groupConsumed . $lang->execution->workHourUnit, $groupLeft . $lang->execution->workHourUnit)) ) ) ); @@ -484,7 +484,7 @@ if($tasks) ( setClass('table condensed'), h::thead($thead()), - h::tbody($tbody()), + h::tbody($tbody()) ) ); } diff --git a/module/execution/ui/importbug.html.php b/module/execution/ui/importbug.html.php index 5380074628..956e0a6fe2 100644 --- a/module/execution/ui/importbug.html.php +++ b/module/execution/ui/importbug.html.php @@ -40,7 +40,7 @@ formBase 'items' => array( array( 'text' => $lang->import, - 'className' => 'btn secondary import-bug-btn size-sm', + 'className' => 'btn secondary import-bug-btn size-sm' ), array( 'text' => $lang->goback, @@ -51,7 +51,7 @@ formBase ) )), set::footPager( - usePager(array('linkCreator' => helper::createLink('execution', 'importBug', "executionID={$execution->id}&browseType={$browseType}¶m=$param&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}"))), + usePager(array('linkCreator' => helper::createLink('execution', 'importBug', "executionID={$execution->id}&browseType={$browseType}¶m=$param&recTotal={$pager->recTotal}&recPerPage={recPerPage}&page={page}"))) ) ) ); diff --git a/module/execution/ui/importtask.html.php b/module/execution/ui/importtask.html.php index 62aeeab85e..585e203c52 100644 --- a/module/execution/ui/importtask.html.php +++ b/module/execution/ui/importtask.html.php @@ -50,7 +50,7 @@ dtable array( 'text' => $lang->execution->importTask, 'className' => 'btn secondary toolbar-item batch-btn size-sm', - 'data-url' => createLink('execution', 'importtask', "executionID={$execution->id}&fromExecution={$fromExecution}"), + 'data-url' => createLink('execution', 'importtask', "executionID={$execution->id}&fromExecution={$fromExecution}") ), array( 'text' => $lang->goback, @@ -64,7 +64,7 @@ dtable usePager ( array('linkCreator' => helper::createLink('execution', 'importTask', "executionID={$execution->id}&fromExecution={$fromExecution}&orderBy=$orderBy&recPerPage={recPerPage}&page={page}")) - ), + ) ) ); diff --git a/module/execution/ui/kanban.html.php b/module/execution/ui/kanban.html.php index 1e12d67ffa..a0385d62ad 100644 --- a/module/execution/ui/kanban.html.php +++ b/module/execution/ui/kanban.html.php @@ -150,7 +150,7 @@ jsVar('priv', 'canChangeStory' => common::hasPriv('story', 'change'), 'canCloseStory' => common::hasPriv('story', 'close'), 'canUnlinkStory' => (common::hasPriv('execution', 'unlinkStory') && !empty($execution->hasProduct)), - 'canViewStory' => common::hasPriv('execution', 'storyView'), + 'canViewStory' => common::hasPriv('execution', 'storyView') ) ); @@ -170,7 +170,7 @@ toolbar 'icon' => 'fullscreen' ) ), - $lang->kanban->fullScreen, + $lang->kanban->fullScreen ), common::hasPriv('execution', 'setKanban') ? btn ( @@ -184,7 +184,7 @@ toolbar 'data-toggle' => 'modal' ) ), - $lang->settings, + $lang->settings ) : null, common::hasPriv('execution', 'edit') ? btn ( @@ -199,8 +199,8 @@ toolbar 'data-size' => 'lg' ) ), - $lang->edit, - ) : null, + $lang->edit + ) : null ), $operationMenu ? dropdown ( @@ -210,7 +210,7 @@ toolbar set::icon('ellipsis-v'), ), set::caret(false), - set::items($operationMenu), + set::items($operationMenu) ) : null, $createMenu ? dropdown ( @@ -220,8 +220,8 @@ toolbar set::icon('plus'), $lang->create, ), - set::items($createMenu), - ) : null, + set::items($createMenu) + ) : null ); div diff --git a/module/execution/ui/linkstory.html.php b/module/execution/ui/linkstory.html.php index 1031db3b61..f78550781f 100644 --- a/module/execution/ui/linkstory.html.php +++ b/module/execution/ui/linkstory.html.php @@ -33,7 +33,7 @@ $footToolbar['items'][] = array ( 'type' => 'btn-group', 'items' => array( - array('text' => $lang->save, 'className' => "btn size-sm batch-btn ajax-btn link-story-btn", 'btnType' => 'secondary', 'data-url' => commonModel::isTutorialMode() ? '' : createLink('execution', 'linkStory', "objectID=$object->id")), + array('text' => $lang->save, 'className' => "btn size-sm batch-btn ajax-btn link-story-btn", 'btnType' => 'secondary', 'data-url' => commonModel::isTutorialMode() ? '' : createLink('execution', 'linkStory', "objectID=$object->id")) ) ); @@ -62,7 +62,7 @@ dtable set::onRenderCell(jsRaw('window.onRenderLinkStoryCell')), set::footPager(usePager(array( 'linkCreator' => helper::createLink($object->type, 'linkStory', "objectID={$object->id}&browseType={$browseType}¶m={$param}&recPerPage={recPerPage}&page={page}&extra=$extra") - ))), + ))) ); render(); diff --git a/module/execution/ui/managemembers.html.php b/module/execution/ui/managemembers.html.php index aa72082681..49a201464c 100644 --- a/module/execution/ui/managemembers.html.php +++ b/module/execution/ui/managemembers.html.php @@ -33,8 +33,8 @@ if(count($teams2Import) != 1) set::value($team2Import), set::items($teams2Import), set('data-placeholder', $lang->execution->copyTeamTitle), - on::change('choseTeam2Copy'), - ), + on::change('choseTeam2Copy') + ) ); } featureBar @@ -56,10 +56,10 @@ featureBar set::value($dept), set::items($depts), set('data-placeholder', $lang->execution->selectDeptTitle), - on::change('setDeptUsers'), + on::change('setDeptUsers') ), - $copyTeamBox, - ), + $copyTeamBox + ) ); $memberTR = array(); @@ -75,14 +75,14 @@ foreach($teamMembers as $member) set::id("realname{$i}"), set::name("realname[$i]"), set::value($member->realname), - set::readonly(true), + set::readonly(true) ), input ( set::id("account{$i}"), set::name("account[$i]"), set::value($member->account), - set::type('hidden'), + set::type('hidden') ), ) : h::td( picker @@ -92,8 +92,8 @@ foreach($teamMembers as $member) set::value($member->account), set::items($users), set('data-max-list-count', $config->maxCount), - set('onchange', "setRole('{$i}')"), - ), + set('onchange', "setRole('{$i}')") + ) ), h::td ( @@ -101,7 +101,7 @@ foreach($teamMembers as $member) ( set::id("role{$i}"), set::name("role[$i]"), - set::value($member->role), + set::value($member->role) ) ), h::td @@ -110,7 +110,7 @@ foreach($teamMembers as $member) ( set::id("days{$i}"), set::name("days[$i]"), - set::value($member->days), + set::value($member->days) ) ), h::td @@ -119,7 +119,7 @@ foreach($teamMembers as $member) ( set::id("hours{$i}"), set::name("hours[$i]"), - set::value($member->hours), + set::value($member->hours) ) ), h::td @@ -130,7 +130,7 @@ foreach($teamMembers as $member) set::name("limited[$i]"), set::items($lang->team->limitedList), set::value($member->limited), - set::inline(true), + set::inline(true) ) ), h::td @@ -140,7 +140,7 @@ foreach($teamMembers as $member) ( set::items(array( array('class' => 'btn btn-link text-gray', 'icon' => 'plus', 'onclick' => 'addItem(this)'), - array('class' => 'btn btn-link text-gray', 'icon' => 'trash', 'onclick' => 'deleteItem(this)'), + array('class' => 'btn btn-link text-gray', 'icon' => 'trash', 'onclick' => 'deleteItem(this)') )) ) ) @@ -165,15 +165,15 @@ h::table set::name("account[$i]"), set::items($users), set('data-max-list-count', $config->maxCount), - set('onchange', "setRole('{$i}')"), - ), + set('onchange', "setRole('{$i}')") + ) ), h::td ( input ( set::id("role{$i}"), - set::name("role[$i]"), + set::name("role[$i]") ) ), h::td @@ -182,7 +182,7 @@ h::table ( set::id("days{$i}"), set::name("days[$i]"), - set::value($execution->days), + set::value($execution->days) ) ), h::td @@ -191,7 +191,7 @@ h::table ( set::id("hours{$i}"), set::name("hours[$i]"), - set::value($config->execution->defaultWorkhours), + set::value($config->execution->defaultWorkhours) ) ), h::td @@ -202,7 +202,7 @@ h::table set::name("limited[$i]"), set::items($lang->team->limitedList), set::value('no'), - set::inline(true), + set::inline(true) ) ), h::td @@ -212,7 +212,7 @@ h::table ( set::items(array( array('class' => 'btn btn-link text-gray', 'icon' => 'plus', 'onclick' => 'addItem(this)'), - array('class' => 'btn btn-link text-gray', 'icon' => 'trash', 'onclick' => 'deleteItem(this)'), + array('class' => 'btn btn-link text-gray', 'icon' => 'trash', 'onclick' => 'deleteItem(this)') )) ) ) @@ -236,41 +236,41 @@ div h::th ( $lang->team->account, - set::width('240px'), + set::width('240px') ), h::th ( $lang->team->role, - set::width('240px'), + set::width('240px') ), h::th ( $lang->team->days, - set::width('76px'), + set::width('76px') ), h::th ( $lang->team->hours, - set::width('136px'), + set::width('136px') ), h::th ( $lang->team->limited, - set::width('96px'), + set::width('96px') ), h::th ( $lang->actions, - set::width('48px'), - ), - ), + set::width('48px') + ) + ) ), h::tbody ( $memberTR ) ) - ), + ) ); /* ====== Render page ====== */ diff --git a/module/execution/ui/manageproducts.html.php b/module/execution/ui/manageproducts.html.php index 9205fee74b..26c6f1dc05 100644 --- a/module/execution/ui/manageproducts.html.php +++ b/module/execution/ui/manageproducts.html.php @@ -43,7 +43,7 @@ foreach($allProducts as $productID => $productName) set::items($allBranches[$productID]), set::disabled(true), set::required(true), - ) : formHidden("branch[{$index}]", $branchID), + ) : formHidden("branch[{$index}]", $branchID) ); if(!isset($branchGroups[$productID])) unset($allProducts[$productID]); @@ -68,7 +68,7 @@ if($execution->grade == 1 || $execution->grade == 2) ( set::name("products[{$index}]"), set::text($productName), - set::value($productID), + set::value($productID) ), isset($branchGroups[$productID]) ? picker ( @@ -76,7 +76,7 @@ if($execution->grade == 1 || $execution->grade == 2) set::value(key($branchGroups[$productID])), set::items($branchGroups[$productID]), set::required(true), - ) : formHidden("branch[{$index}]", 0), + ) : formHidden("branch[{$index}]", 0) ); $index ++; @@ -112,9 +112,9 @@ form ) ) : null, - $canModify ? h::hr() : null, + $canModify ? h::hr() : null ), - $canModify ? set::actions(array('submit')) : null, + $canModify ? set::actions(array('submit')) : null ); render(); diff --git a/module/execution/ui/putoff.html.php b/module/execution/ui/putoff.html.php index fc5e5bc6df..5677430c86 100644 --- a/module/execution/ui/putoff.html.php +++ b/module/execution/ui/putoff.html.php @@ -36,7 +36,7 @@ formPanel set::name('begin'), set::value($execution->begin), set::placeholder($lang->execution->begin), - on::change('computeWorkDays'), + on::change('computeWorkDays') ), $lang->execution->to, input @@ -46,9 +46,9 @@ formPanel set::name('end'), set::value($execution->end), set::placeholder($lang->execution->end), - on::change('computeWorkDays'), - ), - ), + on::change('computeWorkDays') + ) + ) ), formGroup ( @@ -58,8 +58,8 @@ formPanel set::name('delta'), set::items($lang->execution->endList), set::inline(true), - on::change('computeEndDate'), - ), + on::change('computeEndDate') + ) ) ), formRow @@ -72,8 +72,8 @@ formPanel ( input(set::name('days')), to::suffix($lang->execution->day), - set::suffixWidth(20), - ), + set::suffixWidth(20) + ) ) ), formRow @@ -84,7 +84,7 @@ formPanel editor ( set::name('comment'), - set::rows('6'), + set::rows('6') ) ) ) diff --git a/module/execution/ui/start.html.php b/module/execution/ui/start.html.php index 83e8bcb014..c268476653 100644 --- a/module/execution/ui/start.html.php +++ b/module/execution/ui/start.html.php @@ -25,7 +25,7 @@ formPanel set::label($lang->execution->realBegan), set::name('realBegan'), set::control('date'), - set::value(!helper::isZeroDate($execution->realBegan) ? $execution->realBegan : helper::today()), + set::value(!helper::isZeroDate($execution->realBegan) ? $execution->realBegan : helper::today()) ), formGroup ( @@ -33,9 +33,9 @@ formPanel editor ( set::name('comment'), - set::rows('6'), + set::rows('6') ) - ), + ) ); hr(); history(); diff --git a/module/execution/ui/story.html.php b/module/execution/ui/story.html.php index edbdd838c1..89b1b08c80 100644 --- a/module/execution/ui/story.html.php +++ b/module/execution/ui/story.html.php @@ -49,7 +49,7 @@ modal set::required(true), set::items($allPlans) ) - ), + ) ) ); @@ -92,7 +92,7 @@ $product ? toolbar 'text' => $lang->story->report->common, 'icon' => 'bar-chart', 'class' => 'ghost', - 'url' => createLink('story', 'report', "productID={$product->id}&branchID=&storyType={$storyType}&browseType={$type}&moduleID={$param}&chartType=pie&projectID={$execution->id}") . '#app=execution', + 'url' => createLink('story', 'report', "productID={$product->id}&branchID=&storyType={$storyType}&browseType={$type}&moduleID={$param}&chartType=pie&projectID={$execution->id}") . '#app=execution' ))) : null, hasPriv('story', 'export') ? item(set(array ( @@ -117,7 +117,7 @@ $product ? toolbar btn(setClass('btn secondary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))), set::items(array_filter(array($createItem, $batchCreateItem))), - set::placement('bottom-end'), + set::placement('bottom-end') ) ) : null, $canCreate && !$canBatchCreate ? item(set($createItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null, @@ -136,11 +136,11 @@ $product ? toolbar btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))), set::items(array_filter(array($linkItem, $linkPlanItem))), - set::placement('bottom-end'), + set::placement('bottom-end') ) ) : null, $canLinkStory && !$canlinkPlanStory ? item(set($linkItem + array('class' => 'btn primary link-story-btn', 'icon' => 'plus'))) : null, - $canlinkPlanStory && !$canLinkStory ? item(set($linkPlanItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null, + $canlinkPlanStory && !$canLinkStory ? item(set($linkPlanItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null ) : null; sidebar @@ -202,7 +202,7 @@ modal setClass('input-group-addon'), $lang->workingHour ) - ), + ) ) : null, formGroup ( @@ -225,7 +225,7 @@ modal set::text($lang->execution->next), set::btnType('submit'), set::type('primary'), - set('data-dismiss', 'primary'), + set('data-dismiss', 'primary') ) ) ); @@ -265,7 +265,7 @@ if($canBatchAction) 'type' => 'btn-group', 'items' => array( array('text' => $lang->edit, 'className' => "btn secondary size-sm {$editClass}", 'btnType' => 'primary', 'data-url' => createLink('story', 'batchEdit', "productID=0&executionID={$execution->id}&branch=0&storyType={$storyType}")), - array('caret' => 'up', 'className' => 'btn btn-caret size-sm secondary', 'url' => '#batchToTask', 'data-toggle' => 'dropdown', 'data-placement' => 'top-start'), + array('caret' => 'up', 'className' => 'btn btn-caret size-sm secondary', 'url' => '#batchToTask', 'data-toggle' => 'dropdown', 'data-placement' => 'top-start') ) ); } @@ -290,7 +290,7 @@ if($canBatchAction) 'text' => $lang->story->assignedTo, 'className' => 'btn btn-caret size-sm secondary', 'type' => 'dropdown', - 'items' => $assignedToItems, + 'items' => $assignedToItems ); } diff --git a/module/execution/ui/storyestimate.html.php b/module/execution/ui/storyestimate.html.php index e3e2f034a1..6c1aab9bf5 100644 --- a/module/execution/ui/storyestimate.html.php +++ b/module/execution/ui/storyestimate.html.php @@ -46,7 +46,7 @@ else set::items($rounds), set::value($round), set::required(true), - on::change("selectRound('{$loadUrl}')"), + on::change("selectRound('{$loadUrl}')") ), btn ( @@ -88,7 +88,7 @@ else set::disabled(!empty($estimateInfo->estimate)), set::value($estimate), on::input('updateAverage()') - ), + ) ), !empty($estimateInfo->estimate) ? h::td ( @@ -99,8 +99,8 @@ else set::name('estimate[]'), set::value($estimate), on::input('updateAverage()') - ), - ) : null, + ) + ) : null ); } @@ -138,7 +138,7 @@ else empty($estimateInfo->estimate) ? set::name('average') : null, set::readonly(true), set::value(!empty($estimateInfo->estimate) ? $estimateInfo->average : '') - ), + ) ), !empty($estimateInfo->estimate) ? h::td ( @@ -149,15 +149,15 @@ else setClass('form-control text-primary'), set::readonly(true), set::value($estimateInfo->average) - ), - ) : null, + ) + ) : null ) ) ), set::actions(array(array( 'text' => $lang->save, 'type' => empty($estimateInfo->estimate) ? 'primary' : 'primary hidden', - 'btnType' => 'submit', + 'btnType' => 'submit' ))) ); } diff --git a/module/execution/ui/suspend.html.php b/module/execution/ui/suspend.html.php index 769b6db185..ff94a4082e 100644 --- a/module/execution/ui/suspend.html.php +++ b/module/execution/ui/suspend.html.php @@ -12,7 +12,7 @@ namespace zin; modalHeader ( - set::title($lang->execution->suspend . $space . $lang->executionCommon), + set::title($lang->execution->suspend . $space . $lang->executionCommon) ); $space = common::checkNotCN() ? ' ' : ''; @@ -25,9 +25,9 @@ formPanel editor ( set::name('comment'), - set::rows('6'), + set::rows('6') ) - ), + ) ); hr(); history(); diff --git a/module/execution/ui/task.html.php b/module/execution/ui/task.html.php index ed6fef7f4d..0293670e3e 100644 --- a/module/execution/ui/task.html.php +++ b/module/execution/ui/task.html.php @@ -73,7 +73,7 @@ toolbar set::icon('import') ), set::items($importItems), - set::placement('bottom-end'), + set::placement('bottom-end') ) : null, $canCreate && $canBatchCreate ? btngroup ( @@ -83,11 +83,11 @@ toolbar btn(setClass('btn primary dropdown-toggle'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))), set::items(array_filter(array($createItem, $batchCreateItem))), - set::placement('bottom-end'), + set::placement('bottom-end') ) ) : null, $canCreate && !$canBatchCreate ? item(set($createItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null, - $canBatchCreate && !$canCreate ? item(set($batchCreateItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null, + $canBatchCreate && !$canCreate ? item(set($batchCreateItem + array('class' => 'btn primary', 'icon' => 'plus'))) : null ); /* zin: Define the sidebar in main content. */ @@ -118,7 +118,7 @@ if($canBatchAction) $batchItems = array ( array('text' => $lang->close, 'innerClass' => 'batch-btn ajax-btn not-open-url' . ($canBatchClose ? '' : 'hidden'), 'data-url' => createLink('task', 'batchClose')), - array('text' => $lang->task->cancel, 'innerClass' => 'batch-btn ajax-btn not-open-url' . ($canBatchCancel ? '' : 'hidden'), 'data-url' => createLink('task', 'batchCancel')), + array('text' => $lang->task->cancel, 'innerClass' => 'batch-btn ajax-btn not-open-url' . ($canBatchCancel ? '' : 'hidden'), 'data-url' => createLink('task', 'batchCancel')) ); } @@ -147,7 +147,7 @@ if($canBatchAction) 'type' => 'btn-group', 'items' => array( array('text' => $lang->edit, 'className' => "btn size-sm {$editClass}", 'btnType' => 'secondary', 'data-url' => createLink('task', 'batchEdit', "executionID={$execution->id}")), - array('caret' => 'up', 'className' => 'btn btn-caret size-sm not-open-url', 'btnType' => 'secondary', 'items' => $batchItems, 'data-placement' => 'top-start'), + array('caret' => 'up', 'className' => 'btn btn-caret size-sm not-open-url', 'btnType' => 'secondary', 'items' => $batchItems, 'data-placement' => 'top-start') ) ); } diff --git a/module/execution/ui/taskkanban.html.php b/module/execution/ui/taskkanban.html.php index 2516b03373..9a03e92eec 100644 --- a/module/execution/ui/taskkanban.html.php +++ b/module/execution/ui/taskkanban.html.php @@ -138,7 +138,7 @@ row set::items($lang->kanban->type), set::value($browseType), set::require(true), - set::onchange('changeBrowseType()'), + set::onchange('changeBrowseType()') ) ) : null, $browseType != 'all' ? inputControl @@ -151,9 +151,9 @@ row set::items($lang->kanban->group->$browseType), set::value($groupBy), set::require(true), - set::onchange('changeGroupBy()'), + set::onchange('changeGroupBy()') ) - ) : null, + ) : null ), cell ( @@ -171,7 +171,7 @@ row setID('taskKanbanSearchInput'), set::name('taskKanbanSearchInput'), set::oninput('searchCards(this.value)'), - set::placeholder($lang->execution->pleaseInput), + set::placeholder($lang->execution->pleaseInput) ) ) ), @@ -185,8 +185,8 @@ row set::items(array ( common::hasPriv('execution', 'importTask') ? array('text' => $lang->execution->importTask, 'url' => createLink('execution', 'importTask', "execution=$execution->id")) : null, - ($features['qa'] && common::hasPriv('execution', 'importBug')) ? array('text' => $lang->execution->importBug, 'url' => createLink('execution', 'importBug', "execution=$execution->id")) : null, - )), + ($features['qa'] && common::hasPriv('execution', 'importBug')) ? array('text' => $lang->execution->importBug, 'url' => createLink('execution', 'importBug', "execution=$execution->id")) : null + )) ) : null, dropdown ( @@ -196,8 +196,8 @@ row ( common::hasPriv('execution', 'setKanban') ? array('text' => $lang->execution->setKanban, 'url' => createLink('execution', 'setKanban', "executionID=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'sm') : null, common::hasPriv('execution', 'printKanban') ? array('text' => $lang->execution->printKanban, 'url' => createLink('execution', 'printKanban', "executionID=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'sm', 'id' => 'printKanban') : null, - array('text' => $lang->execution->fullScreen, 'url' => 'javascript:fullScreen()'), - )), + array('text' => $lang->execution->fullScreen, 'url' => 'javascript:fullScreen()') + )) ), $canCreateObject ? dropdown ( @@ -215,9 +215,9 @@ row ($features['qa'] && $canImportBug) ? array('text' => $lang->execution->importBug, 'url' => createLink('execution', 'importBug', "execution=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg') : null, ($features['story'] and $hasStoryButton and $features['qa']) ? array('text' => '', 'class' => 'menu-divider') : null, ($canCreateTask) ? array('text' => $lang->task->create, 'url' => createLink('task', 'create', "execution=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg') : null, - ($canBatchCreateTask) ? array('text' => $lang->execution->batchCreateTask, 'url' => createLink('task', 'batchCreate', "execution=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg') : null, + ($canBatchCreateTask) ? array('text' => $lang->execution->batchCreateTask, 'url' => createLink('task', 'batchCreate', "execution=$execution->id"), 'data-toggle' => 'modal', 'data-size' => 'lg') : null )) - ) : null, + ) : null ) ); @@ -239,7 +239,7 @@ modal to::header ( h4($lang->execution->linkStoryByPlan), - "({$lang->execution->linkStoryByPlanTips})", + "({$lang->execution->linkStoryByPlanTips})" ), inputGroup ( @@ -249,7 +249,7 @@ modal set::width(200), setID('plan'), set::name('plan'), - set::items($allPlans), + set::items($allPlans) ), span ( @@ -272,7 +272,7 @@ modal setID('product'), set::name('productName'), set::items($productNames), - set::onchange('changeBugProduct()'), + set::onchange('changeBugProduct()') ), span ( diff --git a/module/execution/ui/team.html.php b/module/execution/ui/team.html.php index 2d2a82ee3f..35dbe04bb8 100644 --- a/module/execution/ui/team.html.php +++ b/module/execution/ui/team.html.php @@ -14,7 +14,7 @@ namespace zin; featureBar ( set::current('all'), - set::linkParams("executionID={$execution->id}"), + set::linkParams("executionID={$execution->id}") ); /* zin: Define the toolbar on main menu. */ diff --git a/module/execution/ui/testcase.html.php b/module/execution/ui/testcase.html.php index af08c27313..958a8a590e 100644 --- a/module/execution/ui/testcase.html.php +++ b/module/execution/ui/testcase.html.php @@ -23,7 +23,7 @@ $canCreateTestcase = hasPriv('testcase', 'create') && common::canModify('executi if($canCreateTestcase) $createItem = array('icon' => 'plus', 'class' => 'primary', 'text' => $lang->testcase->create, 'url' => $this->createLink('testcase', 'create', "productID={$productID}&branch=0&moduleID=0&from=execution¶m={$execution->id}"), 'data-app' => 'execution'); toolbar ( - !empty($createItem) ? item(set($createItem)) : null, + !empty($createItem) ? item(set($createItem)) : null ); /* zin: Define the sidebar in main content. */ diff --git a/module/execution/ui/tips.html.php b/module/execution/ui/tips.html.php index 0b7dda0b99..450d568600 100644 --- a/module/execution/ui/tips.html.php +++ b/module/execution/ui/tips.html.php @@ -36,32 +36,32 @@ panel ( set::className('mr-2 tipBtn ml-1'), $lang->execution->setTeam, - set('data-url', createLink('execution', 'team', "executionID={$executionID}")), + set('data-url', createLink('execution', 'team', "executionID={$executionID}")) ), $execution->lifetime != 'ops' ? btn ( set::className('mr-2 tipBtn'), $lang->execution->linkStory, - set('data-url', createLink('execution', 'linkstory', "executionID=$executionID")), + set('data-url', createLink('execution', 'linkstory', "executionID=$executionID")) ) : null, btn ( set::className('mr-2 tipBtn'), $lang->execution->createTask, - set('data-url', createLink('task', 'create', "execution=$executionID")), + set('data-url', createLink('task', 'create', "execution=$executionID")) ), btn ( set::className('mr-2 tipBtn'), $lang->execution->goback, - set('data-url', createLink('execution', 'task', "executionID={$executionID}")), + set('data-url', createLink('execution', 'task', "executionID={$executionID}")) ), btn ( set::className('tipBtn'), $lang->execution->gobackExecution, - set('data-url', createLink('execution', 'all')), - ), + set('data-url', createLink('execution', 'all')) + ) ) ); diff --git a/module/execution/ui/tree.html.php b/module/execution/ui/tree.html.php index 96d9fbd2e8..a8fc9a12b5 100644 --- a/module/execution/ui/tree.html.php +++ b/module/execution/ui/tree.html.php @@ -21,7 +21,7 @@ featureBar set::name('showStory'), set::text($lang->execution->treeLevel['story']), on::change('changeDisplay') - ), + ) ); /* zin: Define the toolbar on main menu. */ @@ -45,7 +45,7 @@ toolbar 'icon' => 'bar-chart', 'text' => $lang->task->reportChart, 'class' => 'ghost', - 'url' => createLink('task', 'report', "execution={$executionID}&browseType={$browseType}"), + 'url' => createLink('task', 'report', "execution={$executionID}&browseType={$browseType}") ))) : null, (!empty($importTaskItem) || !empty($importBugItem)) ? dropdown( btn( @@ -54,7 +54,7 @@ toolbar set::text($lang->import) ), set::items(array_filter(array($importTaskItem, $importBugItem))), - set::placement('bottom-end'), + set::placement('bottom-end') ) : null, hasPriv('task', 'export') ? item(set(array ( @@ -69,7 +69,7 @@ toolbar 'icon' => 'plus', 'text' => $lang->task->create, 'class' => 'primary create-execution-btn', - 'url' => createLink('task', 'create', "execution={$executionID}"), + 'url' => createLink('task', 'create', "execution={$executionID}") ))) : null ); @@ -90,7 +90,7 @@ if(empty($tree)) set::text($lang->task->create), set::icon('plus'), set::url(createLink('task', 'create', "execution={$executionID}" . (isset($moduleID) ? "&storyID=&moduleID={$moduleID}" : ''))), - setClass('primary ml-2'), + setClass('primary ml-2') ) : null ); } @@ -114,6 +114,6 @@ div div ( setID('detailBlock'), - setClass('w-96 ml-4 hidden'), + setClass('w-96 ml-4 hidden') ) ); diff --git a/module/execution/ui/treestory.html.php b/module/execution/ui/treestory.html.php index 61ba600881..10cf84290c 100644 --- a/module/execution/ui/treestory.html.php +++ b/module/execution/ui/treestory.html.php @@ -53,7 +53,7 @@ div ( setClass('article-h2 clip'), $story->title - ), + ) ), div ( @@ -64,7 +64,7 @@ div ( setClass('ml-2 article-h3'), $lang->story->stageList[$story->stage] - ), + ) ), div ( @@ -88,7 +88,7 @@ div set::hint($lang->story->operateList['changed']), set::url(createLink('story', 'change', array('storyID' => $story->id))), set::disabled(!$this->story->isClickable($story, 'change')), - set('data-app', $app->tab), + set('data-app', $app->tab) ) : null, hasPriv('story', 'delete') ? btn ( @@ -97,7 +97,7 @@ div set::hint($lang->story->delete), set::url(createLink('story', 'delete', array('storyID' => $story->id))), set::disabled(!$this->story->isClickable($story, 'delete')), - set('data-confirm', $story->type == 'requirement' ? str_replace($lang->SRCommon, $lang->URCommon, $lang->story->confirmDelete) : $lang->story->confirmDelete), + set('data-confirm', $story->type == 'requirement' ? str_replace($lang->SRCommon, $lang->URCommon, $lang->story->confirmDelete) : $lang->story->confirmDelete) ) : null, hasPriv('story', 'review') ? btn ( @@ -106,7 +106,7 @@ div set::hint($lang->story->review), set::url(createLink('story', 'review', array('storyID' => $story->id))), set::disabled(!$this->story->isClickable($story, 'review')), - set('data-app', $app->tab), + set('data-app', $app->tab) ) : null, hasPriv('story', 'close') ? btn ( @@ -115,7 +115,7 @@ div set::hint($lang->story->close), set::url(createLink('story', 'close', array('storyID' => $story->id))), set::disabled(!$this->story->isClickable($story, 'close')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, hasPriv('story', 'edit') ? btn ( @@ -124,7 +124,7 @@ div set::hint($lang->story->edit), set::url(createLink('story', 'edit', array('storyID' => $story->id))), set::disabled(!$this->story->isClickable($story, 'edit')), - set('data-app', $app->tab), + set('data-app', $app->tab) ) : null, hasPriv('story', 'createCase') ? btn ( @@ -133,8 +133,8 @@ div set::hint($lang->story->createCase), set::url(createLink('story', 'createCase', "productID={$story->product}&branch={$story->branch}&module=0&from=¶m=0&storyID={$story->id}")), set::disabled(!$this->story->isClickable($story, 'createCase')), - set('data-app', $app->tab), - ) : null, + set('data-app', $app->tab) + ) : null ), hr(), section @@ -154,7 +154,7 @@ div fileList ( set::padding(false), - set::files($story->files), + set::files($story->files) ), hr(), section @@ -291,7 +291,7 @@ div ( set::title($case->title), label(setClass('circle size-sm'), $case->id), - common::hasPriv('testcase', 'view') ? a(set::href(helper::createLink('testcase', 'view', "caseID=$case->id")), setClass('title'), set('data-toggle', 'modal'), set::title($case->title), $case->title) : span(setClass('title'), $case->title), + common::hasPriv('testcase', 'view') ? a(set::href(helper::createLink('testcase', 'view', "caseID=$case->id")), setClass('title'), set('data-toggle', 'modal'), set::title($case->title), $case->title) : span(setClass('title'), $case->title) ); }, $cases)) ) @@ -310,11 +310,11 @@ div ( set::title($storyTitle), label(setClass('circle size-sm'), $storyID), - $hasPriv ? a(set::href(helper::createLink('story', 'view', "storyID=$storyID&version=0¶m=0&storyType=$story->type")), setClass('title'), set('data-toggle', 'modal'), set::title($storyTitle), $storyTitle) : span(setClass('title'), $storyTitle), + $hasPriv ? a(set::href(helper::createLink('story', 'view', "storyID=$storyID&version=0¶m=0&storyType=$story->type")), setClass('title'), set('data-toggle', 'modal'), set::title($storyTitle), $storyTitle) : span(setClass('title'), $storyTitle) ); }, array_keys($story->linkStoryTitles), array_values($story->linkStoryTitles))) ) - ), + ) ) ), hr(), @@ -359,14 +359,14 @@ div ( set::name($lang->story->lastEditedBy), $story->lastEditedBy ? zget($users, $story->lastEditedBy) . $lang->at . $story->lastEditedDate : $lang->noData - ), + ) ) ) - ), + ) ); history ( set::commentBtn(true), - set::commentUrl(createLink('action', 'comment', array('objectType' => 'story', 'objectID' => $story->id))), + set::commentUrl(createLink('action', 'comment', array('objectType' => 'story', 'objectID' => $story->id))) ); diff --git a/module/execution/ui/treetask.html.php b/module/execution/ui/treetask.html.php index 7bc7cffbe8..b800eb4bf2 100644 --- a/module/execution/ui/treetask.html.php +++ b/module/execution/ui/treetask.html.php @@ -40,7 +40,7 @@ div ( setClass('flex-none rounded-full status-' . $task->status), $this->processStatus('task', $task) - ), + ) ), div ( @@ -53,7 +53,7 @@ div ( setClass('ml-2 article-h3'), $task->estimate . ' ' . $lang->execution->workHourUnit - ), + ) ), div ( @@ -63,7 +63,7 @@ div ( setClass('ml-2 article-h3'), round($task->consumed, 2) . ' ' . $lang->execution->workHourUnit - ), + ) ), div ( @@ -73,7 +73,7 @@ div ( setClass('ml-2 article-h3'), $task->left . ' ' . $lang->execution->workHourUnit - ), + ) ), div ( @@ -83,7 +83,7 @@ div ( setClass('ml-2 article-h3'), $lang->task->typeList[$task->type] - ), + ) ), helper::isZeroDate($task->deadline) ? null : div ( @@ -98,8 +98,8 @@ div ( setClass('flex-none rounded-full danger-pale ml-2'), html(sprintf($lang->task->delayWarning, $task->delay)) - ) : null, - ), + ) : null + ) ), btngroup ( @@ -112,7 +112,7 @@ div set::hint($lang->task->finish), set::url(createLink('task', 'finish', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'finish')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, ($task->status == 'wait' && hasPriv('task', 'start')) ? btn ( @@ -121,7 +121,7 @@ div set::hint($lang->task->start), set::url(createLink('task', 'start', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'start')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, ($task->status == 'pause' && hasPriv('task', 'restart')) ? btn ( @@ -130,7 +130,7 @@ div set::hint($lang->task->restart), set::url(createLink('task', 'restart', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'restart')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, (($task->status == 'done' || $task->status == 'cancel' || $task->status == 'closed') && hasPriv('task', 'close')) ? btn ( @@ -139,7 +139,7 @@ div set::hint($lang->task->close), set::url(createLink('task', 'close', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'close')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, ($task->status == 'doing' && hasPriv('task', 'finish')) ? btn ( @@ -148,7 +148,7 @@ div set::hint($lang->task->finish), set::url(createLink('task', 'finish', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'finish')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, hasPriv('task', 'recordWorkhour') ? btn ( @@ -157,7 +157,7 @@ div set::hint($lang->task->recordWorkhour), set::url(createLink('task', 'recordWorkhour', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'recordWorkhour')), - set('data-toggle', 'modal'), + set('data-toggle', 'modal') ) : null, hasPriv('task', 'edit') ? btn ( @@ -166,7 +166,7 @@ div set::hint($lang->task->edit), set::url(createLink('task', 'edit', array('taskID' => $task->id))), set::disabled(!$this->task->isClickable($task, 'edit')), - set('data-app', $app->tab), + set('data-app', $app->tab) ) : null, ((empty($task->team) || empty($task->children)) && hasPriv('task', 'batchCreate') && $config->vision != 'lite') ? btn ( @@ -175,19 +175,19 @@ div set::hint($lang->task->batchCreate), set::url(createLink('task', 'batchCreate', "execution={$task->execution}&storyID={$task->story}&moduleID={$task->module}&askID={$task->id}&ifame=0")), set::disabled(!$this->task->isClickable($task, 'batchCreate')), - set('data-app', $app->tab), - ) : null, + set('data-app', $app->tab) + ) : null ), section ( set::title($lang->task->legendDesc), set::content(empty($task->desc) ? $lang->noData : $task->desc), set::useHtml(true) - ), + ) ); history ( set::commentBtn(true), - set::commentUrl(createLink('action', 'comment', array('objectType' => 'task', 'objectID' => $task->id))), + set::commentUrl(createLink('action', 'comment', array('objectType' => 'task', 'objectID' => $task->id))) ); diff --git a/module/execution/ui/view.html.php b/module/execution/ui/view.html.php index 334a7e3bbd..6a2d0372db 100644 --- a/module/execution/ui/view.html.php +++ b/module/execution/ui/view.html.php @@ -193,7 +193,7 @@ div set('data-placement', 'bottom'), set('data-type', 'white'), set('data-class-name', 'text-gray border border-light'), - setClass('text-gray '), + setClass('text-gray ') ) ) ) @@ -313,8 +313,8 @@ div ( set::className('detail-content mt-4'), html($execution->desc) - ), - ), + ) + ) ), div ( @@ -444,7 +444,7 @@ if(common::hasPriv('execution', 'doc')) ( $docLib->name, set('data-app', $app->tab == 'search' ? 'execution' : $app->tab), - set::href($libID == 'files' ? $this->createLink('doc', 'showFiles', "type=execution&objectID={$execution->id}") : $this->createLink('execution', 'doc', "objectID={$execution->id}&libID={$libID}")), + set::href($libID == 'files' ? $this->createLink('doc', 'showFiles', "type=execution&objectID={$execution->id}") : $this->createLink('execution', 'doc', "objectID={$execution->id}&libID={$libID}")) ) ); @@ -791,7 +791,7 @@ div ) ) ) : null - ), + ) ) : null, div (