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

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
wangyidong
2021-04-01 10:45:03 +08:00
parent 14b00b3a58 7378c1d3b0
commit 066e0a58c6
8 changed files with 48 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+4 -3
View File
@@ -54,7 +54,7 @@ class bug extends control
$projectID = $this->session->project;
$products = $this->loadModel('project')->getProducts($projectID, false);
}
else if($this->app->openApp == 'execution')
elseif($this->app->openApp == 'execution')
{
$products = $this->loadModel('execution')->getProducts($this->session->execution, false);
}
@@ -62,9 +62,10 @@ class bug extends control
{
$products = $this->product->getPairs();
}
$this->view->products = $this->products = $products;
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName={$this->app->openApp}&activeMenu=bug&projectID=$projectID")));
$this->view->products = $this->products = $products;
$openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=bug&projectID=$projectID")));
}
/**
module/program/view/project.html.php
+2 -2
View File
@@ -31,7 +31,7 @@ js::set('browseType', $browseType);
</div>
<div class="btn-toolbar pull-right">
<?php if(isset($this->config->maxVersion)):?>
<?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->program->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
<?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
<?php elseif($this->config->systemMode == 'new'):?>
<?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-primary"');?>
<?php endif;?>
@@ -44,7 +44,7 @@ js::set('browseType', $browseType);
<p>
<span class="text-muted"><?php echo $lang->project->empty;?></span>
<?php if(isset($this->config->maxVersion)):?>
<?php common::printLink('program', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
<?php common::printLink('project', 'createGuide', "programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide " data-toggle="modal" data-target="#guideDialog"');?>
<?php elseif($this->config->systemMode == 'new'):?>
<?php common::printLink('project', 'create', "mode=scrum&programID=$programID", '<i class="icon icon-plus"></i>' . $lang->project->create, '', 'class="btn btn-info btn-wide"');?>
<?php endif;?>
module/project/model.php
+7 -4
View File
@@ -261,8 +261,8 @@ class projectModel extends model
$teams = $this->dao->select('root, count(*) as teams')->from(TABLE_TEAM)->where('root')->in($projectIdList)->groupBy('root')->fetchPairs();
$hours = $this->dao->select('project,
cast(sum(consumed) as decimal(10,2)) as consumed,
cast(sum(estimate) as decimal(10,2)) as estimate')
sum(consumed) as consumed,
sum(estimate) as estimate')
->from(TABLE_TASK)
->where('project')->in($projectIdList)
->andWhere('deleted')->eq(0)
@@ -293,8 +293,8 @@ class projectModel extends model
foreach($projects as $projectID => $project)
{
$project->consumed = isset($hours[$projectID]) ? $hours[$projectID]->consumed : 0;
$project->estimate = isset($hours[$projectID]) ? $hours[$projectID]->estimate : 0;
$project->consumed = isset($hours[$projectID]) ? (float)$hours[$projectID]->consumed : 0;
$project->estimate = isset($hours[$projectID]) ? (float)$hours[$projectID]->estimate : 0;
$project->teamCount = isset($teams[$projectID]) ? $teams[$projectID] : 0;
$project->leftTasks = isset($leftTasks[$projectID]) ? $leftTasks[$projectID] : 0;
$project->leftBugs = isset($leftBugs[$projectID]) ? $leftBugs[$projectID] : 0;
@@ -303,6 +303,9 @@ class projectModel extends model
$project->allStories = $allStories[$projectID];
$project->doneStories = $doneStories[$projectID];
$project->leftStories = $leftStories[$projectID];
if(is_float($project->consumed)) $project->consumed = round($project->consumed, 1);
if(is_float($project->estimate)) $project->estimate = round($project->estimate, 1);
}
return $projects;
module/search/view/index.html.php
+1 -1
View File
@@ -35,7 +35,7 @@ adjustMenuWidth();
<div class='item'>
<div class='item-heading'>
<div class="pull-right">
<span><?php echo html::a($object->url . (strpos($object->url, '?') !== false ? '&onlybody=yes' : '?onlybody=yes'), "<i class='icon-eye-open'></i>" . $lang->search->preview, '', "class='iframe' data-width='90%' data-title=\"<a href='$object->url' target='_blank' class='btn'><i class='icon-eye-open'></i>$lang->preview</a>\"")?></span>
<span><?php echo html::a($object->url . (strpos($object->url, '?') !== false ? '&onlybody=yes' : '?onlybody=yes'), $lang->search->preview, '', "class='iframe' data-width='90%'")?></span>
</div>
<h4>
<?php
module/testcase/control.php
+11 -3
View File
@@ -48,10 +48,18 @@ class testcase extends control
$projectID = $this->session->project;
$products = $this->loadModel('project')->getProducts($projectID, false);
}
if($this->app->openApp == 'execution') $products = $this->loadModel('execution')->getProducts($this->session->execution, false);
if($this->app->openApp == 'qa' or $this->app->openApp == 'my' or $this->app->openApp == 'product') $products = $this->product->getPairs();
elseif($this->app->openApp == 'execution')
{
$products = $this->loadModel('execution')->getProducts($this->session->execution, false);
}
else
{
$products = $this->product->getPairs();
}
$this->view->products = $this->products = $products;
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName={$this->app->openApp}&activeMenu=testcase&projectID=$projectID")));
$openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=testcase&projectID=$projectID")));
}
/**
module/testreport/control.php
+11 -9
View File
@@ -45,22 +45,24 @@ class testreport extends control
$this->app->loadLang('report');
/* Get product data. */
$objectID = 0;
$projectID = 0;
if($this->app->openApp == 'project')
{
$objectID = $this->session->project;
$products = $this->loadModel('project')->getProducts($objectID, false);
$projectID = $this->session->project;
$products = $this->loadModel('project')->getProducts($projectID, false);
}
if($this->app->openApp == 'execution')
elseif($this->app->openApp == 'execution')
{
$objectID = $this->session->execution;
$products = $this->loadModel('execution')->getProducts($objectID, false);
$products = $this->loadModel('execution')->getProducts($this->session->execution, false);
}
else
{
$products = $this->product->getPairs();
}
if($this->app->openApp == 'qa' or $this->app->openApp == 'my') $products = $this->loadModel('product')->getPairs();
$this->view->products = $this->products = $products;
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName={$this->app->openApp}&activeMenu=testreport&objectID=$objectID")));
$openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=testreport&projectID=$projectID")));
}
/**
module/testtask/control.php
+11 -3
View File
@@ -46,10 +46,18 @@ class testtask extends control
$projectID = $this->session->project;
$products = $this->loadModel('project')->getProducts($projectID, false);
}
if($this->app->openApp == 'execution') $products = $this->loadModel('execution')->getProducts($this->session->execution, false);
if($this->app->openApp == 'qa' or $this->app->openApp == 'my') $products = $this->product->getPairs();
elseif($this->app->openApp == 'execution')
{
$products = $this->loadModel('execution')->getProducts($this->session->execution, false);
}
else
{
$products = $this->product->getPairs();
}
$this->view->products = $this->products = $products;
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName={$this->app->openApp}&activeMenu=testtask&projectID=$projectID")));
$openApp = ($this->app->openApp == 'project' or $this->app->openApp == 'execution') ? $this->app->openApp : 'qa';
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "moduleName=$openApp&activeMenu=testtask&projectID=$projectID")));
}
/**
module/user/css/profile.css
+1 -1
View File
@@ -4,7 +4,7 @@
.row td {width: 33%; text-align: left; font-weight: 700;}
.main-actions {margin: 20px 0 20px 0; text-align: center;}
.user-title {margin: 10px 10px -10px 10px; font-size: 14px; font-weight: bold; padding-left: 10px;}
.avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
.cell .avatar {display: inline-block; width: 50px; height: 50px; line-height: 50px;}
.user-name {margin-left: 15px; font-weight: bold;}
.user-name, .user-role {font-size: 16px; vertical-align: top; line-height: 50px;}
.line {border-top: 1px solid #eee; margin: 10px;}