Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Remove , at the end of row in the lastest children in task.

Browse Source
This commit is contained in:
liumengyi
2023-11-14 15:48:45 +08:00
parent 68be9802dd
commit 359032af3b
18 changed files with 176 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/ui/activate.html.php
+8 -8
View File
@@ -66,7 +66,7 @@ if($isMultiple)
(
set::className('hidden'),
set::name('mode'),
set::value($task->mode),
set::value($task->mode)
)
)
);
@@ -99,7 +99,7 @@ if($task->parent != '-1')
inputControl
(
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
set::suffixWidth(20)
)
);
}
@@ -160,12 +160,12 @@ foreach($task->team as $member)
(
set::type('hidden'),
set::name('teamSource[]'),
set::value($member->account),
set::value($member->account)
),
$memberDisabled ? input(
set::type('hidden'),
set::name('team[]'),
set::value($member->account),
set::value($member->account)
) : null
),
h::td
@@ -222,7 +222,7 @@ foreach($task->team as $member)
(
set::items(array(
array('icon' => 'plus', 'class' => 'btn ghost btn-add text-gray', 'disabled' => $memberDisabled ? 'disabled' : ''),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete text-gray', 'disabled' => $memberDisabled ? 'disabled' : ''),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete text-gray', 'disabled' => $memberDisabled ? 'disabled' : '')
))
)
)
@@ -274,7 +274,7 @@ for($i; $i <= $rowCount; $i ++)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20)
),
)
),
h::td
(
@@ -287,7 +287,7 @@ for($i; $i <= $rowCount; $i ++)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20)
),
)
),
h::td
(
@@ -300,7 +300,7 @@ for($i; $i <= $rowCount; $i ++)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20)
),
)
),
h::td
(
module/task/ui/ajaxgetteststories.html.php
+16 -16
View File
@@ -29,8 +29,8 @@ foreach($testStories as $storyID => $storyTitle)
set::id("testStory{$i}"),
set::name("testStory[$i]"),
set::value($storyID),
set::items(array($storyID => $storyTitle)),
),
set::items(array($storyID => $storyTitle))
)
),
h::td
(
@@ -40,8 +40,8 @@ foreach($testStories as $storyID => $storyTitle)
set::name("testPri[$i]"),
set::required(true),
set::value(empty($task->pri) ? 3 : $task->pri),
set::items($lang->task->priList),
),
set::items($lang->task->priList)
)
),
h::td
(
@@ -49,8 +49,8 @@ foreach($testStories as $storyID => $storyTitle)
(
set::id("testEstStarted{$i}"),
set::name("testEstStarted[$i]"),
set::value(empty($task->estStarted) ? '' : $task->estStarted),
),
set::value(empty($task->estStarted) ? '' : $task->estStarted)
)
),
h::td
(
@@ -58,8 +58,8 @@ foreach($testStories as $storyID => $storyTitle)
(
set::id("testDeadline{$i}"),
set::name("testDeadline[$i]"),
set::value(empty($task->deadline) ? '' : $task->deadline),
),
set::value(empty($task->deadline) ? '' : $task->deadline)
)
),
h::td
(
@@ -68,8 +68,8 @@ foreach($testStories as $storyID => $storyTitle)
set::id("testAssignedTo{$i}"),
set::name("testAssignedTo[$i]"),
set::value(empty($task->assignedTo) ? '' : $task->assignedTo),
set::items($members),
),
set::items($members)
)
),
h::td
(
@@ -78,11 +78,11 @@ foreach($testStories as $storyID => $storyTitle)
input
(
set::id("testEstimate{$i}"),
set::name("testEstimate[$i]"),
set::name("testEstimate[$i]")
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
h::td
(
@@ -91,7 +91,7 @@ foreach($testStories as $storyID => $storyTitle)
(
set::items(array(
array('class' => 'btn ghost text-gray', 'icon' => 'plus', 'onclick' => 'addItem(this)'),
array('class' => 'btn ghost text-gray', 'icon' => 'trash', 'onclick' => 'removeItem(this)'),
array('class' => 'btn ghost text-gray', 'icon' => 'trash', 'onclick' => 'removeItem(this)')
))
)
)
@@ -145,14 +145,14 @@ formGroup
(
$lang->actions,
set::width('70px')
),
)
)
),
h::tbody
(
$taskTR
)
),
)
);
/* ====== Render page ====== */
module/task/ui/batchcreate.html.php
+20 -20
View File
@@ -28,7 +28,7 @@ if(!$hideStory)
set::control('picker'),
set::items($stories),
set::width('240px'),
set::ditto(true),
set::ditto(true)
);
$previewItem = formBatchItem(
@@ -45,7 +45,7 @@ if(!$hideStory)
set('hint', $lang->preview),
set('data-url', '#'),
set('data-toggle', 'modal'),
set('disabled', true),
set('disabled', true)
)
);
@@ -60,7 +60,7 @@ if(!$hideStory)
set('type', 'btn'),
set('icon', 'arrow-right'),
set('class', 'ghost'),
set('hint', $lang->task->copyStoryTitle),
set('hint', $lang->task->copyStoryTitle)
)
);
@@ -68,21 +68,21 @@ if(!$hideStory)
set::name('storyEstimate'),
set::label(''),
set('labelClass', 'hidden'),
set::control('hidden'),
set::control('hidden')
);
$storyDescItem = formBatchItem(
set::name('storyDesc'),
set::label(''),
set('labelClass', 'hidden'),
set::control('hidden'),
set::control('hidden')
);
$storyPriItem = formBatchItem(
set::name('storyPri'),
set::label(''),
set('labelClass', 'hidden'),
set::control('hidden'),
set::control('hidden')
);
}
@@ -100,7 +100,7 @@ if($execution->type == 'kanban')
set::width('160px'),
set::ditto(true),
set::required(true),
set::hidden($config->vision == 'lite'),
set::hidden($config->vision == 'lite')
);
$laneItem = formBatchItem(
set::name('lane'),
@@ -111,7 +111,7 @@ if($execution->type == 'kanban')
set::width('160px'),
set::ditto(true),
set::required(true),
set::hidden($config->vision == 'lite'),
set::hidden($config->vision == 'lite')
);
}
@@ -127,7 +127,7 @@ formBatchPanel
set::name('id'),
set::label($lang->idAB),
set::control('index'),
set::width('32px'),
set::width('32px')
),
formBatchItem
(
@@ -137,7 +137,7 @@ formBatchPanel
set::value($moduleID),
set::items($modules),
set::width('200px'),
set::ditto(true),
set::ditto(true)
),
$storyItem,
$previewItem,
@@ -149,7 +149,7 @@ formBatchPanel
(
set::name('name'),
set::label($lang->task->name),
set::width('240px'),
set::width('240px')
),
$regionItem,
$laneItem,
@@ -160,7 +160,7 @@ formBatchPanel
set::control('picker'),
set::items($lang->task->typeList),
set::width('160px'),
set::ditto(true),
set::ditto(true)
),
formBatchItem
(
@@ -169,7 +169,7 @@ formBatchPanel
set::control('picker'),
set::items($members),
set::width('128px'),
set::ditto(true),
set::ditto(true)
),
formBatchItem
(
@@ -179,7 +179,7 @@ formBatchPanel
set::value(3),
set::required(true),
set::items($lang->task->priList),
set::width('80px'),
set::width('80px')
),
formBatchItem
(
@@ -201,7 +201,7 @@ formBatchPanel
set::label($lang->task->estStarted),
set::control('date'),
set::width('128px'),
set::ditto(true),
set::ditto(true)
),
formBatchItem
(
@@ -209,14 +209,14 @@ formBatchPanel
set::label($lang->task->deadline),
set::control('date'),
set::width('128px'),
set::ditto(true),
set::ditto(true)
),
formBatchItem
(
set::name('desc'),
set::label($lang->task->desc),
set::control('textarea'),
set::width('240px'),
set::width('240px')
),
to::headingActions
(
@@ -224,13 +224,13 @@ formBatchPanel
(
set::id('zeroTaskStory'),
set::text($lang->story->zeroTask),
on::change('toggleZeroTaskStory'),
),
on::change('toggleZeroTaskStory')
)
),
on::change('[data-name="module"]', 'setStories'),
on::change('[data-name="story"]', 'setStoryRelated'),
on::click('[data-name="copyStory"]', 'copyStoryTitle'),
on::change('[data-name="region"]', 'loadLanes'),
on::change('[data-name="region"]', 'loadLanes')
);
/* ====== Render page ====== */
module/task/ui/batchedit.html.php
+11 -11
View File
@@ -29,20 +29,20 @@ 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('64px'),
set::width('64px')
),
formBatchItem
(
set::name('name'),
set::label($lang->task->name),
set::width('240px'),
set::width('240px')
),
formBatchItem
(
@@ -52,7 +52,7 @@ formBatchPanel
set::items($modules),
set::width('200px'),
set::ditto(true),
set::defaultDitto('off'),
set::defaultDitto('off')
),
formBatchItem
(
@@ -62,7 +62,7 @@ formBatchPanel
set::items(array()),
set::width('128px'),
set::ditto(true),
set::defaultDitto('off'),
set::defaultDitto('off')
),
formBatchItem
(
@@ -72,7 +72,7 @@ formBatchPanel
set::items($lang->task->typeList),
set::width('128px'),
set::ditto(true),
set::defaultDitto('off'),
set::defaultDitto('off')
),
formBatchItem
(
@@ -82,21 +82,21 @@ formBatchPanel
set::items($lang->task->statusList),
set::width('128px'),
set::ditto(true),
set::defaultDitto('off'),
set::defaultDitto('off')
),
formBatchItem
(
set::name('estStarted'),
set::label($lang->task->estStarted),
set::control('date'),
set::width('128px'),
set::width('128px')
),
formBatchItem
(
set::name('deadline'),
set::label($lang->task->deadline),
set::control('date'),
set::width('128px'),
set::width('128px')
),
formBatchItem
(
@@ -104,7 +104,7 @@ formBatchPanel
set::label($lang->task->pri),
set::control('priPicker'),
set::items($lang->task->priList),
set::width('80px'),
set::width('80px')
),
formBatchItem
(
@@ -147,7 +147,7 @@ formBatchPanel
'suffixWidth' => 20
)
)
),
)
);
/* ====== Render page ====== */
render();
module/task/ui/cancel.html.php
+2 -2
View File
@@ -21,14 +21,14 @@ formPanel
editor
(
set::name('comment'),
set::rows('5'),
set::rows('5')
),
input(
set::className('hidden'),
set::name('status'),
set::value('cancel')
)
),
)
);
hr();
history();
module/task/ui/close.html.php
+2 -2
View File
@@ -21,9 +21,9 @@ formPanel
editor
(
set::name('comment'),
set::rows('5'),
set::rows('5')
)
),
)
);
hr();
history();
module/task/ui/create.html.php
+3 -3
View File
@@ -305,7 +305,7 @@ formPanel
'data-toggle' => 'modal',
'url' => '#modalTeam',
'icon' => 'plus'
),
)
),
$lang->task->addMember
),
@@ -411,8 +411,8 @@ formPanel
set::text($lang->task->copyStoryTitle),
set::rootClass('ml-8 border-l border-gray pl-2'),
on::change('copyStoryTitle')
),
),
)
)
),
formHidden('storyEstimate', ''),
formHidden('storyDesc', ''),
module/task/ui/edit.html.php
+6 -6
View File
@@ -169,7 +169,7 @@ detailBody
set::value($showAllModule ? '1' : ''),
set::inline(true)
)
),
)
)
),
($task->parent >= 0 and empty($task->team))
@@ -181,7 +181,7 @@ detailBody
set::name('parent'),
set::value($task->parent),
set::items($tasks)
),
)
)
: null,
empty($modeText)
@@ -246,7 +246,7 @@ detailBody
set::required(true),
set::value($task->type),
set::items($typeOptions)
),
)
),
empty($task->children)
? item
@@ -258,7 +258,7 @@ detailBody
set::required(true),
set::value($task->status),
set::items($statusOptions)
),
)
)
: null,
item
@@ -287,7 +287,7 @@ detailBody
'type' => 'picker',
'items' => $mailtoOptions,
'multiple' => true
))),
)))
),
div
(
@@ -298,7 +298,7 @@ detailBody
set::type('picker'),
set::items($contactListMenuOptions),
on::change('setMailto')
),
)
)
)
)
module/task/ui/editeffort.html.php
+9 -9
View File
@@ -28,7 +28,7 @@ formPanel
set::level(1),
set::text($task->name),
set::entityID($task->id),
set::reverse(true),
set::reverse(true)
)
),
formGroup
@@ -50,11 +50,11 @@ formPanel
input
(
set::name('consumed'),
set::value($effort->consumed),
set::value($effort->consumed)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
formGroup
(
@@ -66,11 +66,11 @@ formPanel
(
set::name('left'),
set::value($effort->left),
set::readonly($readonly),
set::readonly($readonly)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
)
),
formGroup
@@ -78,8 +78,8 @@ formPanel
set::label($lang->task->work),
set::control('textarea'),
set::name('work'),
set::rows('1'),
),
set::rows('1')
)
);
render();
module/task/ui/finish.html.php
+8 -8
View File
@@ -96,8 +96,8 @@ else
span
(
setClass('label secondary-pale'),
$task->consumed . $lang->task->suffixHour,
),
$task->consumed . $lang->task->suffixHour
)
),
span
(
@@ -111,7 +111,7 @@ else
setID('totalConsumed'),
$task->consumed
),
$lang->task->suffixHour,
$lang->task->suffixHour
)
)
)
@@ -132,11 +132,11 @@ else
(
set::name('currentConsumed'),
set::value(0),
set::type('text'),
set::type('text')
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
$assignedToControl,
formGroup
@@ -158,7 +158,7 @@ else
datetimePicker
(
set::name('finishedDate'),
set::value(helper::now()),
set::value(helper::now())
)
),
formGroup
@@ -171,7 +171,7 @@ else
set::name('comment'),
set::label($lang->comment),
set::control("editor")
),
)
);
hr();
history();
module/task/ui/linearefforts.html.php
+6 -6
View File
@@ -78,8 +78,8 @@ foreach($myCountList as $order => $count)
set('data-confirm', $lang->task->confirmDeleteEffort),
set::href(createLink('task', 'deleteWorkhour', "id={$effort->id}")),
icon('trash')
) : null,
),
) : null
)
);
}
}
@@ -101,7 +101,7 @@ foreach($recorders as $order => $accounts)
h::td(zget($users, $effort->account)),
h::td($effort->work),
h::td($effort->consumed . ' H'),
h::td($effort->left . ' H'),
h::td($effort->left . ' H')
);
}
}
@@ -151,7 +151,7 @@ div
(
width('80px'),
$lang->actions
),
)
),
$myEffortTable
)
@@ -190,10 +190,10 @@ div
(
width('60px'),
$lang->task->leftAB
),
)
),
$allEffortTable
)
),
)
)
);
module/task/ui/pause.html.php
+2 -2
View File
@@ -24,14 +24,14 @@ formPanel
editor
(
set::name('comment'),
set::rows('5'),
set::rows('5')
),
input(
set::className('hidden'),
set::name('status'),
set::value('pause')
)
),
)
);
hr();
history();
module/task/ui/recordworkhour.html.php
+9 -9
View File
@@ -21,7 +21,7 @@ to::header
set::text($task->name),
set::entityID($task->id),
set::reverse(true),
setClass('clip w-1/2'),
setClass('clip w-1/2')
),
span
(
@@ -30,8 +30,8 @@ to::header
span
(
setClass('label secondary-pale'),
$task->estimate . $lang->task->suffixHour,
),
$task->estimate . $lang->task->suffixHour
)
),
span
(
@@ -45,7 +45,7 @@ to::header
setID('totalConsumed'),
$task->consumed
),
$lang->task->suffixHour,
$lang->task->suffixHour
)
)
);
@@ -77,7 +77,7 @@ if($efforts)
setClass('btn ghost toolbar-item square size-sm'),
set::href(createLink('task', 'editEffort', "id={$effort->id}")),
icon('edit'),
set('data-dismiss', 'modal'),
set('data-dismiss', 'modal')
) : null,
common::hasPriv('task', 'deleteWorkhour') ? a
(
@@ -85,8 +85,8 @@ if($efforts)
set('data-confirm', $lang->task->confirmDeleteEffort),
set::href(createLink('task', 'deleteWorkhour', "id={$effort->id}")),
icon('trash')
) : null,
),
) : null
)
);
}
div
@@ -129,7 +129,7 @@ if($efforts)
(
width('80px'),
$lang->actions
),
)
),
$effortRows
);
@@ -172,7 +172,7 @@ else
set::name('id'),
set::label($lang->idAB),
set::control('index'),
set::width('32px'),
set::width('32px')
),
formBatchItem
(
module/task/ui/report.html.php
+7 -7
View File
@@ -22,7 +22,7 @@ detailHeader
set::level(1),
set::text($lang->task->report->common)
)
),
)
);
$selectCharts = array();
@@ -48,8 +48,8 @@ foreach($charts as $type => $option)
set::tableHeaders(array(
'item' => $lang->task->report->$type->item,
'value' => $lang->task->report->value,
'percent' => $lang->report->percent,
)),
'percent' => $lang->report->percent
))
);
}
@@ -102,7 +102,7 @@ div
'text' => $lang->task->report->create,
'class' => 'btn-select-all space',
'url' => 'javascript:createChart();'
),
)
)
),
checkList
@@ -111,9 +111,9 @@ div
set::name('charts[]'),
set::value('code'),
set::inline(false),
set::items($selectCharts),
),
),
set::items($selectCharts)
)
)
),
cell
(
module/task/ui/restart.html.php
+10 -10
View File
@@ -21,7 +21,7 @@ if($task->mode == 'linear')
(
set::className('hidden'),
set::name('assignedTo'),
set::value($assignedTo),
set::value($assignedTo)
)
);
}
@@ -30,7 +30,7 @@ elseif($canRecordEffort)
$assignedToControl = select(
set::name('assignedTo'),
set::value($assignedTo),
set::items($members),
set::items($members)
);
}
@@ -71,7 +71,7 @@ else
set::className($task->mode == 'multi' ? 'hidden' : ''),
set::width('1/3'),
set::label($lang->task->assignedTo),
$assignedToControl,
$assignedToControl
),
formGroup
(
@@ -96,8 +96,8 @@ else
set::disabled(!empty($currentTeam) ? true : false),
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
formGroup
(
@@ -111,9 +111,9 @@ else
set::value(!empty($currentTeam) ? (float)$currentTeam->left : $task->left),
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
),
set::suffixWidth(20)
)
)
),
formGroup
(
@@ -121,9 +121,9 @@ else
editor
(
set::name('comment'),
set::rows('5'),
set::rows('5')
)
),
)
);
hr();
history();
module/task/ui/start.html.php
+12 -12
View File
@@ -24,7 +24,7 @@ if($task->mode == 'linear')
(
set::className('hidden'),
set::name('assignedTo'),
set::value($assignedTo),
set::value($assignedTo)
)
);
}
@@ -33,7 +33,7 @@ elseif($canRecordEffort)
$assignedToControl = picker(
set::name('assignedTo'),
set::value($assignedTo),
set::items($members),
set::items($members)
);
}
@@ -76,7 +76,7 @@ else
set::className($task->mode == 'multi' ? 'hidden' : ''),
set::width('1/2'),
set::label($lang->task->assignedTo),
$assignedToControl,
$assignedToControl
),
formGroup
(
@@ -99,11 +99,11 @@ else
input
(
set::name('consumed'),
set::value(!empty($currentTeam) ? (float)$currentTeam->consumed : $task->consumed),
set::value(!empty($currentTeam) ? (float)$currentTeam->consumed : $task->consumed)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
formGroup
(
@@ -114,12 +114,12 @@ else
input
(
set::name('left'),
set::value(!empty($currentTeam) ? (float)$currentTeam->left : $task->left),
set::value(!empty($currentTeam) ? (float)$currentTeam->left : $task->left)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
),
set::suffixWidth(20)
)
)
),
formGroup
(
@@ -127,9 +127,9 @@ else
editor
(
set::name('comment'),
set::rows('5'),
set::rows('5')
)
),
)
);
hr();
history();
module/task/ui/taskteam.html.php
+23 -23
View File
@@ -66,7 +66,7 @@ if(!empty($task->team))
set::items($members),
set::value($member->account),
$memberDisabled ? set::disabled(true) : null
),
)
),
h::td
(
@@ -78,11 +78,11 @@ if(!empty($task->team))
set::name("teamEstimate[]"),
set::value((float)$member->estimate),
$hourDisabled ? set::readonly(true) : null,
set::placeholder($lang->task->estimateAB),
set::placeholder($lang->task->estimateAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
h::td
(
@@ -94,11 +94,11 @@ if(!empty($task->team))
set::name("teamConsumed[]"),
set::value((float)$member->consumed),
set::readonly(true),
set::placeholder($lang->task->consumedAB),
set::placeholder($lang->task->consumedAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
h::td
(
@@ -110,11 +110,11 @@ if(!empty($task->team))
set::name("teamLeft[]"),
set::value((float)$member->left),
$hourDisabled ? set::readonly(true) : null,
set::placeholder($lang->task->leftAB),
set::placeholder($lang->task->leftAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
h::td
(
@@ -124,7 +124,7 @@ if(!empty($task->team))
(
set::items(array(
array('icon' => 'plus', 'class' => 'btn ghost btn-add'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete')
))
)
)
@@ -155,8 +155,8 @@ for($i; $i < $count; $i ++)
picker
(
set::name("team[]"),
set::items($members),
),
set::items($members)
)
),
h::td
(
@@ -166,11 +166,11 @@ for($i; $i < $count; $i ++)
input
(
set::name("teamEstimate[]"),
set::placeholder($lang->task->estimateAB),
set::placeholder($lang->task->estimateAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
),
!empty($task->team) ? h::td
(
@@ -182,11 +182,11 @@ for($i; $i < $count; $i ++)
set::name("teamConsumed[]"),
set::value(0),
set::readonly(true),
set::placeholder($lang->task->consumedAB),
set::placeholder($lang->task->consumedAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
) : null,
!empty($task->team) ? h::td
(
@@ -196,11 +196,11 @@ for($i; $i < $count; $i ++)
input
(
set::name("teamLeft[]"),
set::placeholder($lang->task->leftAB),
set::placeholder($lang->task->leftAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20),
),
set::suffixWidth(20)
)
) : null,
h::td
(
@@ -210,7 +210,7 @@ for($i; $i < $count; $i ++)
(
set::items(array(
array('icon' => 'plus', 'class' => 'btn ghost btn-add'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete')
))
)
)
module/task/ui/view.html.php
+22 -23
View File
@@ -28,7 +28,7 @@ detailHeader
array
(
'entityID' => $task->id,
'level' => 1,
'level' => 1
)
),
$task->parent > 0 ?
@@ -108,7 +108,7 @@ if($task->team)
(
setClass("status-{$team->status}"),
zget($lang->task->statusList, $team->status)
),
)
);
}
}
@@ -163,7 +163,6 @@ foreach($linkCommits as $commit)
set::href(createLink('repo', 'revision', "repoID={$commit->repo}&objectID={$task->execution}&revision={$commit->revision}")),
"#$MRID $linkMRTitle",
set('data-ap', $app->tab)
) : div($revision . ' ' . $commit->comment);
}
@@ -186,7 +185,7 @@ detailBody
entityLabel
(
set::entityID($task->fromBug),
set::text($fromBug->title),
set::text($fromBug->title)
),
item
(
@@ -204,7 +203,7 @@ detailBody
entityLabel
(
set::entityID($task->storyID),
set::text($task->storyTitle),
set::text($task->storyTitle)
),
item
(
@@ -215,7 +214,7 @@ detailBody
(
set::title($lang->task->storyVerify),
empty($task->storyVerify) ? $lang->noData : html($task->storyVerify)
),
)
)
) : null,
$task->children ?
@@ -226,13 +225,13 @@ detailBody
(
set::cols(array_values($config->task->dtable->children->fieldList)),
set::data($children),
set::checkable(false),
set::checkable(false)
)
) : null,
) : null
),
$task->files ? fileList
(
set::files($task->files),
set::files($task->files)
) : null,
history(),
floatToolbar
@@ -339,12 +338,12 @@ detailBody
item
(
set::name($lang->task->canceledBy),
$task->canceledBy ? zget($users, $task->canceledBy, $task->canceledBy) . $lang->at . $task->canceledDate : '',
$task->canceledBy ? zget($users, $task->canceledBy, $task->canceledBy) . $lang->at . $task->canceledDate : ''
),
item
(
set::name($lang->task->closedBy),
$task->closedBy ? zget($users, $task->closedBy, $task->closedBy) . $lang->at . $task->closedDate : '',
$task->closedBy ? zget($users, $task->closedBy, $task->closedBy) . $lang->at . $task->closedDate : ''
),
item
(
@@ -355,7 +354,7 @@ detailBody
(
set::name($lang->task->lastEdited),
$task->lastEditedBy ? zget($users, $task->lastEditedBy, $task->lastEditedBy) . $lang->at . $task->lastEditedDate : ''
),
)
)
),
$task->team ? tabPane
@@ -373,33 +372,33 @@ detailBody
h::th
(
$lang->task->team,
set::width('80px'),
set::width('80px')
),
h::th
(
$lang->task->estimateAB,
set::width('60px'),
set::width('60px')
),
h::th
(
$lang->task->consumedAB,
set::width('60px'),
set::width('60px')
),
h::th
(
$lang->task->leftAB,
set::width('60px'),
set::width('60px')
),
h::th
(
$lang->task->statusAB,
set::width('80px'),
),
),
set::width('80px')
)
)
),
h::tbody($teams)
)
) : null,
) : null
),
tabs
(
@@ -419,7 +418,7 @@ detailBody
item
(
set::name($lang->task->consumed),
round($task->consumed, 2) . $lang->workingHour,
round($task->consumed, 2) . $lang->workingHour
),
item
(
@@ -434,13 +433,13 @@ detailBody
item
(
set::name($lang->task->realStarted),
helper::isZeroDate($task->realStarted) ? '' : substr($task->realStarted, 0, 19),
helper::isZeroDate($task->realStarted) ? '' : substr($task->realStarted, 0, 19)
),
item
(
set::name($lang->task->deadline),
$task->deadline
),
)
)
),
tabPane