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

* Fix bug #41760.

Browse Source
This commit is contained in:
sunguangming
2023-12-23 15:57:05 +08:00
parent 371895de56
commit a69a040de5
2 changed files with 114 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/js/create.ui.js
+6
View File
@@ -7,6 +7,12 @@ $(function()
$("input[name='after'][value='toTaskList']").prop('checked', true);
}
if(task.mode != '')
{
$('[name="multiple"]').prop('checked', true);
toggleTeam();
}
setStoryRelated();
})
module/task/ui/create.html.php
+108 -46
View File
@@ -33,6 +33,7 @@ jsVar('showFields', $showFields);
jsVar('toTaskList', !empty($task->id));
jsVar('blockID', $blockID);
jsVar('taskID', $taskID ?? 0);
jsVar('task', $task);
jsVar('ditto', $lang->task->ditto);
jsVar('teamMemberError', $lang->task->error->teamMember);
jsVar('vision', $config->vision);
@@ -129,56 +130,117 @@ $storyPreviewBtn = span
);
$teamForm = array();
for($i = 1; $i <= 3; $i ++)
if(empty($task->team))
{
$teamForm[] = h::tr
(
h::td
(
setClass('team-index'),
span
for($i = 1; $i <= 3; $i ++)
{
$teamForm[] = h::tr
(
setClass("team-number"),
$i
),
icon('angle-down')
),
h::td
(
set::width('240px'),
picker
(
set::name("team[]"),
set::items($members)
)
),
h::td
(
set::width('135px'),
inputControl
(
input
h::td
(
set::name("teamEstimate[]"),
set::placeholder($lang->task->estimateAB)
setClass('team-index'),
span
(
setClass("team-number"),
$i
),
icon('angle-down')
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20)
)
),
h::td
(
set::width('100px'),
setClass('center'),
btnGroup
h::td
(
set::width('240px'),
picker
(
set::name("team[]"),
set::items($members)
)
),
h::td
(
set::width('135px'),
inputControl
(
input
(
set::name("teamEstimate[]"),
set::placeholder($lang->task->estimateAB)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20)
)
),
h::td
(
set::width('100px'),
setClass('center'),
btnGroup
(
set::items(array(
array('icon' => 'plus', 'class' => 'btn ghost btn-add'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete')
))
)
)
);
}
}
else
{
$i = 0;
foreach($task->team as $member)
{
$i ++;
$teamForm[] = h::tr
(
set::items(array(
array('icon' => 'plus', 'class' => 'btn ghost btn-add'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete')
))
)
)
);
h::td
(
setClass('team-index'),
span
(
setClass("team-number"),
$i
),
icon('angle-down')
),
h::td
(
set::width('240px'),
picker
(
set::name("team[]"),
set::items($members),
set::value($member->account)
)
),
h::td
(
set::width('135px'),
inputControl
(
input
(
set::name("teamEstimate[]"),
set::placeholder($lang->task->estimateAB),
set::value($member->estimate)
),
to::suffix($lang->task->suffixHour),
set::suffixWidth(20)
)
),
h::td
(
set::width('100px'),
setClass('center'),
btnGroup
(
set::items(array(
array('icon' => 'plus', 'class' => 'btn ghost btn-add'),
array('icon' => 'trash', 'class' => 'btn ghost btn-delete')
))
)
)
);
}
}
$selectStoryRow = '';
@@ -231,7 +293,7 @@ formPanel
picker
(
set::name("mode"),
set::value("linear"),
!empty($task->mode) ? set::value($task->mode) : set::value("linear"),
set::items($lang->task->modeList),
set::required(true)
)