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

* Finish task #41438.

Browse Source
This commit is contained in:
hufangzhou
2021-08-16 15:41:47 +08:00
parent a5919d62f6
commit 2ab74f5a81
4 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/control.php
+1 -1
View File
@@ -2702,7 +2702,7 @@ class execution extends control
{
$orderedExecutions = array();
$projects = $this->loadModel('program')->getProjectList(0, 'all', 0, 'order_asc');
$projects = $this->loadModel('program')->getProjectList(0, 'all', 0, 'order_asc', null, 0, 0, true);
$executionGroups = $this->dao->select('*')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
->andWhere('type')->in('sprint,stage')
module/execution/view/ajaxgetdropmenu.html.php
+3 -1
View File
@@ -29,6 +29,7 @@ a.executionName:focus, a.executionName:hover {background: #0c64eb; color: #fff !
<?php
$executionCounts = array();
$executionNames = array();
$preFix = '';
$closedExecutionsHtml = '';
$tabActive = '';
$myExecutions = 0;
@@ -59,6 +60,7 @@ foreach($executions as $projectID => $projectExecutions)
if($projectID and $config->systemMode == 'new')
{
$projectName = zget($projects, $projectID);
$preFix = $projectName . '/';
if($executionCounts[$projectID]['myExecution']) $myExecutionsHtml .= '<li class="hide-in-search"><div><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a> <label class="label">' . $lang->project->common . '</label></div><ul>';
if($executionCounts[$projectID]['others']) $normalExecutionsHtml .= '<li class="hide-in-search"><div><a class="text-muted" title="' . $projectName . '">' . $projectName . '</a> <label class="label">' . $lang->project->common . '</label></div><ul>';
@@ -85,7 +87,7 @@ foreach($executions as $projectID => $projectExecutions)
}
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}'");
$closedExecutionsHtml .= html::a(sprintf($link, $execution->id), $preFix . $execution->name, '', "class='$selected' title='" . $preFix . $execution->name . "' data-key='" . zget($executionsPinYin, $execution->name, '') . "' data-app='{$this->app->openApp}'");
if($selected == 'selected') $tabActive = 'closed';
}
module/product/view/ajaxgetdropmenu.html.php
+3 -1
View File
@@ -30,6 +30,7 @@ a.productName:focus, a.productName:hover {background: #0c64eb; color: #fff !impo
<?php
$productCounts = array();
$productNames = array();
$preFix = '';
$closedProductsHtml = '';
$tabActive = '';
$myProducts = 0;
@@ -61,6 +62,7 @@ foreach($products as $programID => $programProducts)
if($programID and $config->systemMode == 'new')
{
$programName = zget($programs, $programID);
$preFix = $programName . '/';
if($productCounts[$programID]['myProduct']) $myProductsHtml .= '<li class="hide-in-search"><div><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
if($productCounts[$programID]['others']) $normalProductsHtml .= '<li class="hide-in-search"><div><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
@@ -90,7 +92,7 @@ foreach($products as $programID => $programProducts)
}
else if($product->status == 'closed')
{
$closedProductsHtml .= html::a($linkHtml, $productName, '', "class='$selected' title='{$productName}' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
$closedProductsHtml .= html::a($linkHtml, $preFix . $productName, '', "class='$selected' title='" . $preFix . $productName . "' class='closed' data-key='" . zget($productsPinYin, $product->name, '') . "' data-app='$openApp'");
if($selected == 'selected') $tabActive = 'closed';
}
module/project/view/ajaxgetdropmenu.html.php
+3 -1
View File
@@ -29,6 +29,7 @@ a.projectName:focus, a.projectName:hover {background: #0c64eb; color: #fff !impo
<?php
$projectCounts = array();
$projectNames = array();
$preFix = '';
$closedProjectsHtml = '';
$tabActive = '';
$myProjects = 0;
@@ -59,6 +60,7 @@ foreach($projects as $programID => $programProjects)
if(isset($programs[$programID]) and $config->systemMode == 'new')
{
$programName = zget($programs, $programID);
$preFix = $programName . '/';
if($projectCounts[$programID]['myProject']) $myProjectsHtml .= '<li class="hide-in-search"><div><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
if($projectCounts[$programID]['others']) $normalProjectsHtml .= '<li class="hide-in-search"><div><a class="text-muted" title="' . $programName . '">' . $programName . '</a> <label class="label">' . $lang->program->common . '</label></div><ul>';
@@ -91,7 +93,7 @@ foreach($projects as $programID => $programProjects)
}
else if($project->status == 'done' or $project->status == 'closed')
{
$closedProjectsHtml .= html::a(sprintf($link, $project->id), $project->name, '', "class='$selected' title='{$project->name}' data-key='" . zget($projectsPinYin, $project->name, '') . "'");
$closedProjectsHtml .= html::a(sprintf($link, $project->id), $preFix . $project->name, '', "class='$selected' title='" . $preFix . $project->name . "' data-key='" . zget($projectsPinYin, $project->name, '') . "'");
if($selected == 'selected') $tabActive = 'closed';
}