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

* Finish task #40835.

Browse Source
This commit is contained in:
hufangzhou
2021-08-03 09:30:05 +08:00
parent ae24ad59a1
commit 57bf580fa5
3 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/execution/view/ajaxgetdropmenu.html.php
+5 -5
View File
@@ -44,9 +44,9 @@ foreach($executions as $projectID => $projectExecutions)
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++;
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;
}
}
@@ -77,7 +77,7 @@ foreach($executions as $projectID => $projectExecutions)
if($selected == 'selected') $tabActive = 'myExecution';
$myExecutions++;
$myExecutions ++;
}
else if($execution->status != 'done' and $execution->status != 'closed' and $execution->PM != $this->app->user->account and !isset($execution->teams[$this->app->user->account]))
{
@@ -85,7 +85,7 @@ foreach($executions as $projectID => $projectExecutions)
if($selected == 'selected') $tabActive = 'other';
$others++;
$others ++;
}
else if($execution->status == 'done' or $execution->status == 'closed')
{
module/product/view/ajaxgetdropmenu.html.php
+5 -5
View File
@@ -46,9 +46,9 @@ foreach($products as $programID => $programProducts)
foreach($programProducts as $product)
{
if($product->status == 'normal' and $product->PO == $this->app->user->account) $productCounts[$programID]['myProduct']++;
if($product->status == 'normal' and !($product->PO == $this->app->user->account)) $productCounts[$programID]['others']++;
if($product->status == 'closed') $closeds++;
if($product->status == 'normal' and $product->PO == $this->app->user->account) $productCounts[$programID]['myProduct'] ++;
if($product->status == 'normal' and !($product->PO == $this->app->user->account)) $productCounts[$programID]['others'] ++;
if($product->status == 'closed') $closeds ++;
$productNames[] = $product->name;
}
}
@@ -82,7 +82,7 @@ foreach($products as $programID => $programProducts)
if($selected == 'selected') $tabActive = 'myProduct';
$myProducts++;
$myProducts ++;
}
else if($product->status == 'normal' and !($product->PO == $this->app->user->account))
{
@@ -90,7 +90,7 @@ foreach($products as $programID => $programProducts)
if($selected == 'selected') $tabActive = 'other';
$others++;
$others ++;
}
else if($product->status == 'closed')
{
module/project/view/ajaxgetdropmenu.html.php
+5 -5
View File
@@ -44,9 +44,9 @@ foreach($projects as $programID => $programProjects)
foreach($programProjects as $project)
{
if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) $projectCounts[$programID]['myProject']++;
if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account)) $projectCounts[$programID]['others']++;
if($project->status == 'done' or $project->status == 'closed') $dones++;
if($project->status != 'done' and $project->status != 'closed' and $project->PM == $this->app->user->account) $projectCounts[$programID]['myProject'] ++;
if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account)) $projectCounts[$programID]['others'] ++;
if($project->status == 'done' or $project->status == 'closed') $dones ++;
$projectNames[] = $project->name;
}
}
@@ -83,7 +83,7 @@ foreach($projects as $programID => $programProjects)
if($selected == 'selected') $tabActive = 'myProject';
$myProjects++;
$myProjects ++;
}
else if($project->status != 'done' and $project->status != 'closed' and !($project->PM == $this->app->user->account))
{
@@ -91,7 +91,7 @@ foreach($projects as $programID => $programProjects)
if($selected == 'selected') $tabActive = 'other';
$others++;
$others ++;
}
else if($project->status == 'done' or $project->status == 'closed')
{