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

* [task#131937,doing,0.5h] add js func.

Browse Source
This commit is contained in:
sunguangming
2024-11-07 09:47:52 +08:00
committed by 王怡栋
parent 87f5637648
commit bbdf44ae02
3 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/js/edit.ui.js
+18
View File
@@ -400,6 +400,24 @@ window.setStoryModule = function()
}
}
getParentEstStartedAndDeadline = function()
{
const parent = $('[name=parent]').val();
if(!parent) return;
const link = $.createLink('task', 'ajaxGetTaskEstStartedAndDeadline', 'taskID=' + parent);
$.getJSON(link, function(data)
{
parentEstStarted = data.estStarted;
parentDeadline = data.deadline;
overParentEstStartedLang = data.overParentEstStartedLang;
overParentDeadlineLang = data.overParentDeadlineLang;
window.checkEstStartedAndDeadline({target: $('[name=estStarted]')});
window.checkEstStartedAndDeadline({target: $('[name=deadline]')});
});
}
function checkEstStartedAndDeadline(event)
{
const $form = $(event.target).closest('form');
module/task/model.php
+11 -4
View File
@@ -1924,16 +1924,23 @@ class taskModel extends model
过滤自己和后代任务。
*/
$children = $this->getAllChildId($taskID);
return $this->dao->select('id, name')->from(TABLE_TASK)
$taskList = $this->dao->select('id, name, isParent, consumed')->from(TABLE_TASK)
->where('deleted')->eq(0)
->andWhere('consumed')->eq(0)
->andWhere('status')->notin('cancel,closed')
->andWhere('execution')->eq($executionID)
->andWhere('mode')->eq('')
->beginIF($children)->andWhere('id')->notin($children)->fi()
->beginIF($appendIdList)->orWhere('id')->in($appendIdList)->fi()
->fetchPairs();
->fetchAll();
$taskPairs = array();
foreach($taskList as $task)
{
if(!$task->isParent && $task->consumed > 0) continue;
$taskPairs[$task->id] = $task->name;
}
return $taskPairs;
}
/**
module/task/ui/edit.html.php
+6 -5
View File
@@ -31,11 +31,11 @@ jsVar('confirmRecord', $lang->task->confirmRecord);
jsVar('estimateNotEmpty', sprintf($lang->error->gt, $lang->task->estimate, '0'));
jsVar('leftNotEmpty', sprintf($lang->error->gt, $lang->task->left, '0'));
jsVar('requiredFields', $config->task->edit->requiredFields);
jsVar('parentEstStarted', !empty($parentTask) ? $parentTask->estStarted : '');
jsVar('parentDeadline', !empty($parentTask) ? $parentTask->deadline : '');
jsVar('+parentEstStarted', !empty($parentTask) ? $parentTask->estStarted : '');
jsVar('+parentDeadline', !empty($parentTask) ? $parentTask->deadline : '');
jsVar('ignoreLang', $lang->project->ignore);
jsVar('overParentEstStartedLang', !empty($parentTask) ? sprintf($lang->task->overParentEsStarted, $parentTask->estStarted) : '');
jsVar('overParentDeadlineLang', !empty($parentTask) ? sprintf($lang->task->overParentDeadline, $parentTask->deadline) : '');
jsVar('+overParentEstStartedLang', !empty($parentTask) ? sprintf($lang->task->overParentEsStarted, $parentTask->estStarted) : '');
jsVar('+overParentDeadlineLang', !empty($parentTask) ? sprintf($lang->task->overParentDeadline, $parentTask->deadline) : '');
$confirmSyncTip = '';
if(!empty($syncChildren) && !empty($task->children)) $confirmSyncTip = sprintf($lang->task->syncStoryToChildrenTip, 'ID' . implode(', ID', $syncChildren));
@@ -249,7 +249,8 @@ detailBody
(
set::name('parent'),
set::value($task->parent),
set::items($tasks)
set::items($tasks),
on::change('getParentEstStartedAndDeadline')
)
) : formHidden('parent', $task->parent),
empty($modeText) ? item