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

* finish task #6548.

Browse Source
This commit is contained in:
wangyidong
2019-11-20 14:25:59 +08:00
parent 67c482275f
commit 23c78dece4
8 changed files with 47 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/css/edit.css
+1
View File
@@ -0,0 +1 @@
.pl-10px{padding-left:10px;}
module/task/js/create.js
+10
View File
@@ -411,6 +411,16 @@ $(document).ready(function()
});
adjustButtons();
$('#showAllModule').change(function()
{
var moduleID = $('#moduleIdBox #module').val();
var extra = $(this).prop('checked') ? 'allModule' : '';
$('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + projectID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function()
{
$('#moduleIdBox #module').val(moduleID).attr('onchange', "setStories(this.value, " + projectID + ")").chosen();
});
});
});
$('#modalTeam .btn').click(function()
module/task/js/edit.js
+10
View File
@@ -126,4 +126,14 @@ $(document).ready(function()
});
adjustButtons();
$('#showAllModule').change(function()
{
var moduleID = $('#moduleIdBox #module').val();
var extra = $(this).prop('checked') ? 'allModule' : '';
$('#moduleIdBox').load(createLink('tree', 'ajaxGetOptionMenu', "rootID=" + projectID + '&viewType=task&branch=0&rootModuleID=0&returnType=html&fieldID=&needManage=0&extra=' + extra), function()
{
$('#moduleIdBox #module').val(moduleID).attr('onchange', "loadModuleRelated()").chosen();
});
});
});
module/task/lang/zh-cn.php
+1
View File
@@ -51,6 +51,7 @@ $lang->task->progressAB = '%';
$lang->task->progressTips = '已消耗/(已消耗+剩余)';
$lang->task->copy = '复制任务';
$lang->task->waitTask = '未开始的任务';
$lang->task->allModule = '所有模块';
$lang->task->common = '任务';
$lang->task->id = '编号';
module/task/view/create.html.php
+8 -1
View File
@@ -41,7 +41,13 @@
</tr>
<tr>
<th><?php echo $lang->task->module;?></th>
<td id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control chosen' onchange='setStories(this.value,$project->id)'");?></td><td></td><td></td>
<td id='moduleIdBox'><?php echo html::select('module', $moduleOptionMenu, $task->module, "class='form-control chosen' onchange='setStories(this.value, $project->id)'");?></td>
<td>
<div class="checkbox-primary">
<input type="checkbox" id="showAllModule"><label for="showAllModule" class="no-margin"><?php echo $lang->task->allModule;?></label>
</div>
</td>
<td></td>
</tr>
<tr>
<th><?php echo $lang->task->assignedTo;?></th>
@@ -298,4 +304,5 @@
</div>
</div>
<?php js::set('testStoryIdList', $testStoryIdList);?>
<?php js::set('projectID', $project->id);?>
<?php include '../../common/view/footer.html.php';?>
module/task/view/edit.html.php
+11 -1
View File
@@ -96,7 +96,16 @@
<?php endif;?>
<tr>
<th class='thWidth'><?php echo $lang->task->module;?></th>
<td id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen" onchange="loadModuleRelated()"');?></td>
<td>
<div class='table-row'>
<span class='table-col' id="moduleIdBox"><?php echo html::select('module', $modules, $task->module, 'class="form-control chosen" onchange="loadModuleRelated()"');?></span>
<span class='table-col w-100px text-middle pl-10px'>
<div class="checkbox-primary">
<input type="checkbox" id="showAllModule"><label for="showAllModule" class="no-margin"><?php echo $lang->task->allModule;?></label>
</div>
</span>
</div>
</td>
</tr>
<?php if($config->global->flow != 'onlyTask' and $project->type != 'ops'):?>
<tr>
@@ -278,4 +287,5 @@
</div>
</form>
</div>
<?php js::set('projectID', $project->id);?>
<?php include '../../common/view/footer.html.php';?>
module/tree/control.php
+2 -2
View File
@@ -371,11 +371,11 @@ class tree extends control
* @access public
* @return string the html select string.
*/
public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false)
public function ajaxGetOptionMenu($rootID, $viewType = 'story', $branch = 0, $rootModuleID = 0, $returnType = 'html', $fieldID = '', $needManage = false, $extra = '')
{
if($viewType == 'task')
{
$optionMenu = $this->tree->getTaskOptionMenu($rootID);
$optionMenu = $this->tree->getTaskOptionMenu($rootID, 0, 0, $extra);
}
else
{
module/tree/model.php
+4 -4
View File
@@ -219,7 +219,7 @@ class treeModel extends model
* @access public
* @return void
*/
public function getTaskOptionMenu($rootID, $productID = 0, $startModule = 0)
public function getTaskOptionMenu($rootID, $productID = 0, $startModule = 0, $extra = '')
{
/* If createdVersion <= 4.1, go to getOptionMenu(). */
$products = $this->loadModel('product')->getProductsByProject($rootID);
@@ -286,7 +286,7 @@ class treeModel extends model
{
if(!strpos($menu, '|')) continue;
list($label, $moduleID) = explode('|', $menu);
if(isset($projectModules[$moduleID])) $lastMenu[$moduleID] = $label;
if(isset($projectModules[$moduleID]) or strpos($extra, 'allModule') !== false) $lastMenu[$moduleID] = $label;
}
foreach($topMenu as $moduleID => $moduleName)
{
@@ -421,7 +421,7 @@ class treeModel extends model
*/
public function getTaskTreeMenu($rootID, $productID = 0, $startModule = 0, $userFunc, $extra = '')
{
$extra = array('projectID' => $rootID, 'productID' => $productID, 'tip' => true);
$extra = array('projectID' => $rootID, 'productID' => $productID, 'tip' => true, 'extra' => $extra);
/* If createdVersion <= 4.1, go to getTreeMenu(). */
$products = $this->loadModel('product')->getProductsByProject($rootID);
@@ -478,7 +478,7 @@ class treeModel extends model
$stmt = $this->dbh->query($query);
while($module = $stmt->fetch())
{
if(!$manage and !isset($projectModules[$module->id])) continue;
if(!$manage and !isset($projectModules[$module->id]) and strpos($extra['extra'], 'allModule') === false) continue;
$this->buildTree($treeMenu, $module, 'task', $userFunc, $extra);
}
if(isset($treeMenu[0]) and $branch) $treeMenu[0] = "<li><a>$branchName</a><ul>{$treeMenu[0]}</ul></li>";