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

* Only task team member can record effort.

Browse Source
This commit is contained in:
sunguangming
2023-07-04 09:59:18 +08:00
parent fccfbd0b63
commit 74339f0df5
4 changed files with 83 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/control.php
+3 -3
View File
@@ -410,7 +410,7 @@ class task extends control
/* Common actions of task module and task. */
$this->taskZen->commonAction($taskID);
$task = $this->task->getById($taskID);
$currentTeam = empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
$currentTeam = !empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
/* Submit the data process after start the task form. */
if(!empty($_POST))
@@ -555,7 +555,7 @@ class task extends control
$this->taskZen->commonAction($taskID);
$task = $this->task->getById($taskID);
$currentTeam = empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
$currentTeam = !empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
if(!empty($_POST))
{
@@ -662,7 +662,7 @@ class task extends control
/* Common actions of task module and task. */
$this->taskZen->commonAction($taskID);
$task = $this->task->getById($taskID);
$currentTeam = empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
$currentTeam = !empty($task->team) ? $this->task->getTeamByAccount($task->team) : '';
if(!empty($_POST))
{
module/task/css/recordworkhour.ui.css
+1
View File
@@ -3,3 +3,4 @@
.panel-form .panel-heading {padding: 1.5rem 0 !important}
.panel-form .panel-heading .panel-title {font-size: 14px}
.panel-form .panel-body {padding: 0 0 1rem 0 !important}
div.alert {margin-bottom: 10px}
module/task/ui/finish.html.php
+1 -1
View File
@@ -53,7 +53,7 @@ else
$consumedControl = formGroup
(
set::width('1/3'),
set::label($lang->task->currentConsumed),
set::label($lang->task->my . $lang->task->hasConsumed),
div(
set::class('consumed'),
$task->myConsumed . $lang->task->suffixHour
module/task/ui/recordworkhour.html.php
+78 -52
View File
@@ -65,61 +65,87 @@ if($efforts)
);
}
formBatchPanel
(
set::title($lang->task->addEffort),
set::shadow(!isAjaxRequest('modal')),
set::actions(array('submit')),
formBatchItem
if(!$this->task->canOperateEffort($task))
{
$notice = '';
if(!isset($task->members[$app->user->account]))
{
$notice = p(sprintf($lang->task->deniedNotice, $lang->task->teamMember, $lang->task->logEfforts));
}
elseif($task->assignedTo != $app->user->account and $task->mode == 'linear')
{
$notice = p(sprintf($lang->task->deniedNotice, $task->assignedToRealName, $lang->task->logEfforts));
}
div
(
set::name('id'),
set::label($lang->idAB),
set::control('index'),
set::width('32px'),
),
formBatchItem
(
set::name('date'),
set::label($lang->task->date),
set::width('120px'),
set::control('date'),
set::value(helper::today())
),
formBatchItem
(
set::name('work'),
set::label($lang->task->work),
set::width('auto'),
set::control('textarea')
),
formBatchItem
(
set::name('consumed'),
set::label($lang->task->consumed),
set::width('80px'),
set::control
setClass('alert with-icon'),
icon('exclamation-sign'),
div
(
array(
'type' => 'inputControl',
'suffix' => $lang->task->suffixHour,
'suffixWidth' => 20
setClass('content'),
$notice
)
);
}
else
{
formBatchPanel
(
set::title($lang->task->addEffort),
set::shadow(!isAjaxRequest('modal')),
set::actions(array('submit')),
formBatchItem
(
set::name('id'),
set::label($lang->idAB),
set::control('index'),
set::width('32px'),
),
formBatchItem
(
set::name('date'),
set::label($lang->task->date),
set::width('120px'),
set::control('date'),
set::value(helper::today())
),
formBatchItem
(
set::name('work'),
set::label($lang->task->work),
set::width('auto'),
set::control('textarea')
),
formBatchItem
(
set::name('consumed'),
set::label($lang->task->consumed),
set::width('80px'),
set::control
(
array(
'type' => 'inputControl',
'suffix' => $lang->task->suffixHour,
'suffixWidth' => 20
)
)
),
formBatchItem
(
set::name('left'),
set::label($lang->task->left),
set::width('80px'),
set::control
(
array(
'type' => 'inputControl',
'suffix' => $lang->task->suffixHour,
'suffixWidth' => 20
)
)
)
),
formBatchItem
(
set::name('left'),
set::label($lang->task->left),
set::width('80px'),
set::control
(
array(
'type' => 'inputControl',
'suffix' => $lang->task->suffixHour,
'suffixWidth' => 20
)
)
)
);
);
}
render();