From d560f6d2ab861df343def38c7ac180eb2d4a44d1 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 11 May 2022 05:38:29 +0000
Subject: [PATCH 01/21] * Finish task #53652.

---
 module/project/control.php                   |   1 +
 module/project/model.php                     | 205 ++++++++++++++++++-
 module/project/view/ajaxgetdropmenu.html.php |  26 ++-
 3 files changed, 218 insertions(+), 14 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index e46b59976d..2642eb68b5 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -127,6 +127,7 @@ class project extends control
             unset($projects[$project->id]);
         }
 
+        $this->view->link      = $this->project->getProjectLink($module, $method, $projectID);
         $this->view->projectID = $projectID;
         $this->view->projects  = $orderedProjects;
         $this->view->module    = $module;
diff --git a/module/project/model.php b/module/project/model.php
index 04a76c89f2..145776ad82 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -457,6 +457,189 @@ class projectModel extends model
         return $projects;
     }
 
+
+    /**
+     * Create the link from module,method.
+     *
+     * @param  string $module
+     * @param  string $method
+     * @param  int    $projectID
+     * @access public
+     * @return void
+     */
+    public function getProjectLink($module, $method, $projectID)
+    {
+        $link    = helper::createLink('project', 'index', "projectID=%s");
+        $project = $this->getByID($projectID);
+
+        if(strpos(',project,product,projectstory,story,bug,testcase,testtask,testreport,build,projectrelease,stakeholder,', ',' . $module . ',') !== false)
+        {
+            if($module == 'project' and $method == 'execution')
+            {
+                $link = helper::createLink($module, $method, "status=all&projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'bug')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'testcase')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'testtask')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'testreport')
+            { $link = helper::createLink($module, $method, "projectID=%s"); }
+            elseif($module == 'project' and $method == 'build')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'dynamic')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'view')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'manageproducts')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'team')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'managemembers')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'whitelist')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'addwhitelist')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'group')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'project' and $method == 'managePriv')
+            {
+                $link = helper::createLink($module, 'group', "projectID=%s");
+            }
+            elseif($module == 'projectstory' and $method == 'linkstory')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'bug')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method, "productID=0&branch=0&extras=projectID=%s");
+                }
+                elseif($method == 'edit')
+                {
+                    $link = helper::createLink('project', 'bug', "projectID=%s");
+                }
+            }
+            elseif($module == 'story' and $method == 'create')
+            {
+                $link = helper::createLink($module, $method);
+            }
+            elseif($module == 'story' and $method == 'change')
+            {
+                $link = helper::createLink('projectstory', 'story', "projectID=%s");
+            }
+            elseif($module == 'story' and $method == 'zerocase')
+            {
+                $link = helper::createLink('project', 'testcase', "projectID=%s");
+            }
+            elseif($module == 'testcase' and $method == 'create')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method);
+                }
+                elseif($method == 'edit')
+                {
+                    $link = helper::createLink('project', 'testcase', "projectID=%s");
+                }
+            }
+            elseif($module == 'testtask')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method, "product=0&executionID=0&build=0&projectID=%s");
+                }
+                else
+                {
+                    $link = helper::createLink($module, 'browseunits');
+                }
+            }
+            elseif($module == 'testreport')
+            {
+                $link = helper::createLink('project', 'testreport', "projectID=%s");
+            }
+            elseif($module == 'repo')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method, "objectID=%s#app=project");
+                }
+                else
+                {
+                    $link = helper::createLink($module, 'browse', "repoID=&branchID=&objectID=%s#app=project");
+                }
+            }
+            elseif($module == 'doc')
+            {
+                $link = helper::createLink($module, 'tablecontents', "type=projectprojectID=%s#app=project");
+            }
+            elseif($module == 'build')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method, "executionID=&productID=&projectID=%s#app=project");
+                }
+                else
+                {
+                    $link = helper::createLink('project', 'build', "projectID=%s");
+                }
+            }
+            elseif($module == 'projectrelease')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method, "projectID=%s");
+                }
+                else
+                {
+                    $link = helper::createLink('projectrelease', 'browse', "projectID=%s");
+                }
+            }
+            elseif($module == 'stakeholder')
+            {
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method, "projectID=%s");
+                }
+                else
+                {
+                    $link = helper::createLink($module, 'browse', "projectID=%s");
+                }
+            }
+        }
+
+        if($project->model == 'kanban') $link = helper::createLink('project', 'index', "projectID=%s");
+
+        return $link;
+    }
+
     /**
      * Get project stat data .
      *
@@ -517,7 +700,7 @@ class projectModel extends model
             ->andWhere('deleted')->eq(0)
             ->andWhere('vision')->eq($this->config->vision)
             ->beginIF($programID !== '')->andWhere('parent')->eq($programID)->fi()
-            ->beginIF($status != 'all' && $status != 'noclosed')->andWhere('status')->eq($status)->fi()
+            ->beginIF($status != 'all' and $status != 'noclosed')->andWhere('status')->eq($status)->fi()
             ->beginIF($excludedModel)->andWhere('model')->ne($excludedModel)->fi()
             ->beginIF($status == 'noclosed')->andWhere('status')->ne('closed')->fi()
             ->beginIF(!$this->app->user->admin and !$isQueryAll)->andWhere('id')->in($this->app->user->view->projects)->fi()
@@ -981,7 +1164,7 @@ class projectModel extends model
 
             $this->updateProducts($projectID);
 
-            if(isset($_POST['newProduct']) || (!$project->parent && empty($linkedProductsCount)))
+            if(isset($_POST['newProduct']) or (!$project->parent and empty($linkedProductsCount)))
             {
                 /* If parent not empty, link products or create products. */
                 $product = new stdclass();
@@ -1719,11 +1902,11 @@ class projectModel extends model
                     if($project->model === 'scrum') $prefix = "<span class='project-type-label label label-outline label-info'>{$this->lang->project->scrum}</span> ";
                     if($project->model === 'kanban') $prefix = "<span class='project-type-label label label-outline label-info'>{$this->lang->project->kanban}</span> ";
                     if(isset($project->delay)) $suffix = "<span class='label label-danger label-badge'>{$this->lang->project->statusList['delay']}</span>";
-                    if(!empty($suffix) || !empty($prefix)) echo '<div class="project-name' . (empty($prefix) ? '' : ' has-prefix') . (empty($suffix) ? '' : ' has-suffix') . '">';
+                    if(!empty($suffix) or !empty($prefix)) echo '<div class="project-name' . (empty($prefix) ? '' : ' has-prefix') . (empty($suffix) ? '' : ' has-suffix') . '">';
                     if(!empty($prefix)) echo $prefix;
                     echo html::a($projectLink, $project->name, '', "class='text-ellipsis text-primary'");
                     if(!empty($suffix)) echo $suffix;
-                    if(!empty($suffix) || !empty($prefix)) echo '</div>';
+                    if(!empty($suffix) or !empty($prefix)) echo '</div>';
                     break;
                 case 'code':
                     echo $project->code;
@@ -1764,11 +1947,11 @@ class projectModel extends model
                     break;
                 case 'actions':
                     $moduleName = $this->config->systemMode == 'classic' ? "execution" : "project";
-                    if($project->status == 'wait' || $project->status == 'suspended') common::printIcon($moduleName, 'start', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);
+                    if($project->status == 'wait' or $project->status == 'suspended') common::printIcon($moduleName, 'start', "projectID=$project->id", $project, 'list', 'play', '', 'iframe', true);
                     if($project->status == 'doing') common::printIcon($moduleName, 'close', "projectID=$project->id", $project, 'list', 'off', '', 'iframe', true);
                     if($project->status == 'closed') common::printIcon($moduleName, 'activate', "projectID=$project->id", $project, 'list', 'magic', '', 'iframe', true);
 
