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

* Finish task #7515,7516,7517,7518,7524,7525,7526.

Browse Source
This commit is contained in:
holan20180123
2020-07-25 11:59:55 +08:00
parent d4d0453a70
commit 657620244b
5 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/model.php
+1
View File
@@ -134,6 +134,7 @@ class blockModel extends model
$blocks = $this->dao->select('*')->from(TABLE_BLOCK)->where('account')->eq($this->app->user->account)
->andWhere('module')->eq($module)
->andWhere('hidden')->eq(0)
->beginIF($this->config->global->flow != 'full')->andWhere('block')->notin('flowchart')->fi()
->beginIF($this->config->global->flow == 'onlyStory')->andWhere('source')->notin('project,qa')->fi()
->beginIF($this->config->global->flow == 'onlyTask')->andWhere('source')->notin('product,qa')->fi()
->beginIF($this->config->global->flow == 'onlyTest')->andWhere('source')->notin('product,project')->fi()
module/block/view/flowchart.html.php
+2 -5
View File
@@ -1,10 +1,7 @@
<div class='panel-body scrollbar-hover'>
<?php foreach ($lang->block->flowchart as $rowIndex => $flow):?>
<?php if($this->config->global->flow == 'onlyStory' and in_array($rowIndex, ['project', 'dev', 'tester'])) continue; ?>
<?php if($this->config->global->flow == 'onlyTask' and in_array($rowIndex, ['product', 'dev', 'tester'])) continue; ?>
<?php if($this->config->global->flow == 'onlyTest' and in_array($rowIndex, ['project', 'product'])) continue; ?>
<?php foreach ($lang->block->flowchart as $flowName => $flow):?>
<?php $idx = 0; ?>
<div class='row row-<?php echo $rowIndex?>'>
<div class='row row-<?php echo $flowName?>'>
<?php foreach ($flow as $flowItem):?>
<div class='flow-item flow-item-<?php echo $idx++ ?>'><div title='<?php echo $flowItem ?>'><?php echo $flowItem ?></div></div>
<?php endforeach; ?>
module/block/view/welcome.html.php
+5 -5
View File
@@ -46,7 +46,7 @@
<div class="col col-right">
<h4><small class="text-muted"><?php echo date(DT_DATE3)?></small> <?php echo $lang->block->leftToday?></h4>
<div class="row tiles">
<?php if($this->config->global->flow != 'onlyTest' and $this->config->global->flow != 'onlyStory'):?>
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyTask'):?>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myTask?></div>
<div class="tile-amount"><?php echo empty($tasks) ? 0 : html::a($this->createLink('my', 'task', 'type=assignedTo'), (int)$tasks);?></div>
@@ -57,7 +57,7 @@
<?php endif;?>
</div>
<?php endif;?>
<?php if($this->config->global->flow != 'onlyTask' and $this->config->global->flow != 'onlyStory'):?>
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyTest'):?>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myBug?></div>
<div class="tile-amount"><?php echo empty($bugs) ? 0 : html::a($this->createLink('my', 'bug', 'type=assignedTo'), (int)$bugs);?></div>
@@ -68,13 +68,13 @@
<?php endif;?>
</div>
<?php endif;?>
<?php if($this->config->global->flow != 'onlyTask' and $this->config->global->flow != 'onlyTest'):?>
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyStory'):?>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myStory?></div>
<div class="tile-amount"><?php echo empty($stories) ? 0 : html::a($this->createLink('my', 'story', 'type=assignedTo'), (int)$stories);?></div>
</div>
<?php endif;?>
<?php if($this->config->global->flow != 'onlyStory' and $this->config->global->flow != 'onlyTest'):?>
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyTask'):?>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myProject?></div>
<div class="tile-amount"><?php echo empty($projects) ? 0 : html::a($this->createLink('project', 'all', 'type=undone'), (int)$projects);?></div>
@@ -85,7 +85,7 @@
<?php endif;?>
</div>
<?php endif;?>
<?php if($this->config->global->flow != 'onlyTask' and $this->config->global->flow != 'onlyTest'):?>
<?php if($this->config->global->flow == 'full' or $this->config->global->flow == 'onlyStory' or $this->config->global->flow == 'onlyTest'):?>
<div class="col tile">
<div class="tile-title"><?php echo $lang->block->myProduct?></div>
<div class="tile-amount"><?php echo empty($products) ? 0 : html::a($this->createLink('product', 'all', 'product=0&line=0&status=noclosed'), (int)$products);?></div>
module/testcase/model.php
+1 -1
View File
@@ -860,6 +860,7 @@ class testcaseModel extends model
$case->pri = $data->pris[$caseID];
$case->branch = $data->branches[$caseID];
$case->module = $data->modules[$caseID];
$case->status = $data->statuses[$caseID];
$case->story = $data->stories[$caseID];
$case->color = $data->color[$caseID];
$case->title = $data->title[$caseID];
@@ -867,7 +868,6 @@ class testcaseModel extends model
$case->keywords = $data->keywords[$caseID];
$case->type = $data->types[$caseID];
$case->stage = empty($data->stages[$caseID]) ? '' : implode(',', $data->stages[$caseID]);
if(isset($data->statuses[$caseID])) $case->status = $data->statuses[$caseID];
foreach($extendFields as $extendField)
{
module/testcase/view/batchedit.html.php
+11 -10
View File
@@ -86,16 +86,17 @@
<td><?php echo $caseID . html::hidden("caseIDList[$caseID]", $caseID);?></td>
<td class='<?php echo zget($visibleFields, 'pri', 'hidden')?>'> <?php echo html::select("pris[$caseID]", $priList, $cases[$caseID]->pri, 'class=form-control');?></td>
<td class='<?php echo zget($visibleFields, 'status', 'hidden')?>'>
<?php
if(!$forceNotReview and $cases[$caseID]->status == 'wait')
{
echo $lang->testcase->statusList['wait'];
}
else
{
echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');
}
?>
<?php
if(!$forceNotReview and $cases[$caseID]->status == 'wait')
{
echo $lang->testcase->statusList['wait'];
echo html::hidden("statuses[$caseID]",'wait');
}
else
{
echo html::select("statuses[$caseID]", (array)$lang->testcase->statusList, $cases[$caseID]->status, 'class=form-control');
}
?>
</td>
<?php if($branchProduct):?>
<td class='text-left<?php echo zget($visibleFields, 'branch', ' hidden')?>' style='overflow:visible'>