From 57bf580fa563a2e122e37636846e8a9636ae4d9b Mon Sep 17 00:00:00 2001 From: hufangzhou Date: Tue, 3 Aug 2021 09:30:05 +0800 Subject: [PATCH] * Finish task #40835. --- module/execution/view/ajaxgetdropmenu.html.php | 10 +++++----- module/product/view/ajaxgetdropmenu.html.php | 10 +++++----- module/project/view/ajaxgetdropmenu.html.php | 10 +++++----- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/module/execution/view/ajaxgetdropmenu.html.php b/module/execution/view/ajaxgetdropmenu.html.php index b62b94790c..8d471d8874 100644 --- a/module/execution/view/ajaxgetdropmenu.html.php +++ b/module/execution/view/ajaxgetdropmenu.html.php @@ -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') { diff --git a/module/product/view/ajaxgetdropmenu.html.php b/module/product/view/ajaxgetdropmenu.html.php index b505f1e862..66eebb4b2c 100644 --- a/module/product/view/ajaxgetdropmenu.html.php +++ b/module/product/view/ajaxgetdropmenu.html.php @@ -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') { diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php index 924335e285..a9a4f65c28 100644 --- a/module/project/view/ajaxgetdropmenu.html.php +++ b/module/project/view/ajaxgetdropmenu.html.php @@ -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') {