-                    if(common::hasPriv($moduleName, 'suspend') || (common::hasPriv($moduleName, 'close') && $project->status != 'doing') || (common::hasPriv($moduleName, 'activate') && $project->status != 'closed'))
+                    if(common::hasPriv($moduleName, 'suspend') or (common::hasPriv($moduleName, 'close') and $project->status != 'doing') or (common::hasPriv($moduleName, 'activate') && $project->status != 'closed'))
                     {
                         echo "<div class='btn-group'>";
                         echo "<button type='button' class='btn icon-caret-down dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}' style='width: 16px; padding-left: 0px; border-radius: 4px;'></button>";
@@ -1793,7 +1976,7 @@ class projectModel extends model
                         common::printIcon($moduleName, 'team', "projectID=$project->id", $project, 'list', 'group', '', '', '', $dataApp . $attr, $this->lang->execution->team);
                         if($this->config->systemMode == 'new') common::printIcon('project', 'group', "projectID=$project->id&programID=$programID", $project, 'list', 'lock', '', '', '', $dataApp . $attr);
 
-                        if(common::hasPriv($moduleName, 'manageProducts') || common::hasPriv($moduleName, 'whitelist') || common::hasPriv($moduleName, 'delete'))
+                        if(common::hasPriv($moduleName, 'manageProducts') or common::hasPriv($moduleName, 'whitelist') or common::hasPriv($moduleName, 'delete'))
                         {
                             echo "<div class='btn-group'>";
                             echo "<button type='button' class='btn dropdown-toggle' data-toggle='context-dropdown' title='{$this->lang->more}'><i class='icon-more-alt'></i></button>";
@@ -2028,7 +2211,7 @@ class projectModel extends model
                 ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
                 ->where('t1.type')->in('sprint,stage,kanban')
                 ->beginIF($projectID != 0)->andWhere('t1.project')->eq($projectID)->fi()
-                ->beginIF($projectID == 0 && $this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
+                ->beginIF($projectID == 0 and $this->config->vision)->andWhere('t1.vision')->eq($this->config->vision)->fi()
                 ->beginIF(!empty($myExecutionIDList))->andWhere('t1.id')->in(array_keys($myExecutionIDList))->fi()
                 ->beginIF($status == 'undone')->andWhere('t1.status')->notIN('done,closed')->fi()
                 ->beginIF($status != 'all' and $status != 'undone' and $status != 'involved')->andWhere('t1.status')->eq($status)->fi()
@@ -2298,14 +2481,14 @@ class projectModel extends model
             $lang->project->dividerMenu = $lang->{$model}->dividerMenu;
         }
 
-        $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
-
         /* Reset project priv. */
         $moduleName = $this->app->rawModule;
         $methodName = $this->app->rawMethod;
-
         $this->loadModel('common')->resetProjectPriv($objectID);
         if(!$this->common->isOpenMethod($moduleName, $methodName) and !commonModel::hasPriv($moduleName, $methodName)) $this->common->deny($moduleName, $methodName, false);
+
+        $this->lang->switcherMenu = $this->getSwitcher($objectID, $this->app->rawModule, $this->app->rawMethod);
+
         common::setMenuVars('project', $objectID);
     }
 
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index 85a2b1bf4e..e1d549a031 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -30,6 +30,7 @@
 <?php
 $projectCounts      = array();
 $projectNames       = array();
+$defaultLink        = $link;
 $tabActive          = '';
 $myProjects         = 0;
 $others             = 0;
@@ -69,9 +70,28 @@ foreach($projects as $programID => $programProjects)
 
     foreach($programProjects as $index => $project)
     {
-        $selected = $project->id == $projectID ? 'selected' : '';
-        $link     = helper::createLink('project', 'index', "projectID=%s", '', '', $project->id);
-        $icon     = '<i class="icon icon-sprint"></i> ';
+        $selected    = $project->id == $projectID ? 'selected' : '';
+        $icon        = '<i class="icon icon-sprint"></i> ';
+
+        if($project->model == 'waterfall' and $module == 'design')
+        {
+            $link = helper::createLink('design', 'browse', "projectID=%s");
+        }
+        elseif($project->model == 'kanban')
+        {
+            $link = helper::createLink('project', 'index', "projectID=%s");
+        }
+        else
+        {
+            $link = $defaultLink;
+        }
+
+        /* Set link when project redefines permissions. */
+        if($project->auth == 'reset')
+        {
+            $this->loadModel('common')->resetProjectPriv($project->id);
+            $link = helper::createLink('project', 'index', "projectID=%s");
+        }
 
         if($project->model != 'scrum') $icon = "<i class='icon icon-{$project->model}'></i> ";
         $projectName = $icon . $project->name;

From ca2fc749cde295abe5f3e44afa55696a3efa3410 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 11 May 2022 05:40:31 +0000
Subject: [PATCH 02/21] * Optimize code.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 145776ad82..ef25e5e64b 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -465,7 +465,7 @@ class projectModel extends model
      * @param  string $method
      * @param  int    $projectID
      * @access public
-     * @return void
+     * @return string
      */
     public function getProjectLink($module, $method, $projectID)
     {

From 98dcd7517ff8c98dfa9c5ed4378b4baa5cd73d3b Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 11 May 2022 06:38:46 +0000
Subject: [PATCH 03/21] * Optimize code.

---
 module/product/control.php | 2 +-
 module/product/model.php   | 8 +++++---
 module/project/model.php   | 8 ++++++++
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 17e5520626..fc85c81ebf 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -301,7 +301,7 @@ class product extends control
         $actionURL = $this->createLink($rawModule, $rawMethod, $params . "productID=$productID&branch=$branch&browseType=bySearch&queryID=myQueryID&storyType=$storyType");
 
         $this->config->product->search['onMenuBar'] = 'yes';
-        $this->product->buildSearchForm($productID, $this->products, $queryID, $actionURL, $branch);
+        $this->product->buildSearchForm($productID, $this->products, $queryID, $actionURL, $branch, $projectID);
 
         $showModule = !empty($this->config->datatable->productBrowse->showModule) ? $this->config->datatable->productBrowse->showModule : '';
 
diff --git a/module/product/model.php b/module/product/model.php
index aa01af3093..f8427994e5 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -975,13 +975,15 @@ class productModel extends model
      * @param  int    $queryID
      * @param  int    $actionURL
      * @param  int    $branch
+     * @param  int    $projectID
      * @access public
      * @return void
      */
-    public function buildSearchForm($productID, $products, $queryID, $actionURL, $branch = 0)
+    public function buildSearchForm($productID, $products, $queryID, $actionURL, $branch = 0, $projectID = 0)
     {
         $productIdList = ($this->app->tab == 'project' and empty($productID)) ? array_keys($products) : $productID;
         $branchParam   = ($this->app->tab == 'project' and empty($productID)) ? '' : $branch;
+        $projectID     = ($this->app->tab == 'project' and empty($projectID)) ? $this->session->project : $projectID;
 
         $this->config->product->search['actionURL'] = $actionURL;
         $this->config->product->search['queryID']   = $queryID;
@@ -997,7 +999,7 @@ class productModel extends model
             if($productID)
             {
                 $modules          = array();
-                $branchList       = $this->loadModel('branch')->getPairs($productID, '', $this->session->project);
+                $branchList       = $this->loadModel('branch')->getPairs($productID, '', $projectID);
                 $branchModuleList = $this->tree->getOptionMenu($productID, 'story', 0, array_keys($branchList));
                 foreach($branchModuleList as $branchID => $branchModules) $modules[] = $branchModules;
             }
@@ -1005,7 +1007,7 @@ class productModel extends model
             {
                 $moduleList  = array();
                 $modules     = array('/');
-                $branchGroup = $this->loadModel('execution')->getBranchByProduct(array_keys($products), $this->session->project, '');
+                $branchGroup = $this->loadModel('execution')->getBranchByProduct(array_keys($products), $projectID, '');
                 foreach($products as $productID => $productName)
                 {
                     if(isset($branchGroup[$productID]))
diff --git a/module/project/model.php b/module/project/model.php
index ef25e5e64b..0a4b6d9110 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -532,6 +532,14 @@ class projectModel extends model
             {
                 $link = helper::createLink($module, 'group', "projectID=%s");
             }
+            elseif($module == 'product' and $method == 'showerrornone')
+            {
+                $link = helper::createLink('projectstory', 'story', "projectID=%s");
+            }
+            elseif($module == 'projectstory' and $method == 'story')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
             elseif($module == 'projectstory' and $method == 'linkstory')
             {
                 $link = helper::createLink($module, $method, "projectID=%s");

From bbb5ec189d03ae1f5cdf9f2ecce0a335e2699546 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Wed, 11 May 2022 07:57:36 +0000
Subject: [PATCH 04/21] * Optimize code.

---
 module/project/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 0a4b6d9110..3a4b42f608 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -472,7 +472,7 @@ class projectModel extends model
         $link    = helper::createLink('project', 'index', "projectID=%s");
         $project = $this->getByID($projectID);
 
-        if(strpos(',project,product,projectstory,story,bug,testcase,testtask,testreport,build,projectrelease,stakeholder,', ',' . $module . ',') !== false)
+        if(strpos(',project,product,projectstory,story,bug,doc,testcase,testtask,testreport,build,projectrelease,stakeholder,', ',' . $module . ',') !== false)
         {
             if($module == 'project' and $method == 'execution')
             {
@@ -606,7 +606,7 @@ class projectModel extends model
             }
             elseif($module == 'doc')
             {
-                $link = helper::createLink($module, 'tablecontents', "type=projectprojectID=%s#app=project");
+                $link = helper::createLink($module, 'tablecontents', "type=project&objectID=%s#app=project");
             }
             elseif($module == 'build')
             {

From ce7c0afdc112b9be7c6c1d171872f11072db1def Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Wed, 11 May 2022 18:24:13 +0800
Subject: [PATCH 05/21] * Finish task#53666.

---
 lib/date/date.class.php             | 76 ++++++++++++++---------------
 module/execution/control.php        |  7 +--
 module/execution/css/burn.css       |  1 +
 module/execution/js/burn.js         | 12 +++++
 module/execution/lang/en.php        |  3 ++
 module/execution/lang/zh-cn.php     |  3 ++
 module/execution/model.php          | 16 ++++--
 module/execution/view/burn.html.php | 23 ++++++++-
 8 files changed, 94 insertions(+), 47 deletions(-)

diff --git a/lib/date/date.class.php b/lib/date/date.class.php
index efdc37eb02..5737e68cb2 100644
--- a/lib/date/date.class.php
+++ b/lib/date/date.class.php
@@ -9,14 +9,14 @@
  * @version     $Id: date.class.php 2605 2013-01-09 07:22:58Z wwccss $
  * @link        http://www.zentao.net
  */
-class date 
+class date
 {
     /**
      * Build hour time list.
-     * 
-     * @param  int $begin 
-     * @param  int $end 
-     * @param  int $delta 
+     *
+     * @param  int $begin
+     * @param  int $end
+     * @param  int $delta
      * @access public
      * @return array
      */
@@ -37,7 +37,7 @@ class date
 
     /**
      * Get today.
-     * 
+     *
      * @access public
      * @return date
      */
@@ -47,8 +47,8 @@ class date
     }
 
     /**
-     * Get yesterday 
-     * 
+     * Get yesterday
+     *
      * @access public
      * @return date
      */
@@ -59,7 +59,7 @@ class date
 
     /**
      * Get tomorrow.
-     * 
+     *
      * @access public
      * @return date
      */
@@ -70,7 +70,7 @@ class date
 
     /**
      * Get the day before yesterday.
-     * 
+     *
      * @access public
      * @return date
      */
@@ -81,8 +81,8 @@ class date
 
     /**
      * Get now time period.
-     * 
-     * @param  int    $delta 
+     *
+     * @param  int    $delta
      * @access public
      * @return string the current time period, like 0915
      */
@@ -114,8 +114,8 @@ class date
 
     /**
      * Format time 0915 to 09:15
-     * 
-     * @param  string $time 
+     *
+     * @param  string $time
      * @access public
      * @return string
      */
@@ -127,7 +127,7 @@ class date
 
     /**
      * Get the begin and end date of this week.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -141,7 +141,7 @@ class date
 
     /**
      * Get the begin and end date of last week.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -155,7 +155,7 @@ class date
 
     /**
      * Get the time at the middle of this week.
-     * 
+     *
      * If today in week is 1, move it one day in future. Else is 7, move it back one day. To keep the time geted in this week.
      *
      * @access public
@@ -172,7 +172,7 @@ class date
 
     /**
      * Get middle of last week.
-     * 
+     *
      * @access public
      * @return time
      */
@@ -188,7 +188,7 @@ class date
 
     /**
      * Get begin and end time of this month.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -201,7 +201,7 @@ class date
 
     /**
      * Get begin and end time of last month.
-     * 
+     *
      * @access public
      * @return array
      */
@@ -213,11 +213,11 @@ class date
     }
 
     /**
-     * Get begin and end time of this season. 
-     * 
+     * Get begin and end time of this season.
+     *
      * @static
      * @access public
-     * @return array 
+     * @return array
      */
     public static function getThisSeason()
     {
@@ -230,11 +230,11 @@ class date
     }
 
     /**
-     * Get begin and end time of last season. 
-     * 
+     * Get begin and end time of last season.
+     *
      * @static
      * @access public
-     * @return array 
+     * @return array
      */
     public static function getLastSeason()
     {
@@ -242,43 +242,43 @@ class date
         $begin  = date('Y-m-d H:i:s', mktime(0, 0, 0, $season * 3 - 2, 1, date('Y')));
         $endDay = date('t', mktime(0, 0 , 0, $season * 3, 1, date("Y")));                // Get end day.
         $end    = date('Y-m-d H:i:s', mktime(23, 59, 59, $season * 3, $endDay, date('Y')));
-        
+
         return array('begin' => $begin, 'end' => $end);
     }
 
     /**
      * Get begin and end time of this year.
-     * 
+     *
      * @static
      * @access public
-     * @return array 
+     * @return array
      */
     public static function getThisYear()
     {
         $begin = date(DT_DATE1, strtotime('1/1 this year')) . ' 00:00:00';
-        $end   = date(DT_DATE1, strtotime('1/1 next year -1 day')) . ' 23:59:59';  
+        $end   = date(DT_DATE1, strtotime('1/1 next year -1 day')) . ' 23:59:59';
         return array('begin' => $begin, 'end' => $end);
     }
 
     /**
      * Get begin and end time of last year.
-     * 
+     *
      * @static
      * @access public
-     * @return array 
+     * @return array
      */
     public static function getLastYear()
     {
         $begin = date(DT_DATE1, strtotime('1/1 last year')) . ' 00:00:00';
-        $end   = date(DT_DATE1, strtotime('1/1 this year -1 day')) . ' 23:59:59';  
+        $end   = date(DT_DATE1, strtotime('1/1 this year -1 day')) . ' 23:59:59';
         return array('begin' => $begin, 'end' => $end);
     }
 
     /**
-     * Get date list 
-     * 
-     * @param  string $begin 
-     * @param  string $end 
+     * Get date list
+     *
+     * @param  string $begin
+     * @param  string $end
      * @param  string $format     m/d/Y|Y-m-d
      * @param  string $type       noweekend|withweekend
      * @param  int    $weekend    2|1
@@ -295,7 +295,7 @@ class date
         for($date = $begin; $date <= $end; $date += 24 * 3600)
         {
             $weekDay = date('w', $date);
-            if($type == 'noweekend' and (($weekend == 2 and $weekDay == 6) or $weekDay == 0)) continue;
+            if(strpos($type, 'noweekend') !== false and (($weekend == 2 and $weekDay == 6) or $weekDay == 0)) continue;
 
             $dateList[] = date($format, $date);
         }
diff --git a/module/execution/control.php b/module/execution/control.php
index be01e4169e..8ed62988e5 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1149,12 +1149,12 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function burn($executionID = 0, $type = 'noweekend', $interval = 0, $burnBy = 'left')
+    public function burn($executionID = 0, $type = 'noweekend,nodelay', $interval = 0, $burnBy = 'left')
     {
         $this->loadModel('report');
         $execution   = $this->commonAction($executionID);
         $executionID = $execution->id;
-        $burnBy    = $this->cookie->burnBy ? $this->cookie->burnBy : $burnBy;
+        $burnBy      = $this->cookie->burnBy ? $this->cookie->burnBy : $burnBy;
 
         /* Header and position. */
         $title      = $execution->name . $this->lang->colon . $this->lang->execution->burn;
@@ -1163,7 +1163,8 @@ class execution extends control
 
         /* Get date list. */
         $executionInfo = $this->execution->getByID($executionID);
-        list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $executionInfo->end, $type, $interval, 'Y-m-d');
+        $endDate       = strpos($type, 'withdelay') !== false ? helper::today() : $executionInfo->end;
+        list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d');
         $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
 
         $dayList = array_fill(1, floor((int)$execution->days / $this->config->execution->maxBurnDay) + 5, '');
diff --git a/module/execution/css/burn.css b/module/execution/css/burn.css
index b954f140ad..71e7d4b506 100644
--- a/module/execution/css/burn.css
+++ b/module/execution/css/burn.css
@@ -6,5 +6,6 @@
 #burnLegend > div {position: relative; padding-left: 30px;}
 #burnLegend > div > .barline {position: absolute; width: 20px; left: 0; top: 13px; height: 3px; background: #EEEEEE;}
 #burnLegend .line-real .bg-primary {background: #1183fb;}
+#burnLegend .line-real .bg-delay   {background: red;}
 
 .pull-left .input-control {margin-right: 10px;}
diff --git a/module/execution/js/burn.js b/module/execution/js/burn.js
index 85e78025cf..192151808a 100644
--- a/module/execution/js/burn.js
+++ b/module/execution/js/burn.js
@@ -5,6 +5,18 @@ $(function()
     {
         location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + type + '&interval=' + $(this).val());
     });
+
+    $('#weekend').click(function()
+    {
+        var browseType = type.match('noweekend') ? type.replace('noweekend', 'withweekend') : type.replace('withweekend', 'noweekend');
+        location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + browseType + '&interval=' + interval);
+    });
+
+    $('#delay').click(function()
+    {
+        var browseType = type.match('nodelay') ? type.replace('nodelay', 'withdelay') : type.replace('withdelay', 'nodelay');
+        location.href = createLink('execution', 'burn', 'executionID=' + executionID + '&type=' + browseType + '&interval=' + interval);
+    });
 })
 
 /* Save burn as image.*/
diff --git a/module/execution/lang/en.php b/module/execution/lang/en.php
index c9aa6aa2f0..5cff2f8144 100644
--- a/module/execution/lang/en.php
+++ b/module/execution/lang/en.php
@@ -359,7 +359,9 @@ $lang->execution->linkStory                   = 'Link Story';
 $lang->execution->createTask                  = 'Create Task';
 $lang->execution->goback                      = "Go Back";
 $lang->execution->noweekend                   = 'Exclude Weekend';
+$lang->execution->nowdelay                    = 'Exclude Delay Date';
 $lang->execution->withweekend                 = 'Include Weekend';
+$lang->execution->withdelay                   = 'Include Delay Date';
 $lang->execution->interval                    = 'Intervals ';
 $lang->execution->fixFirstWithLeft            = 'Update hours left too';
 $lang->execution->unfinishedExecution         = "This {$lang->executionCommon} has ";
@@ -384,6 +386,7 @@ $lang->execution->charts->burn->graph->rotateNames  = 1;
 $lang->execution->charts->burn->graph->showValues   = 0;
 $lang->execution->charts->burn->graph->reference    = 'Ideal';
 $lang->execution->charts->burn->graph->actuality    = 'Actual';
+$lang->execution->charts->burn->graph->delay        = 'Delay';
 
 $lang->execution->placeholder = new stdclass();
 $lang->execution->placeholder->code      = "Abbreviation of {$lang->executionCommon} name";
diff --git a/module/execution/lang/zh-cn.php b/module/execution/lang/zh-cn.php
index 9248f804cb..377421ee64 100644
--- a/module/execution/lang/zh-cn.php
+++ b/module/execution/lang/zh-cn.php
@@ -359,7 +359,9 @@ $lang->execution->linkStory                   = "关联{$lang->SRCommon}";
 $lang->execution->createTask                  = '创建任务';
 $lang->execution->goback                      = "返回任务列表";
 $lang->execution->noweekend                   = '去除周末';
+$lang->execution->nodelay                     = '去除延期日期';
 $lang->execution->withweekend                 = '显示周末';
+$lang->execution->withdelay                   = '显示延期日期';
 $lang->execution->interval                    = '间隔';
 $lang->execution->fixFirstWithLeft            = '修改剩余工时';
 $lang->execution->unfinishedExecution         = "该{$lang->executionCommon}下还有";
@@ -384,6 +386,7 @@ $lang->execution->charts->burn->graph->rotateNames  = 1;
 $lang->execution->charts->burn->graph->showValues   = 0;
 $lang->execution->charts->burn->graph->reference    = '参考';
 $lang->execution->charts->burn->graph->actuality    = '实际';
+$lang->execution->charts->burn->graph->delay        = '延期';
 
 $lang->execution->placeholder = new stdclass();
 $lang->execution->placeholder->code      = '团队内部的简称';
diff --git a/module/execution/model.php b/module/execution/model.php
index b3180f1394..9bfb2c0046 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2792,8 +2792,7 @@ class executionModel extends model
     {
         $today = helper::today();
         $executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
-            ->where('end')->ge($today)
-            ->andWhere('type')->in('sprint,stage')
+            ->where('type')->in('sprint,stage')
             ->andWhere('lifetime')->ne('ops')
             ->andWhere('status')->notin('done,closed,suspended')
             ->fetchPairs();
@@ -2943,10 +2942,11 @@ class executionModel extends model
      *
      * @param  int    $executionID
      * @param  string $burnBy
+     * @param  bool   $showDelay
      * @access public
      * @return array
      */
-    public function getBurnDataFlot($executionID = 0, $burnBy = '')
+    public function getBurnDataFlot($executionID = 0, $burnBy = '', $showDelay = false)
     {
         /* Get execution and burn counts. */
         $execution    = $this->getById($executionID);
@@ -2959,7 +2959,8 @@ class executionModel extends model
         foreach($sets as $date => $set)
         {
             if($date < $execution->begin) continue;
-            if($date > $execution->end) continue;
+            if(!$showDelay and $date > $execution->end) $set->value = 'null';
+            if($showDelay  and $date < $execution->end) $set->value = 'null';
 
             $burnData[$date] = $set;
             $count++;
@@ -3648,6 +3649,13 @@ class executionModel extends model
         $chartData['burnLine'] = $this->report->createSingleJSON($sets, $dateList);
         $chartData['baseLine'] = $baselineJSON;
 
+        $execution = $this->getById($executionID);
+        if($execution->status != 'closed' and helper::today() > $execution->end)
+        {
+            $delaySets = $this->getBurnDataFlot($executionID, $burnBy, true);
+            $chartData['delayLine'] = $this->report->createSingleJSON($delaySets, $dateList);
+        }
+
         return $chartData;
     }
 
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index 2d0bd26ae7..fd640bf56b 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -18,13 +18,16 @@
 <?php js::set('burnXUnit', $lang->execution->burnXUnit);?>
 <?php js::set('burnYUnit', $lang->execution->burnYUnit);?>
 <?php js::set('type', $type);?>
+<?php js::set('interval', $interval);?>
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php
-    $weekend = ($type == 'noweekend') ? 'withweekend' : "noweekend";
+    $weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
+    $delay   = strpos($type, 'withdelay') !== false ? 'nodelay'     : 'withdelay';
     common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
     echo '<div class="space"></div>';
-    echo html::a($this->createLink('execution', 'burn', "executionID=$executionID&type=$weekend&interval=$interval"), $lang->execution->$weekend, '', "class='btn btn-link'");
+    echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
+    if($execution->status != 'closed' and helper::today() > $execution->end) echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
     if(common::canModify('execution', $execution)) common::printLink('execution', 'fixFirst', "execution=$execution->id", $lang->execution->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
     echo $lang->execution->howToUpdateBurn;
     ?>
@@ -54,6 +57,9 @@
     <div id="burnLegend">
       <div class="line-ref"><div class='barline'></div><?php echo $lang->execution->charts->burn->graph->reference;?></div>
       <div class="line-real"><div class='barline bg-primary'></div><?php echo $lang->execution->charts->burn->graph->actuality;?></div>
+      <?php if(strpos($type, 'withdelay') !== false):?>
+      <div class="line-real"><div class='barline bg-delay'></div><?php echo $lang->execution->charts->burn->graph->delay;?></div>
+      <?php endif;?>
     </div>
   </div>
 </div>
@@ -94,6 +100,19 @@ function initBurnChar()
         }]
     };
 
+    var delaySets =
+    {
+        label: "<?php echo $lang->execution->charts->burn->graph->delay;?>",
+        color: 'red',
+        pointStrokeColor: 'red',
+        pointHighlightStroke: 'red',
+        pointColor: 'red',
+        fillColor: 'rgba(0,106,241, .07)',
+        pointHighlightFill: '#fff',
+        data: <?php echo $chartData['delayLine']?>
+    }
+    if(type.match('withdelay')) data.datasets.push(delaySets);
+
     var burnChart = $("#burnCanvas").lineChart(data,
     {
         pointDotStrokeWidth: 2,

From 691de86d4a9ef1058d377f38917df9d2607444c4 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 12 May 2022 08:15:25 +0800
Subject: [PATCH 06/21] * Code for task#53661.

---
 module/execution/control.php        | 4 +++-
 module/execution/model.php          | 8 +++++---
 module/execution/view/burn.html.php | 4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 8ed62988e5..78e3ee06cc 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1163,7 +1163,8 @@ class execution extends control
 
         /* Get date list. */
         $executionInfo = $this->execution->getByID($executionID);
-        $endDate       = strpos($type, 'withdelay') !== false ? helper::today() : $executionInfo->end;
+        $deadline      = $execution->status != 'closed' ? helper::today() : substr($execution->closedDate, 0, 10);
+        $endDate       = strpos($type, 'withdelay') !== false ? $deadline : $executionInfo->end;
         list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d');
         $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
 
@@ -1928,6 +1929,7 @@ class execution extends control
         if(!empty($_POST))
         {
             $this->loadModel('action');
+            $this->execution->computeBurn($executionID);
             $changes = $this->execution->close($executionID);
             if(dao::isError()) return print(js::error(dao::getError()));
 
diff --git a/module/execution/model.php b/module/execution/model.php
index 9bfb2c0046..7b40302a85 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2785,16 +2785,18 @@ class executionModel extends model
     /**
      * Compute burn of a execution.
      *
+     * @param  int    $executionID
      * @access public
-     * @return array
+     * @return void
      */
-    public function computeBurn()
+    public function computeBurn($executionID = 0)
     {
         $today = helper::today();
         $executions = $this->dao->select('id, code')->from(TABLE_EXECUTION)
             ->where('type')->in('sprint,stage')
             ->andWhere('lifetime')->ne('ops')
             ->andWhere('status')->notin('done,closed,suspended')
+            ->beginIF($executionID)->andWhere('id')->eq($executionID)->fi()
             ->fetchPairs();
         if(!$executions) return array();
 
@@ -3650,7 +3652,7 @@ class executionModel extends model
         $chartData['baseLine'] = $baselineJSON;
 
         $execution = $this->getById($executionID);
-        if($execution->status != 'closed' and helper::today() > $execution->end)
+        if(($execution->status != 'closed' and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end))
         {
             $delaySets = $this->getBurnDataFlot($executionID, $burnBy, true);
             $chartData['delayLine'] = $this->report->createSingleJSON($delaySets, $dateList);
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index fd640bf56b..6374ef4835 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -27,7 +27,7 @@
     common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
     echo '<div class="space"></div>';
     echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
-    if($execution->status != 'closed' and helper::today() > $execution->end) echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
+    if(($execution->status != 'closed' and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)) echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
     if(common::canModify('execution', $execution)) common::printLink('execution', 'fixFirst', "execution=$execution->id", $lang->execution->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
     echo $lang->execution->howToUpdateBurn;
     ?>
@@ -109,7 +109,7 @@ function initBurnChar()
         pointColor: 'red',
         fillColor: 'rgba(0,106,241, .07)',
         pointHighlightFill: '#fff',
-        data: <?php echo $chartData['delayLine']?>
+        data: <?php echo isset($chartData['delayLine']) ? $chartData['delayLine'] : '[]';?>
     }
     if(type.match('withdelay')) data.datasets.push(delaySets);
 

From 1cab87893e38e9559ee4720a6c82db04d2541375 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 12 May 2022 09:19:49 +0800
Subject: [PATCH 07/21] * Finish task#53661.

---
 module/execution/control.php | 1 +
 module/execution/model.php   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/module/execution/control.php b/module/execution/control.php
index 78e3ee06cc..060128b0f2 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1834,6 +1834,7 @@ class execution extends control
         if(!empty($_POST))
         {
             $this->loadModel('action');
+            $this->execution->computeBurn($executionID);
             $changes = $this->execution->suspend($executionID);
             if(dao::isError()) return print(js::error(dao::getError()));
 
diff --git a/module/execution/model.php b/module/execution/model.php
index 7b40302a85..37e7304e64 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -481,6 +481,8 @@ class executionModel extends model
             ->remove('products, branch, uid, plans, syncStories, contactListMenu, teamMembers')
             ->get();
 
+        if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);
+
         if($this->config->systemMode == 'new' and (empty($execution->project) or $execution->project == $oldExecution->project)) $this->checkBeginAndEndDate($oldExecution->project, $execution->begin, $execution->end);
         if(dao::isError()) return false;
 

From ffa1ec828df11d7ca2987217f043dd6644ababfa Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 12 May 2022 10:38:22 +0800
Subject: [PATCH 08/21] * Code for task#53661.

---
 module/execution/control.php        |  2 +-
 module/execution/model.php          |  5 ++++-
 module/execution/view/burn.html.php | 13 ++++++++++---
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 060128b0f2..44c81b6cd1 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1163,7 +1163,7 @@ class execution extends control
 
         /* Get date list. */
         $executionInfo = $this->execution->getByID($executionID);
-        $deadline      = $execution->status != 'closed' ? helper::today() : substr($execution->closedDate, 0, 10);
+        $deadline      = strpos('closed,suspended', $execution->status) === false ? helper::today() : ($execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate);
         $endDate       = strpos($type, 'withdelay') !== false ? $deadline : $executionInfo->end;
         list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d');
         $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
diff --git a/module/execution/model.php b/module/execution/model.php
index 37e7304e64..25be47604a 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -827,6 +827,7 @@ class executionModel extends model
             ->setDefault('status', 'suspended')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', $now)
+            ->setDefault('suspendedDate', helper::today())
             ->remove('comment')->get();
 
         $this->dao->update(TABLE_EXECUTION)->data($execution)
@@ -3654,7 +3655,9 @@ class executionModel extends model
         $chartData['baseLine'] = $baselineJSON;
 
         $execution = $this->getById($executionID);
-        if(($execution->status != 'closed' and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end))
+        if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
+            or ($execution->status == 'closed'    and substr($execution->closedDate, 0, 10) > $execution->end)
+            or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
         {
             $delaySets = $this->getBurnDataFlot($executionID, $burnBy, true);
             $chartData['delayLine'] = $this->report->createSingleJSON($delaySets, $dateList);
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index 6374ef4835..b1f9af0f86 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -24,10 +24,17 @@
     <?php
     $weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
     $delay   = strpos($type, 'withdelay') !== false ? 'nodelay'     : 'withdelay';
-    common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
-    echo '<div class="space"></div>';
+    if(strpos('closed,suspended', $execution->status) === false)
+    {
+        common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
+        echo '<div class="space"></div>';
+    }
     echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
-    if(($execution->status != 'closed' and helper::today() > $execution->end) or ($execution->status == 'closed' and substr($execution->closedDate, 0, 10) > $execution->end)) echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
+    if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
+        or ($execution->status == 'closed'    and substr($execution->closedDate, 0, 10) > $execution->end)
+        or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
+    echo html::a('#', $lang->execution->$delay, '', "class='btn btn-link' id='delay'");
+
     if(common::canModify('execution', $execution)) common::printLink('execution', 'fixFirst', "execution=$execution->id", $lang->execution->fixFirst, '', "class='btn btn-link iframe' data-width='700'");
     echo $lang->execution->howToUpdateBurn;
     ?>

From dab8c1bb1ea8917ee4164b821bcd5410d092c9d6 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 12 May 2022 10:55:50 +0800
Subject: [PATCH 09/21] * Modify review code.

---
 module/execution/control.php        | 3 ++-
 module/execution/view/burn.html.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 44c81b6cd1..3c03258f1d 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1163,7 +1163,8 @@ class execution extends control
 
         /* Get date list. */
         $executionInfo = $this->execution->getByID($executionID);
-        $deadline      = strpos('closed,suspended', $execution->status) === false ? helper::today() : ($execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate);
+        $deadline      = $execution->status == 'closed' ? substr($execution->closedDate, 0, 10) : $execution->suspendedDate;
+        $deadline      = strpos('closed,suspended', $execution->status) === false ? helper::today() : $deadline;
         $endDate       = strpos($type, 'withdelay') !== false ? $deadline : $executionInfo->end;
         list($dateList, $interval) = $this->execution->getDateList($executionInfo->begin, $endDate, $type, $interval, 'Y-m-d');
         $chartData = $this->execution->buildBurnData($executionID, $dateList, $type, $burnBy);
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index b1f9af0f86..d84e0a834b 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -24,7 +24,7 @@
     <?php
     $weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
     $delay   = strpos($type, 'withdelay') !== false ? 'nodelay'     : 'withdelay';
-    if(strpos('closed,suspended', $execution->status) === false)
+    if(strpos('wait,doing', $execution->status) !== false)
     {
         common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
         echo '<div class="space"></div>';

From 612a2b656efc3486cf5369d24c50b3e2a96475c7 Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 12 May 2022 00:18:05 +0800
Subject: [PATCH 10/21] * Adjust code style.

---
 module/execution/model.php          | 2 +-
 module/execution/view/burn.html.php | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index 25be47604a..e886b3c703 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2790,7 +2790,7 @@ class executionModel extends model
      *
      * @param  int    $executionID
      * @access public
-     * @return void
+     * @return array
      */
     public function computeBurn($executionID = 0)
     {
diff --git a/module/execution/view/burn.html.php b/module/execution/view/burn.html.php
index d84e0a834b..81ea61c552 100644
--- a/module/execution/view/burn.html.php
+++ b/module/execution/view/burn.html.php
@@ -22,13 +22,14 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <?php
-    $weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
-    $delay   = strpos($type, 'withdelay') !== false ? 'nodelay'     : 'withdelay';
     if(strpos('wait,doing', $execution->status) !== false)
     {
         common::printLink('execution', 'computeBurn', 'reload=yes', '<i class="icon icon-refresh"></i> ' . $lang->execution->computeBurn, 'hiddenwin', "title='{$lang->execution->computeBurn}' class='btn btn-primary' id='computeBurn'");
         echo '<div class="space"></div>';
     }
+
+    $weekend = strpos($type, 'noweekend') !== false ? 'withweekend' : 'noweekend';
+    $delay   = strpos($type, 'withdelay') !== false ? 'nodelay'     : 'withdelay';
     echo html::a('#', $lang->execution->$weekend, '', "class='btn btn-link' id='weekend'");
     if((strpos('closed,suspended', $execution->status) === false and helper::today() > $execution->end)
         or ($execution->status == 'closed'    and substr($execution->closedDate, 0, 10) > $execution->end)

From e7d559a90b5cc8a56456770db22ccfa1c405ecad Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 12 May 2022 01:13:42 +0800
Subject: [PATCH 11/21] * Fix bug for task#53666.

---
 module/execution/model.php | 22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/module/execution/model.php b/module/execution/model.php
index e886b3c703..e0de475c9e 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -2948,10 +2948,11 @@ class executionModel extends model
      * @param  int    $executionID
      * @param  string $burnBy
      * @param  bool   $showDelay
+     * @param  array  $dateList
      * @access public
      * @return array
      */
-    public function getBurnDataFlot($executionID = 0, $burnBy = '', $showDelay = false)
+    public function getBurnDataFlot($executionID = 0, $burnBy = '', $showDelay = false, $dateList = array())
     {
         /* Get execution and burn counts. */
         $execution    = $this->getById($executionID);
@@ -2970,6 +2971,23 @@ class executionModel extends model
             $burnData[$date] = $set;
             $count++;
         }
+
+        if($showDelay)
+        {
+            foreach($dateList as $date)
+            {
+                if(!isset($burnData[$date]))
+                {
+                    $set = new stdClass();
+                    $set->name  = $date;
+                    $set->left  = 0;
+                    $set->value = 'null';
+
+                    $burnData[$date] = $set;
+                }
+            }
+        }
+
         $burnData = array_reverse($burnData);
 
         return $burnData;
@@ -3659,7 +3677,7 @@ class executionModel extends model
             or ($execution->status == 'closed'    and substr($execution->closedDate, 0, 10) > $execution->end)
             or ($execution->status == 'suspended' and $execution->suspendedDate > $execution->end))
         {
-            $delaySets = $this->getBurnDataFlot($executionID, $burnBy, true);
+            $delaySets = $this->getBurnDataFlot($executionID, $burnBy, true, $dateList);
             $chartData['delayLine'] = $this->report->createSingleJSON($delaySets, $dateList);
         }
 

From 86344c7a65d6844be319158a8d6300ac7b778310 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 12 May 2022 01:35:53 +0000
Subject: [PATCH 12/21] * Fix bug #22361.

---
 module/product/view/all.html.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/product/view/all.html.php b/module/product/view/all.html.php
index 3350ee0031..7b29353309 100644
--- a/module/product/view/all.html.php
+++ b/module/product/view/all.html.php
@@ -27,6 +27,7 @@
 </div>
 <div id="mainContent" class="main-row fade">
   <?php if(empty($productStructure)):?>
+  <div class="cell<?php if($browseType == 'bySearch') echo ' show';?>" id="queryBox" data-module='product'></div>
   <div class="table-empty-tip">
     <p><span class="text-muted"><?php echo $lang->product->noProduct;?></span></p>
   </div>

From 46c555fb3fc5aa0da32d609c7198bd3e12768b83 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 02:38:33 +0000
Subject: [PATCH 13/21] * Add max code.

---
 config/zentaopms.php                         |  2 +
 module/project/model.php                     | 50 +++++++++++++++++++-
 module/project/view/ajaxgetdropmenu.html.php |  4 +-
 3 files changed, 53 insertions(+), 3 deletions(-)

diff --git a/config/zentaopms.php b/config/zentaopms.php
index dd24aaf97f..86ef7cdbe9 100644
--- a/config/zentaopms.php
+++ b/config/zentaopms.php
@@ -378,3 +378,5 @@ $config->newFeatures = array('introduction', 'tutorial', 'youngBlueTheme', 'visi
 $config->programPriv = new stdclass();
 $config->programPriv->scrum     = array('story', 'projectstory', 'projectrelease', 'project', 'execution', 'build', 'bug', 'testcase', 'testreport', 'doc', 'repo', 'meeting', 'stakeholder', 'testtask');
 $config->programPriv->waterfall = array_merge($config->programPriv->scrum, array('task', 'workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'issue', 'risk', 'opportunity', 'measrecord', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport'));
+
+$config->waterfallModules = array('workestimation', 'durationestimation', 'budget', 'programplan', 'review', 'reviewissue', 'weekly', 'cm', 'milestone', 'design', 'opportunity', 'auditplan', 'trainplan', 'gapanalysis', 'pssp', 'researchplan', 'researchreport');
diff --git a/module/project/model.php b/module/project/model.php
index 3a4b42f608..5e0a1d60c5 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -472,7 +472,7 @@ class projectModel extends model
         $link    = helper::createLink('project', 'index', "projectID=%s");
         $project = $this->getByID($projectID);
 
-        if(strpos(',project,product,projectstory,story,bug,doc,testcase,testtask,testreport,build,projectrelease,stakeholder,', ',' . $module . ',') !== false)
+        if(strpos(',project,product,projectstory,story,bug,doc,testcase,testtask,testreport,build,projectrelease,stakeholder,issue,risk,meeting,report,measrecord', ',' . $module . ',') !== false)
         {
             if($module == 'project' and $method == 'execution')
             {
@@ -641,6 +641,54 @@ class projectModel extends model
                     $link = helper::createLink($module, 'browse', "projectID=%s");
                 }
             }
+            elseif(strpos("issue,risk,meeting,report,measrecord", $module) !== false)
+            {
+                if($method == 'projectsummary')
+                {
+                    $link = helper::createLink($module, $method, "projectID=%s#app=project");
+                }
+                else
+                {
+                    $link = helper::createLink($module, 'browse', "projectID=%s");
+                }
+            }
+        }
+
+        if(in_array($module, $this->config->waterfallModules + array('projectstory'=>'projectstory')))
+        {
+            $link = helper::createLink($module, 'browse', "projectID=%s");
+            if($module == 'projectstory' and $method = 'track')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'reviewissue')
+            {
+                $link = helper::createLink($module, 'issue', "projectID=%s");
+            }
+            elseif($module == 'cm' and $method = 'report')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'weekly' and $method = 'index')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'milestone' and $method = 'index')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'workestimation' and $method = 'index')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'durationestimation' and $method = 'index')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
+            elseif($module == 'budget' and $method = 'summary')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
         }
 
         if($project->model == 'kanban') $link = helper::createLink('project', 'index', "projectID=%s");
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index e1d549a031..e6dba4ce87 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -73,9 +73,9 @@ foreach($projects as $programID => $programProjects)
         $selected    = $project->id == $projectID ? 'selected' : '';
         $icon        = '<i class="icon icon-sprint"></i> ';
 
-        if($project->model == 'waterfall' and $module == 'design')
+        if($project->model != 'waterfall' and (in_array($module, $config->waterfallModules) or $method == 'track'))
         {
-            $link = helper::createLink('design', 'browse', "projectID=%s");
+            $link = helper::createLink('project', 'index', "projectID=%s");
         }
         elseif($project->model == 'kanban')
         {

From d25488046633be9e8a8e979f36eb7bad36ebaf09 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 12 May 2022 10:40:41 +0800
Subject: [PATCH 14/21] * add unit test of sprint 189.

---
 test/class/bug.class.php               | 21 ++++++++++++++
 test/class/kanban.class.php            |  7 +++--
 test/model/bug/getbugquery.php         | 40 ++++++++++++++++++++++++++
 test/model/kanban/getimportedcards.php |  7 ++++-
 4 files changed, 71 insertions(+), 4 deletions(-)
 create mode 100755 test/model/bug/getbugquery.php

diff --git a/test/class/bug.class.php b/test/class/bug.class.php
index c7929bd28d..1a9a726a66 100644
--- a/test/class/bug.class.php
+++ b/test/class/bug.class.php
@@ -2024,4 +2024,25 @@ class bugTest
             return $array;
         }
     }
+
+    /**
+     * Test get bug query.
+     *
+     * @param  string $bugQuery
+     * @access public
+     * @return array
+     */
+    public function getBugQueryTest($bugQuery)
+    {
+        $array = $this->objectModel->getBugQuery($bugQuery);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $array;
+        }
+    }
 }
diff --git a/test/class/kanban.class.php b/test/class/kanban.class.php
index 1a61562ed8..6e6e5adc1c 100644
--- a/test/class/kanban.class.php
+++ b/test/class/kanban.class.php
@@ -518,20 +518,21 @@ class kanbanTest
      *
      * @param  int    $kanbanID
      * @param  string $fromType
+     * @param  int    $archived
      * @access public
      * @return string
      */
-    public function getImportedCardsTest($kanbanID, $fromType)
+    public function getImportedCardsTest($kanbanID, $fromType, $archived = 0)
     {
         global $tester;
         $cards = $tester->dao->select('*')->from(TABLE_KANBANCARD)
             ->where('deleted')->eq(0)
             ->andWhere('kanban')->eq($kanbanID)
-            ->andWhere('archived')->eq(0)
+            ->andWhere('archived')->eq($archived)
             ->andWhere('fromID')->eq(0)
             ->fetchAll('id');
 
-        $objects = $this->objectModel->getImportedCards($kanbanID, $cards, $fromType);
+        $objects = $this->objectModel->getImportedCards($kanbanID, $cards, $fromType, $archived);
 
         if(dao::isError()) return dao::getError();
 
diff --git a/test/model/bug/getbugquery.php b/test/model/bug/getbugquery.php
new file mode 100755
index 0000000000..cd4d92ccc1
--- /dev/null
+++ b/test/model/bug/getbugquery.php
@@ -0,0 +1,40 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/bug.class.php';
+su('admin');
+
+/**
+
+title=bugModel->getBugQuery();
+cid=1
+pid=1
+
+查询 `product` = 'all' 的bugQuery >> 1 AND `product` IN ('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50','51','52','53','54','55','56','57','58','59','60','61','62','63','64','65','66','67','68','69','70','71','72','73','74','75','76','77','78','79','80','81','82','83','84','85','86','87','88','89','90','91','92','93','94','95','96','97','98','99','100','101','102','103','104','105','106','107','108','109','110','111','112','113','114','115','116','117','118','119','120','1','2','3','4','5','6','7','8','9','10','21','22','23','24','25','26','27','28','29','30','41','42','43','44','45','46','47','48','49','50','61','62','63','64','65','66','67','68','69','70','81','82','83','84','85','86','87','88','89','90','101','102','103','104','105','106','107','108','109','110
+查询 `project` = 'all' 的bugQuery >> 1 AND `project` in (11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750)
+查询 `resolvedDate` = '2022-01-01' 的bugQuery >>  `resolvedDate` != '0000-00-00 00:00:00' AND `resolvedDate` > '2022-01-01'
+查询 `closedDate` = '2022-01-01' 的bugQuery >>  `closedDate` != '0000-00-00 00:00:00' AND `closedDate` <= '2022-01-01'
+查询 `story` LIKE '%abc%' 的bugQuery >>  `story`  IN (2,12,20,21,22,23,24,25,26,27,28,29,32,42,52,62,70,71,72,73,74,75,76,77,78,79,82,92,102,112,120,121,122,123,124,125,126,127,128,129,132,142,152,162,172,182,192,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,302,312,320,321,322,323,324,325,326,327,328,329,332,342,352,362,372,382,392,402,412,420,421,422,423,424,425,426,427,428,429,432,442) AND `story` != 0
+查询 `story` NOT LIKE '%abc%' 的bugQuery >>  `story` NOT  IN (2,12,20,21,22,23,24,25,26,27,28,29,32,42,52,62,70,71,72,73,74,75,76,77,78,79,82,92,102,112,120,121,122,123,124,125,126,127,128,129,132,142,152,162,172,182,192,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,302,312,320,321,322,323,324,325,326,327,328,329,332,342,352,362,372,382,392,402,412,420,421,422,423,424,425,426,427,428,429,432,442) AND `story` != 0
+查询 `product` = '1' and `project` = '1' and `story` > 'abc' 的bugQuery >> `product` = '1' and `project` = '1' and `story` > 'abc' AND `story` != 0
+
+*/
+
+$bugQuery = array();
+$bugQuery[] = "`product` = 'all'";
+$bugQuery[] = "`project` = 'all'";
+$bugQuery[] = " `resolvedDate` > '2022-01-01'";
+$bugQuery[] = " `closedDate` <= '2022-01-01'";
+$bugQuery[] = " `story` LIKE '%2%'";
+$bugQuery[] = " `story` NOT LIKE '%2%'";
+$bugQuery[] = " `product` = '1' and `project` = '1' and `story` > 'abc'";
+
+$bug=new bugTest();
+
+r($bug->getBugQueryTest($bugQuery[0])) && p()  && e("1 AND `product` IN ('1','2','3','4','5','6','7','8','9','10','11','12','13','14','15','16','17','18','19','20','21','22','23','24','25','26','27','28','29','30','31','32','33','34','35','36','37','38','39','40','41','42','43','44','45','46','47','48','49','50','51','52','53','54','55','56','57','58','59','60','61','62','63','64','65','66','67','68','69','70','71','72','73','74','75','76','77','78','79','80','81','82','83','84','85','86','87','88','89','90','91','92','93','94','95','96','97','98','99','100','101','102','103','104','105','106','107','108','109','110','111','112','113','114','115','116','117','118','119','120','1','2','3','4','5','6','7','8','9','10','21','22','23','24','25','26','27','28','29','30','41','42','43','44','45','46','47','48','49','50','61','62','63','64','65','66','67','68','69','70','81','82','83','84','85','86','87','88','89','90','101','102','103','104','105','106','107','108','109','110')"); // 查询 `product` = 'all' 的bugQuery
+r($bug->getBugQueryTest($bugQuery[1])) && p()  && e("1 AND `project` in (11,12,13,14,15,16,17,18,19,20,21,22,23,24,25,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40,41,42,43,44,45,46,47,48,49,50,51,52,53,54,55,56,57,58,59,60,61,62,63,64,65,66,67,68,69,70,71,72,73,74,75,76,77,78,79,80,81,82,83,84,85,86,87,88,89,90,91,92,93,94,95,96,97,98,99,100,731,732,733,734,735,736,737,738,739,740,741,742,743,744,745,746,747,748,749,750)"); // 查询 `project` = 'all' 的bugQuery
+r($bug->getBugQueryTest($bugQuery[2])) && p()  && e(" `resolvedDate` != '0000-00-00 00:00:00' AND `resolvedDate` > '2022-01-01'"); // 查询 `resolvedDate` = '2022-01-01' 的bugQuery
+r($bug->getBugQueryTest($bugQuery[3])) && p()  && e(" `closedDate` != '0000-00-00 00:00:00' AND `closedDate` <= '2022-01-01'");    // 查询 `closedDate` = '2022-01-01' 的bugQuery
+r($bug->getBugQueryTest($bugQuery[4])) && p()  && e(" `story`  IN (2,12,20,21,22,23,24,25,26,27,28,29,32,42,52,62,70,71,72,73,74,75,76,77,78,79,82,92,102,112,120,121,122,123,124,125,126,127,128,129,132,142,152,162,172,182,192,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,302,312,320,321,322,323,324,325,326,327,328,329,332,342,352,362,372,382,392,402,412,420,421,422,423,424,425,426,427,428,429,432,442) AND `story` != 0"); // 查询 `story` LIKE '%abc%' 的bugQuery
+r($bug->getBugQueryTest($bugQuery[5])) && p()  && e(" `story` NOT  IN (2,12,20,21,22,23,24,25,26,27,28,29,32,42,52,62,70,71,72,73,74,75,76,77,78,79,82,92,102,112,120,121,122,123,124,125,126,127,128,129,132,142,152,162,172,182,192,200,201,202,203,204,205,206,207,208,209,210,211,212,213,214,215,216,217,218,219,220,221,222,223,224,225,226,227,228,229,230,231,232,233,234,235,236,237,238,239,240,241,242,243,244,245,246,247,248,249,250,251,252,253,254,255,256,257,258,259,260,261,262,263,264,265,266,267,268,269,270,271,272,273,274,275,276,277,278,279,280,281,282,283,284,285,286,287,288,289,290,291,292,293,294,295,296,297,298,299,302,312,320,321,322,323,324,325,326,327,328,329,332,342,352,362,372,382,392,402,412,420,421,422,423,424,425,426,427,428,429,432,442) AND `story` != 0"); // 查询 `story` NOT LIKE '%abc%' 的bugQuery
+r($bug->getBugQueryTest($bugQuery[6])) && p()  && e("`product` = '1' and `project` = '1' and `story` > 'abc' AND `story` != 0");   // 查询 `product` = '1' and `project` = '1' and `story` > 'abc' 的bugQuery
diff --git a/test/model/kanban/getimportedcards.php b/test/model/kanban/getimportedcards.php
index 699429d5ff..2790ae8641 100755
--- a/test/model/kanban/getimportedcards.php
+++ b/test/model/kanban/getimportedcards.php
@@ -31,6 +31,7 @@ pid=1
 
 $kanbanIDList = array('1', '2', '9', '10', '11', '12', '23', '25');
 $fromType     = array('productplan', 'release', 'execution', 'build');
+$archived     = 1;
 
 $kanban = new kanbanTest();
 
@@ -49,4 +50,8 @@ r($kanban->getImportedCardstest($kanbanIDList[5], $fromType[3])) && p() && e(',8
 r($kanban->getImportedCardstest($kanbanIDList[6], $fromType[3])) && p() && e(',177,178,179,180,181,182,183,184,981,982,983,984');                  // 查看看板23的普通卡片和build卡片
 r($kanban->getImportedCardstest($kanbanIDList[6], $fromType[0])) && p() && e(',177,178,179,180,181,182,183,184');                                  // 查看看板23的普通卡片和productplan片
 r($kanban->getImportedCardstest($kanbanIDList[7], $fromType[3])) && p() && e(',193,194,195,196,197,198,199,200,993,994,995,996,997,998,999,1000'); // 查看看板25的普通卡片和build卡片
-r($kanban->getImportedCardstest($kanbanIDList[7], $fromType[0])) && p() && e(',193,194,195,196,197,198,199,200');                                  // 查看看板25的普通卡片和productplan片
\ No newline at end of file
+r($kanban->getImportedCardstest($kanbanIDList[7], $fromType[0])) && p() && e(',193,194,195,196,197,198,199,200');                                  // 查看看板25的普通卡片和productplan片
+global $tester;
+$tester->dao->update(TABLE_KANBANCARD)->set('archived')->eq(1)->where('id')->gt('5')->exec();
+r($kanban->getImportedCardsTest($kanbanIDList[0], $fromType[0], $archived)) && p() && e(',6,7,8,801,802,803,804,805,806,807,808');                 // 查看看板1已归档的普通卡片和productplan卡片
+$tester->dao->update(TABLE_KANBANCARD)->set('archived')->eq(0)->where('id')->gt('5')->exec();

From f3f439cb47d5795a215f04ade474f0c227d1fb10 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 12 May 2022 10:44:16 +0800
Subject: [PATCH 15/21] * Add annotation.

---
 test/model/kanban/getimportedcards.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/model/kanban/getimportedcards.php b/test/model/kanban/getimportedcards.php
index 2790ae8641..800527d2b4 100755
--- a/test/model/kanban/getimportedcards.php
+++ b/test/model/kanban/getimportedcards.php
@@ -26,6 +26,7 @@ pid=1
 查看看板23的普通卡片和productplan片 >> ,177,178,179,180,181,182,183,184
 查看看板25的普通卡片和build卡片 >> ,193,194,195,196,197,198,199,200,993,994,995,996,997,998,999,1000
 查看看板25的普通卡片和productplan片 >> ,193,194,195,196,197,198,199,200
+查看看板1已归档的普通卡片和productplan卡片 >> ,6,7,8,801,802,803,804,805,806,807,808
 
 */
 

From 3e2181dea011f73d6d0cc87499a477f9f5c9ebff Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Thu, 12 May 2022 02:44:37 +0000
Subject: [PATCH 16/21] * Fix bug #22371.

---
 module/product/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/product/control.php b/module/product/control.php
index eea2e15688..5026674f7f 100644
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1197,7 +1197,7 @@ class product extends control
      * @access public
      * @return void
      */
-    public function all($browseType = 'noclosed', $orderBy = 'order_asc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function all($browseType = 'noclosed', $orderBy = 'program_asc', $param = 0, $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
         /* Load module and set session. */
         $this->loadModel('program');

From 4460a50980a3f98e77e710de8d40dcaa5eb8b84d Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 02:50:13 +0000
Subject: [PATCH 17/21] * Optimize code.

---
 module/project/view/ajaxgetdropmenu.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index e6dba4ce87..fc010e15d1 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -90,7 +90,7 @@ foreach($projects as $programID => $programProjects)
         if($project->auth == 'reset')
         {
             $this->loadModel('common')->resetProjectPriv($project->id);
-            $link = helper::createLink('project', 'index', "projectID=%s");
+            if(!common::hasPriv($module, $method)) $link = helper::createLink('project', 'index', "projectID=%s");
         }
 
         if($project->model != 'scrum') $icon = "<i class='icon icon-{$project->model}'></i> ";

From ac6e3ab49145bd87c0daf4db3bd5fca183cd08cb Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 02:58:23 +0000
Subject: [PATCH 18/21] * Optimize code.

---
 module/project/model.php                     | 4 +++-
 module/project/view/ajaxgetdropmenu.html.php | 6 +-----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 5e0a1d60c5..1a18b3dbf1 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -491,7 +491,9 @@ class projectModel extends model
                 $link = helper::createLink($module, $method, "projectID=%s");
             }
             elseif($module == 'project' and $method == 'testreport')
-            { $link = helper::createLink($module, $method, "projectID=%s"); }
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
             elseif($module == 'project' and $method == 'build')
             {
                 $link = helper::createLink($module, $method, "projectID=%s");
diff --git a/module/project/view/ajaxgetdropmenu.html.php b/module/project/view/ajaxgetdropmenu.html.php
index fc010e15d1..c6a2b8e485 100644
--- a/module/project/view/ajaxgetdropmenu.html.php
+++ b/module/project/view/ajaxgetdropmenu.html.php
@@ -87,11 +87,7 @@ foreach($projects as $programID => $programProjects)
         }
 
         /* Set link when project redefines permissions. */
-        if($project->auth == 'reset')
-        {
-            $this->loadModel('common')->resetProjectPriv($project->id);
-            if(!common::hasPriv($module, $method)) $link = helper::createLink('project', 'index', "projectID=%s");
-        }
+        if($project->auth == 'reset') $link = helper::createLink('project', 'index', "projectID=%s");
 
         if($project->model != 'scrum') $icon = "<i class='icon icon-{$project->model}'></i> ";
         $projectName = $icon . $project->name;

From 3a2c85415947c6e428cda434c536bbbf57558717 Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 03:13:39 +0000
Subject: [PATCH 19/21] * Optimize code.

---
 module/project/model.php | 73 ++++++++--------------------------------
 1 file changed, 14 insertions(+), 59 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 1a18b3dbf1..2415489e50 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -478,55 +478,7 @@ class projectModel extends model
             {
                 $link = helper::createLink($module, $method, "status=all&projectID=%s");
             }
-            elseif($module == 'project' and $method == 'bug')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'testcase')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'testtask')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'testreport')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'build')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'dynamic')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'view')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'manageproducts')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'team')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'managemembers')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'whitelist')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'addwhitelist')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'project' and $method == 'group')
+            elseif($module == 'project' and strpos(',bug,testcase,testtask,testreport,build,dynamic,view,manageproducts,team,managemembers,whitelist,addwhitelist,group', $method))
             {
                 $link = helper::createLink($module, $method, "projectID=%s");
             }
