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

* Finish task #40000.

Browse Source
This commit is contained in:
hufangzhou
2021-07-13 18:20:48 +08:00
parent b76d6f2b3e
commit a4db5380eb
8 changed files with 124 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+8 -2
View File
@@ -2667,6 +2667,7 @@ class execution extends control
->andWhere('type')->eq('execution')
->fetchGroup('root', 'account');
$projectPairs = array();
if($this->config->systemMode == 'new')
{
foreach($projects as $project)
@@ -2679,6 +2680,8 @@ class execution extends control
$execution->teams = zget($teams, $execution->id, array());
$orderedExecutions[$execution->id] = $execution;
}
$projectPairs[$project->id] = $project->name;
}
}
else
@@ -2693,13 +2696,16 @@ class execution extends control
}
}
$projectExecutions = array();
foreach($orderedExecutions as $execution) $projectExecutions[$execution->project][] = $execution;
$this->view->link = $this->execution->getLink($module, $method, $extra);
$this->view->module = $module;
$this->view->method = $method;
$this->view->executionID = $executionID;
$this->view->extra = $extra;
$this->view->projects = $this->project->getPairsByModel();
$this->view->executions = $orderedExecutions;
$this->view->projects = $projectPairs;
$this->view->executions = $projectExecutions;
$this->display();
}
module/execution/lang/de.php
+2 -2
View File
@@ -74,8 +74,8 @@ $lang->execution->undone = 'Unabgeschlossen ';
$lang->execution->unclosed = 'Geschlossen';
$lang->execution->typeDesc = "Keine {$lang->SRCommon}, Bug, Build, Testaufgabe oder ist bei OPS erlaubt";
$lang->execution->mine = 'Meine Zuständigkeit: ';
$lang->execution->involved = 'Mine: ';
$lang->execution->other = 'Andere:';
$lang->execution->involved = 'Mine';
$lang->execution->other = 'Andere';
$lang->execution->deleted = 'Gelöscht';
$lang->execution->delayed = 'Verspätet';
$lang->execution->product = $lang->execution->products;
module/execution/lang/en.php
+2 -2
View File
@@ -74,8 +74,8 @@ $lang->execution->undone = 'Unfinished ';
$lang->execution->unclosed = 'Unclosed';
$lang->execution->typeDesc = "OPS {$lang->executionCommon} has no {$lang->SRCommon}, Bug, Build, or Test features.";
$lang->execution->mine = 'Mine: ';
$lang->execution->involved = 'Mine: ';
$lang->execution->other = 'Others:';
$lang->execution->involved = 'Mine';
$lang->execution->other = 'Others';
$lang->execution->deleted = 'Deleted';
$lang->execution->delayed = 'Delayed';
$lang->execution->product = $lang->execution->products;
module/execution/lang/fr.php
+2 -2
View File
@@ -74,8 +74,8 @@ $lang->execution->undone = 'Non Terminé';
$lang->execution->unclosed = 'Non Fermées';
$lang->execution->typeDesc = "Aucune {$lang->SRCommon}, bug, build, test, ou graphe d'atterrissage n'est disponible";
$lang->execution->mine = 'A Moi: ';
$lang->execution->involved = 'Mine: ';
$lang->execution->other = 'Autres:';
$lang->execution->involved = 'Mine';
$lang->execution->other = 'Autres';
$lang->execution->deleted = 'Supprimé';
$lang->execution->delayed = 'Delayed';
$lang->execution->product = $lang->execution->products;
module/execution/lang/vi.php
+2 -1
View File
@@ -74,7 +74,8 @@ $lang->execution->undone = 'Chưa kết thúc ';
$lang->execution->unclosed = 'Chưa đóng';
$lang->execution->typeDesc = 'Không có câu chuyện, bug, bản dựng, test, hoặc biểu đồ burndown được phép trong OPS';
$lang->execution->mine = 'Của bạn: ';
$lang->execution->other = 'Khác:';
$lang->execution->involved = 'Mine';
$lang->execution->other = 'Khác';
$lang->execution->deleted = 'Đã xóa';
$lang->execution->delayed = 'Tạm ngưng';
$lang->execution->delayed = 'Delayed';
module/execution/lang/zh-cn.php
+2 -2
View File
@@ -74,8 +74,8 @@ $lang->execution->undone = '未完成';
$lang->execution->unclosed = '未关闭';
$lang->execution->typeDesc = "运维{$lang->executionCommon}没有{$lang->SRCommon}、bug、版本、测试功能。";
$lang->execution->mine = '我负责：';
$lang->execution->involved = '我参与：';
$lang->execution->other = '其他：';
$lang->execution->involved = '我参与';
$lang->execution->other = '其他';
$lang->execution->deleted = '已删除';
$lang->execution->delayed = '已延期';
$lang->execution->product = $lang->execution->products;
module/execution/lang/zh-tw.php
+2 -2
View File
@@ -74,8 +74,8 @@ $lang->execution->undone = '未完成';
$lang->execution->unclosed = '未關閉';
$lang->execution->typeDesc = "運維{$lang->executionCommon}沒有{$lang->SRCommon}、bug、版本、測試功能。";
$lang->execution->mine = '我負責：';
$lang->execution->involved = '我參與：';
$lang->execution->other = '其他：';
$lang->execution->involved = '我參與';
$lang->execution->other = '其他';
$lang->execution->deleted = '已刪除';
$lang->execution->delayed = '已延期';
$lang->execution->product = $lang->execution->products;
module/execution/view/ajaxgetdropmenu.html.php
+104 -35
View File
@@ -1,60 +1,129 @@
<?php js::set('module', $module);?>
<?php js::set('method', $method);?>
<?php js::set('extra', $extra);?>
<style>
.table-row .table-col .list-group .nav-tabs {position: sticky; top: 0; background: #fff;}
.table-row .table-col .list-group .nav-tabs>li>span {display: inline-block; margin-left: -6px;}
.table-row .table-col .list-group .nav-tabs>li>a {padding: 8px 10px; display: inline-block}
.table-row .table-col .list-group .nav-tabs>li.active>a, .nav-tabs>li.active>span {font-weight: 700; color: #0c64eb;}
.table-row .table-col .list-group .nav-tabs>li.active>a:before {position: absolute; right: 0; bottom: -1px; left: 0; display: block; height: 2px; content: ' '; background: #0c64eb; }
.nav-tabs>li.active>a, .nav-tabs>li.active>a:focus, .nav-tabs>li.active>a:hover {border: none;}
.table-row .table-col .list-group .tab-content {margin-top: 10px;}
.table-row .table-col .list-group .tab-content ul {list-style: none; margin: 0}
.table-row .table-col .list-group .tab-content .tab-pane>ul {padding-left: 7px;}
.table-row .table-col .list-group .tab-content .tab-pane>ul>li span {padding-left: 5px;}
.table-row .table-col .list-group .tab-content .tab-pane>ul>li label {background: rgba(131,138,157,0.5);}
.table-row .table-col .list-group .tab-content li a i.icon {font-size: 15px !important;}
.table-row .table-col .list-group .tab-content li a i.icon:before {min-width: 16px !important;}
.table-row .table-col .list-group .tab-content li .label {margin-top: 2px; position: unset;}
.table-row .table-col .list-group .tab-content li ul {padding-left: 15px;}
.table-row .table-col .list-group .tab-content li>a {margin-top: 5px;display: block; padding: 2px 10px 2px 5px; overflow: hidden; line-height: 20px; text-overflow: ellipsis; white-space: nowrap; border-radius: 4px;}
.table-row .table-col .list-group .tab-content li>a.selected {color: #e9f2fb; background-color: #0c64eb;}
</style>
<?php
$iCharges = 0;
$others = 0;
$dones = 0;
$executionNames = array();
$myProjectsHtml = '';
$normalProjectsHtml = '';
$closedProjectsHtml = '';
foreach($executions as $execution)
$executionCounts = array();
$executionNames = array();
$myExecutionsHtml = '';
$normalExecutionsHtml = '';
$closedExecutionsHtml = '';
$tabActive = '';
$iCharges = 0;
$others = 0;
$dones = 0;
foreach($executions as $projectID => $projectExecutions)
{
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account]))) $iCharges++;
if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account])) $others++;
if($execution->status == 'done' or $execution->status == 'closed') $dones++;
$executionNames[] = $execution->name;
$executionCounts[$projectID]['myExecution'] = 0;
$executionCounts[$projectID]['others'] = 0;
foreach($projectExecutions as $execution)
{
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account]))) $executionCounts[$projectID]['myExecution']++;
if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account])) $executionCounts[$projectID]['others']++;
if($execution->status == 'done' or $execution->status == 'closed') $dones++;
$executionNames[] = $execution->name;
}
}
$executionsPinYin = common::convert2Pinyin($executionNames);
foreach($executions as $execution)
foreach($executions as $projectID => $projectExecutions)
{
$selected = $execution->id == $executionID ? 'selected' : '';
$executionName = $config->systemMode == 'new' ? zget($projects, $execution->project) . '/' . $execution->name : $execution->name;
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account])))
if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '<ul><li class="hide-in-search"><span class="text-muted">' . zget($projects, $projectID) . '</span> <label class="label">' . $lang->project->common . '</label></li><li><ul>';
if($executionCounts[$projectID]['others']) $normalExecutionsHtml .= '<ul><li class="hide-in-search"><span class="text-muted">' . zget($projects, $projectID) . '</span> <label class="label">' . $lang->project->common . '</label></li><li><ul>';
foreach($projectExecutions as $index => $execution)
{
$myProjectsHtml .= html::a(sprintf($link, $execution->id), $executionName, '', "class='text-important $selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
$selected = $execution->id == $executionID ? 'selected' : '';
if($execution->status != 'done' and $execution->status != 'closed' and ($execution->PM == $this->app->user->account or isset($execution->teams[$this->app->user->account])))
{
$myExecutionsHtml .= '<li>' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='text-muted $selected' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'") . '</li>';
if($selected == 'selected') $tabActive = 'myExecution';
$iCharges++;
}
else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
{
$normalExecutionsHtml .= '<li>' . html::a(sprintf($link, $execution->id), $execution->name, '', "class='text-muted $selected' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'") . '</li>';
if($selected == 'selected') $tabActive = 'other';
$others++;
}
else if($execution->status == 'done' or $execution->status == 'closed') $closedExecutionsHtml .= html::a(sprintf($link, $execution->id), $execution->name, '', "class='$selected' title='{$execution->name}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
/* If the execution is the last one in the project, print the closed label. */
if(!isset($projectExecutions[$index + 1]))
{
if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '</ul></li>';
if($executionCounts[$projectID]['others']) $normalExecutionsHtml .= '</ul></li>';
}
}
else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
{
$normalProjectsHtml .= html::a(sprintf($link, $execution->id), $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
}
else if($execution->status == 'done' or $execution->status == 'closed') $closedProjectsHtml .= html::a(sprintf($link, $execution->id), $executionName, '', "class='$selected' title='{$executionName}' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '</ul>';
if($executionCounts[$projectID]['others']) $normalExecutionsHtml .= '</ul>';
}
?>
<div class="table-row">
<div class="table-col col-left">
<div class='list-group'>
<?php
if(!empty($myProjectsHtml))
{
echo "<div class='heading'>{$lang->execution->involved}</div>";
echo $myProjectsHtml;
if(!empty($myProjectsHtml))
{
echo "<div class='heading'>{$lang->execution->other}</div>";
}
}
echo $normalProjectsHtml;
?>
<?php if($iCharges): ?>
<?php $tabActive = ($tabActive == '' or $tabActive == 'myExecution') ? 'myExecution' : 'other';?>
<ul class="nav nav-tabs">
<li class="<?php if($tabActive == 'myExecution') echo 'active';?>"><?php echo html::a('#myExecution', $lang->execution->involved, '', "data-toggle='tab' class='not-list-item not-clear-menu'");?><span class="text-muted"><?php echo $iCharges;?></span><li>
<li class="<?php if($tabActive == 'other') echo 'active';?>"><?php echo html::a('#other', $lang->project->other, '', "data-toggle='tab' class='not-list-item not-clear-menu'")?><span class="text-muted"><?php echo $others;?></span><li>
</ul>
<?php endif;?>
<div class="tab-content">
<div class="tab-pane <?php if($tabActive == 'myExecution') echo 'active';?>" id="myExecution">
<?php echo $myExecutionsHtml;?>
</div>
<div class="tab-pane <?php if($tabActive == 'other') echo 'active';?>" id="other">
<?php echo $normalExecutionsHtml;?>
</div>
</div>
</div>
<div class="col-footer">
<a class='pull-right toggle-right-col not-list-item'><?php echo $lang->execution->doneExecutions;?><i class='icon icon-angle-right'></i></a>
</div>
</div>
<div class="table-col col-right">
<div class='list-group'><?php echo $closedProjectsHtml;?></div>
<div class='list-group'><?php echo $closedExecutionsHtml;?></div>
</div>
</div>
<script>scrollToSelected();</script>
<script>
$(function()
{
$('.nav-tabs li span').hide();
$('.nav-tabs li.active').find('span').show();
$('.nav-tabs>li').click(function()
{
$(this).find('span').show();
$(this).siblings('li').find('span').hide();
})
})
</script>