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

Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

Browse Source
This commit is contained in:
wangyidong
2021-08-03 16:38:51 +08:00
parent 1445f18e14 31edf998a3
commit 9be2cf253f
3 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/doc/control.php
+3 -3
View File
@@ -163,9 +163,9 @@ class doc extends control
}
$libTypeList = $this->lang->doc->libTypeList;
if(empty($products)) unset($libTypeList['product']);
if(empty($projects)) unset($libTypeList['project']);
if(empty($executions) or ($type == 'custom' and $this->config->systemMode == 'new')) unset($libTypeList['execution']);
if(empty($products)) unset($libTypeList['product']);
if(empty($projects)) unset($libTypeList['project']);
if(empty($executions) or ($this->config->systemMode == 'new' and $this->app->openApp == 'doc')) unset($libTypeList['execution']);
$this->view->groups = $this->loadModel('group')->getPairs();
$this->view->users = $this->user->getPairs('nocode');
module/product/model.php
+2
View File
@@ -1638,6 +1638,8 @@ class productModel extends model
*/
public function statisticData($type = 'program', $productStructure = array(), $product = null)
{
if(empty($productStructure)) return $productStructure;
/* Init vars. */
$data = $type == 'program' ? $productStructure[$product->program] : $productStructure[$product->program][$product->line];
foreach($this->config->product->statisticFields as $key => $fields)
module/upgrade/js/mergeprogram.js
+38 -50
View File
@@ -129,27 +129,25 @@ $(function()
/* Select all product line events. */
$('#checkAllLines').click(function()
{
var checked = true;
if($(this).is(':checked'))
{
$('#checkAllProducts').prop('checked', true);
$('#checkAllProjects').prop('checked', true);
$('[name^=productLines]').prop('checked', true);
$('[name^=products]').prop('checked', true);
$('[name^=sprints]').prop('checked', true);
$('.main-row .side-col .nav li').addClass('active');
$('#programName').val($('.main-row .side-col .nav li.currentPage div a').text());
}
else
{
$('#checkAllProducts').prop('checked', false);
$('#checkAllProjects').prop('checked', false);
$('[name^=productLines]').prop('checked', false);
$('[name^=products]').prop('checked', false);
$('[name^=sprints]').prop('checked', false);
checked = false;
$('.main-row .side-col .nav li').removeClass('active');
$('#programName').val('');
}
$('#checkAllProducts').prop('checked', checked);
$('#checkAllProjects').prop('checked', checked);
$('[name^=productLines]').prop('checked', checked);
$('[name^=products]').prop('checked', checked);
$('[name^=sprints]').prop('checked', checked);
setProgramBegin(programBegin);
setProgramEnd(programEnd);
@@ -160,42 +158,39 @@ $(function()
/* Select all product events. */
$('#checkAllProducts').click(function()
{
var lineID = $('li.currentPage').attr('lineid');
var lineID = $('li.currentPage').attr('lineid');
var checked = true;
if($(this).is(':checked'))
{
$('#programName').val($('.main-row .side-col .nav li.currentPage div a').text());
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', true);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', true);
var projectNum = $("[id^='sprints\[" + lineID + "\]']").length;
}
else
{
$('[name^=products]').prop('checked', true);
$('[name^=sprints]').prop('checked', true);
var projectNum = $("[id^='sprints']").length;
}
if(projectNum !== 0) $('#checkAllProjects').prop('checked', true);
}
else
{
checked = false;
$('#checkAllProjects').prop('checked', false);
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', false);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', false);
}
else
{
$('[name^=products]').prop('checked', false);
$('[name^=sprints]').prop('checked', false);
}
$('#programName').val('');
}
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', checked);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', checked);
}
else
{
$('[name^=products]').prop('checked', checked);
$('[name^=sprints]').prop('checked', checked);
}
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);
@@ -208,37 +203,30 @@ $(function()
/* Select all project events. */
$('#checkAllProjects').click(function()
{
var lineID = $('li.currentPage').attr('lineid');
var lineID = $('li.currentPage').attr('lineid');
var checked = true;
if($(this).is(':checked'))
{
$('#checkAllProducts').prop('checked', true);
$('#programName').val($('.main-row .side-col .nav li.currentPage div a').text());
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', true);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', true);
}
else
{
$('[name^=products]').prop('checked', true);
$('[name^=sprints]').prop('checked', true);
}
}
else
{
$('#checkAllProducts').prop('checked', false);
checked = false;
$('#programName').val('');
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', false);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', false);
}
else
{
$('[name^=products]').prop('checked', false);
$('[name^=sprints]').prop('checked', false);
}
}
$('#checkAllProducts').prop('checked', checked);
if($('[id^=productLines]').length > 0)
{
$('[data-line=' + lineID + ']').prop('checked', checked);
$("[id^='productLines\[" + lineID + "\]']").prop('checked', checked);
}
else
{
$('[name^=products]').prop('checked', checked);
$('[name^=sprints]').prop('checked', checked);
}
var checkAllLines = isSelectAll(0, 'line');
$("[id='checkAllLines']").prop('checked', checkAllLines);