@@ -557,17 +509,20 @@ class projectModel extends model
                     $link = helper::createLink('project', 'bug', "projectID=%s");
                 }
             }
-            elseif($module == 'story' and $method == 'create')
+            elseif($module == 'story')
             {
-                $link = helper::createLink($module, $method);
-            }
-            elseif($module == 'story' and $method == 'change')
-            {
-                $link = helper::createLink('projectstory', 'story', "projectID=%s");
-            }
-            elseif($module == 'story' and $method == 'zerocase')
-            {
-                $link = helper::createLink('project', 'testcase', "projectID=%s");
+                if($method == 'create')
+                {
+                    $link = helper::createLink($module, $method);
+                }
+                elseif($method == 'change')
+                {
+                    $link = helper::createLink('projectstory', 'story', "projectID=%s");
+                }
+                elseif($method == 'zerocase')
+                {
+                    $link = helper::createLink('project', 'testcase', "projectID=%s");
+                }
             }
             elseif($module == 'testcase' and $method == 'create')
             {

From 5a2ef22f3b33eccb898e2883652ec5140f5c47ec Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 03:17:00 +0000
Subject: [PATCH 20/21] * Optimize code.

---
 module/project/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 2415489e50..f58413ceee 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -478,7 +478,7 @@ class projectModel extends model
             {
                 $link = helper::createLink($module, $method, "status=all&projectID=%s");
             }
-            elseif($module == 'project' and strpos(',bug,testcase,testtask,testreport,build,dynamic,view,manageproducts,team,managemembers,whitelist,addwhitelist,group', $method))
+            elseif($module == 'project' and strpos(',bug,testcase,testtask,testreport,build,dynamic,view,manageproducts,team,managemembers,whitelist,addwhitelist,group,', ',' . $method . ','))
             {
                 $link = helper::createLink($module, $method, "projectID=%s");
             }

From e65e7568b21abfc3b489cbcae8221cd45549465e Mon Sep 17 00:00:00 2001
From: mayue <mayue@easycorp.ltd>
Date: Thu, 12 May 2022 03:37:22 +0000
Subject: [PATCH 21/21] * Optimize code.

---
 module/project/model.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index f58413ceee..87682c35eb 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -498,6 +498,10 @@ class projectModel extends model
             {
                 $link = helper::createLink($module, $method, "projectID=%s");
             }
+            elseif($module == 'projectstory' and $method = 'track')
+            {
+                $link = helper::createLink($module, $method, "projectID=%s");
+            }
             elseif($module == 'bug')
             {
                 if($method == 'create')
@@ -611,14 +615,10 @@ class projectModel extends model
             }
         }
 
-        if(in_array($module, $this->config->waterfallModules + array('projectstory'=>'projectstory')))
+        if(in_array($module, $this->config->waterfallModules))
         {
             $link = helper::createLink($module, 'browse', "projectID=%s");
-            if($module == 'projectstory' and $method = 'track')
-            {
-                $link = helper::createLink($module, $method, "projectID=%s");
-            }
-            elseif($module == 'reviewissue')
+            if($module == 'reviewissue')
             {
                 $link = helper::createLink($module, 'issue', "projectID=%s");
             }