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

* Modify multi task activate.

Browse Source
This commit is contained in:
曹延义
2022-10-26 10:11:44 +08:00
committed by caoyanyi
parent 81cf50307a
commit 485bff213a
2 changed files with 19 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/js/activate.js
+18 -15
View File
@@ -68,6 +68,7 @@ $(function()
var oldTeamCount = $('#taskTeamEditor select:disabled').length;
var removeCount = oldTeamCount > 6 ? 1 : (5 - oldTeamCount);
$('#taskTeamEditor tr.teamTemplate').filter(':gt(' + removeCount + ')').remove();
$('.member-done').find('input[name^=teamLeft]').val(0);
/* Reset assignedTo select.*/
$('#assignedTo_chosen').remove();
@@ -134,12 +135,22 @@ function setTeamUser()
var estimate = parseInt($('#left').val());
if(!assignedTo || !estimate) return;
var teamLine = '<input type="hidden" name="team[]" value="' + assignedTo + '">';
teamLine += '<input type="hidden" name="teamSource[]" value="' + assignedTo + '">';
teamLine += '<input type="hidden" name="teamEstimate[]" value="' + estimate + '">';
teamLine += '<input type="hidden" name="teamConsumed[]" value="0">';
teamLine += '<input type="hidden" name="teamLeft[]" value="' + estimate + '">';
$('.multi-append').html(teamLine);
if(taskMode == 'multi')
{
$('.member-done').each(function()
{
if($(this).find('select').val() == assignedTo) $(this).find('input[name^=teamLeft]').val(estimate);
});
}
else
{
var teamLine = '<input type="hidden" name="team[]" value="' + assignedTo + '">';
teamLine += '<input type="hidden" name="teamSource[]" value="' + assignedTo + '">';
teamLine += '<input type="hidden" name="teamEstimate[]" value="' + estimate + '">';
teamLine += '<input type="hidden" name="teamConsumed[]" value="0">';
teamLine += '<input type="hidden" name="teamLeft[]" value="' + estimate + '">';
$('.multi-append').html(teamLine);
}
}
/**
@@ -168,15 +179,7 @@ function updateAssignedTo()
html += "<option value='" + account + "' title='" + realName + "'" + selected + ">" + realName + "</option>";
});
if(mode == 'multi' && isTeamMember && mode != 'linear')
{
$('[name=assignedTo]').removeAttr('disabled').trigger('chosen:updated');
}
else
{
$('[name=assignedTo]').attr('disabled', 'disabled').trigger('chosen:updated');
}
$('[name=assignedTo]').attr('disabled', 'disabled').trigger('chosen:updated');
}
else
{
module/task/view/activate.html.php
+1 -1
View File
@@ -25,7 +25,7 @@
<?php $isMultiple = !empty($task->team);?>
<?php js::set('isMultiple', $isMultiple);?>
<?php js::set('taskMode', $task->mode);?>
<?php js::set('assignedToHtml', html::select('assignedTo', $teamMembers, '', "class='form-control'"));?>
<?php js::set('assignedToHtml', html::select('assignedTo', $teamMembers, '', "class='form-control' disabled"));?>
<div id='mainContent' class='main-content'>
<div class='center-block'>
<div class='main-header'>