From fd306d7c78a85c42e159242ffbd7d83c412b61d3 Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 01:00:21 +0000
Subject: [PATCH 01/80] + Add unit test yaml data files for
 todoModel::batchCreate().

---
 .../model/yaml/batchcreate/batchcreate.yaml   | 33 +++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 module/todo/test/model/yaml/batchcreate/batchcreate.yaml

diff --git a/module/todo/test/model/yaml/batchcreate/batchcreate.yaml b/module/todo/test/model/yaml/batchcreate/batchcreate.yaml
new file mode 100644
index 0000000000..8875351c60
--- /dev/null
+++ b/module/todo/test/model/yaml/batchcreate/batchcreate.yaml
@@ -0,0 +1,33 @@
+title: Batch create todos for todoModel::batchCreate UTC.
+desc: Batch create todos for todoModel::batchCreate UTC.
+author: xushenjie
+version: 1.0.0
+
+fields:
+  - field: account
+    range: 'admin'
+  - field: name
+    range: 1-5
+    prefix: '批量待办'
+  - field: date
+    range: 1-9
+    prefix: '2023-04-2'
+  - field: type
+    range: 'custom'
+  - field: begin
+    range: 1000-1100
+  - field: end
+    range: 1200-1300
+  - field: assignedTo
+    range: 'admin'
+  - field: desc
+    range: 1-5
+    prefix: '批量待办描述'
+  - field: status
+    range: 'wait,doing,doing,doing,wait'
+  - field: objectID
+    range: 0
+  - field: assignedBy
+    range: 'admin'
+  - field: pri
+    range: 1-4

From 462d4957bf17c4cef6ace94e9a9b2008cc2f2320 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 09:29:35 +0800
Subject: [PATCH 02/80] * test

---
 module/todo/control.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/module/todo/control.php b/module/todo/control.php
index a5ea4c66ab..acdca87fd5 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -11,7 +11,10 @@ declare(strict_types=1);
  */
 class todo extends control
 {
+    sdasdasdasdasdas
     /**
+     * sadasdasd
+     *
      * Construct function, load model of task, bug, my.
      *
      * @access public

From 50687f1555925af2b3baa08f9206701092c47732 Mon Sep 17 00:00:00 2001
From: chentao <chentao@easycorp.ltd>
Date: Fri, 5 May 2023 10:04:34 +0800
Subject: [PATCH 03/80] * product: fix sonar errors.

---
 module/product/control.php | 6 ++----
 module/product/model.php   | 4 ++--
 module/product/zen.php     | 8 ++++----
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 47da78d20f..c8da60f69e 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -1213,10 +1213,8 @@ class product extends control
         {
             return printf($this->lang->build->noProduct, $this->createLink('execution', 'manageproducts', "executionID=$executionID&from=buildCreate", '', 'true'), 'project');
         }
-        else
-        {
-            return print(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
-        }
+
+        return print(html::select('product', $products, '', "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
     }
 
     /**
diff --git a/module/product/model.php b/module/product/model.php
index 5457ee4085..577443a338 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1315,7 +1315,7 @@ class productModel extends model
         {
             if(in_array($project->model, array('waterfall', 'waterfallplus'))) $hasWaterfall = true;
         }
-        $orderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc';
+        $waterFallOrderBy = $hasWaterfall ? 't2.begin_asc,t2.id_asc' : 't2.begin_desc,t2.id_desc';
 
         $executions = $this->dao->select('t2.id,t2.name,t2.project,t2.grade,t2.path,t2.parent,t2.attribute,t2.multiple,t3.name as projectName')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.project = t2.id')
@@ -1328,7 +1328,7 @@ class productModel extends model
             ->beginIF(strpos($mode, 'noclosed') !== false)->andWhere('t2.status')->ne('closed')->fi()
             ->beginIF(strpos($mode, 'multiple') !== false)->andWhere('t2.multiple')->eq('1')->fi()
             ->andWhere('t2.deleted')->eq('0')
-            ->orderBy($orderBy)
+            ->orderBy($waterFallOrderBy)
             ->fetchAll('id');
 
         /* Only show leaf executions. */
diff --git a/module/product/zen.php b/module/product/zen.php
index aaaf765743..ae51a1f4b4 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -79,9 +79,9 @@ class productZen extends product
     {
         if($this->app->getViewType() == 'mhtml') return $this->product->setMenu();
 
-        if($moduleName == 'qa')        return $this->setShowErrorNoneMenu4QA($activeMenu);
-        if($moduleName == 'project')   return $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
-        if($moduleName == 'execution') return $this->setShowErrorNoneMenu4Execution($activeMenu, $objectID);
+        if($moduleName == 'qa')        $this->setShowErrorNoneMenu4QA($activeMenu);
+        if($moduleName == 'project')   $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
+        if($moduleName == 'execution') $this->setShowErrorNoneMenu4Execution($activeMenu, $objectID);
     }
 
     /**
@@ -401,7 +401,7 @@ class productZen extends product
         $message = $this->executeHooks($productID);
         if($message) $this->lang->saveSuccess = $message;
 
-        return $this->sendCreateLocate($productID, $programID);
+        $this->sendCreateLocate($productID, $programID);
     }
 
     /**

From d0075f617c75da0edd92adedb35d9e3f8d9b8418 Mon Sep 17 00:00:00 2001
From: jukui <jukui@easycorp.ltd>
Date: Fri, 5 May 2023 10:11:20 +0800
Subject: [PATCH 04/80] * Optimized getList function for todo model.

---
 module/todo/model.php | 10 +++-------
 module/todo/tao.php   | 10 +++++-----
 2 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/module/todo/model.php b/module/todo/model.php
index 7c9727be6a..ab286b09bc 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -249,30 +249,26 @@ class todoModel extends model
      */
     public function getList(string $type = 'today', string $account = '', string|array $status = 'all', int $limit = 0, object $pager = null, string $orderBy="date, status, begin"): array
     {
-        $todos = array();
         $type  = strtolower($type);
 
         $dateRange = $this->dateRange($type);
 
         if(empty($account)) $account = $this->app->user->account;
 
-        $stmt = $this->todoTao->getListQuery($type, $account, $status, (string)$dateRange['begin'], (string)$dateRange['end'], $limit, $orderBy, $pager);
+        $todos = $this->todoTao->getListBy($type, $account, $status, (string)$dateRange['begin'], (string)$dateRange['end'], $limit, $orderBy, $pager);
 
         /* Set session. */
         $sql = explode('WHERE', $this->dao->get());
         $sql = explode('ORDER', $sql[1]);
         $this->session->set('todoReportCondition', $sql[0]);
 
-        while($todo = $stmt->fetch())
+        foreach($todos as $todo)
         {
             $todo = $this->todoTao->setTodoNameByType($todo);
             $todo->begin = date::formatTime($todo->begin);
             $todo->end   = date::formatTime($todo->end);
 
-            /* If is private, change the title to private. */
             if($todo->private and $this->app->user->account != $todo->account) $todo->name = $this->lang->todo->thisIsPrivate;
-
-            $todos[] = $todo;
         }
 
         return $todos;
@@ -303,7 +299,7 @@ class todoModel extends model
         $dateRange['thisseason']      = array('begin' => date::getThisSeason()['begin'], 'end' => date::getThisSeason()['end']);
         $dateRange['thisyear']        = array('begin' => date::getThisYear()['begin'],   'end' => date::getThisYear()['end']);
 
-        return isset($dateRange[$type]) ? $dateRange[$type] : array('begin' => $type, 'end' => $type);;
+        return isset($dateRange[$type]) ? $dateRange[$type] : array('begin' => $type, 'end' => $type);
     }
 
     /**
diff --git a/module/todo/tao.php b/module/todo/tao.php
index a341af9768..00413df041 100644
--- a/module/todo/tao.php
+++ b/module/todo/tao.php
@@ -478,8 +478,8 @@ class todoTao extends todoModel
     }
 
     /**
-     * 构造待办列表查询语句。
-     * Build query for todo list.
+     * 获取待办列表数据。
+     * Get the todo list data.
      *
      * @param string       $type
      * @param string       $account
@@ -490,9 +490,9 @@ class todoTao extends todoModel
      * @param string       $orderBy
      * @param object       $pager
      * @access protected
-     * @return object
+     * @return array
      */
-    protected function getListQuery(string $type, string $account, array|string $status, string $begin, string $end, int $limit, string $orderBy, object $pager = null): object
+    protected function getListBy(string $type, string $account, array|string $status, string $begin, string $end, int $limit, string $orderBy, object $pager = null): array
     {
         return $this->dao->select('*')->from(TABLE_TODO)
             ->where('deleted')->eq('0')
@@ -512,6 +512,6 @@ class todoTao extends todoModel
             ->orderBy($orderBy)
             ->beginIF($limit > 0)->limit($limit)->fi()
             ->page($pager)
-            ->query();
+            ->fetchAll();
     }
 }

From 6d6c61ec071055eba4d36f7f6cf6723282115fe1 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Fri, 5 May 2023 10:00:56 +0800
Subject: [PATCH 05/80]  * Code review.

---
 .scannerwork/.sonar_lock           |  0
 .scannerwork/class-mapping.csv     |  0
 .scannerwork/report-task.txt       |  6 +++++
 module/block/control.php           |  6 +++--
 module/block/js/create.ui.js       | 38 ++++++++++++++++++------------
 module/block/test/model/create.php | 24 +++++++++----------
 module/block/ui/create.html.php    | 12 +++++++++-
 module/block/zen.php               |  2 +-
 8 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 .scannerwork/.sonar_lock
 create mode 100644 .scannerwork/class-mapping.csv
 create mode 100644 .scannerwork/report-task.txt

diff --git a/.scannerwork/.sonar_lock b/.scannerwork/.sonar_lock
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.scannerwork/class-mapping.csv b/.scannerwork/class-mapping.csv
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt
new file mode 100644
index 0000000000..60c38be90c
--- /dev/null
+++ b/.scannerwork/report-task.txt
@@ -0,0 +1,6 @@
+projectKey=zentaopms
+serverUrl=http://10.0.1.249:6230
+serverVersion=9.9.0.65466
+dashboardUrl=http://10.0.1.249:6230/dashboard?id=zentaopms
+ceTaskId=AYfmgmd5aBmpAvupYydG
+ceTaskUrl=http://10.0.1.249:6230/api/ce/task?id=AYfmgmd5aBmpAvupYydG
diff --git a/module/block/control.php b/module/block/control.php
index 1c975d73cc..ba96ea0975 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -26,6 +26,7 @@ class block extends control
     }
 
     /**
+     * 创建区块
      * Create a block under a dashboard.
      *
      * @param  string $dashboard
@@ -43,7 +44,7 @@ class block extends control
             $formData->account   = $this->app->user->account;
             $formData->vision    = $this->config->vision;
             $formData->order     = $this->block->getMaxOrderByDashboard($dashboard) + 1;
-            $formData->params    = helper::jsonEncode($formData->params);
+            $formData->params    = json_encode($formData->params);
 
             $this->block->create($formData);
             if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -55,12 +56,13 @@ class block extends control
         $this->view->module    = $module;
         $this->view->code      = $code;
         $this->view->modules   = $this->blockZen->getAvailableModules($dashboard);
-        $this->view->codes     = $this->blockZen->getAvailableBlocks($dashboard, $module);
+        $this->view->codes     = $this->blockZen->getAvailableCodes($dashboard, $module);
         $this->view->params    = $this->blockZen->getAvailableParams($dashboard, $module, $code);
         $this->display();
     }
 
     /**
+     * 编辑区块
      * Update a block.
      *
      * @param  string $dashboard
diff --git a/module/block/js/create.ui.js b/module/block/js/create.ui.js
index 30424ed14d..9a2e34f9e4 100644
--- a/module/block/js/create.ui.js
+++ b/module/block/js/create.ui.js
@@ -3,32 +3,40 @@ function getForm(event)
     const field  = $(event.target).attr('id');
     const module = $('#module').val();
     const code   = field == 'module' ? '' : $('#code').val();
-    const url    = $.createLink('block', 'create', 'dashboard='+ dashboard +'&module=' + module + '&code=' + (code ? code : ''));
+    const url    = $.createLink('block', 'create', 'dashboard=' + dashboard + '&module=' + module + '&code=' + (code ? code : ''));
     loadPage(url, '#codesRow, #paramsRow');
 }
 
-function onParamsTypeChange(event)
+/**
+ * Get block title.
+ *
+ * @return void
+ */
+function onParamsTypeChange()
 {
     const lang  = config.clientLang;
-    const $code = document.querySelector('#code');
+    const $code = $('#code')[0];
 
+    /* 在项目仪表盘创建的待测版本区块时，直接取类型名称为该区块的标题。*/
+    /* When creating a test version block in the project dashboard, directly take the name of the block of type.*/
     if($('#module').val() == 'scrumtest' && $('#paramstype').val() != 'all')
     {
         $('#title').val($code.options[$code.selectedIndex].text);
+        return;
+    }
+
+    const $paramstype = $('#paramstype')[0];
+    let blockTitle = '';
+
+    /* Chinese attributives come first, while other language items have attributives placed after. */
+    if(lang.indexOf('zh') >= 0)
+    {
+        blockTitle = $paramstype.options[$paramstype.selectedIndex].text + of + $code.options[$code.selectedIndex].text;
     }
     else
     {
-        const $paramstype = document.querySelector('#paramstype');
-
-        if(lang.indexOf('zh') >= 0)
-        {
-            const blockTitle  = $paramstype.options[$paramstype.selectedIndex].text + of + $code.options[$code.selectedIndex].text;
-        }
-        else
-        {
-            const blockTitle  = $code.options[$code.selectedIndex].text + of + $paramstype.options[$paramstype.selectedIndex].text;
-        }
-
-        $('#title').val(blockTitle);
+        blockTitle = $code.options[$code.selectedIndex].text + of + $paramstype.options[$paramstype.selectedIndex].text;
     }
+
+    $('#title').val(blockTitle);
 }
diff --git a/module/block/test/model/create.php b/module/block/test/model/create.php
index 9b2c4928bd..9fbb185e38 100755
--- a/module/block/test/model/create.php
+++ b/module/block/test/model/create.php
@@ -27,7 +27,7 @@ cid=39
 - 执行block模块的getByID方法，参数是$newBlockID
  - 属性account @admin
  - 属性vision @rnd
- - 属性module @my
+ - 属性dashboard @my
  - 属性title @区块123
  - 属性source @my
  - 属性block @bug
@@ -45,21 +45,21 @@ $tester->loadModel('block');
 initData();
 
 $block = new stdclass();
-$block->account = 'admin';
-$block->vision  = 'rnd';
-$block->module  = 'my';
-$block->title   = '区块123';
-$block->order   = '5';
+$block->account   = 'admin';
+$block->vision    = 'rnd';
+$block->dashboard = 'my';
+$block->title     = '区块123';
+$block->order     = '5';
 
 $accoutTooLangBlock = new stdclass();
-$accoutTooLangBlock->account = 'adminadminadminadminadminadminadminadmin1';
-$accoutTooLangBlock->vision  = 'rnd';
-$accoutTooLangBlock->module  = 'my';
-$accoutTooLangBlock->title   = 'long account';
-$accoutTooLangBlock->order   = '5';
+$accoutTooLangBlock->account   = 'adminadminadminadminadminadminadminadmin1';
+$accoutTooLangBlock->vision    = 'rnd';
+$accoutTooLangBlock->dashboard = 'my';
+$accoutTooLangBlock->title     = 'long account';
+$accoutTooLangBlock->order     = '5';
 
 $blockTest = new blockTest();
 $newBlockID = $blockTest->createTest($block);
 
-r($tester->block->getByID($newBlockID)) && p('account,vision,module,title,order') && e('admin,rnd,my,区块123,5'); // 测试获取正常的block的内容
+r($tester->block->getByID($newBlockID)) && p('account,vision,dashboard,title,order') && e('admin,rnd,my,区块123,5'); // 测试获取正常的block的内容
 r($blockTest->createTest($accoutTooLangBlock)) && p('account:0') && e('『所属用户』长度应当不超过『30』，且大于『0』。'); // 测试account 字段字符超出长度
diff --git a/module/block/ui/create.html.php b/module/block/ui/create.html.php
index 5f0836a951..44d94ed86a 100644
--- a/module/block/ui/create.html.php
+++ b/module/block/ui/create.html.php
@@ -19,6 +19,16 @@ $paramsRows  = array();
 $showModules = ($dashboard == 'my' and $modules);
 $showCodes   = (($showModules and $module and $codes) or $dashboard != 'my');
 
+if($module == 'scrumtest' && $code != 'all')
+{
+    $blockTitle = zget($codes, $code);
+}
+else
+{
+    $typeOptions = isset($params['type']['options']) ? $params['type']['options'] : array();
+    $blockTitle  = (count($typeOptions) ? $typeOptions[array_keys($typeOptions)[0]] . $lang->block->of : '') . zget($codes, $code);
+}
+
 foreach($params as $key => $row)
 {
     $paramsRows[] = formGroup
@@ -79,7 +89,7 @@ form
             (
                 set::label($lang->block->name),
                 set::name('title'),
-                set::value(zget($codes, $code)),
+                set::value($blockTitle),
                 set::class('form-row'),
                 set::control('input')  
             ),
diff --git a/module/block/zen.php b/module/block/zen.php
index 9e506df62b..77987914d2 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -59,7 +59,7 @@ class blockZen extends block
      * @access protected
      * @return string[]|true
      */
-    protected function getAvailableBlocks($dashboard, $module): array|bool
+    protected function getAvailableCodes($dashboard, $module): array|bool
     {
         if(!$this->selfCall)
         {

From 38f7254d6711a9234fecbb2c2597b0130b28f3f3 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Fri, 5 May 2023 10:19:39 +0800
Subject: [PATCH 06/80]  * Code review.

---
 .scannerwork/report-task.txt    | 4 ++--
 module/block/ui/create.html.php | 8 ++++----
 module/block/zen.php            | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt
index 60c38be90c..63ca473f46 100644
--- a/.scannerwork/report-task.txt
+++ b/.scannerwork/report-task.txt
@@ -2,5 +2,5 @@ projectKey=zentaopms
 serverUrl=http://10.0.1.249:6230
 serverVersion=9.9.0.65466
 dashboardUrl=http://10.0.1.249:6230/dashboard?id=zentaopms
-ceTaskId=AYfmgmd5aBmpAvupYydG
-ceTaskUrl=http://10.0.1.249:6230/api/ce/task?id=AYfmgmd5aBmpAvupYydG
+ceTaskId=AYfppPP3aBmpAvupYyeE
+ceTaskUrl=http://10.0.1.249:6230/api/ce/task?id=AYfppPP3aBmpAvupYyeE
diff --git a/module/block/ui/create.html.php b/module/block/ui/create.html.php
index 44d94ed86a..afdbc6863d 100644
--- a/module/block/ui/create.html.php
+++ b/module/block/ui/create.html.php
@@ -42,7 +42,7 @@ foreach($params as $key => $row)
             'id'    => "params$key",
             'type'  => $row['control'],
             'items' => isset($row['options']) ? $row['options'] : null
-        ))  
+        ))
     );
 }
 
@@ -61,7 +61,7 @@ form
         (
             'type'  => 'select',
             'items' => $modules
-        ) : 'input')  
+        ) : 'input')
     ),
     div
     (
@@ -91,7 +91,7 @@ form
                 set::name('title'),
                 set::value($blockTitle),
                 set::class('form-row'),
-                set::control('input')  
+                set::control('input')
             ),
             $paramsRows,
             formGroup
@@ -103,7 +103,7 @@ form
                 (
                     'type'  => 'select',
                     'items' => $lang->block->gridOptions
-                ))  
+                ))
             )
         )
     )
diff --git a/module/block/zen.php b/module/block/zen.php
index 77987914d2..2180e4476c 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -4,14 +4,14 @@ class blockZen extends block
     /**
      * 添加或编辑区块时获取可使用的模块选项
      * Get module options when adding or editing blocks.
-     * 
+     *
      * @param  string $dashboard
      * @access protected
      * @return string[]
      */
     protected function getAvailableModules(string $dashboard): array
     {
-        if($dashboard != 'my') return array();        
+        if($dashboard != 'my') return array();
 
         $modules = $this->lang->block->moduleList;
         unset($modules['doc']);

From f76e521eca7e789f3cf35952efdefd2bdfb6da28 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Fri, 5 May 2023 10:33:41 +0800
Subject: [PATCH 07/80]  * Code review.

---
 .scannerwork/.sonar_lock       | 0
 .scannerwork/class-mapping.csv | 0
 .scannerwork/report-task.txt   | 6 ------
 3 files changed, 6 deletions(-)
 delete mode 100644 .scannerwork/.sonar_lock
 delete mode 100644 .scannerwork/class-mapping.csv
 delete mode 100644 .scannerwork/report-task.txt

diff --git a/.scannerwork/.sonar_lock b/.scannerwork/.sonar_lock
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/.scannerwork/class-mapping.csv b/.scannerwork/class-mapping.csv
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/.scannerwork/report-task.txt b/.scannerwork/report-task.txt
deleted file mode 100644
index 63ca473f46..0000000000
--- a/.scannerwork/report-task.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-projectKey=zentaopms
-serverUrl=http://10.0.1.249:6230
-serverVersion=9.9.0.65466
-dashboardUrl=http://10.0.1.249:6230/dashboard?id=zentaopms
-ceTaskId=AYfppPP3aBmpAvupYyeE
-ceTaskUrl=http://10.0.1.249:6230/api/ce/task?id=AYfppPP3aBmpAvupYyeE

From e7a1048ab0e505a171a3c77638e472f71e73f102 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Fri, 5 May 2023 10:39:57 +0800
Subject: [PATCH 08/80] * Fix undefined variable.

---
 lib/form/form.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/form/form.class.php b/lib/form/form.class.php
index b1c8f96ee3..94e871c3ef 100644
--- a/lib/form/form.class.php
+++ b/lib/form/form.class.php
@@ -114,7 +114,7 @@ class form extends baseFixer
             {
                 if(!isset($this->errors[$field])) $this->errors[$field] = array();
                 $fieldName = isset($app->lang->{$app->rawModule}->$field) ? $app->lang->{$app->rawModule}->$field : $field;
-                $this->errors[$field][] = sprintf($lang->error->notempty, $fieldName);
+                $this->errors[$field][] = sprintf($app->lang->error->notempty, $fieldName);
             }
         }
 

From 564aa477643a97f8c7b49719cbac7e8ffb35321c Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 10:45:43 +0800
Subject: [PATCH 09/80] * Modify unit test position.

---
 .../test/model/gettotalbugbyproject.php       | 24 --------
 .../test/model/gettotalstoriesbyproject.php   | 24 --------
 .../test/model/gettotaltaskbyproject.php      | 26 ---------
 .../project/test/tao/gettotalbugbyproject.php | 49 +++++++++++++++++
 .../test/tao/gettotalstoriesbyproject.php     | 49 +++++++++++++++++
 .../test/tao/gettotaltaskbyproject.php        | 55 +++++++++++++++++++
 test/data/story.yaml                          |  8 +--
 7 files changed, 156 insertions(+), 79 deletions(-)
 delete mode 100755 module/project/test/model/gettotalbugbyproject.php
 delete mode 100755 module/project/test/model/gettotalstoriesbyproject.php
 delete mode 100755 module/project/test/model/gettotaltaskbyproject.php
 create mode 100755 module/project/test/tao/gettotalbugbyproject.php
 create mode 100755 module/project/test/tao/gettotalstoriesbyproject.php
 create mode 100755 module/project/test/tao/gettotaltaskbyproject.php

diff --git a/module/project/test/model/gettotalbugbyproject.php b/module/project/test/model/gettotalbugbyproject.php
deleted file mode 100755
index afa2ad47f2..0000000000
--- a/module/project/test/model/gettotalbugbyproject.php
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
-su('admin');
-
-/**
-
-title=测试 projectModel->getTotalBugByProject();
-cid=1
-pid=1
-
-获取id为11的项目下激活的bug数量 >> 4
-获取id为27的项目下激活的bug数量 >> 1
-
-*/
-
-global $tester;
-$tester->loadModel('project');
-
-$projectIdList = array(11, 12, 13, 14, 15, 16, 27);
-$result = $tester->project->getTotalBugByProject($projectIdList, 'active');
-
-r($result[11]) && p('allBugs') && e('4');  //获取id为11的项目下激活的bug数量
-r($result[27]) && p('allBugs') && e('1');  //获取id为27的项目下激活的bug数量
diff --git a/module/project/test/model/gettotalstoriesbyproject.php b/module/project/test/model/gettotalstoriesbyproject.php
deleted file mode 100755
index ab928b35dc..0000000000
--- a/module/project/test/model/gettotalstoriesbyproject.php
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
-su('admin');
-
-/**
-
-title=测试 projectModel::getTotalStoriesByProject;
-cid=1
-pid=1
-
-不传入产品ID列表，获取项目11下的所有需求数量 >> 4
-传入产品ID列表，获取项目11下的所有需求数量 >> 4;4
-*/
-
-global $tester;
-$tester->loadModel('project');
-
-$projectIdList = array(12,13);
-$stories1 = $tester->project->getTotalStoriesByProject(11);
-$stories2 = $tester->project->getTotalStoriesByProject($projectIdList);
-
-r($stories1[11]) && p('allStories') && e('4');                    // 不传入产品ID列表，获取项目11下的所有需求数量
-r($stories2)     && p('12:allStories;13:allStories') && e('4;4'); // 传入产品ID列表，获取项目11下的所有需求数量
diff --git a/module/project/test/model/gettotaltaskbyproject.php b/module/project/test/model/gettotaltaskbyproject.php
deleted file mode 100755
index e7dd6cb4c9..0000000000
--- a/module/project/test/model/gettotaltaskbyproject.php
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
-su('admin');
-
-/**
-
-title=测试 projectModel->getTotalTaskByProject();
-cid=1
-pid=1
-
-获取id为11的项目下进行中的task数量 >> 4
-获取id为15的项目下完成的task数量   >> 2
-获取id为27的项目下激活的task数量   >> 8
-
-*/
-
-global $tester;
-$tester->loadModel('project');
-
-$projectIdList = array(11, 12, 13, 14, 15, 16, 27);
-$result = $tester->project->getTotalTaskByProject($projectIdList);
-
-r($result[11]) && p('doingTasks') && e('4');  // 获取id为11的项目下进行中的task数量
-r($result[15]) && p('doneTasks')  && e('2');  // 获取id为15的项目下完成的task数量
-r($result[27]) && p('leftTasks')  && e('8');  // 获取id为27的项目下激活的task数量
diff --git a/module/project/test/tao/gettotalbugbyproject.php b/module/project/test/tao/gettotalbugbyproject.php
new file mode 100755
index 0000000000..30fa1d3045
--- /dev/null
+++ b/module/project/test/tao/gettotalbugbyproject.php
@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('11-19');
+    $project->project->range('11-19');
+    $project->name->prefix("项目")->range('11-19');
+    $project->code->prefix("project")->range('11-19');
+    $project->model->range("scrum");
+    $project->auth->range("[]");
+    $project->path->range("[]");
+    $project->type->range("project");
+    $project->grade->range("1");
+    $project->days->range("1");
+    $project->status->range("wait,doing,suspended,closed");
+    $project->desc->range("[]");
+    $project->budget->range("100000,200000");
+    $project->budgetUnit->range("CNY");
+    $project->percent->range("0-0");
+    $project->openedDate->range("`2023-05-01 10:00:10`");
+    $project->gen(9);
+
+    zdTable('bug')->gen(50);
+}
+
+initData();
+
+/**
+
+title=测试 projectModel->getTotalBugByProject();
+cid=1
+
+*/
+
+global $tester;
+$tester->loadModel('project');
+
+
+$projectIdList = array(11, 12, 13, 14, 15, 16, 27);
+$result  = $tester->project->getTotalBugByProject($projectIdList);
+$result2 = $tester->project->getTotalBugByProject(array());
+
+r($result)  && p('11:allBugs') && e('3');                            //获取id为11的项目下bug数量
+r($result)  && p('27:allBugs') && e('Error: Cannot get index 27.');  //获取id为27的项目下bug数量
+r($result2) && p()             && e('0');                            //获取项目为空时的bug数量
diff --git a/module/project/test/tao/gettotalstoriesbyproject.php b/module/project/test/tao/gettotalstoriesbyproject.php
new file mode 100755
index 0000000000..6e822cb4c1
--- /dev/null
+++ b/module/project/test/tao/gettotalstoriesbyproject.php
@@ -0,0 +1,49 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('11-19');
+    $project->project->range('11-19');
+    $project->name->prefix("项目")->range('11-19');
+    $project->code->prefix("project")->range('11-19');
+    $project->model->range("scrum");
+    $project->auth->range("[]");
+    $project->path->range("[]");
+    $project->type->range("project");
+    $project->grade->range("1");
+    $project->days->range("1");
+    $project->status->range("wait,doing,suspended,closed");
+    $project->desc->range("[]");
+    $project->budget->range("100000,200000");
+    $project->budgetUnit->range("CNY");
+    $project->percent->range("0-0");
+    $project->openedDate->range("`2023-05-01 10:00:10`");
+    $project->gen(9);
+
+    zdTable('story')->gen(50);
+    zdTable('projectstory')->gen(10);
+}
+
+initData();
+
+/**
+
+title=测试 projectModel::getTotalStoriesByProject;
+cid=1
+
+*/
+
+global $tester;
+$projectTester = $tester->loadModel('project');
+
+$noneIdList      = array();
+$notExistsIdList = array(1);
+$realIdList      = array(12, 13);
+
+r($projectTester->getTotalStoriesByProject($noneIdList))      && p()                              && e('0');   // 不传入项目ID列表，获取需求数量
+r($projectTester->getTotalStoriesByProject($notExistsIdList)) && p()                              && e('0');   // 传入错误的ID列表，获取需求数量
+r($projectTester->getTotalStoriesByProject($realIdList))      && p('12:allStories;13:allStories') && e('2,2'); // 传入正确的ID列表，获取需求数量
diff --git a/module/project/test/tao/gettotaltaskbyproject.php b/module/project/test/tao/gettotaltaskbyproject.php
new file mode 100755
index 0000000000..67040f98e7
--- /dev/null
+++ b/module/project/test/tao/gettotaltaskbyproject.php
@@ -0,0 +1,55 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('11-19,101-109');
+    $project->project->range('11-19');
+    $project->name->setFields(array(
+        array('field' => 'name1', 'range' => '项目{9},迭代{9}'),
+        array('field' => 'name2', 'range' => '11-19,101-109')
+    ));
+    $project->code->setFields(array(
+        array('field' => 'name1', 'range' => 'project{9},execution{9}'),
+        array('field' => 'name2', 'range' => '11-19,101-109')
+    ));
+    $project->model->range("scrum{9},[]{9}");
+    $project->auth->range("[]");
+    $project->path->range("[]");
+    $project->type->range("project{9},sprint{9}");
+    $project->grade->range("1");
+    $project->days->range("1");
+    $project->status->range("wait,doing,suspended,closed");
+    $project->desc->range("[]");
+    $project->budget->range("100000,200000");
+    $project->budgetUnit->range("CNY");
+    $project->percent->range("0-0");
+    $project->openedDate->range("`2023-05-01 10:00:10`");
+    $project->gen(18);
+
+    zdTable('task')->gen(10);
+}
+
+initData();
+
+/**
+
+title=测试 projectModel->getTotalTaskByProject();
+cid=1
+
+*/
+
+global $tester;
+$tester->loadModel('project');
+
+$projectIdList = array(11, 12, 13, 14, 15, 16, 27);
+$result1 = $tester->project->getTotalTaskByProject($projectIdList);
+$result2 = $tester->project->getTotalTaskByProject(array());
+
+r($result1) && p('11:waitTasks') && e('1');                           // 获取id为11的项目下未开始的task数量
+r($result1) && p('15:allTasks')  && e('1');                           // 获取id为15的项目下所有的task数量
+r($result1) && p('27:waitTasks') && e('Error: Cannot get index 27.'); // 获取id为27的项目下未开始的task数量
+r($result2) && p()               && e('0');                           // 获取项目为空的task数量
diff --git a/test/data/story.yaml b/test/data/story.yaml
index 5bad0a6f55..d0d5bb9e06 100644
--- a/test/data/story.yaml
+++ b/test/data/story.yaml
@@ -63,7 +63,7 @@ fields:
     note: "需求名称"
     fields:
       - field: field1
-        range: [用户需求,软件需求]
+        range: "[用户需求,软件需求]"
       - field: field2
         range: 1-10000
     prefix: ""
@@ -146,7 +146,7 @@ fields:
       - field: openedBy1
         range: admin,user,test,dev
       - field: openedBy2
-        range: [],2-4
+        range: "[],2-4"
     prefix: ""
     postfix: ""
     loop: 0
@@ -155,7 +155,6 @@ fields:
     note: "创建日期"
     range: "(M)-(w)"
     type: timestamp
-    prefix: "DateTime"
     postfix: ""
     format: "YY/MM/DD"
   - field: assignedTo
@@ -164,7 +163,7 @@ fields:
       - field: openedBy1
         range: admin,user,test,dev
       - field: openedBy2
-        range: [],2-4
+        range: "[],2-4"
     prefix: ""
     postfix: ""
     loop: 0
@@ -173,7 +172,6 @@ fields:
     note: "指派日期"
     range: "(M)-(w)"
     type: timestamp
-    prefix: "DateTime"
     postfix: ""
     format: "YY/MM/DD"
   - field: lastEditedBy

From e09c830411ad2c371f2c5456b68b463379433c36 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 10:46:10 +0800
Subject: [PATCH 10/80] * Split getOverviewList function.

---
 module/project/model.php | 87 +++++-----------------------------------
 module/project/tao.php   | 64 +++++++++++++++++++++++++++--
 2 files changed, 71 insertions(+), 80 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 0b6505660e..7773addd72 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -259,7 +259,7 @@ class projectModel extends model
             $orderBy = $project->model == 'waterfall' ? 'id_asc' : 'id_desc';
             $pager   = $project->model == 'waterfall' ? null : new pager(0, 1, 1);
             $project->executions = $this->loadModel('execution')->getStatData($projectID, 'undone', 0, 0, false, '', $orderBy, $pager);
-            $project->teamCount  = isset($teams[$projectID]) ? $teams[$projectID]->count : 0;
+            $project->teamCount  = isset($teams[$projectID]) ? $teams[$projectID] : 0;
             $project->estimate   = isset($estimates[$projectID]) ? round($estimates[$projectID]->estimate, 2) : 0;
             $project->parentName = $project->parent ? $this->projectTao->getParentProgram($project->parent, $project->path, $project->grade) : '';
         }
@@ -279,6 +279,7 @@ class projectModel extends model
      */
     public function getOverviewList($queryType = 'byStatus', $param = 'all', $orderBy = 'id_desc', $limit = 15, $excludedModel = '')
     {
+        /*  */
         $queryType = strtolower($queryType);
         $projects = $this->dao->select('*')->from(TABLE_PROJECT)
             ->where('type')->eq('project')
@@ -294,32 +295,21 @@ class projectModel extends model
             ->fetchAll('id');
 
         if(empty($projects)) return array();
+
         $projectIdList = array_keys($projects);
+        $teams         = $this->projectTao->fetchMemberCountByIdList($projectIdList);
 
-        $teams = $this->dao->select('t1.root, count(t1.id) as teams')->from(TABLE_TEAM)->alias('t1')
-            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
-            ->where('t1.root')->in($projectIdList)
-            ->andWhere('t1.type')->eq('project')
-            ->andWhere('t2.deleted')->eq(0)
-            ->groupBy('root')->fetchPairs();
+        $fields = 't2.project, ROUND(SUM(t1.consumed), 1) AS consumed, ROUND(SUM(t1.estimate), 1) AS estimate';
+        $hours  = $this->projectTao->fetchTaskEstimateByIdList($projectIdList, $fields);
 
-        $hours = $this->dao->select('t2.project, ROUND(SUM(t1.consumed), 1) AS consumed, ROUND(SUM(t1.estimate), 1) AS estimate')->from(TABLE_TASK)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id')
-            ->where('t2.project')->in($projectIdList)
-            ->andWhere('t2.deleted')->eq(0)
-            ->andWhere('t1.deleted')->eq(0)
-            ->andWhere('t1.parent')->lt(1)
-            ->groupBy('t2.project')
-            ->fetchAll('project');
-
-        $storySummary = $this->getTotalStoriesByProject($projectIdList);
-        $taskSummary  = $this->getTotalTaskByProject($projectIdList);
-        $bugSummary   = $this->getTotalBugByProject($projectIdList);
+        $storySummary = $this->projectTao->getTotalStoriesByProject($projectIdList);
+        $taskSummary  = $this->projectTao->getTotalTaskByProject($projectIdList);
+        $bugSummary   = $this->projectTao->getTotalBugByProject($projectIdList);
 
         foreach($projects as $projectID => $project)
         {
-            $project->consumed      = isset($hours[$projectID]) ? (float)$hours[$projectID]->consumed : 0;
-            $project->estimate      = isset($hours[$projectID]) ? (float)$hours[$projectID]->estimate : 0;
+            $project->consumed      = isset($hours[$projectID]) ? round((float)$hours[$projectID]->consumed, 1) : 0;
+            $project->estimate      = isset($hours[$projectID]) ? round((float)$hours[$projectID]->estimate, 1) : 0;
             $project->teamCount     = isset($teams[$projectID]) ? $teams[$projectID] : 0;
             $project->leftBugs      = isset($bugSummary[$projectID])   ? $bugSummary[$projectID]->leftBugs : 0;
             $project->allBugs       = isset($bugSummary[$projectID])   ? $bugSummary[$projectID]->allBugs : 0;
@@ -333,66 +323,11 @@ class projectModel extends model
             $project->doingTasks    = isset($taskSummary[$projectID])  ? $taskSummary[$projectID]->doingTasks : 0;
             $project->rndDoneTasks  = isset($taskSummary[$projectID])  ? $taskSummary[$projectID]->doneTasks : 0;
             $project->liteDoneTasks = isset($taskSummary[$projectID])  ? $taskSummary[$projectID]->litedoneTasks : 0;
-
-            if(is_float($project->consumed)) $project->consumed = round($project->consumed, 1);
-            if(is_float($project->estimate)) $project->estimate = round($project->estimate, 1);
         }
 
         return $projects;
     }
 
-    /**
-     * Get the number of stories associated with the project.
-     *
-     * @param  array   $projectIdList
-     * @access public
-     * @return int
-     */
-    public function getTotalStoriesByProject($projectIdList = 0)
-    {
-        return $this->dao->select("t1.project, count(t2.id) as allStories, count(if(t2.status = 'active' or t2.status = 'changing', 1, null)) as leftStories, count(if(t2.status = 'closed' and t2.closedReason = 'done', 1, null)) as doneStories")->from(TABLE_PROJECTSTORY)->alias('t1')
-            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
-            ->where('t1.project')->in($projectIdList)
-            ->andWhere('t2.type')->eq('story')
-            ->andWhere('deleted')->eq('0')
-            ->groupBy('project')
-            ->fetchAll('project');
-    }
-
-    /**
-     * Get associated bugs by project.
-     *
-     * @param  array  $projectIdList
-     * @access public
-     * @return array
-     */
-    public function getTotalBugByProject($projectIdList)
-    {
-        return $this->dao->select("project, count(id) as allBugs, count(if(status = 'active', 1, null)) as leftBugs, count(if(status = 'resolved', 1, null)) as doneBugs")->from(TABLE_BUG)
-            ->where('project')->in($projectIdList)
-            ->andWhere('deleted')->eq(0)
-            ->groupBy('project')
-            ->fetchAll('project');
-    }
-
-    /**
-     * Get associated tasks by project.
-     *
-     * @param  array  $projectIdList
-     * @access public
-     * @return array
-     */
-    public function getTotalTaskByProject($projectIdList)
-    {
-        return $this->dao->select("t1.project, count(t1.id) as allTasks, count(if(t1.status = 'wait', 1, null)) as waitTasks, count(if(t1.status = 'doing', 1, null)) as doingTasks, count(if(t1.status = 'done', 1, null)) as doneTasks, count(if(t1.status = 'wait' or t1.status = 'pause' or t1.status = 'cancel', 1, null)) as leftTasks, count(if(t1.status = 'done' or t1.status = 'closed', 1, null)) as litedoneTasks")->from(TABLE_TASK)->alias('t1')
-            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
-            ->where('t1.project')->in($projectIdList)
-            ->andWhere('t1.deleted')->eq(0)
-            ->andWhere('t2.deleted')->eq(0)
-            ->groupBy('t1.project')
-            ->fetchAll('project');
-    }
-
     /**
      * Get waterfall project progress.
      *
diff --git a/module/project/tao.php b/module/project/tao.php
index 07ee19fb5f..c4c1dc6179 100755
--- a/module/project/tao.php
+++ b/module/project/tao.php
@@ -587,20 +587,21 @@ class projectTao extends projectModel
             ->where('t1.root')->in($projectIdList)
             ->andWhere('t2.deleted')->eq(0)
             ->groupBy('t1.root')
-            ->fetchAll('root');
+            ->fetchPairs();
     }
 
     /**
      * 根据项目ID列表查询任务的总预计工时。
      * Get task all estimate by project id list.
      *
-     * @param  array $projectIdList
+     * @param  array  $projectIdList
+     * @param  string $fields
      * @access protected
      * @return array
      */
-    protected function fetchTaskEstimateByIdList(array $projectIdList): array
+    protected function fetchTaskEstimateByIdList(array $projectIdList, string $fields = 't2.project as project, sum(estimate) as estimate'): array
     {
-        return $this->dao->select("t2.project as project, sum(estimate) as estimate")->from(TABLE_TASK)->alias('t1')
+        return $this->dao->select($fields)->from(TABLE_TASK)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution = t2.id')
             ->where('t1.parent')->lt(1)
             ->andWhere('t2.project')->in($projectIdList)
@@ -609,4 +610,59 @@ class projectTao extends projectModel
             ->groupBy('t2.project')
             ->fetchAll('project');
     }
+
+    /**
+     * 通过项目ID列表查询需求的数量。
+     * Get the number of stories associated with the project.
+     *
+     * @param  array   $projectIdList
+     * @access public
+     * @return array
+     */
+    public function getTotalStoriesByProject(array $projectIdList): array
+    {
+        return $this->dao->select("t1.project, count(t2.id) as allStories, count(if(t2.status = 'active' or t2.status = 'changing', 1, null)) as leftStories, count(if(t2.status = 'closed' and t2.closedReason = 'done', 1, null)) as doneStories")->from(TABLE_PROJECTSTORY)->alias('t1')
+            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story=t2.id')
+            ->where('t1.project')->in($projectIdList)
+            ->andWhere('t2.type')->eq('story')
+            ->andWhere('deleted')->eq('0')
+            ->groupBy('project')
+            ->fetchAll('project');
+    }
+
+    /**
+     * 通过项目ID获取任务数量统计。
+     * Get the number of tasks associated with the project.
+     *
+     * @param  array  $projectIdList
+     * @access public
+     * @return array
+     */
+    public function getTotalTaskByProject(array $projectIdList): array
+    {
+        return $this->dao->select("t1.project, count(t1.id) as allTasks, count(if(t1.status = 'wait', 1, null)) as waitTasks, count(if(t1.status = 'doing', 1, null)) as doingTasks, count(if(t1.status = 'done', 1, null)) as doneTasks, count(if(t1.status = 'wait' or t1.status = 'pause' or t1.status = 'cancel', 1, null)) as leftTasks, count(if(t1.status = 'done' or t1.status = 'closed', 1, null)) as litedoneTasks")->from(TABLE_TASK)->alias('t1')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
+            ->where('t1.project')->in($projectIdList)
+            ->andWhere('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted')->eq(0)
+            ->groupBy('t1.project')
+            ->fetchAll('project');
+    }
+
+    /**
+     * 通过项目ID获取Bug数量统计。
+     * Get the number of bugs associated with the project.
+     *
+     * @param  array  $projectIdList
+     * @access public
+     * @return array
+     */
+    public function getTotalBugByProject(array $projectIdList): array
+    {
+        return $this->dao->select("project, count(id) as allBugs, count(if(status = 'active', 1, null)) as leftBugs, count(if(status = 'resolved', 1, null)) as doneBugs")->from(TABLE_BUG)
+            ->where('project')->in($projectIdList)
+            ->andWhere('deleted')->eq(0)
+            ->groupBy('project')
+            ->fetchAll('project');
+    }
 }

From d655873b6fd84e911d8a95bcc99b89c8175aef34 Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycrop.ltd>
Date: Fri, 5 May 2023 10:47:59 +0800
Subject: [PATCH 11/80] * Add build initial yaml file.

---
 test/lib/yaml.class.php | 32 +++++++++++++++++++++++++++-----
 1 file changed, 27 insertions(+), 5 deletions(-)

diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index 56cd39a8fd..cde84f8db7 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -243,7 +243,29 @@ class yaml
         $this->tableName = $tableName;
         $this->fields    = new fields();
 
-        $this->configFiles[] = dirname(dirname(__FILE__)) . "/data/{$this->tableName}.yaml";
+        $yamlPath = dirname(dirname(__FILE__)) . "/data/{$this->tableName}.yaml";
+        $this->configFiles[] = $yamlPath;
+
+        if(!file_exists($yamlPath)) $this->buildYamlFile($this->tableName);
+    }
+
+    /**
+     * Build the initial yaml file.
+     *
+     * @param  string $tableName
+     * @access public
+     * @return viod
+     */
+    public function buildYamlFile($tableName)
+    {
+        $yamlData['title']   = 'table zt_' . $tableName;
+        $yamlData['author']  = 'automated export';
+        $yamlData['version'] = '1.0';
+        $yamlData['fields'][0]['field'] = 'id';
+        $yamlData['fields'][0]['range'] = '1-1000';
+
+        $yamlFile = dirname(dirname(__FILE__)) . "/data/{$this->tableName}.yaml";
+        yaml_emit_file($yamlFile, $yamlData, YAML_UTF8_ENCODING);
     }
 
     /**
@@ -386,7 +408,7 @@ class yaml
         system($execDump);
         $stderr = '';
         $this->exec_with_stderr($execYaml, $stderr);
-        
+
         if(empty($stderr)) return;
 
         $errors = explode(PHP_EOL, $stderr);
@@ -394,7 +416,7 @@ class yaml
         {
             return !empty($error) && !strpos($error, 'Using a password on the command line interface can be insecure');
         });
-        
+
         if(!empty($errors)) echo implode(PHP_EOL, $errors) . PHP_EOL;
     }
 
@@ -407,11 +429,11 @@ class yaml
      * @access private
      * @return string
      */
-    private function exec_with_stderr($cmd, &$stderr=null) 
+    private function exec_with_stderr($cmd, &$stderr=null)
     {
         $proc   = proc_open($cmd, array(2 => array('pipe', 'w')), $pipes);
         $stderr = stream_get_contents($pipes[2]);
-        
+
         fclose($pipes[2]);
         proc_close($proc);
     }

From 5d9560e4ea45ed4ded3a1a9e07598eed5ddcd7b4 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 11:02:45 +0800
Subject: [PATCH 12/80] * fix bug.

---
 module/todo/control.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index acdca87fd5..778864b7d8 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -11,10 +11,7 @@ declare(strict_types=1);
  */
 class todo extends control
 {
-    sdasdasdasdasdas
     /**
-     * sadasdasd
-     *
      * Construct function, load model of task, bug, my.
      *
      * @access public
@@ -24,6 +21,7 @@ class todo extends control
     {
         parent::__construct();
 
+        $this->app->loadClass('date');
         $this->app->loadLang('my');
     }
 

From da410be404362813498c9d3ba3fb52ad51438f6d Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 May 2023 11:04:10 +0800
Subject: [PATCH 13/80]  * adjust code for product create.

---
 module/product/config/form.php                |  17 +-
 module/product/control.php                    |  72 ++----
 module/product/model.php                      |  75 +++---
 module/product/tao.php                        |  67 ++++++
 module/product/test/model/create.php          |  23 +-
 .../test/model/getprojectlistbyproduct.php    |  49 +++-
 module/product/test/product.class.php         |   7 +-
 module/product/test/tao/createline.php        |   2 +-
 module/product/test/tao/createmainlib.php     |   7 +-
 .../test/tao/fetchallproductprojects.php      |  53 +++++
 .../test/tao/fetchinvolvedproductprojects.php |  93 ++++++++
 module/product/ui/create.html.php             | 195 +++-------------
 module/product/view/project.html.php          |   6 +-
 module/product/zen.php                        | 214 ++++++++++--------
 module/project/test/model/create.php          |   6 +-
 test/data/stakeholder.yaml                    |  11 +
 test/lib/yaml.class.php                       |   8 +-
 17 files changed, 508 insertions(+), 397 deletions(-)
 create mode 100755 module/product/test/tao/fetchallproductprojects.php
 create mode 100755 module/product/test/tao/fetchinvolvedproductprojects.php

diff --git a/module/product/config/form.php b/module/product/config/form.php
index 40fb2703ec..0e23310aa9 100644
--- a/module/product/config/form.php
+++ b/module/product/config/form.php
@@ -4,24 +4,24 @@ $config->product->form = new stdclass();
 $config->product->form->create = array();
 $config->product->form->create['program']   = array('type' => 'int',     'control' => 'select',       'required' => false, 'default' => 0,  'options' => array());
 $config->product->form->create['line']      = array('type' => 'int',     'control' => 'select',       'required' => false, 'default' => 0,  'options' => array());
-$config->product->form->create['lineName']  = array('type' => 'string',  'control' => 'input',        'required' => false, 'default' => '', 'filter' => 'trim');
-$config->product->form->create['name']      = array('type' => 'string',  'control' => 'input',        'required' => true,  'default' => '', 'filter' => 'trim');
-$config->product->form->create['code']      = array('type' => 'string',  'control' => 'input',        'required' => true,  'default' => '', 'filter' => 'trim');
+$config->product->form->create['lineName']  = array('type' => 'string',  'control' => 'text',         'required' => false, 'default' => '', 'filter' => 'trim');
+$config->product->form->create['name']      = array('type' => 'string',  'control' => 'text',         'required' => true,  'default' => '', 'filter' => 'trim');
+$config->product->form->create['code']      = array('type' => 'string',  'control' => 'text',         'required' => true,  'default' => '', 'filter' => 'trim');
 $config->product->form->create['PO']        = array('type' => 'account', 'control' => 'select',       'required' => false, 'default' => '', 'options' => array());
 $config->product->form->create['QD']        = array('type' => 'account', 'control' => 'select',       'required' => false, 'default' => '', 'options' => array());
 $config->product->form->create['RD']        = array('type' => 'account', 'control' => 'select',       'required' => false, 'default' => '', 'options' => array());
 $config->product->form->create['reviewer']  = array('type' => 'array',   'control' => 'multi-select', 'required' => false, 'default' => '', 'filter' => 'join', 'options' => 'users');
 $config->product->form->create['type']      = array('type' => 'string',  'control' => 'select',       'required' => false, 'default' => 'normal', 'options' => $lang->product->typeList);
 $config->product->form->create['status']    = array('type' => 'string',  'control' => 'hidden',       'required' => false, 'default' => 'normal');
-$config->product->form->create['desc']      = array('type' => 'string',  'control' => 'textarea',     'required' => false, 'default' => '');
-$config->product->form->create['acl']       = array('type' => 'string',  'control' => 'radio',        'required' => false, 'default' => 'private', 'options' => $lang->product->aclList);
-$config->product->form->create['whitelist'] = array('type' => 'array',   'control' => 'multi-select', 'required' => false, 'default' => '', 'filter' => 'join', 'options' => 'users');
+$config->product->form->create['desc']      = array('type' => 'string',  'control' => 'editor',       'required' => false, 'default' => '', 'width' => 'full');
+$config->product->form->create['acl']       = array('type' => 'string',  'control' => 'radio',        'required' => false, 'default' => 'private', 'width' => 'full', 'options' => $lang->product->aclList);
+$config->product->form->create['whitelist'] = array('type' => 'array',   'control' => 'multi-select', 'required' => false, 'default' => '', 'filter' => 'join', 'width' => 'full', 'options' => 'users');
 
 $config->product->form->edit = array();
 $config->product->form->edit['program']        = array('type' => 'int',     'control' => 'select',       'required' => false, 'default' => 0,  'options' => array());
 $config->product->form->edit['line']           = array('type' => 'int',     'control' => 'select',       'required' => false, 'default' => 0,  'options' => array());
-$config->product->form->edit['name']           = array('type' => 'string',  'control' => 'input',        'required' => true,  'default' => '', 'filter' => 'trim');
-$config->product->form->edit['code']           = array('type' => 'string',  'control' => 'input',        'required' => true,  'default' => '', 'filter' => 'trim');
+$config->product->form->edit['name']           = array('type' => 'string',  'control' => 'text',         'required' => true,  'default' => '', 'filter' => 'trim');
+$config->product->form->edit['code']           = array('type' => 'string',  'control' => 'text',         'required' => true,  'default' => '', 'filter' => 'trim');
 $config->product->form->edit['PO']             = array('type' => 'account', 'control' => 'select',       'required' => false, 'default' => '', 'options' => array());
 $config->product->form->edit['QD']             = array('type' => 'account', 'control' => 'select',       'required' => false, 'default' => '', 'options' => array());
 $config->product->form->edit['RD']             = array('type' => 'account', 'control' => 'select',       'required' => false, 'default' => '', 'options' => array());
@@ -31,4 +31,3 @@ $config->product->form->edit['status']         = array('type' => 'string',  'con
 $config->product->form->edit['desc']           = array('type' => 'string',  'control' => 'textarea',     'required' => false, 'default' => '');
 $config->product->form->edit['acl']            = array('type' => 'string',  'control' => 'radio',        'required' => false, 'default' => 'private', 'options' => $lang->product->aclList);
 $config->product->form->edit['whitelist']      = array('type' => 'array',   'control' => 'multi-select', 'required' => false, 'default' => '', 'filter' => 'join', 'options' => 'users');
-$config->product->form->edit['changeProjects'] = array('type' => 'string',  'control' => 'hidden',       'required' => false, 'default' => '');
diff --git a/module/product/control.php b/module/product/control.php
index 47da78d20f..dd64874844 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -73,56 +73,28 @@ class product extends control
      * The projects which linked the product.
      *
      * @param  string $status
-     * @param  int    $productID
-     * @param  int    $branch
-     * @param  int    $involved
+     * @param  string $productID
+     * @param  string $branch
+     * @param  string $involved
      * @param  string $orderBy
-     * @param  int    $recTotal
-     * @param  int    $recPerPage
-     * @param  int    $pageID
+     * @param  string $recTotal
+     * @param  string $recPerPage
+     * @param  string $pageID
      * @access public
      * @return void
      */
-    public function project($status = 'all', $productID = 0, $branch = '', $involved = 0, $orderBy = 'order_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
+    public function project(string $status = 'all', string $productID = '0', string $branch = '', string $involved = '0', string $orderBy = 'order_desc', string $recTotal = '0', string $recPerPage = '20', string $pageID = '1')
     {
-        $this->app->loadLang('execution');
-        $this->loadModel('project');
-
-        $branch = ($this->cookie->preBranch !== '' and $branch === '') ? $this->cookie->preBranch : $branch;
-        setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
-        $this->session->set('createProjectLocate', $this->app->getURI(true), 'product');
-
-        $this->product->setMenu($productID, $branch);
+        $productID = (int)$productID;
+        $involved  = ($this->cookie->involved or $involved);
+        $this->productZen->setProjectMenu($productID, $branch, $this->cookie->preBranch);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
-        $pager = new pager($recTotal, $recPerPage, $pageID);
+        $pager = new pager((int)$recTotal, (int)$recPerPage, (int)$pageID);
 
-        /* Get PM id list. */
-        $accounts     = array();
-        $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved, $orderBy, $pager);
-        $product      = $this->product->getByID($productID);
-        $projects     = $this->project->getPairsByProgram($product->program, 'all', false, 'order_asc', '', '', 'product');
-
-        foreach($projectStats as $project)
-        {
-            if(!empty($project->PM) and !in_array($project->PM, $accounts)) $accounts[] = $project->PM;
-            unset($projects[$project->id]);
-        }
-        $PMList = $this->user->getListByAccounts($accounts, 'account');
-
-        $this->view->title        = $this->products[$productID] . $this->lang->colon . $this->lang->product->project;
-        $this->view->projectStats = $projectStats;
-        $this->view->PMList       = $PMList;
-        $this->view->productID    = $productID;
-        $this->view->product      = $product;
-        $this->view->projects     = $projects;
-        $this->view->status       = $status;
-        $this->view->users        = $this->loadModel('user')->getPairs('noletter');
-        $this->view->branchID     = $branch;
-        $this->view->branchStatus = $this->loadModel('branch')->getByID($branch, 0, 'status');
-        $this->view->pager        = $pager;
-        $this->display();
+        /* Set view variables and display. */
+        $this->productZen->displayProjectPage($productID, $branch, $status, $involved, $orderBy, $pager);
     }
 
     /**
@@ -399,7 +371,7 @@ class product extends control
      * Create a product.
      * 创建产品。可以是顶级产品，也可以是项目集下的产品。
      *
-     * @param  int    $programID
+     * @param  string $programID
      * @param  string $extra
      * @access public
      * @return void
@@ -410,13 +382,14 @@ class product extends control
 
         if(!empty($_POST))
         {
-            $data = form::data($this->config->product->form->create);
-            $data = $this->productZen->prepareCreateExtras($data, $this->post->acl, $this->post->uid);
+            $data    = form::data($this->config->product->form->create);
+            $product = $this->productZen->prepareCreateExtras($data);
 
-            $productID = $this->product->create($data);
-            if(!$productID) return $this->productZen->sendDaoError();
+            $productID = $this->product->create($product, $this->post->uid, zget($_POST, 'lineName', ''));
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            return $this->productZen->responseAfterCreate($productID, $data, $this->post->uid, zget($_POST, 'lineName', ''));
+            $response = $this->productZen->responseAfterCreate($productID, (int)$product->program);
+            $this->send($response);
         }
 
         $this->productZen->setCreateMenu($programID);
@@ -447,7 +420,8 @@ class product extends control
             if(dao::isError()) return $this->productZen->sendDaoError();
 
             if($action == 'undelete') $this->loadModel('action')->undelete((int)$extra);
-            return $this->productZen->responseAfterEdit($productID, $programID, $changes);
+            $response = $this->productZen->responseAfterEdit($productID, $programID, $changes);
+            $this->send($response);
         }
 
         $this->productZen->setEditMenu($productID, $programID);
@@ -1215,7 +1189,7 @@ class product extends control
         }
         else
         {
-            return print(html::select('product', $products, empty($product) ? '' : $product->id, "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
+            return print(html::select('product', $products, '', "onchange='loadBranches(this.value);' class='form-control chosen' required data-toggle='modal' data-type='iframe'"));
         }
     }
 
diff --git a/module/product/model.php b/module/product/model.php
index 9f076efcb1..0c2cf7f1d9 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -668,20 +668,39 @@ class productModel extends model
      * 直接用对象数据创建产品
      *
      * @param  object  $product
+     * @param  string  $uid
+     * @param  string  $lineName
      * @access public
      * @return int|false
      */
-    public function create(object $product): int|false
+    public function create(object $product, string $uid = '', string $lineName = ''): int|false
     {
         $this->lang->error->unique = $this->lang->error->repeat;
         $this->dao->insert(TABLE_PRODUCT)->data($product)->autoCheck()
-            ->batchCheck($this->config->product->create->requiredFields, 'notempty')
             ->checkIF(!empty($product->name), 'name', 'unique', "`program` = {$product->program} and `deleted` = '0'")
             ->checkIF(!empty($product->code), 'code', 'unique', "`deleted` = '0'")
             ->checkFlow()
             ->exec();
         if(dao::isError()) return false;
-        return (int)$this->dao->lastInsertID();
+        $productID = (int)$this->dao->lastInsertID();
+
+        /* Fix order and line fields for product. */
+        $fixData = new stdclass();
+        $fixData->order = $productID * 5;
+        if(!empty($lineName))
+        {
+            $lineID = $this->productTao->createLine((int)$product->program, $lineName);
+            if($lineID) $fixData->line = $lineID;
+        }
+        $this->dao->update(TABLE_PRODUCT)->data($fixData)->where('id')->eq($productID)->exec();
+
+        /* Update and create linked data. */
+        $this->loadModel('file')->updateObjectID($uid, $productID, 'product');
+        $this->productTao->createMainLib($productID);
+        if($product->whitelist)     $this->loadModel('personnel')->updateWhitelist(explode(',', $product->whitelist), 'product', $productID);
+        if($product->acl != 'open') $this->loadModel('user')->updateUserView($productID, 'product');
+
+        return $productID;
     }
 
     /**
@@ -699,7 +718,6 @@ class productModel extends model
 
         $this->lang->error->unique = $this->lang->error->repeat;
         $this->dao->update(TABLE_PRODUCT)->data($product, 'uid,changeProjects,contactListMenu')->autoCheck()
-            ->batchCheck($this->config->product->edit->requiredFields, 'notempty')
             ->checkIF(!empty($product->name), 'name', 'unique', "id != {$productID} and `program` = {$product->program} and `deleted` = '0'")
             ->checkIF(!empty($product->code), 'code', 'unique', "id != {$productID} and `deleted` = '0'")
             ->checkFlow()
@@ -1158,49 +1176,26 @@ class productModel extends model
     /**
      * Get project list by product.
      *
-     * @param  int    $productID
-     * @param  string $browseType
-     * @param  int    $branch
-     * @param  int    $involved
-     * @param  string $orderBy
-     * @param  object $pager
+     * @param  int         $productID
+     * @param  string      $browseType    all|undone|wait|doing|done
+     * @param  string      $branch
+     * @param  bool        $involved     $this->cookie->involved or $involved
+     * @param  string      $orderBy
+     * @param  object|null $pager
      * @access public
      * @return array
      */
-    public function getProjectListByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0, $orderBy = 'order_desc', $pager = null)
+    public function getProjectListByProduct(int $productID, string $browseType = 'all', string $branch = '0', bool $involved = false, string $orderBy = 'order_desc', object|null $pager = null): array
     {
-        $projectList = $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
-            ->leftJoin(TABLE_TEAM)->alias('t3')->on('t2.id=t3.root')
-            ->leftJoin(TABLE_STAKEHOLDER)->alias('t4')->on('t2.id=t4.objectID')
-            ->where('t1.product')->eq($productID)
-            ->andWhere('t2.type')->eq('project')
-            ->beginIF($this->cookie->involved or $involved)->andWhere('t3.type')->eq('project')->fi()
-            ->beginIF($browseType == 'undone')->andWhere('t2.status')->in('wait,doing')->fi()
-            ->beginIF(strpos(",all,undone,", ",$browseType,") === false)->andWhere('t2.status')->eq($browseType)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
-            ->beginIF($this->cookie->involved or $involved)
-            ->andWhere('t2.openedBy', true)->eq($this->app->user->account)
-            ->orWhere('t2.PM')->eq($this->app->user->account)
-            ->orWhere('t3.account')->eq($this->app->user->account)
-            ->orWhere('(t4.user')->eq($this->app->user->account)
-            ->andWhere('t4.deleted')->eq(0)
-            ->markRight(1)
-            ->orWhere("CONCAT(',', t2.whitelist, ',')")->like("%,{$this->app->user->account},%")
-            ->markRight(1)
-            ->fi()
-            ->beginIF($branch !== '' and $branch !== 'all')->andWhere('t1.branch')->in($branch)->fi()
-            ->andWhere('t2.deleted')->eq('0')
-            ->orderBy($orderBy)
-            ->page($pager, 't2.id')
-            ->fetchAll('id');
+        if(!$involved) $projectList = $this->productTao->fetchAllProductProjects($productID, $browseType, $branch, $orderBy, $pager);
+        if($involved)  $projectList = $this->productTao->fetchInvolvedProductProjects($productID, $browseType, $branch, $orderBy, $pager);
 
         /* Determine how to display the name of the program. */
         $programList = $this->loadModel('program')->getParentPairs('', 'all');
         foreach($projectList as $id => $project)
         {
-            $projectList[$id]->programName = $project->parent ? zget($programList, $project->parent, '') : '';
-            $projectList[$id]->programName = preg_replace('/\//', '', $projectList[$id]->programName, 1);
+            $programName = $project->parent ? zget($programList, $project->parent, '') : '';
+            $projectList[$id]->programName = preg_replace('/\//', '', $programName, 1);
         }
 
         return $projectList;
@@ -1212,13 +1207,13 @@ class productModel extends model
      * @param  int       $productID
      * @param  string    $browseType
      * @param  int       $branch
-     * @param  int       $involved
+     * @param  bool      $involved     $this->cookie->involved or $involved
      * @param  string    $orderBy
      * @param  object    $pager
      * @access public
      * @return array
      */
-    public function getProjectStatsByProduct($productID, $browseType = 'all', $branch = 0, $involved = 0, $orderBy = 'order_desc', $pager = null)
+    public function getProjectStatsByProduct(int $productID, string $browseType = 'all', string $branch = '0', bool $involved = false, string $orderBy = 'order_desc', object|null $pager = null): array
     {
         $projects = $this->getProjectListByProduct($productID, $browseType, $branch, $involved, $orderBy, $pager);
         if(empty($projects)) return array();
diff --git a/module/product/tao.php b/module/product/tao.php
index 0b0a5a8faf..bb04178ba9 100644
--- a/module/product/tao.php
+++ b/module/product/tao.php
@@ -64,6 +64,73 @@ class productTao extends productModel
             ->fetchPairs('id', 'name');
     }
 
+    /**
+     * 获取该产品下，所有符合参数条件的关联项目。
+     * Fetch all projects link this product.
+     *
+     * @param  int $productID
+     * @param  string $browseType    all|undone|wait|doing|done
+     * @param  string $branch
+     * @param  string $orderBy
+     * @param  object|null $pager
+     * @access protected
+     * @return array
+     */
+    protected function fetchAllProductProjects(int $productID, string $browseType = 'all', string $branch = '0', string $orderBy = 'order_desc', object|null $pager = null): array
+    {
+        return $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->where('t1.product')->eq($productID)
+            ->andWhere('t2.type')->eq('project')
+            ->beginIF($browseType == 'undone')->andWhere('t2.status')->in('wait,doing')->fi()
+            ->beginIF(strpos(",all,undone,", ",$browseType,") === false)->andWhere('t2.status')->eq($browseType)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
+            ->beginIF($branch !== '' and $branch !== 'all')->andWhere('t1.branch')->in($branch)->fi()
+            ->andWhere('t2.deleted')->eq('0')
+            ->orderBy($orderBy)
+            ->page($pager, 't2.id')
+            ->fetchAll('id');
+    }
+
+    /**
+     * 只获取该产品下，我参与的，符合参数条件的关联项目。
+     * Fetch involved projects link product.
+     *
+     * @param  int $productID
+     * @param  string $browseType    all|undone|wait|doing|done
+     * @param  string $branch
+     * @param  string $orderBy
+     * @param  object|null $pager
+     * @access protected
+     * @return array
+     */
+    protected function fetchInvolvedProductProjects(int $productID, string $browseType = 'all', string $branch = '0', string $orderBy = 'order_desc', object|null $pager = null): array
+    {
+        return $this->dao->select('t2.*')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+            ->leftJoin(TABLE_TEAM)->alias('t3')->on('t2.id=t3.root')
+            ->leftJoin(TABLE_STAKEHOLDER)->alias('t4')->on('t2.id=t4.objectID')
+            ->where('t1.product')->eq($productID)
+            ->andWhere('t2.type')->eq('project')
+            ->andWhere('t3.type')->eq('project')
+            ->beginIF($browseType == 'undone')->andWhere('t2.status')->in('wait,doing')->fi()
+            ->beginIF(strpos(",all,undone,", ",$browseType,") === false)->andWhere('t2.status')->eq($browseType)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t2.id')->in($this->app->user->view->projects)->fi()
+            ->andWhere('t2.openedBy', true)->eq($this->app->user->account)
+            ->orWhere('t2.PM')->eq($this->app->user->account)
+            ->orWhere('t3.account')->eq($this->app->user->account)
+            ->orWhere('(t4.user')->eq($this->app->user->account)
+            ->andWhere('t4.deleted')->eq(0)
+            ->markRight(1)
+            ->orWhere("CONCAT(',', t2.whitelist, ',')")->like("%,{$this->app->user->account},%")
+            ->markRight(1)
+            ->beginIF($branch !== '' and $branch !== 'all')->andWhere('t1.branch')->in($branch)->fi()
+            ->andWhere('t2.deleted')->eq('0')
+            ->orderBy($orderBy)
+            ->page($pager, 't2.id')
+            ->fetchAll('id');
+    }
+
     /**
      * 获取产品ID数组中带有项目集信息的产品分页列表。
      * Get products with program data that in the ID list.
diff --git a/module/product/test/model/create.php b/module/product/test/model/create.php
index 26458b3d19..df3ce1af32 100755
--- a/module/product/test/model/create.php
+++ b/module/product/test/model/create.php
@@ -3,8 +3,8 @@
 include dirname(__FILE__, 5) . "/test/lib/init.php";
 include dirname(__FILE__, 2) . '/product.class.php';
 
-#su('admin');
-zdTable('product')->gen(0);
+zdTable('product')->gen(1);
+zdTable('module')->gen(1);
 
 /**
 
@@ -12,15 +12,6 @@ title=测试productModel->create();
 cid=1
 pid=1
 
-测试正常的创建 >> case1
-测试不填产品代号的情况 >> 『产品代号』不能为空。
-测试创建重复的产品 >> 『产品代号』已经有『testcase1』这条记录了。
-测试不填产品名称的情况 >> 『产品名称』不能为空。
-测试传入name和code >> case3,testcase3
-测试传入program、name、code >> 3,case4,testcase4
-测试传入program、name、code、type、status >> 4,branch,closed
-测试不填权限控制的情况 >> 『访问控制』不符合格式，应当为:『/open|private|custom/』。
-
 */
 
 $product = new productTest('admin');
@@ -31,8 +22,8 @@ $namecode     = array('name' => 'case3', 'code' => 'testcase3');
 $pronamecode  = array('program' => '3', 'name' => 'case4', 'code' => 'testcase4');
 $intypestatus = array('program' => '4', 'name' => 'case5', 'code' => 'testcase5', 'type' => 'branch', 'status' => 'closed');
 
-r($product->createObject($create))       && p('name')                && e('case1');                  // 测试正常的创建
-r($product->createObject($repeat))       && p('code:0')              && e('『产品代号』已经有『testcase1』这条记录了。'); // 测试创建重复的产品
-r($product->createObject($namecode))     && p('name,code')           && e('case3,testcase3');        // 测试传入name和code
-r($product->createObject($pronamecode))  && p('program,name,code')   && e('3,case4,testcase4');      // 测试传入program、name、code
-r($product->createObject($intypestatus)) && p('program,type,status') && e('4,branch,closed');        // 测试传入program、name、code、type、status
+r($product->createObject($create))                && p('name')                && e('case1');                  // 测试正常的创建
+r($product->createObject($repeat))                && p('code:0')              && e('『产品代号』已经有『testcase1』这条记录了。'); // 测试创建重复的产品
+r($product->createObject($namecode, 'test line')) && p('name,code,line')      && e('case3,testcase3,2');        // 测试传入name和code
+r($product->createObject($pronamecode))           && p('program,name,code')   && e('3,case4,testcase4');      // 测试传入program、name、code
+r($product->createObject($intypestatus))          && p('program,type,status') && e('4,branch,closed');        // 测试传入program、name、code、type、status
diff --git a/module/product/test/model/getprojectlistbyproduct.php b/module/product/test/model/getprojectlistbyproduct.php
index 4909502d10..a5f05cbf15 100755
--- a/module/product/test/model/getprojectlistbyproduct.php
+++ b/module/product/test/model/getprojectlistbyproduct.php
@@ -3,22 +3,51 @@
 include dirname(__FILE__, 5) . "/test/lib/init.php";
 include dirname(__FILE__, 2) . '/product.class.php';
 
+zdTable('product')->gen(50);
+zdTable('user')->gen(50);
+
+$project = zdTable('project');
+$project->PM->range('user2,user3');
+$project->gen(50);
+
+$team = zdTable('team');
+$team->root->range('1-50');
+$team->type->range('project');
+$team->account->range('admin,admin,user1,user1');
+$team->days->range('5');
+$team->hours->range('6,7');
+$team->gen(50);
+
+$stakeholder = zdTable('stakeholder');
+$stakeholder->objectType->range('project');
+$stakeholder->objectID->range('1-50');
+$stakeholder->user->range('user4,user5');
+$stakeholder->type->range('inside');
+$stakeholder->from->range('');
+$stakeholder->gen(50);
+
+$projectproduct = zdTable('projectproduct');
+$projectproduct->product->range('1-2');
+$projectproduct->project->range('1-50');
+$projectproduct->gen(50);
+
 /**
 
 title=productModel->getProjectListByProduct();
 cid=1
 pid=1
 
-返回产品1关联的项目11名字 >> 项目1
-返回产品1关联的项目21名字 >> 项目11
-传入不存在的产品 >> 没有数据
-
 */
 
-$product = new productTest('admin');
+global $tester;
+$product = $tester->loadModel('product');
+su('admin');
+$product->app->user->admin = true;
+$product->app->moduleName = 'product';
+$product->app->methodName = 'project';
 
-$t_retion = array('1', '1', '10001');
-
-r($product->getAllProjectsByProduct($t_retion[0]))   && p('11:name') && e('项目1');     // 返回产品1关联的项目11名字
-r($product->getAllProjectsByProduct($t_retion[1]))   && p('21:name') && e('项目11');    // 返回产品1关联的项目21名字
-r($product->getAllProjectsByProduct($t_retion[2]))   && p()          && e('没有数据');  // 传入不存在的产品
\ No newline at end of file
+r(count($product->getProjectListByProduct($productID = 0, 'all',    '',    'order_desc')))   && p() && e('0');
+r(count($product->getProjectListByProduct($productID = 1, 'all',    '',    'order_desc')))   && p() && e('20');
+r(count($product->getProjectListByProduct($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('17');
+r(count($product->getProjectListByProduct($productID = 1, 'undone', '',    'order_desc')))   && p() && e('15');
+r(count($product->getProjectListByProduct($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('5');
diff --git a/module/product/test/product.class.php b/module/product/test/product.class.php
index 2b6fe5ba26..d84aff0887 100644
--- a/module/product/test/product.class.php
+++ b/module/product/test/product.class.php
@@ -25,11 +25,12 @@ class productTest
     /**
      * Test create a product.
      *
-     * @param  array  $param
+     * @param  array   $param
+     * @param  string  $lineName
      * @access public
      * @return object|array
      */
-    public function createObject(array $param = array()): object|array
+    public function createObject(array $param = array(), string $lineName = ''): object|array
     {
         $createFields = array();
         $createFields['program']        = 1;
@@ -52,7 +53,7 @@ class productTest
         $data = new stdclass();
         foreach($createFields as $field => $defaultValue) $data->$field = zget($param, $field, $defaultValue);
 
-        $objectID = $this->objectModel->create($data);
+        $objectID = $this->objectModel->create($data, '', $lineName);
 
         if(dao::isError())
         {
diff --git a/module/product/test/tao/createline.php b/module/product/test/tao/createline.php
index 23362cb2fa..bc6bddf7cd 100755
--- a/module/product/test/tao/createline.php
+++ b/module/product/test/tao/createline.php
@@ -3,7 +3,7 @@
 include dirname(__FILE__, 5) . "/test/lib/init.php";
 include dirname(__FILE__, 2) . '/product.class.php';
 
-zdTable('module')->gen(0);
+zdTable('module')->gen(1);
 
 /**
 
diff --git a/module/product/test/tao/createmainlib.php b/module/product/test/tao/createmainlib.php
index 25375620f2..d4f0e3a4fd 100755
--- a/module/product/test/tao/createmainlib.php
+++ b/module/product/test/tao/createmainlib.php
@@ -3,7 +3,10 @@
 include dirname(__FILE__, 5) . "/test/lib/init.php";
 include dirname(__FILE__, 2) . '/product.class.php';
 
-zdTable('doclib')->gen(0);
+$doclib = zdTable('doclib');
+$doclib->addedBy->range('admin');
+$doclib->addedDate->range('`' . date('Y-m-d H:i:s') . '`');
+$doclib->gen(1);
 
 /**
 
@@ -17,4 +20,4 @@ $product = new productTest('admin');
 
 r($product->createMainLibTest('-1')) && p() && e('0');
 r($product->createMainLibTest('0'))  && p() && e('0');
-r($product->createMainLibTest('1'))  && p('product,name,type,main') && e('1,产品主库,product,1');
+r($product->createMainLibTest('2'))  && p('product,name,type,main') && e('2,产品主库,product,1');
diff --git a/module/product/test/tao/fetchallproductprojects.php b/module/product/test/tao/fetchallproductprojects.php
new file mode 100755
index 0000000000..3afca1bd6c
--- /dev/null
+++ b/module/product/test/tao/fetchallproductprojects.php
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+include dirname(__FILE__, 2) . '/product.class.php';
+
+zdTable('product')->gen(50);
+zdTable('project')->gen(50);
+$projectproduct = zdTable('projectproduct');
+$projectproduct->product->range('1-2');
+$projectproduct->project->range('1-50');
+$projectproduct->gen(50);
+
+/**
+
+title=测试productModel->fetchPairs();
+cid=1
+pid=1
+
+*/
+
+global $tester;
+$product = $tester->loadModel('product');
+su('admin');
+$product->app->user->admin = true;
+$product->app->moduleName = 'product';
+$product->app->methodName = 'project';
+
+r(count($product->fetchAllProductProjects($productID = 0, 'all',    '',    'order_desc')))   && p() && e('0');
+r(count($product->fetchAllProductProjects($productID = 1, 'all',    '',    'order_desc')))   && p() && e('20');
+r(count($product->fetchAllProductProjects($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('17');
+r(count($product->fetchAllProductProjects($productID = 1, 'undone', '',    'order_desc')))   && p() && e('15');
+r(count($product->fetchAllProductProjects($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('5');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('20');
+
+$pager = new pager(0, 5, 1);
+r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('5');
+
+$product->app->user->admin = false;
+$product->app->user->view->projects = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,48,49,50';
+r(count($product->fetchAllProductProjects($productID = 1, 'all',    '',    'order_desc')))   && p() && e('7');
+r(count($product->fetchAllProductProjects($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('7');
+r(count($product->fetchAllProductProjects($productID = 1, 'undone', '',    'order_desc')))   && p() && e('5');
+r(count($product->fetchAllProductProjects($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('2');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('7');
+
+$pager = new pager(0, 5, 1);
+r(count($product->fetchAllProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('5');
diff --git a/module/product/test/tao/fetchinvolvedproductprojects.php b/module/product/test/tao/fetchinvolvedproductprojects.php
new file mode 100755
index 0000000000..050a145d4e
--- /dev/null
+++ b/module/product/test/tao/fetchinvolvedproductprojects.php
@@ -0,0 +1,93 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+include dirname(__FILE__, 2) . '/product.class.php';
+
+zdTable('product')->gen(50);
+zdTable('user')->gen(50);
+
+$project = zdTable('project');
+$project->PM->range('user2,user3');
+$project->gen(50);
+
+$team = zdTable('team');
+$team->root->range('1-50');
+$team->type->range('project');
+$team->account->range('admin,admin,user1,user1');
+$team->days->range('5');
+$team->hours->range('6,7');
+$team->gen(50);
+
+$stakeholder = zdTable('stakeholder');
+$stakeholder->objectType->range('project');
+$stakeholder->objectID->range('1-50');
+$stakeholder->user->range('user4,user5');
+$stakeholder->type->range('inside');
+$stakeholder->from->range('');
+$stakeholder->gen(50);
+
+$projectproduct = zdTable('projectproduct');
+$projectproduct->product->range('1-2');
+$projectproduct->project->range('1-50');
+$projectproduct->gen(50);
+
+/**
+
+title=测试productModel->fetchPairs();
+cid=1
+pid=1
+
+*/
+
+global $tester;
+$product = $tester->loadModel('product');
+su('admin');
+$product->app->user->admin = true;
+$product->app->moduleName = 'product';
+$product->app->methodName = 'project';
+
+r(count($product->fetchInvolvedProductProjects($productID = 0, 'all',    '',    'order_desc')))   && p() && e('0');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '',    'order_desc')))   && p() && e('10');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('8');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'undone', '',    'order_desc')))   && p() && e('5');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('0');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('10');
+
+$pager = new pager(0, 5, 1);
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('5');
+
+su('user1');
+$product->app->user->view->projects = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,48,49,50';
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '',    'order_desc')))   && p() && e('3');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('3');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'undone', '',    'order_desc')))   && p() && e('3');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('2');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('3');
+
+su('user2');
+$product->app->user->view->projects = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,48,49,50';
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '',    'order_desc')))   && p() && e('7');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('7');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'undone', '',    'order_desc')))   && p() && e('5');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('2');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('7');
+
+su('user4');
+$product->app->user->view->projects = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,48,49,50';
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '',    'order_desc')))   && p() && e('7');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('7');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'undone', '',    'order_desc')))   && p() && e('5');
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('2');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->fetchInvolvedProductProjects($productID = 1, 'all', '', 'order_desc', $pager))) && p() && e('7');
diff --git a/module/product/ui/create.html.php b/module/product/ui/create.html.php
index 057df83c4e..4995acb143 100644
--- a/module/product/ui/create.html.php
+++ b/module/product/ui/create.html.php
@@ -2,177 +2,40 @@
 /**
  * The create view of product of ZenTaoPMS.
  */
-
-/*
-  ======= Attention ======
-
-  This file is generated by zin-tool, you should check the following to-do list.
-
-  + Familiar with the use of these widgets in zin: .
-  + Check the following variables which used in widgets: $programOptions, $lineOptions, $POOptions, $QDOptions, $RDOptions, $reviewerOptions, $typeOptions, $aclOptions, $whitelistOptions.
-  + Check the origin code in module/product/view/create.html.php, and ensure that all features have been implemented.
-  + Check the origin js code in module/product/js/common.js and module/product/js/create.js
-  + Check the origin css code in module/product/css/common.css and module/product/css/create.css
-  + Remove the comments which starts with "zin:"
-  + Test according to the new design draft and the original implementation
- */
-
 namespace zin;
 
-/* ====== Preparing and processing page data ====== */
-
-/* zin: Set variables to define picker options for form */
-$programOptions = array();
-$lineOptions = array();
-$POOptions = array();
-$QDOptions = array();
-$RDOptions = array();
-$reviewerOptions = array();
-$typeOptions = array(array('value' => "normal", 'text' => "正常"), array('value' => "branch", 'text' => "多分支(适用于客户定制场景)"), array('value' => "platform", 'text' => "多平台(适用于跨平台应用开发，比如IOS、安卓、PC端等)"));
-$aclOptions = array(array('checked' => true, 'value' => "private", 'disabled' => false, 'text' => "私有(产品相关负责人、所属项目集的负责人及干系人、相关联项目的团队成员和干系人可访问)"), array('checked' => false, 'value' => "open", 'disabled' => false, 'text' => "公开(有产品视图权限，即可访问)"));
-$whitelistOptions = array();
-
-
-/* ====== Define the page structure with zin widgets ====== */
 
 /* zin: Define the form in main content */
-formPanel
-(
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("program"),
-        set::label("项目集"),
-        set::control("picker"),
-        set::items($programOptions)
-    ),
-    formRow
-    (
-        set::hidden(true),
-        formGroup
-        (
-            set::width("1/3"),
-            set::name("line"),
-            set::label("产品线"),
-            set::control("picker"),
-            set::items($lineOptions)
-        )
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("name"),
-        set::label("产品名称"),
-        set::required(true),
-        set::control("text")
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("PO"),
-        set::label("产品负责人"),
-        set::control("picker"),
-        set::items($POOptions)
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("QD"),
-        set::label("测试负责人"),
-        set::control("picker"),
-        set::items($QDOptions)
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("RD"),
-        set::label("发布负责人"),
-        set::control("picker"),
-        set::items($RDOptions)
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("reviewer[]"),
-        set::label("评审人"),
-        set::control(["type" =>"picker","multiple"=>true]),
-        set::id("reviewer"),
-        set::items($reviewerOptions)
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::name("type"),
-        set::label("产品类型"),
-        set::value("normal"),
-        set::control("picker"),
-        set::items($typeOptions)
-    ),
-    formGroup
-    (
-        set::width("2/3"),
-        set::label("产品描述"),
-        inputGroup
-        (
-            control(set(array
-            (
-                'id' => "title",
-                'value' => "",
-                'disabled' => false,
-                'type' => "text"
-            ))),
-            "公共",
-            btn(set(array
-            (
-                'type' => "btn",
-                'text' => "保存",
-                'class' => "input-group-btn"
-            )))
-        )
-    ),
-    formGroup
-    (
-        set::width("2/3"),
-        set::name("acl"),
-        set::label("访问控制"),
-        set::control("radioList"),
-        set::items($aclOptions)
-    ),
-    formGroup
-    (
-        set::width("1/3"),
-        set::label("白名单"),
-        inputGroup
-        (
-            control(set(array
-            (
-                'name' => "whitelist[]",
-                'id' => "whitelist",
-                'value' => NULL,
-                'disabled' => false,
-                'type' => "picker",
-                'items' => $whitelistOptions,
-                'multiple' => true
-            ))),
-            btn(set(array
-            (
-                'type' => "btn",
-                'icon' => "cog",
-                'text' => "",
-                'class' => "input-group-btn"
-            ))),
-            btn(set(array
-            (
-                'type' => "btn",
-                'icon' => "refresh",
-                'text' => "",
-                'class' => "input-group-btn"
-            )))
-        )
-    )
-);
+$formItems = array();
+foreach($fields as $field => $info)
+{
+    $width = zget($info, 'width', '1/3');
 
+    $control['type'] = $info['control'];
+    if($control['type'] == 'select') $control['type'] = 'picker';
+    if(!empty($info['options'])) $control['items'] = $info['options'];
+    if($info['control'] == 'multi-select')
+    {
+        $control['type']     = 'picker';
+        $control['multiple'] = true;
+        $field .= '[]';
+    }
+    if($info['control'] == 'radio') $control['type'] = 'radioList';
+
+    $formGroup = formGroup
+    (
+        set::width($width),
+        set::name($field),
+        set::label($info['title']),
+        set::control($control),
+        set::value($info['default']),
+        set::required($info['required'])
+    );
+    if($info['control'] == 'hidden') $formGroup = formRow(set::hidden(true), $formGroup);
+    $formItems[$field] = $formGroup;
+}
+
+formPanel($formItems);
 
 /* ====== Render page ====== */
-
 render();
diff --git a/module/product/view/project.html.php b/module/product/view/project.html.php
index 6ebdce6889..2f0e1de0bf 100644
--- a/module/product/view/project.html.php
+++ b/module/product/view/project.html.php
@@ -13,7 +13,7 @@
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">
     <?php foreach($lang->product->featureBar['project'] as $key => $label):?>
-    <?php echo html::a(inlink("project", "status=$key&productID=$productID"), "<span class='text'>{$label}</span>" . ($status == $key ? " <span class='label label-light label-badge'>" . count($projectStats) . "</span>" : ''), '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?>
+    <?php echo html::a(inlink("project", "status=$key&productID={$product->id}"), "<span class='text'>{$label}</span>" . ($status == $key ? " <span class='label label-light label-badge'>" . count($projectStats) . "</span>" : ''), '', "class='btn btn-link" . ($status == $key ? ' btn-active-text' : '') . "' id='{$key}Tab'");?>
     <?php endforeach;?>
     <?php echo html::checkbox('involved', array('1' => $lang->project->mine), '', $this->cookie->involved ? 'checked=checked' : '');?>
     <div class="tip"><a data-toggle='tooltip' title='<?php echo $lang->product->projectInfo;?>'><i class='icon-help'></i></a></div>
@@ -22,7 +22,7 @@
   <?php if($branchStatus != 'closed'):?>
   <div class="btn-toolbar pull-right">
     <?php if(common::hasPriv('project', 'manageProducts')) echo html::a('#link2Project', '<i class="icon-link"></i> ' . $lang->product->link2Project, '', "data-toggle='modal' class='btn btn-secondary'");?>
-    <?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$product->program&from=project&productID=$productID&branchID=$branchID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
+    <?php if(common::hasPriv('project', 'create')) common::printLink('project', 'createGuide', "programID=$product->program&from=project&productID={$product->id}&branchID=$branchID", '<i class="icon icon-plus"></i> ' . $lang->project->create, '', 'class="btn btn-primary" data-toggle="modal" data-target="#guideDialog"');?>
   </div>
   <?php endif;?>
 </div>
@@ -125,7 +125,7 @@
           </tr>
           <tr>
             <td colspan='2' class='text-center'>
-              <?php echo html::hidden('product', $productID);?>
+              <?php echo html::hidden('product', $product->id);?>
               <?php echo html::hidden('branch', $branchID);?>
               <?php echo html::commonButton($lang->save, "id='saveButton'", 'btn btn-primary btn-wide');?>
               <?php echo html::commonButton($lang->cancel, "data-dismiss='modal'", 'btn btn-default btn-wide');?>
diff --git a/module/product/zen.php b/module/product/zen.php
index aaaf765743..6ba1cd18e4 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -32,6 +32,15 @@ class productZen extends product
         }
     }
 
+    protected function setProjectMenu(int $productID, string $branch, string $preBranch)
+    {
+        $branch = ($preBranch !== '' and $branch === '') ? $preBranch : $branch;
+        setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        $this->session->set('createProjectLocate', $this->app->getURI(true), 'product');
+
+        $this->product->setMenu($productID, $branch);
+    }
+
     /**
      * 为创建产品设置导航数据，主要是替换占位符。
      * Set menu for create product page.
@@ -43,7 +52,8 @@ class productZen extends product
     protected function setCreateMenu(int $programID)
     {
         if($this->app->tab == 'program') $this->loadModel('program')->setMenu($programID);
-        if($this->app->tab == 'doc') unset($this->lang->doc->menu->product['subMenu']);
+        if($this->app->tab == 'doc')     unset($this->lang->doc->menu->product['subMenu']);
+
         if($this->app->getViewType() != 'mhtml') return;
 
         if($this->app->rawModule == 'projectstory' and $this->app->rawMethod == 'story') return $this->loadModel('project')->setMenu();
@@ -79,9 +89,9 @@ class productZen extends product
     {
         if($this->app->getViewType() == 'mhtml') return $this->product->setMenu();
 
-        if($moduleName == 'qa')        return $this->setShowErrorNoneMenu4QA($activeMenu);
-        if($moduleName == 'project')   return $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
-        if($moduleName == 'execution') return $this->setShowErrorNoneMenu4Execution($activeMenu, $objectID);
+        if($moduleName == 'qa')        $this->setShowErrorNoneMenu4QA($activeMenu);
+        if($moduleName == 'project')   $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
+        if($moduleName == 'execution') $this->setShowErrorNoneMenu4Execution($activeMenu, $objectID);
     }
 
     /**
@@ -202,7 +212,7 @@ class productZen extends product
         $fields['RD']['options']      = $rdUsers;
 
         if($programID) $fields['line']['options'] = array('') + $this->product->getLinePairs($programID);
-        if(empty($programID) or $this->config->systemMode != 'ALM') unset($fields['line']);
+        if(empty($programID) or $this->config->systemMode != 'ALM') unset($fields['line'], $fields['lineName']);
 
         return $fields;
     }
@@ -217,6 +227,7 @@ class productZen extends product
      */
     private function getFormFields4Edit(object $product): array
     {
+        /* Init fields. */
         $programID = (int)$product->program;
         $fields    = $this->getFormFields4Create($programID, $this->config->product->form->edit);
 
@@ -234,6 +245,7 @@ class productZen extends product
         {
             if(isset($product->{$field})) $fields[$field]['default'] = $product->{$field};
         }
+        $fields['changeProjects'] = array('type' => 'string', 'control' => 'hidden', 'required' => false, 'default' => '');
 
         return $fields;
     }
@@ -260,6 +272,64 @@ class productZen extends product
         return array($productLines, $programLines);
     }
 
+    /**
+     * Get project PM List
+     *
+     * @param  array $projectStats
+     * @access private
+     * @return string[]
+     */
+    private function getPMList(array $projectStats): array
+    {
+        $accounts = array();
+        foreach($projectStats as $project) $accounts[] = $project->PM;
+        $accounts = array_filter(array_unique($accounts));
+
+        if(empty($accounts)) return array();
+        return $this->user->getListByAccounts($accounts, 'account');
+    }
+
+    /**
+     * 创建完成后，做页面跳转。
+     * Locate after create product.
+     *
+     * @param  int   $productID
+     * @param  int   $programID
+     * @access private
+     * @return array
+     */
+    private function getCreatedLocate(int $productID, int $programID): array
+    {
+        $tab = $this->app->tab;
+        $moduleName = $tab == 'program' ? 'program' : $this->moduleName;
+        $methodName = $tab == 'program' ? 'product' : 'browse';
+        $param      = $tab == 'program' ? "programID=$programID" : "productID=$productID";
+        $locate     = isonlybody() ? 'true' : $this->createLink($moduleName, $methodName, $param);
+        if($tab == 'doc') $locate = $this->createLink('doc', 'productSpace', "objectID=$productID");
+
+        return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $locate);
+    }
+
+    /**
+     * 编辑完成后，做页面跳转。
+     * Locate after edit product.
+     *
+     * @param  int   $productID
+     * @param  int   $programID
+     * @access private
+     * @return array
+     */
+    private function getEditedLocate(int $productID, int $programID): array
+    {
+        $moduleName = $programID ? 'program' : 'product';
+        $methodName = $programID ? 'product' : 'view';
+        $param      = $programID ? "programID=$programID" : "product=$productID";
+        $locate     = $this->createLink($moduleName, $methodName, $param);
+
+        if(!$programID) $this->session->set('productList', $this->createLink('product', 'browse', $param), 'product');
+        return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate);
+    }
+
     /**
      * 构建创建产品页面数据。
      * Build form fields for create.
@@ -298,28 +368,60 @@ class productZen extends product
         $this->display();
     }
 
+    /**
+     * 为view层设置要用数据。
+     * Set view variables and display for project page.
+     *
+     * @param  int    $productID
+     * @param  string $branch
+     * @param  string $status
+     * @param  bool   $involved   $this->cookie->involved or $involved
+     * @param  string $orderBy
+     * @param  object $pager
+     * @access protected
+     * @return void
+     */
+    protected function displayProjectPage(int $productID, string $branch, string $status, bool $involved, string $orderBy, object $pager)
+    {
+        $this->app->loadLang('execution');
+        $projectStats = $this->product->getProjectStatsByProduct($productID, $status, $branch, $involved, $orderBy, $pager);
+
+        $product  = $this->product->getByID($productID);
+        $projects = $this->loadModel('project')->getPairsByProgram($product->program, 'all', false, 'order_asc', '', '', 'product');
+        foreach($projectStats as $project) unset($projects[$project->id]);
+
+        $this->view->title        = $this->products[$productID] . $this->lang->colon . $this->lang->product->project;
+        $this->view->projectStats = $projectStats;
+        $this->view->PMList       = $this->getPMList($projectStats);
+        $this->view->product      = $product;
+        $this->view->projects     = $projects;
+        $this->view->status       = $status;
+        $this->view->users        = $this->loadModel('user')->getPairs('noletter');
+        $this->view->branchID     = $branch;
+        $this->view->branchStatus = $this->loadModel('branch')->getByID($branch, 0, 'status');
+        $this->view->pager        = $pager;
+        $this->display();
+    }
+
     /**
      * 追加创建信息，处理白名单、项目集字段，还有富文本内容处理。
      * Prepare data for create.
      *
-     * @param  object $data
-     * @param  string $acl
-     * @param  string $uid
+     * @param  form $data
      * @access protected
      * @return object
      */
-    protected function prepareCreateExtras(object $data, string $acl, string $uid): object
+    protected function prepareCreateExtras(form $data): object
     {
         $product = $data->setDefault('createdBy', $this->app->user->account)
             ->setDefault('createdDate', helper::now())
             ->setDefault('createdVersion', $this->config->version)
             ->setIF($this->config->systemMode == 'light', 'program', (int)zget($this->config->global, 'defaultProgram', 0))
-            ->setIF($acl == 'open', 'whitelist', '')
+            ->setIF($data->rawdata->acl == 'open', 'whitelist', '')
             ->stripTags($this->config->product->editor->create['id'], $this->config->allowedTags)
-            ->remove('uid,newLine,lineName,contactListMenu')
             ->get();
 
-        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $uid);
+        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $data->rawdata->uid);
     }
 
     /**
@@ -347,37 +449,20 @@ class productZen extends product
      * Process after create product.
      *
      * @param  int    $productID
-     * @param  object $product
-     * @param  string $uid
-     * @param  string $lineName
+     * @param  int    $programID
      * @access protected
-     * @return void
+     * @return array
      */
-    protected function responseAfterCreate(int $productID, object $product, string $uid, string $lineName = '')
+    protected function responseAfterCreate(int $productID, int $programID): array
     {
-        /* Fix order and line fields for product. */
-        $fixData = new stdclass();
-        $fixData->order = $productID * 5;
-        if(!empty($lineName))
-        {
-            $lineID = $this->product->createLine((int)$product->program, $lineName);
-            if($lineID) $fixData->line = $lineID;
-        }
-        $this->dao->update(TABLE_PRODUCT)->data($fixData)->where('id')->eq($productID)->exec();
-
-        /* Update and create linked data. */
-        $this->loadModel('file')->updateObjectID($uid, $productID, 'product');
-        $this->product->createMainLib($productID);
-        if($product->whitelist)     $this->loadModel('personnel')->updateWhitelist(explode(',', $product->whitelist), 'product', $productID);
-        if($product->acl != 'open') $this->loadModel('user')->updateUserView($productID, 'product');
-
         $this->loadModel('action')->create('product', $productID, 'opened');
 
         $message = $this->executeHooks($productID);
         if($message) $this->lang->saveSuccess = $message;
 
-        if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $productID));
-        $this->sendCreateLocate($productID, (int)$product->program);
+        /* 移动到control。*/
+        if($this->viewType == 'json') return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'id' => $productID);
+        return $this->getCreatedLocate($productID, $programID);
     }
 
     /**
@@ -388,9 +473,9 @@ class productZen extends product
      * @param  int    $programID
      * @param  array  $changes
      * @access protected
-     * @return void
+     * @return array
      */
-    protected function responseAfterEdit(int $productID, int $programID, array $changes)
+    protected function responseAfterEdit(int $productID, int $programID, array $changes): array
     {
         if($changes)
         {
@@ -401,60 +486,7 @@ class productZen extends product
         $message = $this->executeHooks($productID);
         if($message) $this->lang->saveSuccess = $message;
 
-        return $this->sendCreateLocate($productID, $programID);
-    }
-
-    /**
-     * 创建完成后，做页面跳转。
-     * Locate after create product.
-     *
-     * @param  int   $productID
-     * @param  int   $programID
-     * @access private
-     * @return void
-     */
-    private function sendCreateLocate(int $productID, int $programID)
-    {
-        $tab = $this->app->tab;
-        $moduleName = $tab == 'program' ? 'program' : $this->moduleName;
-        $methodName = $tab == 'program' ? 'product' : 'browse';
-        $param      = $tab == 'program' ? "programID=$programID" : "productID=$productID";
-        $locate     = isonlybody() ? 'true' : $this->createLink($moduleName, $methodName, $param);
-        if($tab == 'doc') $locate = $this->createLink('doc', 'productSpace', "objectID=$productID");
-
-        $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => $locate));
-    }
-
-    /**
-     * 编辑完成后，做页面跳转。
-     * Locate after edit product.
-     *
-     * @param  int   $productID
-     * @param  int   $programID
-     * @access private
-     * @return void
-     */
-    private function sendEditLocate(int $productID, int $programID)
-    {
-        $moduleName = $programID ? 'program' : 'product';
-        $methodName = $programID ? 'product' : 'view';
-        $param      = $programID ? "programID=$programID" : "product=$productID";
-        $locate     = $this->createLink($moduleName, $methodName, $param);
-
-        if(!$programID) $this->session->set('productList', $this->createLink('product', 'browse', $param), 'product');
-        return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
-    }
-
-    /**
-     * 输出数据库操作产生的错误。
-     * Send error for dao.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function sendDaoError()
-    {
-        if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
+        return $this->getEditedLocate($productID, $programID);
     }
 
     /**
diff --git a/module/project/test/model/create.php b/module/project/test/model/create.php
index 6648aeb94e..ee3b3e4068 100755
--- a/module/project/test/model/create.php
+++ b/module/project/test/model/create.php
@@ -74,8 +74,8 @@ $beginGtEndProject = clone $project;
 $beginGtEndProject->end  = '2021-01-10';
 $beginGtEndProject->name = '测试新增项目四';
 
-r($projectClass->create($normalProject, $postData))     && p('name')             && e('测试新增项目一');                       
-r($projectClass->create($emptyNameProject, $postData))  && p('message[name]:0')  && e('『项目名称』不能为空。');               
-r($projectClass->create($emptyEndProject, $postData))   && p('message[end]:0')   && e('『计划完成』不能为空。');               
+r($projectClass->create($normalProject, $postData))     && p('name')             && e('测试新增项目一');
+r($projectClass->create($emptyNameProject, $postData))  && p('message[name]:0')  && e('『项目名称』不能为空。');
+r($projectClass->create($emptyEndProject, $postData))   && p('message[end]:0')   && e('『计划完成』不能为空。');
 r($projectClass->create($beginGtEndProject, $postData)) && p('message[end]:0')   && e('『计划完成』应当大于『2022-02-07』。');
 r($projectClass->create($emptyBeginProject, $postData)) && p('message[begin]:0') && e('『计划开始』不能为空。');
diff --git a/test/data/stakeholder.yaml b/test/data/stakeholder.yaml
index 3c524b169b..5858dcc7d8 100644
--- a/test/data/stakeholder.yaml
+++ b/test/data/stakeholder.yaml
@@ -1,12 +1,23 @@
 title: zt_stakeholder
 desc: 干系人表
+author: automated export
 version: 1.0
 fields:
   - field: objectID
     range: 11-100
   - field: objectType
     range: project
+  - field: type
+    range: inside
+  - field: from
   - field: key
     range: 1
   - field: user
     range: admin
+  - field: createdBy
+    range: admin
+  - field: createdDate
+    range: "(M)-(w)"
+    type: timestamp
+    postfix: ""
+    format: "YYYY/MM/DD"
diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index 56cd39a8fd..f2f8b43a43 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -386,7 +386,7 @@ class yaml
         system($execDump);
         $stderr = '';
         $this->exec_with_stderr($execYaml, $stderr);
-        
+
         if(empty($stderr)) return;
 
         $errors = explode(PHP_EOL, $stderr);
@@ -394,7 +394,7 @@ class yaml
         {
             return !empty($error) && !strpos($error, 'Using a password on the command line interface can be insecure');
         });
-        
+
         if(!empty($errors)) echo implode(PHP_EOL, $errors) . PHP_EOL;
     }
 
@@ -407,11 +407,11 @@ class yaml
      * @access private
      * @return string
      */
-    private function exec_with_stderr($cmd, &$stderr=null) 
+    private function exec_with_stderr($cmd, &$stderr=null)
     {
         $proc   = proc_open($cmd, array(2 => array('pipe', 'w')), $pipes);
         $stderr = stream_get_contents($pipes[2]);
-        
+
         fclose($pipes[2]);
         proc_close($proc);
     }

From 61bb5b74f9bf5bc71b05afe2e60e063ed7f28aee Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 11:10:48 +0800
Subject: [PATCH 14/80] * Adjust codes.

---
 module/project/model.php |  4 ++--
 module/project/tao.php   | 11 +++++------
 module/project/zen.php   | 14 +++++---------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 7773addd72..76e7d0f2c9 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -261,7 +261,7 @@ class projectModel extends model
             $project->executions = $this->loadModel('execution')->getStatData($projectID, 'undone', 0, 0, false, '', $orderBy, $pager);
             $project->teamCount  = isset($teams[$projectID]) ? $teams[$projectID] : 0;
             $project->estimate   = isset($estimates[$projectID]) ? round($estimates[$projectID]->estimate, 2) : 0;
-            $project->parentName = $project->parent ? $this->projectTao->getParentProgram($project->parent, $project->path, $project->grade) : '';
+            $project->parentName = $project->parent ? $this->projectTao->getParentProgram($project->path, $project->grade) : '';
         }
         return $projects;
     }
@@ -1207,7 +1207,7 @@ class projectModel extends model
         $this->loadModel('personnel')->updateWhitelist($whitelist, 'project', $projectID);
 
         $program = $project->parent ? $this->getByID((int)$project->parent) : new stdclass();
-        $this->projectTao->createDocLib($projectID, $project, $postData, $program);
+        $this->projectTao->createDocLib($projectID, $project, $program);
 
         if($project->hasProduct) $this->updateProducts($projectID);
 
diff --git a/module/project/tao.php b/module/project/tao.php
index c4c1dc6179..d048e33870 100755
--- a/module/project/tao.php
+++ b/module/project/tao.php
@@ -247,12 +247,11 @@ class projectTao extends projectModel
      *
      * @param  int    $projectID
      * @param  object $project
-     * @param  object $postData
      * @param  object $program
      * @access protected
      * @return bool
      */
-    protected function createDocLib(int $projectID, object $project, object $postData, object $program): bool
+    protected function createDocLib(int $projectID, object $project, object $program): bool
     {
         /* Create doc lib. */
         $this->app->loadLang('doc');
@@ -495,13 +494,12 @@ class projectTao extends projectModel
      * 根据项目集ID查询所有项目集的层级。
      * Get all program level of a program.
      *
-     * @param  int    $program
      * @param  string $path
      * @param  int    $grade
      * @access public
      * @return string
      */
-    public function getParentProgram(int $program, string $path, int $grade): string
+    public function getParentProgram(string $path, int $grade): string
     {
         $parentName = $this->dao->select('id,name')->from(TABLE_PROGRAM)
             ->where('id')->in(trim($path, ','))
@@ -527,8 +525,9 @@ class projectTao extends projectModel
      */
     protected function getExecutionProductGroup(array $executionIDs): array
     {
-        $oldExecutionProducts = $this->dao->select('project,product')->from(TABLE_PROJECTPRODUCT)->where('project')->in($executionIDs)->fetchGroup('project', 'product');
-        return $oldExecutionProducts;
+        return $this->dao->select('project,product')->from(TABLE_PROJECTPRODUCT)
+            ->where('project')->in($executionIDs)
+            ->fetchGroup('project', 'product');
     }
 
     /**
diff --git a/module/project/zen.php b/module/project/zen.php
index b841f57fe2..399756ddd4 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -59,8 +59,7 @@ class projectZen extends project
      */
     protected function prepareEditExtras(object $postData): object
     {
-        $rawdata = $postData->rawdata;
-        $project = $postData ->setDefault('team', $this->post->name)
+        $project = $postData->setDefault('team', $this->post->name)
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
             ->setDefault('days', '0')
@@ -109,8 +108,6 @@ class projectZen extends project
 
         if($project->parent)
         {
-            $program = $this->project->getByID((int)$project->parent);
-
             /* Judge products not empty. */
             if($project->hasProduct && empty($linkedProductsCount) and !isset($rawdata->newProduct))
             {
@@ -698,7 +695,7 @@ class projectZen extends project
         /* Record multiple and waterfall project unlinked products. */
         if($project->multiple and $project->model != 'waterfall' and $project->model != 'waterfallplus')
         {
-            $this->dealUnlinkedProduct($project, $oldProducts, $newProductIDs, $executionIDs);
+            $this->dealUnlinkedProduct($oldProducts, $newProductIDs, $executionIDs);
         }
     }
 
@@ -706,7 +703,6 @@ class projectZen extends project
      * 记录多迭代及瀑布类项目移除的产品
      * Record multiple and waterfall project unlinked products
      *
-     * @param  object    $project
      * @param  array     $oldProducts
      * @param  array     $newProductIDs
      * @param  int|array $executionIDs
@@ -714,7 +710,7 @@ class projectZen extends project
      * @access protected
      * @return void
      */
-    protected function dealUnlinkedProduct(object $project, array $oldProducts, array $newProductIDs, array $executionIDs): void
+    protected function dealUnlinkedProduct(array $oldProducts, array $newProductIDs, array $executionIDs): void
     {
         $oldExecutionProducts = $this->projectTao->getExecutionProductGroup($executionIDs);
         $unlinkedProducts     = array_diff(array_keys($oldProducts), $newProductIDs);
@@ -780,7 +776,7 @@ class projectZen extends project
         }
 
         /* Initializes the product from other linked products. */
-        if($this->config->systemMode == 'ALM') $this->InitOtherLinkProduct($project, $allProducts, $linkedBranchIdList, $linkedBranches, $linkedProducts);
+        if($this->config->systemMode == 'ALM') $this->initOtherLinkProduct($project, $allProducts, $linkedBranchIdList, $linkedBranches, $linkedProducts);
 
         $this->view->unmodifiableProducts     = $unmodifiableProducts;
         $this->view->unmodifiableBranches     = $unmodifiableBranches;
@@ -800,7 +796,7 @@ class projectZen extends project
      * @access protected
      * @return void
      */
-    protected function InitOtherLinkProduct(object $project, array $allProducts, array $linkedBranchIdList, array $linkedBranches, array $linkedProducts): void
+    protected function initOtherLinkProduct(object $project, array $allProducts, array $linkedBranchIdList, array $linkedBranches, array $linkedProducts): void
     {
         $branchGroups           = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal|noclosed', $linkedBranchIdList);
         $topProgramID           = $project->parent ? $this->program->getTopByPath($project->path) : 0;

From 85982c446c94f91d7e2a1243277d1d77f59ccc1f Mon Sep 17 00:00:00 2001
From: liyang <liyang@easycrop.ltd>
Date: Fri, 5 May 2023 11:15:36 +0800
Subject: [PATCH 15/80] * Fix dev data init.

---
 test/devdata/story.yaml | 40 ++++++----------------------------------
 test/lib/utils.php      |  2 +-
 2 files changed, 7 insertions(+), 35 deletions(-)

diff --git a/test/devdata/story.yaml b/test/devdata/story.yaml
index ebeb001b25..058476e2c9 100644
--- a/test/devdata/story.yaml
+++ b/test/devdata/story.yaml
@@ -156,12 +156,10 @@ fields:
     format: ""
   - field: openedDate
     note: "创建日期"
-    from: common.date.v1.yaml
-    use: dateA
-    prefix: ""
+    range: "(M)-(w)"
+    type: timestamp
     postfix: ""
-    loop: 0
-    format: ""
+    format: "YY/MM/DD"
   - field: assignedTo
     note: "指派给"
     fields:
@@ -175,12 +173,10 @@ fields:
     format: ""
   - field: assignedDate
     note: "指派日期"
-    from: common.date.v1.yaml
-    use: dateA
-    prefix: ""
+    range: "(M)-(w)"
+    type: timestamp
     postfix: ""
-    loop: 0
-    format: ""
+    format: "YY/MM/DD"
   - field: lastEditedBy
     note: "最后修改者"
     from: common.user.v1.yaml
@@ -189,14 +185,6 @@ fields:
     postfix: ""
     loop: 0
     format: ""
-  - field: lastEditedDate
-    note: "最后修改日期"
-    from: common.date.v1.yaml
-    use: dateA
-    prefix: ""
-    postfix: ""
-    loop: 0
-    format: ""
   - field: reviewedBy
     note: "评审者"
     fields:
@@ -207,14 +195,6 @@ fields:
     prefix: ""
     postfix: ""
     format: ""
-  - field: reviewedDate
-    note: "评审日期"
-    from: common.date.v1.yaml
-    use: dateA
-    prefix: ""
-    postfix: ""
-    loop: 0
-    format: ""
   - field: closedBy
     note: "关闭者"
     fields:
@@ -226,14 +206,6 @@ fields:
     postfix: ""
     loop: 0
     format: ""
-  - field: closedDate
-    note: "关闭日期"
-    from: common.date.v1.yaml
-    use: dateA
-    prefix: ""
-    postfix: ""
-    loop: 0
-    format: ""
   - field: closedReason
     note: "关闭原因"
     range: done,subdivided,duplicate,postponed,willnotdo,cancel,bydesign
diff --git a/test/lib/utils.php b/test/lib/utils.php
index 7663e181c2..4f9e814a21 100755
--- a/test/lib/utils.php
+++ b/test/lib/utils.php
@@ -125,7 +125,7 @@ function zdRun($isDev = false)
     $zdRoot = dirname(dirname(__FILE__)) . '/data/';
     if($isDev === true)
     {
-        if(isset($config->db->devDbName)) $dao->exec("use {$config->db->devDbName};");
+        if(isset($config->db->devDbName)) $dao->exec("set global sql_mode = ''; set global max_allowed_packet = 1000000000; set global net_buffer_length = 10000000;  use {$config->db->devDbName};");
         $zdRoot = dirname(dirname(__FILE__)) . "/devdata/";
     }
 

From 9b2d4a59898e3867f9e24595655cf1d9c7ddda89 Mon Sep 17 00:00:00 2001
From: sunhao <sunhao@easycorp.ltd>
Date: Fri, 5 May 2023 11:17:32 +0800
Subject: [PATCH 16/80] * zin: optimize zin tool generated template

---
 www/js/zui3/zintool.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/www/js/zui3/zintool.js b/www/js/zui3/zintool.js
index 0aa63948f7..5434f9cda8 100644
--- a/www/js/zui3/zintool.js
+++ b/www/js/zui3/zintool.js
@@ -833,8 +833,15 @@ function getPageTemplate(info)
 
     lines.unshift(
         '<?php',
+        'declare(strict_types=1);',
         '/**',
-        ` * The ${info.methodName} view of ${info.moduleName} of ZenTaoPMS.`,
+        ` * The ${info.methodName} view file of ${info.moduleName} module of ZenTaoPMS.`,
+        ' *',
+        ' * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)',
+        ' * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)',
+        ' * @author      yourname<yourname@easycorp.ltd>',
+        ` * @package     ${info.moduleName}`,
+        ' * @link        http://www.zentao.net',
         ' */',
         '',
         '/*',
@@ -844,12 +851,12 @@ function getPageTemplate(info)
         '',
         `  + Familiar with the use of these widgets in zin: ${widgets.join(', ')}.`,
         variables.length ? `  + Check the following variables which used in widgets: ${variables.map(x => `$${x}`).join(', ')}.` : null,
-        featureBar.items && featureBar.items.length ? `  + Check the ${featureBar.items.length.length} items difinition in featureBar widget.` : null,
-        toolbar && toolbar.length ? `  + Check the ${toolbar.length} items difinition in toolbar widget.` : null,
+        featureBar.items && featureBar.items.length ? `  + Check the ${featureBar.items.length} items definition in featureBar widget.` : null,
+        toolbar && toolbar.length ? `  + Check the ${toolbar.length} items definition in toolbar widget.` : null,
         `  + Check the origin code in module/${info.moduleName}/view/${info.methodName}.html.php, and ensure that all features have been implemented.`,
         `  + Check the origin js code in module/${info.moduleName}/js/common.js and module/${info.moduleName}/js/${info.methodName}.js`,
         `  + Check the origin css code in module/${info.moduleName}/css/common.css and module/${info.moduleName}/css/${info.methodName}.css`,
-        '  + Remove the comments which starts with "zin:"',
+        '  + Remove the comments which start with "zin:"',
         '  + Test according to the new design draft and the original implementation',
         ' */',
         '',

From 94874530b9312824acca82b2ba6bc250efd4de3f Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 May 2023 11:31:42 +0800
Subject: [PATCH 17/80]  * adjust for product edit.

---
 module/product/control.php |  8 ++++----
 module/product/zen.php     | 11 ++++-------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 01c1181528..524b2b87d5 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -413,11 +413,11 @@ class product extends control
 
         if(!empty($_POST))
         {
-            $data = form::data($this->config->product->form->edit);
-            $data = $this->productZen->prepareEditExtras($data, $this->post->acl, $this->post->uid);
+            $data    = form::data($this->config->product->form->edit);
+            $product = $this->productZen->prepareEditExtras($data);
 
-            $changes = $this->product->update($productID, $data, $this->post->uid);
-            if(dao::isError()) return $this->productZen->sendDaoError();
+            $changes = $this->product->update($productID, $product, $this->post->uid);
+            if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             if($action == 'undelete') $this->loadModel('action')->undelete((int)$extra);
             $response = $this->productZen->responseAfterEdit($productID, $programID, $changes);
diff --git a/module/product/zen.php b/module/product/zen.php
index 6ba1cd18e4..70a270f87d 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -428,20 +428,17 @@ class productZen extends product
      * 处理白名单和富文本内容。
      * Prepare data for edit.
      *
-     * @param  object $data
-     * @param  string $acl
-     * @param  string $uid
+     * @param  form $data
      * @access protected
      * @return object
      */
-    protected function prepareEditExtras(object $data, string $acl, string $uid): object
+    protected function prepareEditExtras(form $data): object
     {
-        $product = fixer::input('post')->setIF($acl == 'open', 'whitelist', '')
+        $product = fixer::input('post')->setIF($data->rawdata->acl == 'open', 'whitelist', '')
             ->stripTags($this->config->product->editor->edit['id'], $this->config->allowedTags)
-            ->remove('uid,changeProjects,contactListMenu')
             ->get();
 
-        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], $uid);
+        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], zget($data->rawdata, 'uid', ''));
     }
 
     /**

From 4235e27090ca276e7d3ec1eb28001cd82e2b0b09 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 11:56:58 +0800
Subject: [PATCH 18/80] * Adjust code.

---
 module/project/zen.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/module/project/zen.php b/module/project/zen.php
index 399756ddd4..7405a5a388 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -106,14 +106,11 @@ class projectZen extends project
             }
         }
 
-        if($project->parent)
+        /* Judge products not empty. */
+        if($project->parent and $project->hasProduct && empty($linkedProductsCount) and !isset($rawdata->newProduct))
         {
-            /* Judge products not empty. */
-            if($project->hasProduct && empty($linkedProductsCount) and !isset($rawdata->newProduct))
-            {
-                dao::$errors['products0'] = $this->lang->project->error->productNotEmpty;
-                return false;
-            }
+            dao::$errors['products0'] = $this->lang->project->error->productNotEmpty;
+            return false;
         }
 
         return true;
@@ -807,7 +804,7 @@ class projectZen extends project
         {
             if($programID != $topProgramID)
             {
-                $otherProducts = $this->InitBranchProduct($programProducts, $branchGroups, $linkedBranches, $linkedProducts);
+                $otherProducts = $this->initBranchProduct($programProducts, $branchGroups, $linkedBranches, $linkedProducts);
             }
             else
             {
@@ -836,7 +833,7 @@ class projectZen extends project
      * @access protected
      * @return array
      */
-    protected function InitBranchProduct(object $programProducts, array $branchGroups, array $linkedBranches, array $linkedProducts): array
+    protected function initBranchProduct(object $programProducts, array $branchGroups, array $linkedBranches, array $linkedProducts): array
     {
         $otherProducts = array();
         foreach($programProducts as $productID => $productName)

From 46c3d474abe23ecbd95f2bad4c9ca803e32ff813 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 12:00:30 +0800
Subject: [PATCH 19/80] * Adjust code.

---
 module/project/tao.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/project/tao.php b/module/project/tao.php
index d048e33870..c07b832b44 100755
--- a/module/project/tao.php
+++ b/module/project/tao.php
@@ -494,6 +494,7 @@ class projectTao extends projectModel
      * 根据项目集ID查询所有项目集的层级。
      * Get all program level of a program.
      *
+     * @param  int    $program
      * @param  string $path
      * @param  int    $grade
      * @access public

From 844647e84ea003a7824ba495d21edb882733f5ca Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 05:17:17 +0000
Subject: [PATCH 20/80] * Update the unit test script for
 todoModel::batchCreate().

---
 module/todo/test/model/batchcreate.php | 50 +++++++++++++++-----------
 module/todo/test/todo.class.php        | 25 +++++--------
 2 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/module/todo/test/model/batchcreate.php b/module/todo/test/model/batchcreate.php
index 360624b005..ae3f19adeb 100755
--- a/module/todo/test/model/batchcreate.php
+++ b/module/todo/test/model/batchcreate.php
@@ -1,40 +1,48 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
+include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/todo.class.php';
 su('admin');
 
+function initData()
+{
+    zdTable('todo')->config('batchcreate')->gen(5);
+}
+
 /**
 
 title=测试 todoModel->batchCreate();
 cid=1
 pid=1
 
-批量创建有个没有名字的待办 >> 批量创建待办1,desc1,1,custom,0;批量创建待办2,desc2,2,custom,0;批量创建待办3,desc4,4,custom,0
-批量创建的待办 >> 测试单转Bug13,desc1,1,bug,313;用户需求版本一61,desc2,2,story,1;开发任务11,desc3,3,task,1;测试单1,desc4,4,testtask,1
+- 执行todo模块的batchCreateTest方法，参数是$todos, $formData属性7 @13
+- 执行todo模块的batchCreateTest方法，参数是$invalidEndTodos, $formData @0
 
 */
 
-$names  = array('批量创建待办1','批量创建待办2','', '批量创建待办3', '', '', '', '');
-$types  = array('custom', 'custom', 'custom', 'custom', 'custom', 'custom', 'custom', 'custom');
-$pris   = array('1', '2', '3', '4', '1', '2', '3', '4');
-$descs  = array('desc1', 'desc2', 'desc3', 'desc4', '' , '', '', '');
-$begins = array('0830', '0900', '0930', '1000', '1030', '1100', '1130', '1200');
-$ends   = array('0900', '0930', '1000','1030', '1100', '1130', '1200', '1230');
-$bugs   = array('2' => '313');
-$assignedTos = array('user1', 'ditto', 'ditto', 'ditto', 'ditto', 'ditto', 'ditto', 'ditto',);
-$noname_create = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends, 'assignedTos' => $assignedTos);
+initData();
 
-$names     = array('批量创建待办4','批量创建待办5','批量创建待办6', '批量创建待办7', '', '', '', '');
-$types     = array('bug', 'story', 'task', 'testtask', 'custom', 'custom', 'custom', 'custom');
-$bugs      = array('1' => '313');
-$stories   = array('2' => '1');
-$tasks     = array('3' => '1');
-$testtasks = array('4' => '1');
+$today    = date('Y-m-d');
+$formData = new stdClass;
+$formData->rawdata = new stdClass;
+$formData->rawdata->uid        = '';
+$formData->rawdata->date       = $today;
+$formData->rawdata->switchDate = '';
 
-$except_create = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends, 'bugs' => $bugs, 'stories' => $stories, 'tasks' => $tasks, 'testtasks' => $testtasks, 'assignedTos' => $assignedTos);
+$names       = array('批量创建待办1', '批量创建待办2', '批量创建待办3', '批量创建待办4', '批量创建待办5', '批量创建待办6', '批量创建待办7', '批量创建待办8');
+$types       = array('custom', 'custom', 'custom', 'custom', 'custom', 'custom', 'custom', 'custom');
+$pris        = array(1, 2, 3, 4, 1, 2, 3, 4);
+$descs       = array('desc1', 'desc2', 'desc3', 'desc4', '' , '', '', '');
+$begins      = array('0830', '0900', '0930', '1000', '1030', '1100', '1130', '1200');
+$ends        = array('0900', '0930', '1000','1030', '1100', '1130', '1200', '1230');
+$assignedTos = array('admin', 'productManager', 'projectManager', 'dev1', 'dev2', 'dev3', 'tester1', 'tester2',);
+$todos       = array('types' => $types, 'pris' => $pris, 'names' => $names, 'descs' => $descs, 'begins' => $begins, 'ends' => $ends, 'assignedTos' => $assignedTos, 'date' => $today);
+
+$invalidEnds     = array('0800', '0830', '0800','0800', '0800', '0800', '0800', '0800');
+$invalidEndTodos = $todos;
+$invalidEndTodos['ends'] = $invalidEnds;
 
 $todo = new todoTest();
+r($todo->batchCreateTest($todos, $formData)) && p('7') && e('13');
+r($todo->batchCreateTest($invalidEndTodos, $formData)) && p() && e('0');
 
-r($todo->batchCreateTest($noname_create)) && p('2006:name,desc,pri,type,objectID;2007:name,desc,pri,type,objectID;2008:name,desc,pri,type,objectID')                                 && e('批量创建待办1,desc1,1,custom,0;批量创建待办2,desc2,2,custom,0;批量创建待办3,desc4,4,custom,0'); // 批量创建有个没有名字的待办
-r($todo->batchCreateTest($except_create)) && p('2009:name,desc,pri,type,objectID;2010:name,desc,pri,type,objectID;2011:name,desc,pri,type,objectID;2012:name,desc,pri,type,objectID') && e('测试单转Bug13,desc1,1,bug,313;软件需求版本一551,desc2,2,story,1;开发任务11,desc3,3,task,1;测试单1,desc4,4,testtask,1'); // 批量创建的待办
diff --git a/module/todo/test/todo.class.php b/module/todo/test/todo.class.php
index 45b7015557..b4775d9b17 100755
--- a/module/todo/test/todo.class.php
+++ b/module/todo/test/todo.class.php
@@ -27,27 +27,18 @@ class todoTest
     /**
      * Test batch create todos.
      *
-     * @param  array $param
+     * @param  array  $todos
+     * @param  object $formData
      * @access public
-     * @return array
+     * @return array|int
      */
-    public function batchCreateTest($param = array())
+    public function batchCreateTest($todos, $formData)
     {
-        $createFields['date'] = date('Y-m-d',time());
+        $todos      = json_decode(json_encode($todos));
+        $todoIDList = $this->objectModel->batchCreate($todos, $formData);
 
-        foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
-
-        foreach($param as $key => $value) $_POST[$key] = $value;
-
-        $objects = $this->objectModel->batchCreate();
-
-        $todos = $this->objectModel->getByList($objects);
-
-        unset($_POST);
-
-        if(dao::isError()) return dao::getError();
-
-        return $todos;
+        if(dao::isError()) return 0;
+        return $todoIDList;
     }
 
     /**

From 06335c22666cbef9db5441c40e4d63124fd0462a Mon Sep 17 00:00:00 2001
From: Wangyuting <851424971@qq.com>
Date: Fri, 5 May 2023 13:21:17 +0800
Subject: [PATCH 21/80] * Optimize block printblock function.

---
 module/block/control.php                      | 184 +++++++-----------
 .../{welcome.ui.css => welcomeblock.ui.css}   |   0
 module/block/model.php                        |   7 +-
 .../block/ui/projectstatisticblock.html.php   |  57 ++++++
 ...welcome.html.php => welcomeblock.html.php} |   0
 5 files changed, 130 insertions(+), 118 deletions(-)
 rename module/block/css/{welcome.ui.css => welcomeblock.ui.css} (100%)
 create mode 100644 module/block/ui/projectstatisticblock.html.php
 rename module/block/ui/{welcome.html.php => welcomeblock.html.php} (100%)

diff --git a/module/block/control.php b/module/block/control.php
index ba96ea0975..76cddc6860 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -201,7 +201,7 @@ class block extends control
      * @access public
      * @return void
      */
-    public function dynamic()
+    public function printDynamicBlock()
     {
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -209,8 +209,6 @@ class block extends control
 
         $this->view->actions = $this->loadModel('action')->getDynamic('all', 'today', 'date_desc', $pager);
         $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter|all');
-
-        $this->display();
     }
 
     /**
@@ -219,7 +217,7 @@ class block extends control
      * @access public
      * @return void
      */
-    public function welcome()
+    public function printWelcomeBlock()
     {
         $this->view->tutorialed = $this->loadModel('tutorial')->getTutorialed();
 
@@ -241,7 +239,6 @@ class block extends control
             if($time >= $type) $welcomeType = $type;
         }
         $this->view->welcomeType = $welcomeType;
-        $this->display();
     }
 
     /**
@@ -263,57 +260,29 @@ class block extends control
      *
      * @param  int     $blockID
      * @access public
-     * @return void|false
+     * @return string
      */
     public function printBlock($blockID)
     {
+        $html    = '';
         $blockID = (int)$blockID;
         $block   = $this->block->getByID($blockID);
 
-        if(empty($block)) return false;
+        if(empty($block)) return $html;
 
-        switch($block->code)
-        {
-            case 'html':
-                $html = $this->blockZen->generateHtmlBlock($block);
-            break;
+        $code = $block->code;
+        if($code == 'statistic' or $code == 'list' or $code == 'overview') $code = $block->module . ucfirst($code);
 
-            case 'dynamic':
-                $html = $this->fetch('block', 'dynamic');
-            break;
+        $function = 'print' . ucfirst($code) . 'Block';
+        if(method_exists('block', $function)) $html = $this->$function($blockID);
 
-            case 'guide':
-                $html = $this->fetch('block', 'guide', "blockID=$blockID");
-            break;
-
-            case 'assigntome':
-                $html = $this->blockZen->generateAssignToMeBlock($block);
-            break;
-
-            case 'welcome':
-                $html = $this->fetch('block', 'welcome', "blockID=$blockID");
-            break;
-
-            case 'contribute':
-                $html = $this->fetch('block', 'contribute');
-            break;
-
-            default:
-                $html = $this->blockZen->generateDefaultBlockBySource($block);
-            break;
-        }
-        echo $html;
+        $this->display('block', strtolower($code) . 'block');
     }
 
-    /**
-     * Main function.
-     *
-     * @access public
-     * @return void
-     */
-    public function main($module = '', $blockID = 0)
+    public function printBlockData($module = '', $blockID = 0)
     {
         $blockID = (int)$blockID;
+
         if(!$this->selfCall)
         {
             $lang = str_replace('_', '-', $this->get->lang);
@@ -324,85 +293,72 @@ class block extends control
             if(!$this->block->checkAPI($this->get->hash)) return;
         }
 
-        $mode = strtolower($this->get->mode);
+        $code = strtolower($this->get->blockid);
 
-        if($mode == 'getblocklist')
+        $params = $this->get->param;
+        $params = json_decode(base64_decode($params));
+        if(isset($params->num) and !isset($params->count)) $params->count = $params->num;
+        if(!$this->selfCall)
         {
+            $this->app->user = $this->dao->select('*')->from(TABLE_USER)->where('ranzhi')->eq($params->account)->fetch();
+            if(empty($this->app->user))
+            {
+                $this->app->user = new stdclass();
+                $this->app->user->account = 'guest';
+            }
+            $this->app->user->admin  = strpos($this->app->company->admins, ",{$this->app->user->account},") !== false;
+            $this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account);
+            $this->app->user->groups = $this->user->getGroups($this->app->user->account);
+            $this->app->user->view   = $this->user->grantUserView($this->app->user->account, $this->app->user->rights['acls']);
 
+            $sso = base64_decode($this->get->sso);
+            $this->view->sso  = $sso;
+            $this->view->sign = strpos($sso, '?') === false ? '?' : '&';
         }
-        elseif($mode == 'getblockform')
+
+        if($blockID) $block = $this->block->getByID($blockID);
+        $this->view->longBlock = $this->block->isLongBlock($blockID ? $block : $params);
+        $this->view->selfCall  = $this->selfCall;
+        $this->view->block     = $blockID ? $block : '';
+
+        $this->viewType    = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html';
+        $this->params      = $params;
+        $this->view->code  = $this->get->blockid;
+        $this->view->title = $this->get->blockTitle;
+
+        $func = 'print' . ucfirst($code) . 'Block';
+        if(method_exists('block', $func))
         {
-            echo $this->block->getParams($code, $module);
+            $this->$func($module);
         }
-        elseif($mode == 'getblockdata')
+        else
         {
-            $code = strtolower($this->get->blockid);
-
-            $params = $this->get->param;
-            $params = json_decode(base64_decode($params));
-            if(isset($params->num) and !isset($params->count)) $params->count = $params->num;
-            if(!$this->selfCall)
-            {
-                $this->app->user = $this->dao->select('*')->from(TABLE_USER)->where('ranzhi')->eq($params->account)->fetch();
-                if(empty($this->app->user))
-                {
-                    $this->app->user = new stdclass();
-                    $this->app->user->account = 'guest';
-                }
-                $this->app->user->admin  = strpos($this->app->company->admins, ",{$this->app->user->account},") !== false;
-                $this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account);
-                $this->app->user->groups = $this->user->getGroups($this->app->user->account);
-                $this->app->user->view   = $this->user->grantUserView($this->app->user->account, $this->app->user->rights['acls']);
-
-                $sso = base64_decode($this->get->sso);
-                $this->view->sso  = $sso;
-                $this->view->sign = strpos($sso, '?') === false ? '?' : '&';
-            }
-
-            if($blockID) $block = $this->block->getByID($blockID);
-            $this->view->longBlock = $this->block->isLongBlock($blockID ? $block : $params);
-            $this->view->selfCall  = $this->selfCall;
-            $this->view->block     = $blockID ? $block : '';
-
-            $this->viewType    = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html';
-            $this->params      = $params;
-            $this->view->code  = $this->get->blockid;
-            $this->view->title = $this->get->blockTitle;
-
-            $func = 'print' . ucfirst($code) . 'Block';
-            if(method_exists('block', $func))
-            {
-                $this->$func($module);
-            }
-            else
-            {
-                $this->view->data = $this->block->$func($module, $params);
-            }
-
-            $this->view->moreLink = '';
-            if(isset($this->config->block->modules[$module]->moreLinkList->{$code}))
-            {
-                list($moduleName, $method, $vars) = explode('|', sprintf($this->config->block->modules[$module]->moreLinkList->{$code}, isset($params->type) ? $params->type : ''));
-                $this->view->moreLink = $this->createLink($moduleName, $method, $vars);
-            }
-
-            if($this->viewType == 'json')
-            {
-                unset($this->view->app);
-                unset($this->view->config);
-                unset($this->view->lang);
-                unset($this->view->header);
-                unset($this->view->position);
-                unset($this->view->moduleTree);
-
-                $output['status'] = is_object($this->view) ? 'success' : 'fail';
-                $output['data']   = json_encode($this->view);
-                $output['md5']    = md5(json_encode($this->view));
-                return print(json_encode($output));
-            }
-
-            $this->display('block', $code . 'block');
+            $this->view->data = $this->block->$func($module, $params);
         }
+
+        $this->view->moreLink = '';
+        if(isset($this->config->block->modules[$module]->moreLinkList->{$code}))
+        {
+            list($moduleName, $method, $vars) = explode('|', sprintf($this->config->block->modules[$module]->moreLinkList->{$code}, isset($params->type) ? $params->type : ''));
+            $this->view->moreLink = $this->createLink($moduleName, $method, $vars);
+        }
+
+        if($this->viewType == 'json')
+        {
+            unset($this->view->app);
+            unset($this->view->config);
+            unset($this->view->lang);
+            unset($this->view->header);
+            unset($this->view->position);
+            unset($this->view->moduleTree);
+
+            $output['status'] = is_object($this->view) ? 'success' : 'fail';
+            $output['data']   = json_encode($this->view);
+            $output['md5']    = md5(json_encode($this->view));
+            return print(json_encode($output));
+        }
+
+        $this->display('block', $code . 'block');
     }
 
     /**
diff --git a/module/block/css/welcome.ui.css b/module/block/css/welcomeblock.ui.css
similarity index 100%
rename from module/block/css/welcome.ui.css
rename to module/block/css/welcomeblock.ui.css
diff --git a/module/block/model.php b/module/block/model.php
index 2c20cb4e5f..f776c11294 100644
--- a/module/block/model.php
+++ b/module/block/model.php
@@ -455,12 +455,11 @@ class blockModel extends model
      *
      * @param  object    $block
      * @access public
-     * @return book
+     * @return bool
      */
-    public function isLongBlock($block)
+    public function isLongBlock(object $block): bool
     {
-        if(empty($block)) return true;
-        return $block->grid >= 6;
+        return (!empty($block) and $block->grid >= 6) ? true : false;
     }
 
     /**
diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php
new file mode 100644
index 0000000000..4f15140101
--- /dev/null
+++ b/module/block/ui/projectstatisticblock.html.php
@@ -0,0 +1,57 @@
+<?php
+declare(strict_types=1);
+/**
+* The project block view file of block module of ZenTaoPMS.
+* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+* @author      Wangyuting <wangyuting@easycorp.ltd>
+* @package     block
+* @link        https://www.zentao.net
+*/
+
+namespace zin;
+
+panel
+(
+    set('class', 'welcome-block'),
+    ul
+    (
+        set('class', 'nav nav-tabs'),
+        li
+        (
+            set('class', 'nav-item'),
+            a
+            (
+                set('href', '#tabCount1'),
+                '标签1'
+            )
+        ),
+        li
+        (
+            set('class', 'nav-item'),
+            a
+            (
+                set('href', '#tabCount2'),
+                '标签2'
+            )
+        )
+    ),
+    div
+    (
+        set('class', 'tab-content'),
+        div
+        (
+            set('class', 'tab-pane'),
+            set('id', 'tabCount1'),
+            "我是标签1"
+        )
+        div
+        (
+            set('class', 'tab-pane'),
+            set('id', 'tabCount2'),
+            "我是标签2"
+        )
+    )
+)
+
+render();
diff --git a/module/block/ui/welcome.html.php b/module/block/ui/welcomeblock.html.php
similarity index 100%
rename from module/block/ui/welcome.html.php
rename to module/block/ui/welcomeblock.html.php

From 28349d85c2e254a80a058ea36ea9d72e1b6f82bb Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 13:33:49 +0800
Subject: [PATCH 22/80] * submit unit test for getexecutionproductgroup.

---
 .../test/tao/getexecutionproductgroup.php     | 64 +++++++++++++++++++
 module/user/model.php                         |  2 +-
 test/lib/init.php                             |  2 +-
 3 files changed, 66 insertions(+), 2 deletions(-)
 create mode 100755 module/project/test/tao/getexecutionproductgroup.php

diff --git a/module/project/test/tao/getexecutionproductgroup.php b/module/project/test/tao/getexecutionproductgroup.php
new file mode 100755
index 0000000000..17ba49f2d9
--- /dev/null
+++ b/module/project/test/tao/getexecutionproductgroup.php
@@ -0,0 +1,64 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+include dirname(__FILE__, 2) . '/project.class.php';
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('1,2');
+    $project->gen(2);
+
+    $product = zdTable('product')->gen(3);
+
+    $projectproduct = zdTable('projectproduct');
+    $projectproduct->project->range('1{3},2{2}');
+    $projectproduct->product->range('1,2,3');
+    $projectproduct->gen(5);
+}
+
+/**
+
+title=测试 projectTao::getExecutionProductGroup();
+timeout=0
+cid=1
+
+- 执行$project1[1][1]
+ - 属性project @1
+ - 属性product @1
+
+- 执行$project1[1][2]
+ - 属性project @1
+ - 属性product @2
+
+- 执行$project1[1][3]
+ - 属性project @1
+ - 属性product @3
+
+- 执行$project2[2][1]
+ - 属性project @2
+ - 属性product @1
+
+- 执行$project2[2][2]
+ - 属性project @2
+ - 属性product @2
+
+
+
+*/
+
+initData();
+
+global $tester;
+
+$executions1 = array(1,2);
+$executions2 = array(2);
+$project1    = $tester->loadModel('project')->getExecutionProductGroup($executions1);
+$project2    = $tester->loadModel('project')->getExecutionProductGroup($executions2);
+
+r($project1[1][1]) && p('project,product') && e('1,1');
+r($project1[1][2]) && p('project,product') && e('1,2');
+r($project1[1][3]) && p('project,product') && e('1,3');
+r($project2[2][1]) && p('project,product') && e('2,1');
+r($project2[2][2]) && p('project,product') && e('2,2');
\ No newline at end of file
diff --git a/module/user/model.php b/module/user/model.php
index dc22a23e53..c46bab5a24 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1161,7 +1161,7 @@ class userModel extends model
     {
         if(!$user) return false;
 
-        $this->cleanLocked($user->account);
+//        $this->cleanLocked($user->account);
 
         /* Authorize him and save to session. */
         $user->rights = $this->authorize($user->account);
diff --git a/test/lib/init.php b/test/lib/init.php
index 387ef1f449..e502c1969c 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -477,6 +477,6 @@ function su($account)
     $user      = $userModel->getByID($account);
     if($user) return $userModel->login($user);
 
-    $user = $userModel->identify($account, $user->password);
+    //$user = $userModel->identify($account, $user->password);
     return false;
 }

From 4ed13e67cfc7ac6d4b1cbdce76208ed0a3b9bf30 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 13:38:41 +0800
Subject: [PATCH 23/80] * Adjust code.

---
 module/user/model.php | 2 +-
 test/lib/init.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/user/model.php b/module/user/model.php
index c46bab5a24..dc22a23e53 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -1161,7 +1161,7 @@ class userModel extends model
     {
         if(!$user) return false;
 
-//        $this->cleanLocked($user->account);
+        $this->cleanLocked($user->account);
 
         /* Authorize him and save to session. */
         $user->rights = $this->authorize($user->account);
diff --git a/test/lib/init.php b/test/lib/init.php
index e502c1969c..387ef1f449 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -477,6 +477,6 @@ function su($account)
     $user      = $userModel->getByID($account);
     if($user) return $userModel->login($user);
 
-    //$user = $userModel->identify($account, $user->password);
+    $user = $userModel->identify($account, $user->password);
     return false;
 }

From 22b146fc33353128d4089fe9d7792e4f14a1c224 Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Fri, 5 May 2023 13:46:43 +0800
Subject: [PATCH 24/80] * refactor tabs wg.

---
 zin/wg/tabs/v1.php | 94 +++++++++++++++++++++++-----------------------
 1 file changed, 48 insertions(+), 46 deletions(-)

diff --git a/zin/wg/tabs/v1.php b/zin/wg/tabs/v1.php
index dfa845e262..8cbc51ca60 100644
--- a/zin/wg/tabs/v1.php
+++ b/zin/wg/tabs/v1.php
@@ -7,80 +7,82 @@ class tabs extends wg
         /* Tabs direction: h - horizontal, v - vertical */
         'direction?:string="h"',
         'items:array',
-        'activeId?string'
+        'activeID?string'
     );
 
+    protected function getItemID(array $item): string
+    {
+        return isset($item['id']) ? $item['id'] : $this->gid;
+    }
+
+    protected function buildLabelView(string $id, array $item)
+    {
+        $isActive = $this->prop('activeID') == $id;
+        return li
+        (
+            setClass('nav-item'),
+            $isActive ? setClass('active') : null,
+            a
+            (
+                set('data-toggle', 'tab'),
+                set::href("#$id"),
+                $item['label']
+            )
+        );
+    }
+
+    protected function buildContentView(string $id, array $item)
+    {
+        $isActive = $this->prop('activeID') == $id;
+        return div
+        (
+            setClass('tab-pane'),
+            setID($id),
+            $isActive ? setClass('active') : null,
+            isset($item['data']) ? $item['data'] : null
+        );
+    }
+
     protected function build()
     {
         $items     = $this->prop('items');
         $direction = $this->prop('direction');
-        $activeId  = $this->prop('activeId');
+        $activeID  = $this->prop('activeID');
 
         if(empty($items)) return null;
 
-        $lables  = array();
-        $content = array();
-        $actived = false;
+        $labelViews  = array();
+        $contentViews = array();
         foreach($items as $item)
         {
-            /* Get ID. */
-            $id = isset($item['id']) ? $item['id'] : '';
-            if(empty($id)) $id = isset($item['label']) ? $item['label'] : '';
-            if(empty($id)) $id = $this->gid;
-
-            $active = isset($item['active']) ? !empty($item['active']) : null;
-            if($active === null and !empty($activeId) and $activeId == $id) $active = true;
-            if($active === true) $actived = true;
-
-            $lables[] = h::li
-            (
-                setClass('nav-item'),
-                $active === true ? setClass('active') : null,
-                h::a
-                (
-                    set('data-toggle', 'tab'),
-                    set('href', '#' . $id),
-                    isset($item['label']) ? $item['label'] : null
-                )
-            );
-
-            $content[] = h::div
-            (
-                setClass('tab-pane'),
-                setID($id),
-                $active === true ? setClass('active') : null,
-                isset($item['data']) ? $item['data'] : null
-            );
+            $id = $this->getItemID($item);
+            $labelViews[] = $this->buildLabelView($id, $item);
+            $contentViews[] = $this->buildContentView($id, $item);
         }
 
         /* There is no active item, then set index 0 to be actived. */
-        if(!$actived)
+        if(empty($activeID))
         {
-            $l = $lables[0];
-            $l->setProp('class', 'active');
-            $lables[0] = $l;
-
-            $c = $content[0];
-            $c->setProp('class', 'active');
-            $content[0] = $c;
+            $labelViews[0]->setProp('class', 'active');
+            $contentViews[0]->setProp('class', 'active');
         }
 
-        return h::div
+        return div
         (
             set($this->props->skip(array_keys(static::getDefinedProps()))),
             $direction == 'v' ? setClass('flex') : null,
             /* Tabs. */
-            h::ul
+            ul
             (
                 setClass('nav nav-tabs'),
                 $direction == 'v' ? setClass('nav-stacked') : null,
-                $lables
+                $labelViews
             ),
             /* Content. */
-            h::div
+            div
             (
                 setClass('tab-content'),
-                $content
+                $contentViews
             )
         );
     }

From 306d32c5593e77fb1996b281f2630303f5a247a4 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 13:48:16 +0800
Subject: [PATCH 25/80] * Modify unit test position.

---
 .../project/test/model/getparentprogram.php   | 24 --------
 .../test/tao/fetchmembercountbyidlist.php     |  6 +-
 module/project/test/tao/getparentprogram.php  | 60 +++++++++++++++++++
 3 files changed, 63 insertions(+), 27 deletions(-)
 delete mode 100755 module/project/test/model/getparentprogram.php
 create mode 100755 module/project/test/tao/getparentprogram.php

diff --git a/module/project/test/model/getparentprogram.php b/module/project/test/model/getparentprogram.php
deleted file mode 100755
index 5bb2f5674a..0000000000
--- a/module/project/test/model/getparentprogram.php
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
-su('admin');
-
-/**
-
-title=测试 projectModel::getParentName();
-cid=1
-pid=1
-
-获取id为11的项目父项目名字 >> 项目集1
-获取id为1的项目父项目名字 >> 0
-
-*/
-
-global $tester;
-$tester->loadModel('project');
-
-$project1 = $tester->project->getById(11);
-$project2 = $tester->project->getById(1);
-
-r($tester->project->getParentProgram($project1)) && p('name') && e('项目集1'); // 获取id为11的项目父项目名字
-r($tester->project->getParentProgram($project2)) && p('name') && e('0');       // 获取id为1的项目父项目名字
\ No newline at end of file
diff --git a/module/project/test/tao/fetchmembercountbyidlist.php b/module/project/test/tao/fetchmembercountbyidlist.php
index 20c8dbed9b..0eafa68844 100644
--- a/module/project/test/tao/fetchmembercountbyidlist.php
+++ b/module/project/test/tao/fetchmembercountbyidlist.php
@@ -45,6 +45,6 @@ $realIDList  = array('11', '12');
 
 global $tester;
 $projectTester = $tester->loadModel('project');
-r($projectTester->fetchMemberCountByIdList($noneIDList))  && p()           && e('0'); // 查询没有项目ID的情况
-r($projectTester->fetchMemberCountByIdList($wrongIDList)) && p()           && e('0'); // 查询错误ID的情况
-r($projectTester->fetchMemberCountByIdList($realIDList))  && p('11:count') && e('1'); // 查询正常ID的情况
+r($projectTester->fetchMemberCountByIdList($noneIDList))  && p()     && e('0'); // 查询没有项目ID的情况
+r($projectTester->fetchMemberCountByIdList($wrongIDList)) && p()     && e('0'); // 查询错误ID的情况
+r($projectTester->fetchMemberCountByIdList($realIDList))  && p('11') && e('1'); // 查询正常ID的情况
diff --git a/module/project/test/tao/getparentprogram.php b/module/project/test/tao/getparentprogram.php
new file mode 100755
index 0000000000..15ba9912a1
--- /dev/null
+++ b/module/project/test/tao/getparentprogram.php
@@ -0,0 +1,60 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('1-10,11-19');
+    $project->project->range('0{10},11-19');
+    $project->name->setFields(array(
+        array('field' => 'name1', 'range' => '项目集{10},项目{9}'),
+        array('field' => 'name2', 'range' => '1-10,11-19')
+    ));
+    $project->code->setFields(array(
+        array('field' => 'name1', 'range' => 'program{10},project{9}'),
+        array('field' => 'name2', 'range' => '1-10,11-19')
+    ));
+    $project->path->setFields(array(
+        array('field' => 'name1', 'range' => '1-10', 'prefix' => ','),
+        array('field' => 'name2', 'range' => '11-19', 'prefix' => ',', 'postfix' => ',')
+    ));
+    $project->model->range("[]{10},scrum{9}");
+    $project->auth->range("[]");
+    $project->type->range("program{10},project{9}");
+    $project->grade->range("1{10},2{9}");
+    $project->parent->range("0{10},1-9");
+    $project->days->range("1");
+    $project->status->range("wait,doing,suspended,closed");
+    $project->desc->range("[]");
+    $project->budget->range("100000,200000");
+    $project->budgetUnit->range("CNY");
+    $project->percent->range("0-0");
+    $project->openedDate->range("`2023-05-01 10:00:10`");
+    $project->gen(18);
+
+    zdTable('user')->gen(10);
+}
+
+/**
+
+title=测试 projectTao::getParentProgram();
+cid=1
+
+
+*/
+
+initData();
+su('admin');
+
+global $tester;
+$projectTester = $tester->loadModel('project');
+
+$pathList  = array('', '1', ',1,11,');
+$gradeList = array(0, 1, 2);
+
+r($projectTester->getParentProgram($pathList[0], $gradeList[0])) && p() && e('0');       // 路径和层级都错误的情况
+r($projectTester->getParentProgram($pathList[0], $gradeList[1])) && p() && e('0');       // 路径错误，层级正确的情况
+r($projectTester->getParentProgram($pathList[1], $gradeList[1])) && p() && e('0');       // 路径正确，层级错误的情况
+r($projectTester->getParentProgram($pathList[1], $gradeList[2])) && p() && e('项目集1'); // 路径正确，层级正确的情况
+r($projectTester->getParentProgram($pathList[2], $gradeList[2])) && p() && e('项目集1'); // 路径有逗号，层级正确的情况

From bc9ffe407849848359a90beae312ae9344ccb9d6 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 13:48:53 +0800
Subject: [PATCH 26/80] * Adjust code.

---
 module/project/tao.php | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/module/project/tao.php b/module/project/tao.php
index c07b832b44..8a29c54c72 100755
--- a/module/project/tao.php
+++ b/module/project/tao.php
@@ -502,17 +502,16 @@ class projectTao extends projectModel
      */
     public function getParentProgram(string $path, int $grade): string
     {
-        $parentName = $this->dao->select('id,name')->from(TABLE_PROGRAM)
+        $programList = $this->dao->select('id,name')->from(TABLE_PROGRAM)
             ->where('id')->in(trim($path, ','))
             ->andWhere('grade')->lt($grade)
             ->orderBy('grade asc')
             ->fetchPairs();
 
-        $parentProgram = '';
-        foreach($parentName as $name) $parentProgram .= $name . '/';
-        $parentProgram = rtrim($parentProgram, '/');
+        $programName = '';
+        foreach($programList as $program) $programName .= $program . '/';
 
-        return $parentProgram;
+        return rtrim($programName, '/');
     }
 
     /**

From 36dc7917ed9c7733979e0632deb24b605abb66e7 Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 05:52:35 +0000
Subject: [PATCH 27/80] * The logic of the split
 todoController::createCycle()..

---
 module/todo/control.php |  3 ++-
 module/todo/model.php   | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index 778864b7d8..1958593940 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -573,6 +573,7 @@ class todo extends control
     }
 
     /**
+     * 创建周期待办。
      * Create cycle.
      *
      * @access public
@@ -580,7 +581,7 @@ class todo extends control
      */
     public function createCycle()
     {
-        $todoList = $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->andWhere('deleted')->eq(0)->fetchAll('id');
+        $todoList = $this->todo->getValidCycleList();
         $this->todo->createByCycle($todoList);
     }
 }
diff --git a/module/todo/model.php b/module/todo/model.php
index ab286b09bc..fedceafc2d 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -342,6 +342,7 @@ class todoModel extends model
     }
 
     /**
+     * 根据周期待办创建待办。
      * Create todo by cycle.
      *
      * @param  array   $todoList
@@ -368,7 +369,7 @@ class todoModel extends model
             if($today < $begin or (!empty($end) && $today > $end)) continue;
 
             $newTodo = $this->todoTao->buildCycleTodo($todo);
-            if(isset($todo->assignedTo) and $todo->assignedTo) $newTodo->assignedDate = $now;
+            if(isset($todo->assignedTo) && $todo->assignedTo) $newTodo->assignedDate = $now;
 
             $start  = strtotime($begin);
             $finish = strtotime("$today +{$beforeDays} days");
@@ -388,6 +389,7 @@ class todoModel extends model
                 if($lastCycle and ($date == $lastCycle->date)) continue;
 
                 $newTodo->date = $date;
+
                 $this->todoTao->insert($newTodo);
                 $this->action->create('todo', $this->dao->lastInsertID(), 'opened', '', '', $newTodo->account);
                 $cycleList[$todoID] = $newTodo;
@@ -543,6 +545,18 @@ class todoModel extends model
         return $this->todoTao->fetchRows($todoIdList);
     }
 
+    /**
+     * 获取所有有效的周期待办列表。
+     * Get valid cycle todo listi.
+     *
+     * @access public
+     * @return array
+     */
+    public function getValidCycleList(): array
+    {
+        return $this->dao->select('*')->from(TABLE_TODO)->where('cycle')->eq(1)->andWhere('deleted')->eq(0)->fetchAll('id');
+    }
+
     /**
      * 根据待办ID更新待办数据。
      * Update todo data by id.

From 8a220aa3391bd9e1a0b93d9a1c904d50a54bfa78 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 14:15:08 +0800
Subject: [PATCH 28/80] * todo update test case.

---
 module/todo/control.php           |  2 --
 module/todo/test/model/update.php | 33 +++++--------------------------
 2 files changed, 5 insertions(+), 30 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index 778864b7d8..993178198d 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -145,8 +145,6 @@ class todo extends control
         unset($this->lang->todo->typeList['cycle']);
 
         $this->todoZen->buildEditView($todo);
-
-        return;
     }
 
     /**
diff --git a/module/todo/test/model/update.php b/module/todo/test/model/update.php
index b736beb59f..7267be901d 100755
--- a/module/todo/test/model/update.php
+++ b/module/todo/test/model/update.php
@@ -6,18 +6,7 @@ su('admin');
 
 function initData()
 {
-    $todo = zdTable('todo');
-    $todo->id->range('1');
-    $todo->account->range('admin');
-    $todo->date->range(date('Y-m-d'));
-    $todo->begin->range('1000');
-    $todo->end->range('2400');
-    $todo->type->range('custom');
-    $todo->name->range('这是一个待办');
-    $todo->status->range('wait');
-    $todo->vision->range('rnd');
-
-    $todo->gen(1);
+    zdTable('todo')->config('update')->gen(5);
 }
 
 /**
@@ -26,18 +15,6 @@ title=测试 todoModel::update;
 timeout=0
 cid=1
 
-- 执行todo模块的update方法，参数是1, $t_upname
- - 第0条的field属性 @name
- - 第0条的old属性 @这是一个待办
- - 第0条的new属性 @john
-
-- 执行todo模块的update方法，参数是1, $t_uptype
- - 第0条的field属性 @type
- - 第0条的old属性 @custom
- - 第0条的new属性 @bug
-
-- 执行todo模块的update方法，参数是1, $t_unname @没有数据更新
-
 */
 
 global $tester;
@@ -45,11 +22,11 @@ $tester->loadModel('todo');
 
 initData();
 
-$t_upname = array('name' => 'john');
+$t_upname = array('name' => '我的待办11');
 $t_uptype = array('type' => 'bug', 'objectID' => '1');
-$t_unname = array('name' => 'john');
+$t_unname = array('name' => '我的待办2');
 
 $todo = new todoTest();
-r($todo->updateTest(1, $t_upname)) && p('0:field,old,new') && e('name,这是一个待办,john');
+r($todo->updateTest(1, $t_upname)) && p('0:field,old,new') && e('name,我的待办1,我的待办11');
 r($todo->updateTest(1, $t_uptype)) && p('0:field,old,new') && e('type,custom,bug');
-r($todo->updateTest(1, $t_unname)) && p()                  && e('没有数据更新');
\ No newline at end of file
+r($todo->updateTest(2, $t_unname)) && p()                  && e('没有数据更新');

From f93c96751a5ab54440067420c615d310e9f8765b Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 14:19:05 +0800
Subject: [PATCH 29/80] * add todo update yaml config.

---
 .../todo/test/model/yaml/update/update.yaml   | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 module/todo/test/model/yaml/update/update.yaml

diff --git a/module/todo/test/model/yaml/update/update.yaml b/module/todo/test/model/yaml/update/update.yaml
new file mode 100644
index 0000000000..3c840d402a
--- /dev/null
+++ b/module/todo/test/model/yaml/update/update.yaml
@@ -0,0 +1,35 @@
+title: zt_update
+author: lanzongjun
+version: "1.0"
+fields:
+    - field: id
+      range: 1-5
+    - field: account
+      range: 'admin'
+    - field: date
+      range: 1-9
+      prefix: '2023-04-2'
+    - field: begin
+      range: 1000-1100
+    - field: end
+      range: 1200-1300
+    - field: type
+      range: custom{4},cycle{1}
+    - field: cycle
+      range: 0{4},1{1}
+    - field: pri
+      range: 3
+    - field: config
+      range: '[]{4},`{"specify":{"month":"0","day":"1"},"month":"14,15,25,26","type":"month","beforeDays":2,"end":"2023-05-31","begin":"2023-05-05"}`'
+    - field: name
+      range: 1-5
+      prefix: '我的待办'
+    - field: desc
+      range: 1-5
+      prefix: '这是待办描述'
+    - field: status
+      range: 'wait'
+
+
+
+

From d5981e565a61c39f1d930f5f4bbd0f6bd928934c Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Fri, 5 May 2023 06:31:44 +0000
Subject: [PATCH 30/80] * Fix task edit

---
 module/task/config/form.php                   |  10 +-
 module/task/control.php                       |  34 +-
 .../test/model/getdataoftasksperexecution.php |  11 +-
 .../test/tao/getlistbyreportcondition.php     |  74 ++
 module/task/test/task.class.php               |   1 +
 module/task/ui/edit.html.php                  | 635 +++++++++---------
 module/task/zen.php                           |  82 +--
 7 files changed, 454 insertions(+), 393 deletions(-)
 create mode 100644 module/task/test/tao/getlistbyreportcondition.php

diff --git a/module/task/config/form.php b/module/task/config/form.php
index 28a69266a9..0914fe827a 100644
--- a/module/task/config/form.php
+++ b/module/task/config/form.php
@@ -8,19 +8,17 @@ $config->task->form->assign['left']           = array('type' => 'float', 'requir
 $config->task->form->assign['lastEditedBy']   = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
 $config->task->form->assign['lastEditedDate'] = array('type' => 'string', 'required' => false, 'default' => helper::now());
 $config->task->form->assign['assignedDate']   = array('type' => 'string', 'required' => false, 'default' => helper::now());
-$config->task->form->assign['comment']        = array('type' => 'text', 'required' => false, 'default' => '');
 
 $config->task->form->edit = array();
 $config->task->form->edit['name']         = array('type' => 'string', 'required' => true);
 $config->task->form->edit['color']        = array('type' => 'string', 'required' => false, 'default' => '');
 $config->task->form->edit['desc']         = array('type' => 'string', 'required' => false, 'default' => '');
-$config->task->form->edit['comment']      = array('type' => 'string', 'required' => false, 'default' => '');
 $config->task->form->edit['lastEditedBy'] = array('type' => 'string', 'required' => false, 'default' => $app->user->account);
 $config->task->form->edit['execution']    = array('type' => 'int', 'required' => true);
 $config->task->form->edit['story']        = array('type' => 'int', 'required' => false, 'default' => 0);
 $config->task->form->edit['module']       = array('type' => 'int', 'required' => false, 'default' => 0);
 $config->task->form->edit['parent']       = array('type' => 'int', 'required' => false, 'default' => 0);
-$config->task->form->edit['mailto']       = array('type' => 'string', 'required' => false, 'default' => '');
+$config->task->form->edit['mailto']       = array('type' => 'array', 'required' => false, 'default' => array());
 $config->task->form->edit['mode']         = array('type' => 'string', 'required' => false, 'default' => '');
 $config->task->form->edit['assignedTo']   = array('type' => 'string', 'required' => false, 'default' => '');
 $config->task->form->edit['type']         = array('type' => 'string', 'required' => true);
@@ -39,9 +37,3 @@ $config->task->form->edit['canceledDate'] = array('type' => 'string', 'required'
 $config->task->form->edit['closedBy']     = array('type' => 'string', 'required' => false, 'default' => '');
 $config->task->form->edit['closedReason'] = array('type' => 'string', 'required' => false, 'default' => '');
 $config->task->form->edit['closedDate']   = array('type' => 'string', 'required' => false, 'default' => '');
-$config->task->form->edit['team']         = array('type' => 'array', 'required' => false, 'default' => array());
-$config->task->form->edit['teamSource']   = array('type' => 'array', 'required' => false, 'default' => array());
-$config->task->form->edit['teamEstimate'] = array('type' => 'array', 'required' => false, 'default' => array());
-$config->task->form->edit['teamConsumed'] = array('type' => 'array', 'required' => false, 'default' => array());
-$config->task->form->edit['teamLeft']     = array('type' => 'array', 'required' => false, 'default' => array());
-$config->task->form->edit['deleteFiles']  = array('type' => 'array', 'required' => false, 'default' => array());
diff --git a/module/task/control.php b/module/task/control.php
index c8ec150352..eb50716d46 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -546,12 +546,11 @@ class task extends control
      *
      * @param  int    $taskID
      * @param  string $comment
-     * @param  string $kanbanGroup
      * @param  string $from
      * @access public
      * @return void
      */
-    public function edit($taskID, $comment = 'false', $kanbanGroup = 'default', $from = '')
+    public function edit(string $taskID, string $comment = 'false', string $from = '')
     {
         $this->commonAction($taskID);
 
@@ -561,27 +560,28 @@ class task extends control
             $changes = array();
 
             $postDataFixer = form::data($this->config->task->form->edit);
-            $postData     = $postDataFixer->rawdata;
+            $rawData      = $postDataFixer->rawdata;
 
             if(!$comment or $comment == 'false')
             {
-                $task    = $this->taskZen->prepareCreateExtras($postDataFixer, $taskID);
-                $changes = $this->task->update($task, $postData);
+                $task    = $this->taskZen->prepareEdit($postDataFixer, $taskID);
+                $changes = $this->task->update($task, $rawData);
                 if(dao::isError()) return print(js::error(dao::getError()));
             }
 
-            if($postData->comment != '' or !empty($changes))
+            if($rawData->comment != '' or !empty($changes))
             {
                 $action   = !empty($changes) ? 'Edited' : 'Commented';
-                $actionID = $this->action->create('task', $taskID, $action, $postData->comment);
+                $actionID = $this->action->create('task', $taskID, $action, $rawData->comment);
                 if(!empty($changes)) $this->action->logHistory($actionID, $changes);
             }
 
             $this->executeHooks($taskID);
 
-            if($postData->status == 'doing') $this->loadModel('common')->syncPPEStatus($taskID);
+            if($rawData->status == 'doing') $this->loadModel('common')->syncPPEStatus($taskID);
 
-            return $this->taskZen->reponseAfterEdit($taskID, $from);
+            $reponse = $this->taskZen->reponseAfterEdit($taskID, $from, $changes);
+            return is_array($reponse) ? $this->send($reponse) : $reponse;
         }
 
         $this->taskZen->buildEditForm($taskID);
@@ -736,7 +736,7 @@ class task extends control
      * @access public
      * @return void
      */
-    public function assignTo($executionID, $taskID, $kanbanGroup = 'default', $from = '')
+    public function assignTo(int $executionID, int $taskID, string $kanbanGroup = 'default', string $from = '')
     {
         $this->commonAction($taskID);
         $task = $this->task->getByID($taskID);
@@ -749,18 +749,22 @@ class task extends control
         if(!empty($_POST))
         {
             $postDataFixer = form::data($this->config->task->form->assign);
-            $postData     = $postDataFixer->rawdata;
+            $rawData       = $postDataFixer->rawdata;
 
-            $task    = $this->taskZen->prepareAssignToExtras($postDataFixer, $taskID);
+            $task    = $this->taskZen->prepareAssignTo($postDataFixer, $taskID);
             $changes = $this->task->assign($task);
-            if(dao::isError()) return $this->taskZen->errorAfterAssignTo();
+            if(dao::isError())
+            {
+                if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+                return print(js::error(dao::getError()));
+            }
 
-            $actionID = $this->loadModel('action')->create('task', $taskID, 'Assigned', $postData->comment, $task->assignedTo);
+            $actionID = $this->loadModel('action')->create('task', $taskID, 'Assigned', $rawData->comment, $task->assignedTo);
             $this->action->logHistory($actionID, $changes);
 
             $this->executeHooks($taskID);
 
-            return $this->taskZen->reponseAfterAssignTo($taskID);
+            return $this->taskZen->reponseAfterAssignTo($taskID, $from);
         }
 
         $this->taskZen->buildAssignToForm($executionID, $task);
diff --git a/module/task/test/model/getdataoftasksperexecution.php b/module/task/test/model/getdataoftasksperexecution.php
index c4e6f4068c..abfe7c4214 100755
--- a/module/task/test/model/getdataoftasksperexecution.php
+++ b/module/task/test/model/getdataoftasksperexecution.php
@@ -39,14 +39,18 @@ title=taskModel->getDataOfTasksPerExecution();
 timeout=0
 cid=1
 
-- 执行task模块的getDataOfTasksPerExecution方法，参数是2
+- 统计executionID为2的执行的任务数量
  - 第2条的name属性 @/迭代2
  - 第2条的value属性 @1
 
-- 执行task模块的getDataOfTasksPerExecution方法，参数是3
+- 统计executionID为3的执行的任务数量
  - 第3条的name属性 @/迭代3
  - 第3条的value属性 @2
 
+- 统计executionID为5的执行的任务数量
+ - 第5条的name属性 @0
+ - 第5条的value属性 @0
+
 
 
 */
@@ -55,4 +59,5 @@ initData();
 $tester->session->set('taskOnlyCondition', true);
 $task = new taskTest();
 r($task->getDataOfTasksPerExecutionTest(2)) && p('2:name,value')       && e('/迭代2,1'); //统计executionID为2的执行的任务数量
-r($task->getDataOfTasksPerExecutionTest(3)) && p('3:name,value')       && e('/迭代3,2'); //统计executionID为3的执行的任务数量
\ No newline at end of file
+r($task->getDataOfTasksPerExecutionTest(3)) && p('3:name,value')       && e('/迭代3,2'); //统计executionID为3的执行的任务数量
+r($task->getDataOfTasksPerExecutionTest(5)) && p('5:name,value')       && e('0,0');      //统计executionID为5的执行的任务数量
\ No newline at end of file
diff --git a/module/task/test/tao/getlistbyreportcondition.php b/module/task/test/tao/getlistbyreportcondition.php
new file mode 100644
index 0000000000..63e706859b
--- /dev/null
+++ b/module/task/test/tao/getlistbyreportcondition.php
@@ -0,0 +1,74 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('2-5');
+    $project->project->range('6-9');
+    $project->name->prefix("迭代")->range('2-5');
+    $project->code->prefix("project")->range('2-5');
+    $project->auth->range("[]");
+    $project->path->range("`,6,2,`,`,7,3,`,`,8,4,`,`,9,5,`");
+    $project->type->range("sprint");
+    $project->grade->range("1");
+    $project->days->range("1");
+    $project->status->range("wait");
+    $project->desc->range("[]");
+    $project->budget->range("100000,200000");
+    $project->budgetUnit->range("CNY");
+    $project->percent->range("0-0");
+
+    $project->gen(4);
+
+    $task = zdTable('task');
+    $task->id->range('2-5');
+    $task->execution->range('2,3,3,4');
+    $task->name->prefix("任务")->range('2-5');
+    $task->status->range("wait");
+
+    $task->gen(4);
+}
+
+function getCondition($executionID)
+{
+    return "execution  = '{$executionID}' AND  status IN ('','wait','doing','done','pause','cancel') AND  deleted  = '0'";
+}
+
+/**
+
+title=taskModel->getDataOfTasksPerExecution();
+timeout=0
+cid=1
+
+- 获取任务id，execution列表信息在执行2中
+ - 第2条的id属性 @2
+ - 第2条的execution属性 @2
+
+- 获取任务id，execution列表信息在执行4中
+ - 第5条的id属性 @5
+ - 第5条的execution属性 @4
+
+- 获取任务id，execution列表信息在执行5中
+ - 第5条的id属性 @0
+ - 第5条的execution属性 @0
+
+- 获取执行3的任务个数 @2
+
+
+
+*/
+
+initData();
+
+$fieldList = array('execution');
+$executionIdList = array(2, 3, 4, 5);
+
+$task = $tester->loadModel('task');
+r($task->getListByReportCondition($fieldList[0], getCondition($executionIdList[0]))) && p('2:id,execution') && e('2,2'); //获取任务id，execution列表信息在执行2中
+r($task->getListByReportCondition($fieldList[0], getCondition($executionIdList[2]))) && p('5:id,execution') && e('5,4'); //获取任务id，execution列表信息在执行4中
+r($task->getListByReportCondition($fieldList[0], getCondition($executionIdList[3]))) && p('5:id,execution') && e('0,0'); //获取任务id，execution列表信息在执行5中
+$taskList = $task->getListByReportCondition($fieldList[0], getCondition($executionIdList[1]));
+r(count($taskList)) && p() && e(2); //获取执行3的任务个数
\ No newline at end of file
diff --git a/module/task/test/task.class.php b/module/task/test/task.class.php
index 3e5585435f..519286db12 100644
--- a/module/task/test/task.class.php
+++ b/module/task/test/task.class.php
@@ -292,6 +292,7 @@ class taskTest
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $task = $_POST;
+        $task['id'] = $taskID;
         unset($task['comment']);
         $object = $this->objectModel->assign((object)$task, $taskID);
         unset($_POST);
diff --git a/module/task/ui/edit.html.php b/module/task/ui/edit.html.php
index 4140664979..8e164412bf 100644
--- a/module/task/ui/edit.html.php
+++ b/module/task/ui/edit.html.php
@@ -47,32 +47,19 @@ if($task->status == 'wait' and $task->parent == 0)
 }
 else
 {
-  if($task->mode == '')
-  {
-      $modeOptions = $lang->task->editModeList['single'];
-  }
-  else
-  {
-      $modeOptions = zget($lang->task->editModeList, $task->mode);
-  }
+    $modeText = $task->mode == '' ? $lang->task->editModeList['single'] : zget($lang->task->editModeList, $task->mode);
 }
 $assignedToOptions      = $taskMembers;
 $typeOptions            = $lang->task->typeList;
 $statusOptions          = (array)$lang->task->statusList;
 $priOptions             = $lang->task->priList;
-$mailtoOptions          = $task->mailto;
+$mailtoOptions          = $users;
 $contactListMenuOptions = $contactLists;
 $finishedByOptions      = $members;
 $canceledByOptions      = $users;
 $closedByOptions        = $users;
 $closedReasonOptions    = $lang->task->reasonList;
-$teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zenggang", 'text' => "Z:曾刚"));
-$teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zenggang", 'text' => "Z:曾刚"));
-$teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zenggang", 'text' => "Z:曾刚"));
-$teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zenggang", 'text' => "Z:曾刚"));
-$teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zenggang", 'text' => "Z:曾刚"));
-$teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zenggang", 'text' => "Z:曾刚"));
-
+$teamOptions            = $members;
 
 /* ====== Define the page structure with zin widgets ====== */
 
@@ -80,344 +67,360 @@ $teamOptions = array(array('value' => "", 'text' => ""), array('value' => "zengg
 formPanel
 (
     set::title($formTitle), // The form title is diffrent from the page title,
-    formGroup
+    setStyle(['max-width' => '100%']),
+    div
     (
-        set::width("1/4"),
-        set::name("execution"),
-        set::label("所属执行"),
-        set::required(true),
-        set::value("50"),
-        set::control("picker"),
-        set::items($executionOptions)
-    ),
-    formGroup
+    setClass('flex'),
+    cell
     (
-        set::width("1/4"),
-        set::name("module"),
-        set::label("所属模块"),
-        set::value("0"),
-        set::control("picker"),
-        set::items($moduleOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("story"),
-        set::label("相关软件需求"),
-        set::control("picker"),
-        set::items($storyOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("mode"),
-        set::label("任务模式"),
-        set::value("linear"),
-        set::control("picker"),
-        set::items($modeOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::label("指派给"),
-        inputGroup
-        (
-            control(set(array
-            (
-                'name' => "assignedTo",
-                'id' => "assignedTo",
-                'value' => "zenggang",
-                'disabled' => true,
-                'type' => "picker",
-                'items' => $assignedToOptions
-            ))),
-            btn(set(array
-            (
-                'type' => "btn",
-                'text' => "团队",
-                'class' => "input-group-btn team-group"
-            )))
-        )
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("type"),
-        set::label("任务类型"),
-        set::required(true),
-        set::value("study"),
-        set::control("picker"),
-        set::items($typeOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("status"),
-        set::label("任务状态"),
-        set::value("wait"),
-        set::control("picker"),
-        set::items($statusOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("pri"),
-        set::label("优先级"),
-        set::value("3"),
-        set::control("picker"),
-        set::items($priOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::label("抄送给"),
-        inputGroup
-        (
-            control(set(array
-            (
-                'name' => "mailto[]",
-                'id' => "mailto",
-                'value' => NULL,
-                'disabled' => false,
-                'type' => "picker",
-                'items' => $mailtoOptions,
-                'multiple' => true
-            ))),
-            control(set(array
-            (
-                'name' => "contactListMenu",
-                'id' => "contactListMenu",
-                'value' => "",
-                'disabled' => false,
-                'type' => "picker",
-                'onchange' => "setMailto",
-                'items' => $contactListMenuOptions
-            )))
-        )
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("estStarted"),
-        set::label("预计开始"),
-        set::value("2023-04-25"),
-        set::control("date")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("deadline"),
-        set::label("截止日期"),
-        set::value("2023-04-28"),
-        set::control("date")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("estimate"),
-        set::label("最初预计"),
-        set::value("7"),
-        set::control("text")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("left"),
-        set::label("预计剩余"),
-        set::value("7"),
-        set::control("text")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("realStarted"),
-        set::label("实际开始"),
-        set::value("2023-04-24 17:25:00"),
-        set::control("datetime")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("finishedBy"),
-        set::label("由谁完成"),
-        set::control("picker"),
-        set::items($finishedByOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("finishedDate"),
-        set::label("实际完成"),
-        set::value("0000-00-00 00:00:00"),
-        set::control("datetime")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("canceledBy"),
-        set::label("由谁取消"),
-        set::control("picker"),
-        set::items($canceledByOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("canceledDate"),
-        set::label("取消时间"),
-        set::value("0000-00-00 00:00:00"),
-        set::control("datetime")
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("closedBy"),
-        set::label("由谁关闭"),
-        set::control("picker"),
-        set::items($closedByOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("closedReason"),
-        set::label("关闭原因"),
-        set::control("picker"),
-        set::items($closedReasonOptions)
-    ),
-    formGroup
-    (
-        set::width("1/4"),
-        set::name("closedDate"),
-        set::label("关闭时间"),
-        set::value("0000-00-00 00:00:00"),
-        set::control("datetime")
-    ),
-    formRow
-    (
-        set::hidden(true),
+        set('width', '67%'),
         formGroup
         (
-            set::width("1/4"),
-            set::name("team[]"),
-            set::value("zenggang"),
-            set::control("picker"),
-            set::id("team"),
-            set::items($teamOptions)
+            set::label($lang->task->name),
+            set::name('name'),
+            set::value($task->name),
+            set::placeholder($lang->task->name),
+            set::control('input'),
+            set::required(true),
+            set::autofocus(true),
         ),
         formGroup
         (
-            set::width("1/4"),
-            inputGroup
-            (
-
-            )
-        )
-    ),
-    formRow
-    (
-        set::hidden(true),
-        formGroup
-        (
-            set::width("1/4"),
-            set::name("team[]"),
-            set::value("zenggang"),
-            set::control("picker"),
-            set::id("team"),
-            set::items($teamOptions)
+            set::label($lang->task->desc),
+            set::name('desc'),
+            set::value(htmlSpecialString($task->desc)),
+            set::control('textarea'),
         ),
         formGroup
         (
-            set::width("1/4"),
-            inputGroup
-            (
-
-            )
+            set::label($lang->comment),
+            set::name('comment'),
+            set::value(''),
+            set::control('textarea'),
+        ),
+        history
+        (
+            set::actions($actions),
+            set::users($users),
+            set::methodName($methodName),
         )
     ),
-    formRow
+    cell
     (
-        set::hidden(true),
+        on::change('#execution'),
+        set('width', '33%'),
         formGroup
         (
-            set::width("1/4"),
-            set::name("team[]"),
+            set::name("execution"),
+            set::label($lang->task->execution),
+            set::required(true),
+            set::value($task->execution),
             set::control("picker"),
-            set::id("team"),
-            set::items($teamOptions)
+            set::items($executionOptions)
         ),
         formGroup
         (
-            set::width("1/4"),
-            inputGroup
-            (
-
-            )
-        )
-    ),
-    formRow
-    (
-        set::hidden(true),
-        formGroup
-        (
-            set::width("1/4"),
-            set::name("team[]"),
+            set::name("module"),
+            set::label($lang->task->module),
+            set::value($task->module),
             set::control("picker"),
-            set::id("team"),
-            set::items($teamOptions)
+            set::items($moduleOptions)
         ),
         formGroup
         (
-            set::width("1/4"),
-            inputGroup
-            (
-
-            )
-        )
-    ),
-    formRow
-    (
-        set::hidden(true),
-        formGroup
-        (
-            set::width("1/4"),
-            set::name("team[]"),
+            set::name("story"),
+            set::label($lang->task->story),
+            set::value($task->story),
             set::control("picker"),
-            set::id("team"),
-            set::items($teamOptions)
+            set::items($storyOptions)
+        ),
+        (empty($modeText))
+        ? formGroup
+        (
+            set::name("mode"),
+            set::label($lang->task->mode),
+            set::value($task->mode),
+            set::control("picker"),
+            set::items($modeOptions)
+        )
+        : label
+        (
+            $modeText
         ),
         formGroup
         (
-            set::width("1/4"),
+            set::label($lang->task->assignedTo),
             inputGroup
             (
-
+                control(set(array
+                (
+                    'name' => "assignedTo",
+                    'id' => "assignedTo",
+                    'value' => $task->assignedTo,
+                    'disabled' => (!empty($task->team) and $task->mode == 'linear') ? true : false,
+                    'type' => "picker",
+                    'items' => $assignedToOptions
+                ))),
+                btn(set(array
+                (
+                    'type' => "btn",
+                    'text' => $lang->task->team,
+                    'class' => "input-group-btn team-group"
+                )))
             )
-        )
-    ),
-    formRow
-    (
-        set::hidden(true),
-        formGroup
-        (
-            set::width("1/4"),
-            set::name("team[]"),
-            set::control("picker"),
-            set::id("team"),
-            set::items($teamOptions)
         ),
         formGroup
         (
-            set::width("1/4"),
+            set::name("type"),
+            set::label($lang->task->type),
+            set::required(true),
+            set::value($task->type),
+            set::control("picker"),
+            set::items($typeOptions)
+        ),
+        empty($task->children)
+        ? formGroup
+        (
+            set::name("status"),
+            set::label($lang->task->status),
+            set::value($task->status),
+            set::control("picker"),
+            set::items($statusOptions)
+        )
+        : null,
+        formGroup
+        (
+            set::name("pri"),
+            set::label($lang->task->pri),
+            set::value($task->pri),
+            set::control("picker"),
+            set::items($priOptions)
+        ),
+        formGroup
+        (
+            set::label($lang->task->mailto),
             inputGroup
             (
+                control(set(array
+                (
+                    'name' => "mailto[]",
+                    'id' => "mailto",
+                    'value' => $task->mailto,
+                    'type' => "picker",
+                    'items' => $mailtoOptions,
+                    'multiple' => true
+                ))),
+                control(set(array
+                (
+                    'name' => "contactListMenu",
+                    'id' => "contactListMenu",
+                    'value' => "",
+                    'disabled' => false,
+                    'type' => "picker",
+                    'onchange' => "setMailto",
+                    'items' => $contactListMenuOptions
+                )))
+            )
+        ),
+        formGroup
+        (
+            set::name("estStarted"),
+            set::label($lang->task->estStarted),
+            set::value($task->estStarted),
+            set::control("date")
+        ),
+        formGroup
+        (
+            set::name("deadline"),
+            set::label($lang->task->deadline),
+            set::value($task->deadline),
+            set::control("date")
+        ),
+        formGroup
+        (
+            set::name("estimate"),
+            set::label($lang->task->estimate),
+            set::value($task->estimate),
+            set::control("text")
+        ),
+        formGroup
+        (
+            set::name("left"),
+            set::label($lang->task->left),
+            set::value($task->left),
+            set::control("text")
+        ),
+        formGroup
+        (
+            set::name("realStarted"),
+            set::label($lang->task->realStarted),
+            set::value(helper::isZeroDate($task->realStarted) ? '' : $task->realStarted),
+            set::control("datetime")
+        ),
+        formGroup
+        (
+            set::name("finishedBy"),
+            set::label($lang->task->finishedBy),
+            set::value($task->finishedBy),
+            set::control("picker"),
+            set::items($finishedByOptions)
+        ),
+        formGroup
+        (
+            set::name("finishedDate"),
+            set::label($lang->task->finishedDate),
+            set::value($task->finishedDate),
+            set::control("datetime")
+        ),
+        formGroup
+        (
+            set::name("canceledBy"),
+            set::label($lang->task->canceledBy),
+            set::value($task->canceledBy),
+            set::control("picker"),
+            set::items($canceledByOptions)
+        ),
+        formGroup
+        (
+            set::name("canceledDate"),
+            set::label($lang->task->canceledDate),
+            set::value($task->canceledDate),
+            set::control("datetime")
+        ),
+        formGroup
+        (
+            set::name("closedBy"),
+            set::label($lang->task->closedBy),
+            set::value($task->closedBy),
+            set::control("picker"),
+            set::items($closedByOptions)
+        ),
+        formGroup
+        (
+            set::name("closedReason"),
+            set::label($lang->task->closedReason),
+            set::value($task->closedReason),
+            set::control("picker"),
+            set::items($closedReasonOptions)
+        ),
+        formGroup
+        (
+            set::name("closedDate"),
+            set::label($lang->task->closedDate),
+            set::value($task->closedDate),
+            set::control("datetime")
+        ),
+        formRow
+        (
+            set::hidden(true),
+            formGroup
+            (
+                set::name("team[]"),
+                set::value("zenggang"),
+                set::control("picker"),
+                set::id("team"),
+                set::items($teamOptions)
+            ),
+            formGroup
+            (
+                inputGroup
+                (
 
+                )
+            )
+        ),
+        formRow
+        (
+            set::hidden(true),
+            formGroup
+            (
+                set::name("team[]"),
+                set::value("zenggang"),
+                set::control("picker"),
+                set::id("team"),
+                set::items($teamOptions)
+            ),
+            formGroup
+            (
+                inputGroup
+                (
+
+                )
+            )
+        ),
+        formRow
+        (
+            set::hidden(true),
+            formGroup
+            (
+                set::name("team[]"),
+                set::control("picker"),
+                set::id("team"),
+                set::items($teamOptions)
+            ),
+            formGroup
+            (
+                inputGroup
+                (
+
+                )
+            )
+        ),
+        formRow
+        (
+            set::hidden(true),
+            formGroup
+            (
+                set::name("team[]"),
+                set::control("picker"),
+                set::id("team"),
+                set::items($teamOptions)
+            ),
+            formGroup
+            (
+                inputGroup
+                (
+
+                )
+            )
+        ),
+        formRow
+        (
+            set::hidden(true),
+            formGroup
+            (
+                set::name("team[]"),
+                set::control("picker"),
+                set::id("team"),
+                set::items($teamOptions)
+            ),
+            formGroup
+            (
+                inputGroup
+                (
+
+                )
+            )
+        ),
+        formRow
+        (
+            set::hidden(true),
+            formGroup
+            (
+                set::name("team[]"),
+                set::control("picker"),
+                set::id("team"),
+                set::items($teamOptions)
+            ),
+            formGroup
+            (
+                inputGroup
+                (
+
+                )
             )
         )
-    ),
-    history
-    (
-        set::actions($actions),
-        set::users($users),
-        set::methodName($methodName),
+        )
     )
 );
 
diff --git a/module/task/zen.php b/module/task/zen.php
index 30a9070844..3c34051fcd 100644
--- a/module/task/zen.php
+++ b/module/task/zen.php
@@ -12,31 +12,23 @@ declare(strict_types=1);
 class taskZen extends task
 {
     /**
-     * prepareCreateExtras
+     * 准备创建数据。
+     * Prepare edit data.
      *
-     * @param object $postData
-     * @param int $taskID
+     * @param  form $postDataFixer
+     * @param  int    $taskID
      * @access protected
-     * @return void
+     * @return object
      */
-    protected function prepareCreateExtras(object $postDataFixer, int $taskID)
+    protected function prepareEdit(form $postDataFixer, int $taskID): object
     {
         $oldTask  = $this->task->getByID($taskID);
         $now      = helper::now();
         $postData = $postDataFixer->get();
         $task     = $postDataFixer->add('id', $taskID)
-            ->setIF(!$postData->assignedTo and !empty($oldTask->team) and !empty($postData->team), 'assignedTo', $this->task->getAssignedTo4Multi($postData->team, $oldTask))
-            ->setIF(!$oldTask->mode and !$postData->assignedTo and !empty($postData->team), 'assignedTo', $postData->team[0])
-            ->setIF(is_numeric($postData->estimate), 'estimate', (float)$postData->estimate)
-            ->setIF(is_numeric($postData->consumed), 'consumed', (float)$postData->consumed)
-            ->setIF(is_numeric($postData->left),     'left',     (float)$postData->left)
+            ->setIF(!$postData->assignedTo and !empty($oldTask->team) and !empty($postDataFixer->rawdata->team), 'assignedTo', $this->task->getAssignedTo4Multi($postDataFixer->rawdata->team, $oldTask))
+            ->setIF(!$oldTask->mode and !$postData->assignedTo and !empty($postDataFixer->rawdata->team), 'assignedTo', $postDataFixer->rawdata->team[0])
             ->setIF($oldTask->parent == 0 && $postData->parent == '', 'parent', 0)
-            ->setIF(strpos($this->config->task->edit->requiredFields, 'estStarted') !== false, 'estStarted', $postData->estStarted)
-            ->setIF(strpos($this->config->task->edit->requiredFields, 'deadline') !== false, 'deadline', $postData->deadline)
-            ->setIF(strpos($this->config->task->edit->requiredFields, 'estimate') !== false, 'estimate', $postData->estimate)
-            ->setIF(strpos($this->config->task->edit->requiredFields, 'left') !== false,     'left',     $postData->left)
-            ->setIF(strpos($this->config->task->edit->requiredFields, 'consumed') !== false, 'consumed', $postData->consumed)
-            ->setIF(strpos($this->config->task->edit->requiredFields, 'story') !== false,    'story',    $postData->story)
             ->setIF($postData->story != false and $postData->story != $oldTask->story, 'storyVersion', $this->loadModel('story')->getVersion($postData->story))
 
             ->setIF($postData->mode   == 'single', 'mode', '')
@@ -65,7 +57,6 @@ class taskZen extends task
             ->add('lastEditedDate', $now)
             ->stripTags($this->config->task->editor->edit['id'], $this->config->allowedTags)
             ->join('mailto', ',')
-            ->remove('comment,files,labels,uid,multiple,team,teamEstimate,teamConsumed,teamLeft,teamSource,contactListMenu')
             ->get();
 
         return $task;
@@ -75,11 +66,13 @@ class taskZen extends task
      * 编辑任务后返回响应.
      * Reponse after edit.
      *
-     * @param  object $task
+     * @param  int     $taskID
+     * @param  string  $from
+     * @param  array[] $changes
      * @access protected
      * @return int
      */
-    protected function reponseAfterEdit(int $taskID, string $from): int
+    protected function reponseAfterEdit(int $taskID, string $from, array $changes)
     {
         $task = $this->task->getById($taskID);
         if($task->fromBug != 0)
@@ -121,7 +114,7 @@ class taskZen extends task
             return print(js::reload('parent.parent'));
         }
 
-        if(defined('RUN_MODE') && RUN_MODE == 'api') return $this->send(array('status' => 'success', 'data' => $taskID));
+        if(defined('RUN_MODE') && RUN_MODE == 'api') return array('status' => 'success', 'data' => $taskID);
         return print(js::locate($this->createLink('task', 'view', "taskID=$taskID"), 'parent'));
     }
 
@@ -135,24 +128,23 @@ class taskZen extends task
      */
     protected function buildEditForm(int $taskID): void
     {
-        $task = $this->task->getById($taskID);
-
-        $tasks = $this->task->getParentTaskPairs($this->view->execution->id, $this->view->task->parent);
+        $task  = $this->view->task;
+        $tasks = $this->task->getParentTaskPairs($this->view->execution->id, $task->parent);
         if(isset($tasks[$taskID])) unset($tasks[$taskID]);
 
-        if(!isset($this->view->members[$this->view->task->assignedTo])) $this->view->members[$this->view->task->assignedTo] = $this->view->task->assignedTo;
-        if(isset($this->view->members['closed']) or $this->view->task->status == 'closed') $this->view->members['closed']  = 'Closed';
+        if(!isset($this->view->members[$task->assignedTo])) $this->view->members[$task->assignedTo] = $task->assignedTo;
+        if(isset($this->view->members['closed']) or $task->status == 'closed') $this->view->members['closed']  = 'Closed';
 
-        $executions = array();
-        if(!empty($task->project)) $executions = $this->execution->getByProject($task->project, 'all', 0, true);
+        $executions = !empty($task->project) ? $this->execution->getByProject($task->project, 'all', 0, true) : array();
 
+        /* Get task members. */
         $taskMembers = array();
         if(!empty($task->team))
         {
             $teamAccounts = $task->members;
             foreach($teamAccounts as $teamAccount)
             {
-                if(!isset($members[$teamAccount])) continue;
+                if(!isset($this->view->members[$teamAccount])) continue;
                 $taskMembers[$teamAccount] = $this->view->members[$teamAccount];
             }
         }
@@ -167,39 +159,40 @@ class taskZen extends task
         $this->view->stories       = $this->story->getExecutionStoryPairs($this->view->execution->id, 0, 'all', '', 'full', 'active');
         $this->view->tasks         = $tasks;
         $this->view->taskMembers   = $taskMembers;
-        $this->view->users         = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$this->view->task->openedBy},{$this->view->task->canceledBy},{$this->view->task->closedBy}");
+        $this->view->users         = $this->loadModel('user')->getPairs('nodeleted|noclosed', "{$task->openedBy},{$task->canceledBy},{$task->closedBy}");
         $this->view->showAllModule = isset($this->config->execution->task->allModule) ? $this->config->execution->task->allModule : '';
-        $this->view->modules       = $this->tree->getTaskOptionMenu($this->view->task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : '');
+        $this->view->modules       = $this->tree->getTaskOptionMenu($task->execution, 0, 0, $this->view->showAllModule ? 'allModule' : '');
         $this->view->executions    = $executions;
         $this->view->contactLists  = $this->loadModel('user')->getContactLists($this->app->user->account, 'withnote');
         $this->display();
     }
 
     /**
-     * prepareAssignToExtras
+     * 准备指派给的数据.
+     * Prepare assignto data.
      *
-     * @param object $postDataFixer
-     * @param int $taskID
+     * @param  form $postDataFixer
+     * @param  int    $taskID
      * @access protected
-     * @return void
+     * @return object
      */
-    protected function prepareAssignToExtras(object $postDataFixer, int $taskID)
+    protected function prepareAssignTo(form $postDataFixer, int $taskID): object
     {
         $task = $postDataFixer->add('id', $taskID)
             ->stripTags($this->config->task->editor->assignto['id'], $this->config->allowedTags)
-            ->remove('comment,showModule')
             ->get();
         return $task;
     }
 
     /**
+     * 指派后返回响应.
      * Reponse after assignto.
      *
      * @param  int    $taskID
      * @access protected
-     * @return void
+     * @return int
      */
-    protected function reponseAfterAssignTo(int $taskID): int
+    protected function reponseAfterAssignTo(int $taskID, string $from)
     {
         if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'success'));
         if(isonlybody())
@@ -232,18 +225,7 @@ class taskZen extends task
     }
 
     /**
-     * Return the error after assignto.
-     *
-     * @access protected
-     * @return void
-     */
-    protected function errorAfterAssignTo(): int
-    {
-        if($this->viewType == 'json' or (defined('RUN_MODE') && RUN_MODE == 'api')) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-        return print(js::error(dao::getError()));
-    }
-
-    /**
+     * 构建指派给表格。
      * Build AssignTo Form.
      *
      * @param  int    $executionID

From 45a5f4e4eb35d7457e7f706e0616939919880981 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 14:39:52 +0800
Subject: [PATCH 31/80] * submit control layer manageProducts function.

---
 module/project/control.php | 24 +++++++++++----------
 module/project/zen.php     | 44 ++++++++++++++++++++++++--------------
 2 files changed, 41 insertions(+), 27 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index 12b5d594ff..ef6da958bb 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1838,7 +1838,16 @@ class project extends control
             if($message) $this->lang->saveSuccess = $message;
 
             $this->projectZen->removeAssociatedProducts($project);
-            $this->projectZen->removeAssociatedExecutions($projectID, $from);
+
+            /* Delete the execution under the project. */
+            $executionIdList = $this->loadModel('execution')->getPairs($projectID);
+            if(empty($executionIdList))
+            {
+                if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
+                if($from == 'view') return print(js::locate($this->createLink('project', 'browse'), 'parent'));
+                return print(js::reload('parent'));
+            }
+            $this->projectZen->removeAssociatedExecutions($executionIdList);
 
             if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
 
@@ -1960,7 +1969,8 @@ class project extends control
             }
 
             /* Update linked products. */
-            $this->projectZen->mergeProducts($projectID, $project, $executionIDs, $postData);
+            $errorTips = $this->projectZen->mergeProducts($projectID, $project, $executionIDs, $postData);
+            return $this->send($errorTips);
 
             $locateLink = inLink('manageProducts', "projectID=$projectID");
             if($from == 'program')  $locateLink = $this->session->projectList;
@@ -1968,15 +1978,7 @@ class project extends control
         }
 
         /* Set menu. */
-        if($this->app->tab == 'program')
-        {
-            $this->loadModel('program')->setMenu($project->parent);
-        }
-        else if($this->app->tab == 'project')
-        {
-            $this->project->setMenu($projectID);
-        }
-
+        $this->setProjectMenu($projectID, $project);
         $this->projectZen->dealLinkProduct($projectID, $project);
 
         $this->view->title      = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
diff --git a/module/project/zen.php b/module/project/zen.php
index 7405a5a388..c9fd920d10 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -604,23 +604,13 @@ class projectZen extends project
      * 从项目中删除所有关联的执行。
      * removes all associated executions from the be deleted project
      *
-     * @param  int    $projectID
-     * @param  string $from
+     * @param  array $executionIdList
      *
      * @access protected
-     * @return int 1
+     * @return void
      */
-    protected function removeAssociatedExecutions(int $projectID, string $from): int
+    protected function removeAssociatedExecutions(array $executionIdList): void
     {
-        /* Delete the execution under the project. */
-        $executionIdList = $this->loadModel('execution')->getPairs($projectID);
-        if(empty($executionIdList))
-        {
-            if($this->viewType == 'json') return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess));
-            if($from == 'view') return print(js::locate($this->createLink('project', 'browse'), 'parent'));
-            return print(js::reload('parent'));
-        }
-
         $this->project->deleteByTableName('zt_execution', array_keys($executionIdList));
         foreach($executionIdList as $executionID => $execution) $this->loadModel('action')->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
         $this->loadModel('user')->updateUserView($executionIdList, 'sprint');
@@ -655,16 +645,16 @@ class projectZen extends project
      * @param  array     $postData
      *
      * @access protected
-     * @return void
+     * @return array
      */
-    protected function mergeProducts(int $projectID, object $project, int|array $executionIDs, array $postData): mixed
+    protected function mergeProducts(int $projectID, object $project, int|array $executionIDs, array $postData): array
     {
         $this->loadModel('product');
         $this->loadModel('execution');
 
         $oldProducts = $this->product->getProducts($projectID);
         $this->project->updateProducts($projectID);
-        if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+        if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
 
         /* Merge old and new linked products under the project. */
         $newProducts   = $this->product->getProducts($projectID);
@@ -694,6 +684,8 @@ class projectZen extends project
         {
             $this->dealUnlinkedProduct($oldProducts, $newProductIDs, $executionIDs);
         }
+
+        return array();
     }
 
     /**
@@ -855,4 +847,24 @@ class projectZen extends project
 
         return $otherProducts;
     }
+
+    /**
+     * setProjectMenu
+     *
+     * @param  int    $projectID
+     * @param  object $project
+     * @access protected
+     * @return void
+     */
+    protected function setProjectMenu(int $projectID, object $project): void
+    {
+        if($this->app->tab == 'program')
+        {
+            $this->loadModel('program')->setMenu($project->parent);
+        }
+        else if($this->app->tab == 'project')
+        {
+            $this->project->setMenu($projectID);
+        }
+    }
 }

From 31089b3a4f32fa21b1ad25b7f27913b18fecd470 Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 06:53:29 +0000
Subject: [PATCH 32/80] * Optimized the Logic of todoMoel::createByCycle()
 method.

---
 module/todo/model.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/module/todo/model.php b/module/todo/model.php
index fedceafc2d..126998fa92 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -390,9 +390,8 @@ class todoModel extends model
 
                 $newTodo->date = $date;
 
-                $this->todoTao->insert($newTodo);
-                $this->action->create('todo', $this->dao->lastInsertID(), 'opened', '', '', $newTodo->account);
-                $cycleList[$todoID] = $newTodo;
+                $todoID = $this->todoTao->insert($newTodo);
+                if($todoID) $this->action->create('todo', $todoID, 'opened', '', '', $newTodo->account);
             }
         }
     }

From 0bb3100a291daf2a2d360d2cecd726b2d9f07567 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 14:56:25 +0800
Subject: [PATCH 33/80] + Add programplan tao zen.

---
 module/programplan/tao.php | 14 ++++++++++++++
 module/programplan/zen.php | 14 ++++++++++++++
 2 files changed, 28 insertions(+)
 create mode 100644 module/programplan/tao.php
 create mode 100644 module/programplan/zen.php

diff --git a/module/programplan/tao.php b/module/programplan/tao.php
new file mode 100644
index 0000000000..b987f4b35a
--- /dev/null
+++ b/module/programplan/tao.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+/**
+ * The zen file of programplan module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      lanzongjun <lanzongjun@easycorp.ltd>
+ * @link        https://www.zentao.net
+ */
+class programplanTao extends programplanModel
+{
+
+}
diff --git a/module/programplan/zen.php b/module/programplan/zen.php
new file mode 100644
index 0000000000..b6f113fbd2
--- /dev/null
+++ b/module/programplan/zen.php
@@ -0,0 +1,14 @@
+<?php
+declare(strict_types=1);
+/**
+ * The zen file of programplan module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      lanzongjun <lanzongjun@easycorp.ltd>
+ * @link        https://www.zentao.net
+ */
+class programplanZen extends programplan
+{
+
+}

From 4184338b8776d02077b3db5c10f0bc34182cc49f Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 15:00:21 +0800
Subject: [PATCH 34/80] * Adjusted file header.

---
 module/programplan/tao.php | 2 +-
 module/todo/tao.php        | 9 ++++++++-
 module/todo/zen.php        | 8 ++++++++
 3 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/module/programplan/tao.php b/module/programplan/tao.php
index b987f4b35a..0a5b2abc1e 100644
--- a/module/programplan/tao.php
+++ b/module/programplan/tao.php
@@ -1,7 +1,7 @@
 <?php
 declare(strict_types=1);
 /**
- * The zen file of programplan module of ZenTaoPMS.
+ * The tao file of programplan module of ZenTaoPMS.
  *
  * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
  * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
diff --git a/module/todo/tao.php b/module/todo/tao.php
index 00413df041..7b195d44e0 100644
--- a/module/todo/tao.php
+++ b/module/todo/tao.php
@@ -1,5 +1,13 @@
 <?php
 declare(strict_types=1);
+/**
+ * The tao file of todo module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      lanzongjun <lanzongjun@easycorp.ltd>
+ * @link        https://www.zentao.net
+ */
 class todoTao extends todoModel
 {
     /**
@@ -7,7 +15,6 @@ class todoTao extends todoModel
      * Get a todo.
      *
      * @param  int     $todoID
-     * @param  object  $todo
      * @return object
      */
     protected function fetch(int $todoID): object
diff --git a/module/todo/zen.php b/module/todo/zen.php
index 8a99552be2..6842d88f32 100755
--- a/module/todo/zen.php
+++ b/module/todo/zen.php
@@ -1,5 +1,13 @@
 <?php
 declare(strict_types=1);
+/**
+ * The zen file of todo module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      lanzongjun <lanzongjun@easycorp.ltd>
+ * @link        https://www.zentao.net
+ */
 class todoZen extends todo
 {
     /**

From 4cf1b740e45172d33504beba0c8ce31527a112d3 Mon Sep 17 00:00:00 2001
From: sunhao <sunhao@easycorp.ltd>
Date: Fri, 5 May 2023 14:57:00 +0800
Subject: [PATCH 35/80] * zin: refactor import paths

---
 zin/core/context.class.php   |  2 +-
 zin/core/context.func.php    |  2 +-
 zin/core/directive.class.php |  2 +-
 zin/core/dom.class.php       |  2 +-
 zin/core/h.class.php         |  4 ++--
 zin/core/h.func.php          | 14 +++++++-------
 zin/core/item.class.php      |  4 ++--
 zin/core/on.class.php        |  2 +-
 zin/core/portal.class.php    |  2 +-
 zin/core/render.func.php     |  2 +-
 zin/core/set.class.php       |  2 +-
 zin/core/to.class.php        |  2 +-
 zin/core/wg.class.php        | 12 ++++++------
 zin/core/wg.func.php         |  8 ++++----
 zin/helper.php               |  2 +-
 zin/utils/data.class.php     |  2 +-
 zin/utils/hx.class.php       |  2 +-
 zin/utils/style.class.php    |  2 +-
 zin/zentao/zentao.func.php   |  2 +-
 zin/zui/toggle.class.php     |  2 +-
 zin/zui/zui.class.php        |  4 ++--
 zin/zui/zui.func.php         |  2 +-
 22 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/zin/core/context.class.php b/zin/core/context.class.php
index 76ad849d2c..711eb73931 100644
--- a/zin/core/context.class.php
+++ b/zin/core/context.class.php
@@ -13,7 +13,7 @@ namespace zin;
 
 require_once dirname(__DIR__) . DS . 'utils' . DS . 'dataset.class.php';
 require_once dirname(__DIR__) . DS . 'utils' . DS . 'flat.func.php';
-require_once 'portal.class.php';
+require_once __DIR__ . DS . 'portal.class.php';
 
 class context extends \zin\utils\dataset
 {
diff --git a/zin/core/context.func.php b/zin/core/context.func.php
index 5d7a770644..7a180bb7fa 100644
--- a/zin/core/context.func.php
+++ b/zin/core/context.func.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'context.class.php';
+require_once __DIR__ . DS . 'context.class.php';
 
 function portal(/* string $name, mixed ...$children */)
 {
diff --git a/zin/core/directive.class.php b/zin/core/directive.class.php
index 7e96de8194..9aee815f3e 100644
--- a/zin/core/directive.class.php
+++ b/zin/core/directive.class.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'zin.class.php';
+require_once __DIR__ . DS . 'zin.class.php';
 
 class directive
 {
diff --git a/zin/core/dom.class.php b/zin/core/dom.class.php
index 711f7b0b1c..722a129bde 100644
--- a/zin/core/dom.class.php
+++ b/zin/core/dom.class.php
@@ -12,7 +12,7 @@
 namespace zin;
 
 require_once dirname(__DIR__) . DS . 'utils' . DS . 'deep.func.php';
-require_once 'selector.func.php';
+require_once __DIR__ . DS . 'selector.func.php';
 
 class dom
 {
diff --git a/zin/core/h.class.php b/zin/core/h.class.php
index 967a6a0db2..b51ba4898e 100644
--- a/zin/core/h.class.php
+++ b/zin/core/h.class.php
@@ -12,8 +12,8 @@
 namespace zin;
 
 require_once dirname(__DIR__) . DS . 'utils' . DS . 'flat.func.php';
-require_once 'wg.class.php';
-require_once 'wg.func.php';
+require_once __DIR__ . DS . 'wg.class.php';
+require_once __DIR__ . DS . 'wg.func.php';
 
 class h extends wg
 {
diff --git a/zin/core/h.func.php b/zin/core/h.func.php
index 983112a15e..589be4862c 100644
--- a/zin/core/h.func.php
+++ b/zin/core/h.func.php
@@ -11,13 +11,13 @@
 
 namespace zin;
 
-require_once 'h.class.php';
-require_once 'item.class.php';
-require_once 'wg.func.php';
-require_once 'set.class.php';
-require_once 'to.class.php';
-require_once 'data.func.php';
-require_once 'on.class.php';
+require_once __DIR__ . DS . 'h.class.php';
+require_once __DIR__ . DS . 'item.class.php';
+require_once __DIR__ . DS . 'wg.func.php';
+require_once __DIR__ . DS . 'set.class.php';
+require_once __DIR__ . DS . 'to.class.php';
+require_once __DIR__ . DS . 'data.func.php';
+require_once __DIR__ . DS . 'on.class.php';
 
 function h()          {return call_user_func_array('\zin\h::create', func_get_args());}
 
diff --git a/zin/core/item.class.php b/zin/core/item.class.php
index 4eec23e72d..9f8e001948 100644
--- a/zin/core/item.class.php
+++ b/zin/core/item.class.php
@@ -11,8 +11,8 @@
 
 namespace zin;
 
-require_once 'wg.class.php';
-require_once 'wg.func.php';
+require_once __DIR__ . DS . 'wg.class.php';
+require_once __DIR__ . DS . 'wg.func.php';
 
 class item extends wg
 {
diff --git a/zin/core/on.class.php b/zin/core/on.class.php
index 7990c3ea50..cdd55d3c37 100644
--- a/zin/core/on.class.php
+++ b/zin/core/on.class.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'wg.func.php';
+require_once __DIR__ . DS . 'wg.func.php';
 
 class on
 {
diff --git a/zin/core/portal.class.php b/zin/core/portal.class.php
index 0d306bcbe9..726677bac8 100644
--- a/zin/core/portal.class.php
+++ b/zin/core/portal.class.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'wg.class.php';
+require_once __DIR__ . DS . 'wg.class.php';
 
 class portal extends wg
 {
diff --git a/zin/core/render.func.php b/zin/core/render.func.php
index 09c9ffe1a3..e8676e84a5 100644
--- a/zin/core/render.func.php
+++ b/zin/core/render.func.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'zin.class.php';
+require_once __DIR__ . DS . 'zin.class.php';
 
 /**
  * Render page content with a widget to HTML.
diff --git a/zin/core/set.class.php b/zin/core/set.class.php
index db7d10f589..c711d4c8d3 100644
--- a/zin/core/set.class.php
+++ b/zin/core/set.class.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'directive.class.php';
+require_once __DIR__ . DS . 'directive.class.php';
 
 class set
 {
diff --git a/zin/core/to.class.php b/zin/core/to.class.php
index b54f50ad44..c4ca9d27f1 100644
--- a/zin/core/to.class.php
+++ b/zin/core/to.class.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'directive.class.php';
+require_once __DIR__ . DS . 'directive.class.php';
 
 class to
 {
diff --git a/zin/core/wg.class.php b/zin/core/wg.class.php
index 315aa4d56c..ff167c1d63 100644
--- a/zin/core/wg.class.php
+++ b/zin/core/wg.class.php
@@ -11,12 +11,12 @@
 
 namespace zin;
 
-require_once 'props.class.php';
-require_once 'directive.class.php';
-require_once 'zin.class.php';
-require_once 'context.class.php';
-require_once 'selector.func.php';
-require_once 'dom.class.php';
+require_once __DIR__ . DS . 'props.class.php';
+require_once __DIR__ . DS . 'directive.class.php';
+require_once __DIR__ . DS . 'zin.class.php';
+require_once __DIR__ . DS . 'context.class.php';
+require_once __DIR__ . DS . 'selector.func.php';
+require_once __DIR__ . DS . 'dom.class.php';
 
 class wg
 {
diff --git a/zin/core/wg.func.php b/zin/core/wg.func.php
index bfa9a00096..60351dd966 100644
--- a/zin/core/wg.func.php
+++ b/zin/core/wg.func.php
@@ -11,10 +11,10 @@
 namespace zin;
 
 require_once dirname(__DIR__) . DS . 'utils' . DS . 'flat.func.php';
-require_once 'props.class.php';
-require_once 'directive.class.php';
-require_once 'wg.class.php';
-require_once 'context.func.php';
+require_once __DIR__ . DS . 'props.class.php';
+require_once __DIR__ . DS . 'directive.class.php';
+require_once __DIR__ . DS . 'wg.class.php';
+require_once __DIR__ . DS . 'context.func.php';
 
 function set($name, $value = NULL)
 {
diff --git a/zin/helper.php b/zin/helper.php
index 555d71bee2..1e05922472 100755
--- a/zin/helper.php
+++ b/zin/helper.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'config.php';
+require_once __DIR__ . DS . 'config.php';
 
 function setWgVer($ver, $names = NULL)
 {
diff --git a/zin/utils/data.class.php b/zin/utils/data.class.php
index aa85246f8c..20c94df25a 100644
--- a/zin/utils/data.class.php
+++ b/zin/utils/data.class.php
@@ -11,7 +11,7 @@
 
 namespace zin\utils;
 
-require_once 'dataset.class.php';
+require_once __DIR__ . DS . 'dataset.class.php';
 
 /**
  * Manage data for html element and widgets
diff --git a/zin/utils/hx.class.php b/zin/utils/hx.class.php
index 3eed344b8b..cb8d5b5b28 100755
--- a/zin/utils/hx.class.php
+++ b/zin/utils/hx.class.php
@@ -11,7 +11,7 @@
 
 namespace zin\utils;
 
-require_once 'dataset.class.php';
+require_once __DIR__ . DS . 'dataset.class.php';
 
 /**
  * Manage hx for html element and widgets
diff --git a/zin/utils/style.class.php b/zin/utils/style.class.php
index 09c48d65c0..1679347291 100755
--- a/zin/utils/style.class.php
+++ b/zin/utils/style.class.php
@@ -11,7 +11,7 @@
 
 namespace zin\utils;
 
-require_once 'dataset.class.php';
+require_once __DIR__ . DS . 'dataset.class.php';
 
 /**
  * Manage style for html element and widgets
diff --git a/zin/zentao/zentao.func.php b/zin/zentao/zentao.func.php
index 99a79b61d2..ecbd68c479 100644
--- a/zin/zentao/zentao.func.php
+++ b/zin/zentao/zentao.func.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'pager.func.php';
+require_once __DIR__ . DS . 'pager.func.php';
 
 class helper extends \helper
 {
diff --git a/zin/zui/toggle.class.php b/zin/zui/toggle.class.php
index 91c0b88378..ed9559f21a 100644
--- a/zin/zui/toggle.class.php
+++ b/zin/zui/toggle.class.php
@@ -11,7 +11,7 @@
 
 namespace zin;
 
-require_once 'toggle.func.php';
+require_once __DIR__ . DS . 'toggle.func.php';
 
 class toggle
 {
diff --git a/zin/zui/zui.class.php b/zin/zui/zui.class.php
index 6e011219ea..aed963f33c 100644
--- a/zin/zui/zui.class.php
+++ b/zin/zui/zui.class.php
@@ -14,8 +14,8 @@ namespace zin;
 require_once dirname(__DIR__) . DS . 'core' . DS . 'wg.class.php';
 require_once dirname(__DIR__) . DS . 'core' . DS . 'wg.func.php';
 require_once dirname(__DIR__) . DS . 'core' . DS . 'wg.func.php';
-require_once 'toggle.func.php';
-require_once 'toggle.class.php';
+require_once __DIR__ . DS . 'toggle.func.php';
+require_once __DIR__ . DS . 'toggle.class.php';
 
 class zui extends wg
 {
diff --git a/zin/zui/zui.func.php b/zin/zui/zui.func.php
index 60ef2c8cc4..aaeac4b741 100644
--- a/zin/zui/zui.func.php
+++ b/zin/zui/zui.func.php
@@ -1,7 +1,7 @@
 <?php
 namespace zin;
 
-require_once 'zui.class.php';
+require_once __DIR__ . DS . 'zui.class.php';
 
 function rounded($value = true)     {return zui::rounded($value);}
 function shadow($value = true)      {return zui::shadow($value);}

From 34731be27f9850ab557a9d7529b989b037cebdec Mon Sep 17 00:00:00 2001
From: sunhao <sunhao@easycorp.ltd>
Date: Fri, 5 May 2023 15:03:14 +0800
Subject: [PATCH 36/80] * zin: move zin dir to lib

---
 framework/base/control.class.php            | 3 ++-
 {zin => lib/zin}/config.php                 | 0
 {zin => lib/zin}/core/context.class.php     | 0
 {zin => lib/zin}/core/context.func.php      | 0
 {zin => lib/zin}/core/data.func.php         | 0
 {zin => lib/zin}/core/directive.class.php   | 0
 {zin => lib/zin}/core/dom.class.php         | 0
 {zin => lib/zin}/core/h.class.php           | 0
 {zin => lib/zin}/core/h.func.php            | 0
 {zin => lib/zin}/core/item.class.php        | 0
 {zin => lib/zin}/core/on.class.php          | 0
 {zin => lib/zin}/core/portal.class.php      | 0
 {zin => lib/zin}/core/props.class.php       | 0
 {zin => lib/zin}/core/render.func.php       | 0
 {zin => lib/zin}/core/selector.func.php     | 0
 {zin => lib/zin}/core/set.class.php         | 0
 {zin => lib/zin}/core/to.class.php          | 0
 {zin => lib/zin}/core/wg.class.php          | 0
 {zin => lib/zin}/core/wg.func.php           | 0
 {zin => lib/zin}/core/zin.class.php         | 0
 {zin => lib/zin}/func.php                   | 0
 {zin => lib/zin}/helper.php                 | 2 +-
 {zin => lib/zin}/utils/classlist.class.php  | 0
 {zin => lib/zin}/utils/data.class.php       | 0
 {zin => lib/zin}/utils/dataset.class.php    | 0
 {zin => lib/zin}/utils/debug.func.php       | 0
 {zin => lib/zin}/utils/deep.func.php        | 0
 {zin => lib/zin}/utils/flat.func.php        | 0
 {zin => lib/zin}/utils/hx.class.php         | 0
 {zin => lib/zin}/utils/style.class.php      | 0
 {zin => lib/zin}/wg/actionitem/v1.php       | 0
 {zin => lib/zin}/wg/avatar/v1.php           | 0
 {zin => lib/zin}/wg/btn/v1.php              | 0
 {zin => lib/zin}/wg/btngroup/v1.php         | 0
 {zin => lib/zin}/wg/cell/v1.php             | 0
 {zin => lib/zin}/wg/center/v1.php           | 0
 {zin => lib/zin}/wg/checkbox/v1.php         | 0
 {zin => lib/zin}/wg/checklist/v1.php        | 0
 {zin => lib/zin}/wg/col/v1.php              | 0
 {zin => lib/zin}/wg/colorpicker/v1.php      | 0
 {zin => lib/zin}/wg/control/v1.php          | 0
 {zin => lib/zin}/wg/datepicker/v1.php       | 0
 {zin => lib/zin}/wg/datetimepicker/v1.php   | 0
 {zin => lib/zin}/wg/dropdown/v1.php         | 0
 {zin => lib/zin}/wg/dtable/css/v1.css       | 0
 {zin => lib/zin}/wg/dtable/v1.php           | 0
 {zin => lib/zin}/wg/editor/v1.php           | 0
 {zin => lib/zin}/wg/featurebar/v1.php       | 0
 {zin => lib/zin}/wg/fileinput/v1.php        | 0
 {zin => lib/zin}/wg/form/v1.php             | 0
 {zin => lib/zin}/wg/formgroup/v1.php        | 0
 {zin => lib/zin}/wg/formlabel/v1.php        | 0
 {zin => lib/zin}/wg/formpanel/v1.php        | 0
 {zin => lib/zin}/wg/formrow/v1.php          | 0
 {zin => lib/zin}/wg/fragment/v1.php         | 0
 {zin => lib/zin}/wg/header/v1.php           | 0
 {zin => lib/zin}/wg/heading/v1.php          | 0
 {zin => lib/zin}/wg/history/css/v1.css      | 0
 {zin => lib/zin}/wg/history/v1.php          | 0
 {zin => lib/zin}/wg/icon/v1.php             | 0
 {zin => lib/zin}/wg/input/v1.php            | 0
 {zin => lib/zin}/wg/inputcontrol/v1.php     | 0
 {zin => lib/zin}/wg/inputgroup/v1.php       | 0
 {zin => lib/zin}/wg/label/v1.php            | 0
 {zin => lib/zin}/wg/main/v1.php             | 0
 {zin => lib/zin}/wg/mainmenu/v1.php         | 0
 {zin => lib/zin}/wg/menu/v1.php             | 0
 {zin => lib/zin}/wg/modal/v1.php            | 0
 {zin => lib/zin}/wg/modaldialog/v1.php      | 0
 {zin => lib/zin}/wg/modaltrigger/v1.php     | 0
 {zin => lib/zin}/wg/modulemenu/css/v1.css   | 0
 {zin => lib/zin}/wg/modulemenu/v1.php       | 0
 {zin => lib/zin}/wg/nav/v1.php              | 0
 {zin => lib/zin}/wg/navbar/v1.php           | 0
 {zin => lib/zin}/wg/page/v1.php             | 0
 {zin => lib/zin}/wg/pagebase/v1.php         | 0
 {zin => lib/zin}/wg/pageform/v1.php         | 0
 {zin => lib/zin}/wg/pager/v1.php            | 0
 {zin => lib/zin}/wg/panel/v1.php            | 0
 {zin => lib/zin}/wg/picker/v1.php           | 0
 {zin => lib/zin}/wg/programmenu/css/v1.css  | 0
 {zin => lib/zin}/wg/programmenu/v1.php      | 0
 {zin => lib/zin}/wg/radio/v1.php            | 0
 {zin => lib/zin}/wg/radiolist/v1.php        | 0
 {zin => lib/zin}/wg/row/v1.php              | 0
 {zin => lib/zin}/wg/searchform/v1.php       | 0
 {zin => lib/zin}/wg/searchtoggle/css/v1.css | 0
 {zin => lib/zin}/wg/searchtoggle/js/v1.js   | 0
 {zin => lib/zin}/wg/searchtoggle/v1.php     | 0
 {zin => lib/zin}/wg/select/v1.php           | 0
 {zin => lib/zin}/wg/sidebar/css/v1.css      | 0
 {zin => lib/zin}/wg/sidebar/js/v1.js        | 0
 {zin => lib/zin}/wg/sidebar/v1.php          | 0
 {zin => lib/zin}/wg/switcher/v1.php         | 0
 {zin => lib/zin}/wg/tabs/v1.php             | 0
 {zin => lib/zin}/wg/textarea/v1.php         | 0
 {zin => lib/zin}/wg/timepicker/v1.php       | 0
 {zin => lib/zin}/wg/toolbar/v1.php          | 0
 {zin => lib/zin}/wg/tooltip/v1.php          | 0
 {zin => lib/zin}/wg/useravatar/v1.php       | 0
 {zin => lib/zin}/zentao/pager.func.php      | 0
 {zin => lib/zin}/zentao/zentao.func.php     | 0
 zin/zin.php => lib/zin/zin.class.php        | 0
 {zin => lib/zin}/zui/toggle.class.php       | 0
 {zin => lib/zin}/zui/toggle.func.php        | 0
 {zin => lib/zin}/zui/zui.class.php          | 0
 {zin => lib/zin}/zui/zui.func.php           | 0
 107 files changed, 3 insertions(+), 2 deletions(-)
 rename {zin => lib/zin}/config.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/core/context.class.php (100%)
 rename {zin => lib/zin}/core/context.func.php (100%)
 rename {zin => lib/zin}/core/data.func.php (100%)
 rename {zin => lib/zin}/core/directive.class.php (100%)
 rename {zin => lib/zin}/core/dom.class.php (100%)
 rename {zin => lib/zin}/core/h.class.php (100%)
 rename {zin => lib/zin}/core/h.func.php (100%)
 rename {zin => lib/zin}/core/item.class.php (100%)
 rename {zin => lib/zin}/core/on.class.php (100%)
 rename {zin => lib/zin}/core/portal.class.php (100%)
 rename {zin => lib/zin}/core/props.class.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/core/render.func.php (100%)
 rename {zin => lib/zin}/core/selector.func.php (100%)
 rename {zin => lib/zin}/core/set.class.php (100%)
 rename {zin => lib/zin}/core/to.class.php (100%)
 rename {zin => lib/zin}/core/wg.class.php (100%)
 rename {zin => lib/zin}/core/wg.func.php (100%)
 rename {zin => lib/zin}/core/zin.class.php (100%)
 rename {zin => lib/zin}/func.php (100%)
 rename {zin => lib/zin}/helper.php (96%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/utils/classlist.class.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/utils/data.class.php (100%)
 rename {zin => lib/zin}/utils/dataset.class.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/utils/debug.func.php (100%)
 rename {zin => lib/zin}/utils/deep.func.php (100%)
 rename {zin => lib/zin}/utils/flat.func.php (100%)
 rename {zin => lib/zin}/utils/hx.class.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/utils/style.class.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/wg/actionitem/v1.php (100%)
 rename {zin => lib/zin}/wg/avatar/v1.php (100%)
 rename {zin => lib/zin}/wg/btn/v1.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/wg/btngroup/v1.php (100%)
 rename {zin => lib/zin}/wg/cell/v1.php (100%)
 rename {zin => lib/zin}/wg/center/v1.php (100%)
 rename {zin => lib/zin}/wg/checkbox/v1.php (100%)
 rename {zin => lib/zin}/wg/checklist/v1.php (100%)
 rename {zin => lib/zin}/wg/col/v1.php (100%)
 rename {zin => lib/zin}/wg/colorpicker/v1.php (100%)
 rename {zin => lib/zin}/wg/control/v1.php (100%)
 rename {zin => lib/zin}/wg/datepicker/v1.php (100%)
 rename {zin => lib/zin}/wg/datetimepicker/v1.php (100%)
 rename {zin => lib/zin}/wg/dropdown/v1.php (100%)
 rename {zin => lib/zin}/wg/dtable/css/v1.css (100%)
 rename {zin => lib/zin}/wg/dtable/v1.php (100%)
 rename {zin => lib/zin}/wg/editor/v1.php (100%)
 rename {zin => lib/zin}/wg/featurebar/v1.php (100%)
 rename {zin => lib/zin}/wg/fileinput/v1.php (100%)
 rename {zin => lib/zin}/wg/form/v1.php (100%)
 rename {zin => lib/zin}/wg/formgroup/v1.php (100%)
 rename {zin => lib/zin}/wg/formlabel/v1.php (100%)
 rename {zin => lib/zin}/wg/formpanel/v1.php (100%)
 rename {zin => lib/zin}/wg/formrow/v1.php (100%)
 rename {zin => lib/zin}/wg/fragment/v1.php (100%)
 rename {zin => lib/zin}/wg/header/v1.php (100%)
 rename {zin => lib/zin}/wg/heading/v1.php (100%)
 rename {zin => lib/zin}/wg/history/css/v1.css (100%)
 rename {zin => lib/zin}/wg/history/v1.php (100%)
 rename {zin => lib/zin}/wg/icon/v1.php (100%)
 rename {zin => lib/zin}/wg/input/v1.php (100%)
 rename {zin => lib/zin}/wg/inputcontrol/v1.php (100%)
 rename {zin => lib/zin}/wg/inputgroup/v1.php (100%)
 rename {zin => lib/zin}/wg/label/v1.php (100%)
 rename {zin => lib/zin}/wg/main/v1.php (100%)
 rename {zin => lib/zin}/wg/mainmenu/v1.php (100%)
 rename {zin => lib/zin}/wg/menu/v1.php (100%)
 rename {zin => lib/zin}/wg/modal/v1.php (100%)
 rename {zin => lib/zin}/wg/modaldialog/v1.php (100%)
 rename {zin => lib/zin}/wg/modaltrigger/v1.php (100%)
 rename {zin => lib/zin}/wg/modulemenu/css/v1.css (100%)
 rename {zin => lib/zin}/wg/modulemenu/v1.php (100%)
 rename {zin => lib/zin}/wg/nav/v1.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/wg/navbar/v1.php (100%)
 rename {zin => lib/zin}/wg/page/v1.php (100%)
 rename {zin => lib/zin}/wg/pagebase/v1.php (100%)
 rename {zin => lib/zin}/wg/pageform/v1.php (100%)
 rename {zin => lib/zin}/wg/pager/v1.php (100%)
 rename {zin => lib/zin}/wg/panel/v1.php (100%)
 rename {zin => lib/zin}/wg/picker/v1.php (100%)
 rename {zin => lib/zin}/wg/programmenu/css/v1.css (100%)
 rename {zin => lib/zin}/wg/programmenu/v1.php (100%)
 rename {zin => lib/zin}/wg/radio/v1.php (100%)
 rename {zin => lib/zin}/wg/radiolist/v1.php (100%)
 rename {zin => lib/zin}/wg/row/v1.php (100%)
 rename {zin => lib/zin}/wg/searchform/v1.php (100%)
 rename {zin => lib/zin}/wg/searchtoggle/css/v1.css (100%)
 rename {zin => lib/zin}/wg/searchtoggle/js/v1.js (100%)
 rename {zin => lib/zin}/wg/searchtoggle/v1.php (100%)
 rename {zin => lib/zin}/wg/select/v1.php (100%)
 rename {zin => lib/zin}/wg/sidebar/css/v1.css (100%)
 rename {zin => lib/zin}/wg/sidebar/js/v1.js (100%)
 rename {zin => lib/zin}/wg/sidebar/v1.php (100%)
 rename {zin => lib/zin}/wg/switcher/v1.php (100%)
 rename {zin => lib/zin}/wg/tabs/v1.php (100%)
 rename {zin => lib/zin}/wg/textarea/v1.php (100%)
 rename {zin => lib/zin}/wg/timepicker/v1.php (100%)
 rename {zin => lib/zin}/wg/toolbar/v1.php (100%)
 rename {zin => lib/zin}/wg/tooltip/v1.php (100%)
 rename {zin => lib/zin}/wg/useravatar/v1.php (100%)
 rename {zin => lib/zin}/zentao/pager.func.php (100%)
 rename {zin => lib/zin}/zentao/zentao.func.php (100%)
 rename zin/zin.php => lib/zin/zin.class.php (100%)
 mode change 100755 => 100644
 rename {zin => lib/zin}/zui/toggle.class.php (100%)
 rename {zin => lib/zin}/zui/toggle.func.php (100%)
 rename {zin => lib/zin}/zui/zui.class.php (100%)
 rename {zin => lib/zin}/zui/zui.func.php (100%)

diff --git a/framework/base/control.class.php b/framework/base/control.class.php
index 115b859e95..a78fa3c233 100644
--- a/framework/base/control.class.php
+++ b/framework/base/control.class.php
@@ -950,7 +950,8 @@ class baseControl
         if(empty($moduleName)) $moduleName = $this->moduleName;
         if(empty($methodName)) $methodName = $this->methodName;
 
-        include $this->app->getBasePath() . 'zin' . DS . 'zin.php';
+        /* Load zin lib */
+        $this->app->loadClass('zin', true);
 
         /**
          * 设置视图文件。(PHP7有一个bug，不能直接$viewFile = $this->setViewFile())。
diff --git a/zin/config.php b/lib/zin/config.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/config.php
rename to lib/zin/config.php
diff --git a/zin/core/context.class.php b/lib/zin/core/context.class.php
similarity index 100%
rename from zin/core/context.class.php
rename to lib/zin/core/context.class.php
diff --git a/zin/core/context.func.php b/lib/zin/core/context.func.php
similarity index 100%
rename from zin/core/context.func.php
rename to lib/zin/core/context.func.php
diff --git a/zin/core/data.func.php b/lib/zin/core/data.func.php
similarity index 100%
rename from zin/core/data.func.php
rename to lib/zin/core/data.func.php
diff --git a/zin/core/directive.class.php b/lib/zin/core/directive.class.php
similarity index 100%
rename from zin/core/directive.class.php
rename to lib/zin/core/directive.class.php
diff --git a/zin/core/dom.class.php b/lib/zin/core/dom.class.php
similarity index 100%
rename from zin/core/dom.class.php
rename to lib/zin/core/dom.class.php
diff --git a/zin/core/h.class.php b/lib/zin/core/h.class.php
similarity index 100%
rename from zin/core/h.class.php
rename to lib/zin/core/h.class.php
diff --git a/zin/core/h.func.php b/lib/zin/core/h.func.php
similarity index 100%
rename from zin/core/h.func.php
rename to lib/zin/core/h.func.php
diff --git a/zin/core/item.class.php b/lib/zin/core/item.class.php
similarity index 100%
rename from zin/core/item.class.php
rename to lib/zin/core/item.class.php
diff --git a/zin/core/on.class.php b/lib/zin/core/on.class.php
similarity index 100%
rename from zin/core/on.class.php
rename to lib/zin/core/on.class.php
diff --git a/zin/core/portal.class.php b/lib/zin/core/portal.class.php
similarity index 100%
rename from zin/core/portal.class.php
rename to lib/zin/core/portal.class.php
diff --git a/zin/core/props.class.php b/lib/zin/core/props.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/core/props.class.php
rename to lib/zin/core/props.class.php
diff --git a/zin/core/render.func.php b/lib/zin/core/render.func.php
similarity index 100%
rename from zin/core/render.func.php
rename to lib/zin/core/render.func.php
diff --git a/zin/core/selector.func.php b/lib/zin/core/selector.func.php
similarity index 100%
rename from zin/core/selector.func.php
rename to lib/zin/core/selector.func.php
diff --git a/zin/core/set.class.php b/lib/zin/core/set.class.php
similarity index 100%
rename from zin/core/set.class.php
rename to lib/zin/core/set.class.php
diff --git a/zin/core/to.class.php b/lib/zin/core/to.class.php
similarity index 100%
rename from zin/core/to.class.php
rename to lib/zin/core/to.class.php
diff --git a/zin/core/wg.class.php b/lib/zin/core/wg.class.php
similarity index 100%
rename from zin/core/wg.class.php
rename to lib/zin/core/wg.class.php
diff --git a/zin/core/wg.func.php b/lib/zin/core/wg.func.php
similarity index 100%
rename from zin/core/wg.func.php
rename to lib/zin/core/wg.func.php
diff --git a/zin/core/zin.class.php b/lib/zin/core/zin.class.php
similarity index 100%
rename from zin/core/zin.class.php
rename to lib/zin/core/zin.class.php
diff --git a/zin/func.php b/lib/zin/func.php
similarity index 100%
rename from zin/func.php
rename to lib/zin/func.php
diff --git a/zin/helper.php b/lib/zin/helper.php
old mode 100755
new mode 100644
similarity index 96%
rename from zin/helper.php
rename to lib/zin/helper.php
index 1e05922472..d2d3a82932
--- a/zin/helper.php
+++ b/lib/zin/helper.php
@@ -44,7 +44,7 @@ function createWg($name, $args)
     $name  = strtolower($name);
     $wgVer = getWgVer($name);
 
-    include_once $app->getBasePath() . 'zin' . DS . 'wg' . DS . $name . DS . "v$wgVer.php";
+    include_once __DIR__ . DS . 'wg' . DS . $name . DS . "v$wgVer.php";
 
     $wgName = "\\zin\\$name";
 
diff --git a/zin/utils/classlist.class.php b/lib/zin/utils/classlist.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/utils/classlist.class.php
rename to lib/zin/utils/classlist.class.php
diff --git a/zin/utils/data.class.php b/lib/zin/utils/data.class.php
similarity index 100%
rename from zin/utils/data.class.php
rename to lib/zin/utils/data.class.php
diff --git a/zin/utils/dataset.class.php b/lib/zin/utils/dataset.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/utils/dataset.class.php
rename to lib/zin/utils/dataset.class.php
diff --git a/zin/utils/debug.func.php b/lib/zin/utils/debug.func.php
similarity index 100%
rename from zin/utils/debug.func.php
rename to lib/zin/utils/debug.func.php
diff --git a/zin/utils/deep.func.php b/lib/zin/utils/deep.func.php
similarity index 100%
rename from zin/utils/deep.func.php
rename to lib/zin/utils/deep.func.php
diff --git a/zin/utils/flat.func.php b/lib/zin/utils/flat.func.php
similarity index 100%
rename from zin/utils/flat.func.php
rename to lib/zin/utils/flat.func.php
diff --git a/zin/utils/hx.class.php b/lib/zin/utils/hx.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/utils/hx.class.php
rename to lib/zin/utils/hx.class.php
diff --git a/zin/utils/style.class.php b/lib/zin/utils/style.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/utils/style.class.php
rename to lib/zin/utils/style.class.php
diff --git a/zin/wg/actionitem/v1.php b/lib/zin/wg/actionitem/v1.php
similarity index 100%
rename from zin/wg/actionitem/v1.php
rename to lib/zin/wg/actionitem/v1.php
diff --git a/zin/wg/avatar/v1.php b/lib/zin/wg/avatar/v1.php
similarity index 100%
rename from zin/wg/avatar/v1.php
rename to lib/zin/wg/avatar/v1.php
diff --git a/zin/wg/btn/v1.php b/lib/zin/wg/btn/v1.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/wg/btn/v1.php
rename to lib/zin/wg/btn/v1.php
diff --git a/zin/wg/btngroup/v1.php b/lib/zin/wg/btngroup/v1.php
similarity index 100%
rename from zin/wg/btngroup/v1.php
rename to lib/zin/wg/btngroup/v1.php
diff --git a/zin/wg/cell/v1.php b/lib/zin/wg/cell/v1.php
similarity index 100%
rename from zin/wg/cell/v1.php
rename to lib/zin/wg/cell/v1.php
diff --git a/zin/wg/center/v1.php b/lib/zin/wg/center/v1.php
similarity index 100%
rename from zin/wg/center/v1.php
rename to lib/zin/wg/center/v1.php
diff --git a/zin/wg/checkbox/v1.php b/lib/zin/wg/checkbox/v1.php
similarity index 100%
rename from zin/wg/checkbox/v1.php
rename to lib/zin/wg/checkbox/v1.php
diff --git a/zin/wg/checklist/v1.php b/lib/zin/wg/checklist/v1.php
similarity index 100%
rename from zin/wg/checklist/v1.php
rename to lib/zin/wg/checklist/v1.php
diff --git a/zin/wg/col/v1.php b/lib/zin/wg/col/v1.php
similarity index 100%
rename from zin/wg/col/v1.php
rename to lib/zin/wg/col/v1.php
diff --git a/zin/wg/colorpicker/v1.php b/lib/zin/wg/colorpicker/v1.php
similarity index 100%
rename from zin/wg/colorpicker/v1.php
rename to lib/zin/wg/colorpicker/v1.php
diff --git a/zin/wg/control/v1.php b/lib/zin/wg/control/v1.php
similarity index 100%
rename from zin/wg/control/v1.php
rename to lib/zin/wg/control/v1.php
diff --git a/zin/wg/datepicker/v1.php b/lib/zin/wg/datepicker/v1.php
similarity index 100%
rename from zin/wg/datepicker/v1.php
rename to lib/zin/wg/datepicker/v1.php
diff --git a/zin/wg/datetimepicker/v1.php b/lib/zin/wg/datetimepicker/v1.php
similarity index 100%
rename from zin/wg/datetimepicker/v1.php
rename to lib/zin/wg/datetimepicker/v1.php
diff --git a/zin/wg/dropdown/v1.php b/lib/zin/wg/dropdown/v1.php
similarity index 100%
rename from zin/wg/dropdown/v1.php
rename to lib/zin/wg/dropdown/v1.php
diff --git a/zin/wg/dtable/css/v1.css b/lib/zin/wg/dtable/css/v1.css
similarity index 100%
rename from zin/wg/dtable/css/v1.css
rename to lib/zin/wg/dtable/css/v1.css
diff --git a/zin/wg/dtable/v1.php b/lib/zin/wg/dtable/v1.php
similarity index 100%
rename from zin/wg/dtable/v1.php
rename to lib/zin/wg/dtable/v1.php
diff --git a/zin/wg/editor/v1.php b/lib/zin/wg/editor/v1.php
similarity index 100%
rename from zin/wg/editor/v1.php
rename to lib/zin/wg/editor/v1.php
diff --git a/zin/wg/featurebar/v1.php b/lib/zin/wg/featurebar/v1.php
similarity index 100%
rename from zin/wg/featurebar/v1.php
rename to lib/zin/wg/featurebar/v1.php
diff --git a/zin/wg/fileinput/v1.php b/lib/zin/wg/fileinput/v1.php
similarity index 100%
rename from zin/wg/fileinput/v1.php
rename to lib/zin/wg/fileinput/v1.php
diff --git a/zin/wg/form/v1.php b/lib/zin/wg/form/v1.php
similarity index 100%
rename from zin/wg/form/v1.php
rename to lib/zin/wg/form/v1.php
diff --git a/zin/wg/formgroup/v1.php b/lib/zin/wg/formgroup/v1.php
similarity index 100%
rename from zin/wg/formgroup/v1.php
rename to lib/zin/wg/formgroup/v1.php
diff --git a/zin/wg/formlabel/v1.php b/lib/zin/wg/formlabel/v1.php
similarity index 100%
rename from zin/wg/formlabel/v1.php
rename to lib/zin/wg/formlabel/v1.php
diff --git a/zin/wg/formpanel/v1.php b/lib/zin/wg/formpanel/v1.php
similarity index 100%
rename from zin/wg/formpanel/v1.php
rename to lib/zin/wg/formpanel/v1.php
diff --git a/zin/wg/formrow/v1.php b/lib/zin/wg/formrow/v1.php
similarity index 100%
rename from zin/wg/formrow/v1.php
rename to lib/zin/wg/formrow/v1.php
diff --git a/zin/wg/fragment/v1.php b/lib/zin/wg/fragment/v1.php
similarity index 100%
rename from zin/wg/fragment/v1.php
rename to lib/zin/wg/fragment/v1.php
diff --git a/zin/wg/header/v1.php b/lib/zin/wg/header/v1.php
similarity index 100%
rename from zin/wg/header/v1.php
rename to lib/zin/wg/header/v1.php
diff --git a/zin/wg/heading/v1.php b/lib/zin/wg/heading/v1.php
similarity index 100%
rename from zin/wg/heading/v1.php
rename to lib/zin/wg/heading/v1.php
diff --git a/zin/wg/history/css/v1.css b/lib/zin/wg/history/css/v1.css
similarity index 100%
rename from zin/wg/history/css/v1.css
rename to lib/zin/wg/history/css/v1.css
diff --git a/zin/wg/history/v1.php b/lib/zin/wg/history/v1.php
similarity index 100%
rename from zin/wg/history/v1.php
rename to lib/zin/wg/history/v1.php
diff --git a/zin/wg/icon/v1.php b/lib/zin/wg/icon/v1.php
similarity index 100%
rename from zin/wg/icon/v1.php
rename to lib/zin/wg/icon/v1.php
diff --git a/zin/wg/input/v1.php b/lib/zin/wg/input/v1.php
similarity index 100%
rename from zin/wg/input/v1.php
rename to lib/zin/wg/input/v1.php
diff --git a/zin/wg/inputcontrol/v1.php b/lib/zin/wg/inputcontrol/v1.php
similarity index 100%
rename from zin/wg/inputcontrol/v1.php
rename to lib/zin/wg/inputcontrol/v1.php
diff --git a/zin/wg/inputgroup/v1.php b/lib/zin/wg/inputgroup/v1.php
similarity index 100%
rename from zin/wg/inputgroup/v1.php
rename to lib/zin/wg/inputgroup/v1.php
diff --git a/zin/wg/label/v1.php b/lib/zin/wg/label/v1.php
similarity index 100%
rename from zin/wg/label/v1.php
rename to lib/zin/wg/label/v1.php
diff --git a/zin/wg/main/v1.php b/lib/zin/wg/main/v1.php
similarity index 100%
rename from zin/wg/main/v1.php
rename to lib/zin/wg/main/v1.php
diff --git a/zin/wg/mainmenu/v1.php b/lib/zin/wg/mainmenu/v1.php
similarity index 100%
rename from zin/wg/mainmenu/v1.php
rename to lib/zin/wg/mainmenu/v1.php
diff --git a/zin/wg/menu/v1.php b/lib/zin/wg/menu/v1.php
similarity index 100%
rename from zin/wg/menu/v1.php
rename to lib/zin/wg/menu/v1.php
diff --git a/zin/wg/modal/v1.php b/lib/zin/wg/modal/v1.php
similarity index 100%
rename from zin/wg/modal/v1.php
rename to lib/zin/wg/modal/v1.php
diff --git a/zin/wg/modaldialog/v1.php b/lib/zin/wg/modaldialog/v1.php
similarity index 100%
rename from zin/wg/modaldialog/v1.php
rename to lib/zin/wg/modaldialog/v1.php
diff --git a/zin/wg/modaltrigger/v1.php b/lib/zin/wg/modaltrigger/v1.php
similarity index 100%
rename from zin/wg/modaltrigger/v1.php
rename to lib/zin/wg/modaltrigger/v1.php
diff --git a/zin/wg/modulemenu/css/v1.css b/lib/zin/wg/modulemenu/css/v1.css
similarity index 100%
rename from zin/wg/modulemenu/css/v1.css
rename to lib/zin/wg/modulemenu/css/v1.css
diff --git a/zin/wg/modulemenu/v1.php b/lib/zin/wg/modulemenu/v1.php
similarity index 100%
rename from zin/wg/modulemenu/v1.php
rename to lib/zin/wg/modulemenu/v1.php
diff --git a/zin/wg/nav/v1.php b/lib/zin/wg/nav/v1.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/wg/nav/v1.php
rename to lib/zin/wg/nav/v1.php
diff --git a/zin/wg/navbar/v1.php b/lib/zin/wg/navbar/v1.php
similarity index 100%
rename from zin/wg/navbar/v1.php
rename to lib/zin/wg/navbar/v1.php
diff --git a/zin/wg/page/v1.php b/lib/zin/wg/page/v1.php
similarity index 100%
rename from zin/wg/page/v1.php
rename to lib/zin/wg/page/v1.php
diff --git a/zin/wg/pagebase/v1.php b/lib/zin/wg/pagebase/v1.php
similarity index 100%
rename from zin/wg/pagebase/v1.php
rename to lib/zin/wg/pagebase/v1.php
diff --git a/zin/wg/pageform/v1.php b/lib/zin/wg/pageform/v1.php
similarity index 100%
rename from zin/wg/pageform/v1.php
rename to lib/zin/wg/pageform/v1.php
diff --git a/zin/wg/pager/v1.php b/lib/zin/wg/pager/v1.php
similarity index 100%
rename from zin/wg/pager/v1.php
rename to lib/zin/wg/pager/v1.php
diff --git a/zin/wg/panel/v1.php b/lib/zin/wg/panel/v1.php
similarity index 100%
rename from zin/wg/panel/v1.php
rename to lib/zin/wg/panel/v1.php
diff --git a/zin/wg/picker/v1.php b/lib/zin/wg/picker/v1.php
similarity index 100%
rename from zin/wg/picker/v1.php
rename to lib/zin/wg/picker/v1.php
diff --git a/zin/wg/programmenu/css/v1.css b/lib/zin/wg/programmenu/css/v1.css
similarity index 100%
rename from zin/wg/programmenu/css/v1.css
rename to lib/zin/wg/programmenu/css/v1.css
diff --git a/zin/wg/programmenu/v1.php b/lib/zin/wg/programmenu/v1.php
similarity index 100%
rename from zin/wg/programmenu/v1.php
rename to lib/zin/wg/programmenu/v1.php
diff --git a/zin/wg/radio/v1.php b/lib/zin/wg/radio/v1.php
similarity index 100%
rename from zin/wg/radio/v1.php
rename to lib/zin/wg/radio/v1.php
diff --git a/zin/wg/radiolist/v1.php b/lib/zin/wg/radiolist/v1.php
similarity index 100%
rename from zin/wg/radiolist/v1.php
rename to lib/zin/wg/radiolist/v1.php
diff --git a/zin/wg/row/v1.php b/lib/zin/wg/row/v1.php
similarity index 100%
rename from zin/wg/row/v1.php
rename to lib/zin/wg/row/v1.php
diff --git a/zin/wg/searchform/v1.php b/lib/zin/wg/searchform/v1.php
similarity index 100%
rename from zin/wg/searchform/v1.php
rename to lib/zin/wg/searchform/v1.php
diff --git a/zin/wg/searchtoggle/css/v1.css b/lib/zin/wg/searchtoggle/css/v1.css
similarity index 100%
rename from zin/wg/searchtoggle/css/v1.css
rename to lib/zin/wg/searchtoggle/css/v1.css
diff --git a/zin/wg/searchtoggle/js/v1.js b/lib/zin/wg/searchtoggle/js/v1.js
similarity index 100%
rename from zin/wg/searchtoggle/js/v1.js
rename to lib/zin/wg/searchtoggle/js/v1.js
diff --git a/zin/wg/searchtoggle/v1.php b/lib/zin/wg/searchtoggle/v1.php
similarity index 100%
rename from zin/wg/searchtoggle/v1.php
rename to lib/zin/wg/searchtoggle/v1.php
diff --git a/zin/wg/select/v1.php b/lib/zin/wg/select/v1.php
similarity index 100%
rename from zin/wg/select/v1.php
rename to lib/zin/wg/select/v1.php
diff --git a/zin/wg/sidebar/css/v1.css b/lib/zin/wg/sidebar/css/v1.css
similarity index 100%
rename from zin/wg/sidebar/css/v1.css
rename to lib/zin/wg/sidebar/css/v1.css
diff --git a/zin/wg/sidebar/js/v1.js b/lib/zin/wg/sidebar/js/v1.js
similarity index 100%
rename from zin/wg/sidebar/js/v1.js
rename to lib/zin/wg/sidebar/js/v1.js
diff --git a/zin/wg/sidebar/v1.php b/lib/zin/wg/sidebar/v1.php
similarity index 100%
rename from zin/wg/sidebar/v1.php
rename to lib/zin/wg/sidebar/v1.php
diff --git a/zin/wg/switcher/v1.php b/lib/zin/wg/switcher/v1.php
similarity index 100%
rename from zin/wg/switcher/v1.php
rename to lib/zin/wg/switcher/v1.php
diff --git a/zin/wg/tabs/v1.php b/lib/zin/wg/tabs/v1.php
similarity index 100%
rename from zin/wg/tabs/v1.php
rename to lib/zin/wg/tabs/v1.php
diff --git a/zin/wg/textarea/v1.php b/lib/zin/wg/textarea/v1.php
similarity index 100%
rename from zin/wg/textarea/v1.php
rename to lib/zin/wg/textarea/v1.php
diff --git a/zin/wg/timepicker/v1.php b/lib/zin/wg/timepicker/v1.php
similarity index 100%
rename from zin/wg/timepicker/v1.php
rename to lib/zin/wg/timepicker/v1.php
diff --git a/zin/wg/toolbar/v1.php b/lib/zin/wg/toolbar/v1.php
similarity index 100%
rename from zin/wg/toolbar/v1.php
rename to lib/zin/wg/toolbar/v1.php
diff --git a/zin/wg/tooltip/v1.php b/lib/zin/wg/tooltip/v1.php
similarity index 100%
rename from zin/wg/tooltip/v1.php
rename to lib/zin/wg/tooltip/v1.php
diff --git a/zin/wg/useravatar/v1.php b/lib/zin/wg/useravatar/v1.php
similarity index 100%
rename from zin/wg/useravatar/v1.php
rename to lib/zin/wg/useravatar/v1.php
diff --git a/zin/zentao/pager.func.php b/lib/zin/zentao/pager.func.php
similarity index 100%
rename from zin/zentao/pager.func.php
rename to lib/zin/zentao/pager.func.php
diff --git a/zin/zentao/zentao.func.php b/lib/zin/zentao/zentao.func.php
similarity index 100%
rename from zin/zentao/zentao.func.php
rename to lib/zin/zentao/zentao.func.php
diff --git a/zin/zin.php b/lib/zin/zin.class.php
old mode 100755
new mode 100644
similarity index 100%
rename from zin/zin.php
rename to lib/zin/zin.class.php
diff --git a/zin/zui/toggle.class.php b/lib/zin/zui/toggle.class.php
similarity index 100%
rename from zin/zui/toggle.class.php
rename to lib/zin/zui/toggle.class.php
diff --git a/zin/zui/toggle.func.php b/lib/zin/zui/toggle.func.php
similarity index 100%
rename from zin/zui/toggle.func.php
rename to lib/zin/zui/toggle.func.php
diff --git a/zin/zui/zui.class.php b/lib/zin/zui/zui.class.php
similarity index 100%
rename from zin/zui/zui.class.php
rename to lib/zin/zui/zui.class.php
diff --git a/zin/zui/zui.func.php b/lib/zin/zui/zui.func.php
similarity index 100%
rename from zin/zui/zui.func.php
rename to lib/zin/zui/zui.func.php

From 100274a3b3c37b0011138470ed92439294556dc7 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Fri, 5 May 2023 15:19:32 +0800
Subject: [PATCH 37/80]  * The script and yaml file was not modified, do not
 regenerate the sql file.

---
 .../test/model/getlistbycurrentuser.php       |   8 +-
 test/lib/init.php                             |  25 +++-
 test/lib/yaml.class.php                       | 117 +++++++++++++-----
 3 files changed, 113 insertions(+), 37 deletions(-)

diff --git a/module/project/test/model/getlistbycurrentuser.php b/module/project/test/model/getlistbycurrentuser.php
index 2b2b07ceed..37e302de5d 100644
--- a/module/project/test/model/getlistbycurrentuser.php
+++ b/module/project/test/model/getlistbycurrentuser.php
@@ -27,9 +27,11 @@ cid=1
 global $tester;
 $projectModel = $tester->loadModel('project');
 
-$tester->app->user->admin = true;
+$tester->app->user->admin    = true;
 $tester->app->config->vision = 'lite';
+
 r(count($projectModel->getListByCurrentUser())) && p() && e('0');
+
 $tester->app->config->vision = 'rnd';
-r(count($projectModel->getListByCurrentUser())) && p() && e('1');
-r($projectModel->getListByCurrentUser()) && p('11:id,name') && e('11,项目1');
\ No newline at end of file
+r(count($projectModel->getListByCurrentUser())) && p()             && e('1');
+r($projectModel->getListByCurrentUser())        && p('11:id,name') && e('11,项目1');
\ No newline at end of file
diff --git a/test/lib/init.php b/test/lib/init.php
index 387ef1f449..7cce2b1fb7 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -57,6 +57,22 @@ include $frameworkRoot . 'model.class.php';
 include $frameworkRoot . 'helper.class.php';
 
 $app    = router::createApp('pms', dirname(dirname(__FILE__)), 'router');
+$poolID = getenv('poolID');
+$testDB = empty($config->testDB) ? array() : $config->testDB;
+
+/* 根据ztf设置的poolID环境变量设置连接的数据库 */
+if(!empty($testDB) && !empty($poolID)) 
+{
+    $selectDB = $testDB[$poolID%count($testDB)];
+
+    !empty($selectDB['host'])     && $config->db->host     = $selectDB['host'];
+    !empty($selectDB['port'])     && $config->db->port     = $selectDB['port'];
+    !empty($selectDB['name'])     && $config->db->name     = $selectDB['name'];
+    !empty($selectDB['user'])     && $config->db->user     = $selectDB['user'];
+    !empty($selectDB['password']) && $config->db->password = $selectDB['password'];
+
+    $app->connectDB();
+}
 $tester = $app->loadCommon();
 
 /* Set configs. */
@@ -79,7 +95,7 @@ if(!empty($config->test->account) and !empty($config->test->password) and !empty
 /**
  * Save variable to $_result.
  *
- * @param  mix    $result
+ * @param  mixed    $result
  * @access public
  * @return bool true
  */
@@ -107,7 +123,7 @@ function p($keys = '', $delimiter = ',')
     if(is_array($_result) and isset($_result['code']) and $_result['code'] == 'fail') return print((string) $_result['message'] . "\n");
 
     /* Print $_result. */
-    if(!$keys and is_array($_result)) return print(json_encode($_result['']) . "\n");
+    if(!$keys and is_array($_result)) return print_r($_result) . "\n";
     if(!$keys or !is_array($_result) and !is_object($_result)) return print((string) $_result . "\n");
 
     $parts  = explode(';', $keys);
@@ -170,6 +186,7 @@ function printSteps()
     $file     = $debugInfo[count($debugInfo)-1]['file'];
     $contents = file_get_contents($file);
     $rpeList  = genParamsByRPE($contents);
+    $desc     = '';
 
     foreach($rpeList as $rpe)
     {
@@ -211,8 +228,10 @@ function printSteps()
             }
         }
 
-        echo $stepDesc . ($isGrup ? "\n" : "\n");
+        $desc .= $stepDesc . "\n";
     }
+
+    echo trim($desc);
 }
 
 /**
diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index cde84f8db7..ffe31c41c7 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -307,10 +307,12 @@ class yaml
      * 合并原始yaml与用户自定义yaml文件
      * Merege yaml file.
      *
-     * @access public
+     * @param string $runFileDir
+     * @param string $runFileName
+     * @access private
      * @return string
      */
-    public function mergeYaml()
+    private function mergeYaml($runFileDir, $runFileName)
     {
         $mergeData = array('fields' => array());
         foreach($this->configFiles as $configFile)
@@ -327,13 +329,6 @@ class yaml
             }
         }
 
-        $runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
-
-        $pos = strripos($runFileName, DS);
-        if($pos !== false) $runFileName = mb_substr($runFileName, $pos+1);
-
-        $runFileDir  = dirname($runFileName);
-
         if(!is_dir("{$runFileDir}/data")) mkdir("{$runFileDir}/data", 0777);
         $yamlFile = "{$runFileDir}/data/{$this->tableName}_{$runFileName}.yaml";
 
@@ -349,6 +344,25 @@ class yaml
         return $yamlFile;
     }
 
+    /**
+     * 查找当前执行脚本的相对路径与文件名
+     * Find script path and name.
+     *
+     * @access private
+     * @return array
+     */
+    private function getScriptPathAndName()
+    {
+        $runFileName = str_replace(strrchr($_SERVER['SCRIPT_FILENAME'], "."), "", $_SERVER['SCRIPT_FILENAME']);
+
+        $pos = strripos($runFileName, DS);
+        if($pos !== false) $runFileName = mb_substr($runFileName, $pos+1);
+
+        $runFileDir = dirname($_SERVER['SCRIPT_FILENAME']);
+        
+        return array($runFileDir, $runFileName);
+    }
+
     /**
      * Build yaml file and insert table.
      *
@@ -359,31 +373,75 @@ class yaml
      */
     public function gen($rows, $isClear = true)
     {
-        $yamlFile = $this->mergeYaml();
-        $this->insertDB($yamlFile, $this->tableName, $rows, $isClear);
+        list($runFileDir, $runFileName) = $this->getScriptPathAndName();
+
+        $sqlPath    = sprintf("%s%sdata%ssql%s%s_%s_zd.sql", $runFileDir, DS, DS, DS, $this->tableName, $runFileName);
+        $scriptPath = sprintf("%s%s%s.php", $runFileDir, DS, $runFileName);
+        $yamlPath   = sprintf("%s%sdata%s%s_%s.yaml", $runFileDir, DS, DS, $this->tableName, $runFileName);
+
+        if($this->checkNeedReGenerateSql($sqlPath, $scriptPath, $yamlPath))
+        {
+            $runtimeRoot = dirname(dirname(__FILE__)) . '/runtime/';
+            $zdPath      = $runtimeRoot . 'zd';
+            $configYaml  = $runtimeRoot . 'tmp/config.yaml';
+            $tableName   = $this->config->db->prefix . $this->tableName;
+
+            $yamlFile = $this->mergeYaml($runFileDir, $runFileName);
+
+            $genSQL     = "$zdPath -c %s -d %s -n %d -t %s -o %s";
+            $execGenSQL = sprintf($genSQL, $configYaml, $yamlFile, $rows, $tableName, $sqlPath);
+
+            system($execGenSQL);
+        }
+
+        $this->insertDB($sqlPath, $this->tableName, $isClear);
+    }
+
+    /**
+     * 根据脚本以及yaml文件修改时间判断是否需要重新生成sql文件.
+     * Check if it is necessary to regenerate the SQL file.
+     *
+     * @param  string  $sqlPath
+     * @param  string  $scriptPath
+     * @param  string  $yamlPath
+     * @access private
+     * @return bool
+     */
+    private function checkNeedReGenerateSql($sqlPath, $scriptPath, $yamlPath)
+    {
+        $sqlFileUpdateTime = file_exists($sqlPath) ? filemtime($sqlPath) : 0;
+        $scriptUpdateTime  = filemtime($scriptPath);
+
+        if($sqlFileUpdateTime < $scriptUpdateTime) return true;
+
+        foreach($this->configFiles as $configFile)
+        {
+            if($sqlFileUpdateTime < filemtime($configFile)) return true;
+        }
+
+        /* Check if the range function is used in the YAML file */
+        $content = file_get_contents($yamlPath);
+        if(preg_match('/range:.*?:R\s*(,|$|\n)/', $content)) return true;
+
+        return false;
     }
 
     /**
      * Insert the data into database.
      *
-     * @param  string    $yamlFile
+     * @param  string    $sqlPath
      * @param  string    $tableName
-     * @param  int       $rows
      * @param  bool      $isClear Truncate table if set isClear to true.
      * @access public
      * @return string
      */
-    function insertDB($yamlFile, $tableName, $rows, $isClear = true)
+    function insertDB($sqlPath, $tableName, $isClear = true)
     {
-        $tableSqlDir = "{$_SERVER['PWD']}/data/sql";
+        $tableSqlDir = dirname($sqlPath);
 
         if(!is_dir($tableSqlDir)) mkdir($tableSqlDir, 0777, true);
         $dumpCommand = "mysqldump -u%s -p%s -h%s -P%s %s %s > {$tableSqlDir}/{$tableName}.sql 2>/dev/null";
 
-        $runtimeRoot = dirname(dirname(__FILE__)) . '/runtime/';
-        $zdPath      = $runtimeRoot . 'zd';
-        $configYaml  = $runtimeRoot . 'tmp/config.yaml';
-
         $tableName = $this->config->db->prefix . $tableName;
         $dbName    = $this->config->db->name;
         $dbHost    = $this->config->db->host;
@@ -391,24 +449,21 @@ class yaml
         $dbUser    = $this->config->db->user;
         $dbPWD     = $this->config->db->password;
 
-        $command = "mysql -u%s -p%s -h%s -P%s -D%s < %s";
-        $genSQL  = "$zdPath -c %s -d %s -n %d -t %s -o %s";
+        $command    = "mysql -u%s -p%s -h%s -P%s -D%s < %s";
+        $execInsert = sprintf($command, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $sqlPath);
+        $execDump   = sprintf($dumpCommand, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName);
+        
+        system($execDump);
+
         if($isClear === true)
         {
             /* Truncate table to reset auto increment number. */
             system(sprintf("mysql -u%s -p%s -h%s -P%s %s -e 'truncate %s' 2>/dev/null", $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName));
         }
-        $sqlPath    = "{$tableSqlDir}/{$tableName}_zd.sql";
-        $execYaml   = sprintf($command, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $sqlPath);
-        $execDump   = sprintf($dumpCommand, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName);
 
-        $execGenSQL = sprintf($genSQL, $configYaml, $yamlFile, $rows, $tableName, $sqlPath);
-        system($execGenSQL);
-
-        system($execDump);
         $stderr = '';
-        $this->exec_with_stderr($execYaml, $stderr);
-
+        $this->execWithStderr($execInsert, $stderr);
+        
         if(empty($stderr)) return;
 
         $errors = explode(PHP_EOL, $stderr);
@@ -429,7 +484,7 @@ class yaml
      * @access private
      * @return string
      */
-    private function exec_with_stderr($cmd, &$stderr=null)
+    private function execWithStderr($cmd, &$stderr=null) 
     {
         $proc   = proc_open($cmd, array(2 => array('pipe', 'w')), $pipes);
         $stderr = stream_get_contents($pipes[2]);

From 8305cf298a0d46c073726193ebdacef8c0b9a461 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 15:34:05 +0800
Subject: [PATCH 38/80] * Submit split control layer updateOder function to Zen
 Taoand unit test

---
 module/project/control.php                | 23 +++++--------
 module/project/model.php                  | 32 +++++++++++++++++++
 module/project/test/model/updateorder.php | 39 +++++++++++++++++++++++
 3 files changed, 79 insertions(+), 15 deletions(-)
 create mode 100755 module/project/test/model/updateorder.php

diff --git a/module/project/control.php b/module/project/control.php
index ef6da958bb..edd4959eda 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1858,6 +1858,7 @@ class project extends control
     }
 
     /**
+     * 更新项目排列序号
      * Update projects order.
      *
      * @access public
@@ -1865,22 +1866,14 @@ class project extends control
      */
     public function updateOrder()
     {
-        $idList  = explode(',', trim($this->post->projects, ','));
-        $orderBy = $this->post->orderBy;
+        $postData = form::data();
+        $rawdata  = $postData->rawdata;
+        $idList   = explode(',', trim($rawdata->projects, ','));
+        $orderBy  = $rawdata->orderBy;
+
         if(strpos($orderBy, 'order') === false) return false;
 
-        $projects = $this->dao->select('id,`order`')->from(TABLE_PROJECT)->where('id')->in($idList)->orderBy($orderBy)->fetchPairs('order', 'id');
-        foreach($projects as $order => $id)
-        {
-            $newID = array_shift($idList);
-            if($id == $newID) continue;
-            $this->dao->update(TABLE_PROJECT)
-                ->set('`order`')->eq($order)
-                ->set('lastEditedBy')->eq($this->app->user->account)
-                ->set('lastEditedDate')->eq(helper::now())
-                ->where('id')->eq($newID)
-                ->exec();
-        }
+        $this->project->updateOrder($idList, $orderBy);
     }
 
     /**
@@ -1970,7 +1963,7 @@ class project extends control
 
             /* Update linked products. */
             $errorTips = $this->projectZen->mergeProducts($projectID, $project, $executionIDs, $postData);
-            return $this->send($errorTips);
+            if(!empty($errorTips) return $this->send($errorTips);
 
             $locateLink = inLink('manageProducts', "projectID=$projectID");
             if($from == 'program')  $locateLink = $this->session->projectList;
diff --git a/module/project/model.php b/module/project/model.php
index 76e7d0f2c9..d15ed0115b 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -3013,4 +3013,36 @@ class projectModel extends model
         if(!empty($diffResult)) $this->loadModel('productplan')->linkProject($projectID, $newPlans);
         return !dao::isError();
     }
+
+    /**
+     * 更新项目排序
+     * update project order
+     *
+     * @param  array  $idList
+     * @param  string $orderBy
+     *
+     * @access public
+     * @return bool
+     */
+    public function updateOrder(array $idList, string $orderBy): bool
+    {
+        $projects = $this->dao->select('id,`order`')->from(TABLE_PROJECT)
+            ->where('id')->in($idList)
+            ->orderBy($orderBy)
+            ->fetchPairs('order', 'id');
+
+        foreach($projects as $order => $id)
+        {
+            $newID = array_shift($idList);
+            if($id == $newID) continue;
+            $this->dao->update(TABLE_PROJECT)
+                ->set('`order`')->eq($order)
+                ->set('lastEditedBy')->eq($this->app->user->account)
+                ->set('lastEditedDate')->eq(helper::now())
+                ->where('id')->eq($newID)
+                ->exec();
+        }
+
+        return !dao::isError();
+    }
 }
diff --git a/module/project/test/model/updateorder.php b/module/project/test/model/updateorder.php
new file mode 100755
index 0000000000..60b65838bc
--- /dev/null
+++ b/module/project/test/model/updateorder.php
@@ -0,0 +1,39 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+function initData()
+{
+    $project = zdTable('project');
+    $project->id->range('1-5');
+    $project->gen(5);
+}
+
+/**
+
+title=测试 projectModel::suspend;
+timeout=0
+cid=1
+
+- 执行$project1 @1
+
+- 执行$project2 @1
+
+
+
+*/
+
+global $tester;
+$tester->loadModel('project');
+
+initData();
+
+$idList  = array(1,2,3,4,5);
+$order1  = 'id_asc';
+$order2  = 'id_desc';
+$project1 = $tester->project->updateOrder($idList, $order1);
+$project2 = $tester->project->updateOrder($idList, $order2);
+
+r($project1) && p() && e('1');
+r($project2) && p() && e('1');
\ No newline at end of file

From f64e39b21e35c101f57dc6f71013e4cf03afc45c Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Fri, 5 May 2023 15:43:24 +0800
Subject: [PATCH 39/80]  * Finish task #92543.

---
 module/block/css/productoverviewblock.ui.css  |  3 +
 module/block/ui/productoverviewblock.html.php | 92 +++++++++++++++++++
 module/block/ui/welcomeblock.html.php         | 27 +++---
 3 files changed, 108 insertions(+), 14 deletions(-)
 create mode 100644 module/block/css/productoverviewblock.ui.css
 create mode 100644 module/block/ui/productoverviewblock.html.php

diff --git a/module/block/css/productoverviewblock.ui.css b/module/block/css/productoverviewblock.ui.css
new file mode 100644
index 0000000000..3acd767fd1
--- /dev/null
+++ b/module/block/css/productoverviewblock.ui.css
@@ -0,0 +1,3 @@
+.border-right {position: relative;}
+.border-right::after {content: ''; position: absolute; right: 0px; width: 1px; height: 40px; background: #EEE; top: 50%; margin-top: -20px;}
+.tile-amount {font-size: 32px; font-weight: 700; line-height: 56px;}
diff --git a/module/block/ui/productoverviewblock.html.php b/module/block/ui/productoverviewblock.html.php
new file mode 100644
index 0000000000..55c3c6c04d
--- /dev/null
+++ b/module/block/ui/productoverviewblock.html.php
@@ -0,0 +1,92 @@
+<?php
+declare(strict_types=1);
+/**
+* The product overview block view file of block module of ZenTaoPMS.
+* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+* @author      LiuRuoGu <liuruogu@easycorp.ltd>
+* @package     block
+* @link        https://www.zentao.net
+*/
+
+namespace zin;
+
+panel
+(
+    div
+    (
+        set('class', 'flex'),
+        cell
+        (
+            set('class', 'border-right'),
+            set('style', ['width' => '25%']),
+            col
+            (
+                set('class', 'text-center'),
+                span
+                (
+                    set('class', 'tile-amount text-primary'),
+                    132
+                ),
+                span
+                (
+                    set('class', 'text-light'),
+                    '产品总量'
+                )
+            )
+        ),
+        cell
+        (
+            set('class', 'border-right flex justify-around'),
+            set('style', ['width' => '50%']),
+            col
+            (
+                set('class', 'text-center'),
+                span
+                (
+                    set('class', 'tile-amount text-primary'),
+                    12
+                ),
+                span
+                (
+                    set('class', 'text-light'),
+                    '产品线'
+                )
+            ),
+            col
+            (
+                set('class', 'text-center'),
+                span
+                (
+                    set('class', 'tile-amount text-primary'),
+                    100
+                ),
+                span
+                (
+                    set('class', 'text-light'),
+                    '今年发布'
+                )
+            )
+        ),
+        cell
+        (
+            set('style', ['width' => '25%']),
+            col
+            (
+                set('class', 'text-center'),
+                span
+                (
+                    set('class', 'tile-amount text-important'),
+                    16
+                ),
+                span
+                (
+                    set('class', 'text-light'),
+                    '发布里程碑'
+                )
+            )
+        )
+    )
+);
+
+render();
diff --git a/module/block/ui/welcomeblock.html.php b/module/block/ui/welcomeblock.html.php
index eb8eaa414a..8890e51bd3 100644
--- a/module/block/ui/welcomeblock.html.php
+++ b/module/block/ui/welcomeblock.html.php
@@ -19,9 +19,9 @@ panel
         setClass('flex'),
         col
         (
-            setStyle(['width' => '20%', 'height' => '176px']),
-            set('class', 'border-right p-3'),
+            setStyle(['width' => '20%']),
             set('align', 'center'),
+            set('class', 'border-right p-3'),
             center
             (
                 set('class', 'font-bold'),
@@ -60,7 +60,7 @@ panel
                     span
                     (
                         set('class', 'tile-amount text-primary'),
-                        81
+                        58
                     ),
                     span('研发需求数')
                 ),
@@ -70,9 +70,9 @@ panel
                     span
                     (
                         set('class', 'tile-amount text-primary'),
-                        81
+                        39
                     ),
-                    span('研发需求数')
+                    span('反馈数')
                 ),
                 col
                 (
@@ -80,7 +80,7 @@ panel
                     span
                     (
                         set('class', 'tile-amount text-primary'),
-                        81
+                        17
                     ),
                     span('研发需求数')
                 )
@@ -88,8 +88,8 @@ panel
         ),
         cell
         (
-            set::width('35%'),
-            set('class', 'p-3'),
+            set('width', '35%'),
+            set('class', 'border-right p-3'),
             div
             (
                 set('class', 'font-bold'),
@@ -100,14 +100,14 @@ panel
                 setClass('flex justify-around pt-6'),
                 col
                 (
-                    set('class', 'text-center items-center'),
+                    set('class', 'text-center'),
                     span
                     (
                         set('class', 'tile-amount text-primary'),
-                        81
+                        16
                     ),
                     span('任务数'),
-                    div
+                    span
                     (
                         set('class', 'rounded-full welcome-label-delay px-1 text-sm'),
                         '延期 3'
@@ -115,14 +115,13 @@ panel
                 ),
                 col
                 (
-                    set('justify', 'center'),
                     set('class', 'text-center'),
                     span
                     (
                         set('class', 'tile-amount text-primary'),
-                        81
+                        30
                     ),
-                    span('研发需求数'),
+                    span('BUG数')
                 )
             )
         )

From 32ca0f99f2ed7a22e48527d9d2906415420852cc Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 15:44:08 +0800
Subject: [PATCH 40/80] * Add unit test.

---
 module/project/test/model/getprojectprivs.php | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100755 module/project/test/model/getprojectprivs.php

diff --git a/module/project/test/model/getprojectprivs.php b/module/project/test/model/getprojectprivs.php
new file mode 100755
index 0000000000..54f4b73c87
--- /dev/null
+++ b/module/project/test/model/getprojectprivs.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+/**
+
+title=测试 projectModel->getProjectPrivs();
+timeout=0
+cid=1
+
+*/
+
+global $tester;
+$projectTester = $tester->loadModel('project');
+
+r($projectTester->getProjectPrivs(''))         && p()             && e('0');            // 传递空类型的情况
+r($projectTester->getProjectPrivs('test'))     && p()             && e('0');            // 传递错误的类型的情况
+r($projectTester->getProjectPrivs('scrum'))    && p('bug:delete') && e('deleteAction'); // 传递正确类型的情况

From 9adee22ad52c169627ab8948a6f8d2aa785e8f71 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 15:45:02 +0800
Subject: [PATCH 41/80] * Modify function name.

---
 module/common/model.php    |  2 +-
 module/project/control.php |  2 +-
 module/project/model.php   | 22 ++++++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 79e9211411..0f5a3d03ce 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -2658,7 +2658,7 @@ EOF;
         if($program->auth == 'reset')
         {
             /* If priv way is reset, unset common program priv, and cover by program priv. */
-            $projectPrivs = $this->loadModel('project')->processProjectPrivs($program->multiple ? $program->model : 'noSprint');
+            $projectPrivs = $this->loadModel('project')->getProjectPrivs($program->multiple ? $program->model : 'noSprint');
             foreach($projectPrivs as $module => $methods)
             {
                 foreach($methods as $method => $label)
diff --git a/module/project/control.php b/module/project/control.php
index edd4959eda..ab4c869213 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1453,7 +1453,7 @@ class project extends control
             }
 
             $this->view->project  = $project;
-            $this->lang->resource = $this->project->processProjectPrivs($project->multiple ? $project->model : 'noSprint');
+            $this->lang->resource = $this->project->getProjectPrivs($project->multiple ? $project->model : 'noSprint');
         }
 
         $this->display();
diff --git a/module/project/model.php b/module/project/model.php
index d15ed0115b..6e8ae5065d 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -116,7 +116,7 @@ class projectModel extends model
             }
         }
 
-        setcookie('lastProject', (int)$this->session->project, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        setcookie('lastProject', (string)$this->session->project, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
 
         return $this->session->project;
     }
@@ -893,23 +893,25 @@ class projectModel extends model
     }
 
     /**
-     * Process the project privs according to the project model.
+     * 根据项目类型生成权限数据。
+     * Get project priv data according to the project type.
      *
-     * @param  string $model    sprint | waterfall | noSprint
+     * @param  string $model  scrum|waterfall|noSprint|agileplus|waterfallplus
      * @access public
-     * @return object
+     * @return object|false
      */
-    public function processProjectPrivs($model = 'waterfall')
+    public function getProjectPrivs(string $model = 'waterfall'): object|false
     {
+        if(!in_array($model, array_keys((array)$this->config->programPriv))) return false;
+
         if($model == 'noSprint') $this->config->project->includedPriv = $this->config->project->noSprintPriv;
 
         $this->app->loadLang('group');
-
-        $privs    = new stdclass();
-        $resource = $this->lang->resource;
-        foreach($resource as $module => $methods)
+        $privs = new stdclass();
+        foreach($this->lang->resource as $module => $methods)
         {
-            if(!$methods) continue;
+            if(empty($methods)) continue;
+
             if(!in_array($module, $this->config->programPriv->$model)) continue;
 
             foreach($methods as $method => $label)

From d0fe203e30152a3f1330ed9b91b20357f03a82d1 Mon Sep 17 00:00:00 2001
From: chentao <chentao@easycorp.ltd>
Date: Fri, 5 May 2023 15:45:08 +0800
Subject: [PATCH 42/80] * product: refactor saveState function.

---
 module/product/control.php |  46 +++++++-----
 module/product/model.php   | 104 -------------------------
 module/product/zen.php     | 150 +++++++++++++++++++++++++++++++++++--
 3 files changed, 171 insertions(+), 129 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 524b2b87d5..d39d9bd1c7 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -57,10 +57,10 @@ class product extends control
         if($locate == 'yes') $this->locate($this->createLink($this->moduleName, 'browse'));
 
         if($this->app->getViewType() != 'mhtml') unset($this->lang->product->menu->index);
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->productZen->saveVisitState($productID, $this->products);
         $branch    = (int)$this->cookie->preBranch;
 
-        if($this->app->viewType == 'mhtml') $this->product->setMenu($productID, $branch);
+        if($this->app->viewType == 'mhtml') $this->productZen->setMenu($productID, $branch);
 
         if(common::hasPriv('product', 'create')) $this->lang->TRActions = html::a($this->createLink('product', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->product->create, '', "class='btn btn-primary'");
 
@@ -90,7 +90,7 @@ class product extends control
         $this->productZen->setProjectMenu($productID, $branch, $this->cookie->preBranch);
 
         /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
+        $this->app->loadClass('pager', true);
         $pager = new pager((int)$recTotal, (int)$recPerPage, (int)$pageID);
 
         /* Set view variables and display. */
@@ -98,7 +98,8 @@ class product extends control
     }
 
     /**
-     * Browse a product.
+     * 产品研发需求列表。
+     * Browse requirements list of product.
      *
      * @param  int         $productID
      * @param  int|stirng  $branch
@@ -113,9 +114,16 @@ class product extends control
      * @access public
      * @return void
      */
-    public function browse($productID = 0, $branch = '', $browseType = '', $param = 0, $storyType = 'story', $orderBy = '', $recTotal = 0, $recPerPage = 20, $pageID = 1, $projectID = 0)
+    public function browse(string $productID = '0', string $branch = '', string $browseType = '', string $param = '0', string $storyType = 'story', string $orderBy = '', string $recTotal = '0', string $recPerPage = '20', $pageID = '1', $projectID = '0')
     {
-        $productID = $this->app->tab != 'project' ? $this->product->saveState($productID, $this->products) : $productID;
+        $productID  = (int)$productID;
+        $param      = (int)$param;
+        $recTotal   = (int)$recTotal;
+        $recPerPage = (int)$recPerPage;
+        $pageID     = (int)$pageID;
+        $projectID  = (int)$projectID;
+
+        $productID = $this->app->tab != 'project' ? $this->saveVisitState($productID, $this->products) : $productID;
         $product   = $this->product->getById($productID);
 
         if($product && !isset($this->products[$product->id])) $this->products[$product->id] = $product->name;
@@ -142,7 +150,7 @@ class product extends control
             $this->session->set('storyList',   $this->app->getURI(true), 'product');
             $this->session->set('productList', $this->app->getURI(true), 'product');
 
-            $this->product->setMenu($productID, $branch, 0, '', "storyType=$storyType");
+            $this->productZen->setMenu($productID, $branch, 0, '', "storyType=$storyType");
         }
 
         /* Lower browse type. */
@@ -427,7 +435,7 @@ class product extends control
         $this->productZen->setEditMenu($productID, $programID);
 
         $product   = $this->product->getByID($productID);
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->productZen->saveVisitState($productID, $this->products);
 
         $this->productZen->buildEditForm($product);
     }
@@ -559,7 +567,7 @@ class product extends control
             return print(js::reload('parent.parent'));
         }
 
-        $this->product->setMenu($productID);
+        $this->productZen->setMenu($productID);
 
         $this->view->product    = $product;
         $this->view->title      = $this->view->product->name . $this->lang->colon .$this->lang->close;
@@ -588,7 +596,7 @@ class product extends control
         }
 
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
-        $this->product->setMenu($productID);
+        $this->productZen->setMenu($productID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -647,7 +655,7 @@ class product extends control
      */
     public function roadmap($productID, $branch = 'all')
     {
-        $this->product->setMenu($productID, $branch);
+        $this->productZen->setMenu($productID, $branch);
 
         $this->session->set('releaseList',     $this->app->getURI(true), 'product');
         $this->session->set('productPlanList', $this->app->getURI(true), 'product');
@@ -693,7 +701,7 @@ class product extends control
         $this->session->set('caseList',        $uri, 'qa');
         $this->session->set('testtaskList',    $uri, 'qa');
 
-        $this->product->setMenu($productID, 0, 0, '', $type);
+        $this->productZen->setMenu($productID, 0, 0, '', $type);
 
         /* Append id for secend sort. */
         $orderBy = $direction == 'next' ? 'date_desc' : 'date_asc';
@@ -749,12 +757,12 @@ class product extends control
         $this->session->set('productPlanList', $uri, 'product');
         $this->session->set('releaseList',     $uri, 'product');
 
-        $productID = $this->product->saveState($productID, $this->products);
+        $productID = $this->productZen->saveVisitState($productID, $this->products);
         $product   = $this->product->getStatByID($productID);
         if(!$product) return print(js::locate('product', 'all'));
 
         $product->desc = $this->loadModel('file')->setImgSize($product->desc);
-        $this->product->setMenu($productID);
+        $this->productZen->setMenu($productID);
 
         /* Load pager. */
         $this->app->loadClass('pager', $static = true);
@@ -981,7 +989,7 @@ class product extends control
      */
     public function whitelist($productID = 0, $module = 'product', $objectType = 'product', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1)
     {
-        $this->product->setMenu($productID, 0);
+        $this->productZen->setMenu($productID, 0);
         $this->lang->modulePageNav = '';
 
         echo $this->fetch('personnel', 'whitelist', "objectID=$productID&module=product&browseType=$objectType&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID");
@@ -999,7 +1007,7 @@ class product extends control
      */
     public function addWhitelist($productID = 0, $deptID = 0, $copyID = 0)
     {
-        $this->product->setMenu($productID);
+        $this->productZen->setMenu($productID);
         $this->lang->modulePageNav = '';
 
         echo $this->fetch('personnel', 'addWhitelist', "objectID=$productID&dept=$deptID&copyID=$copyID&objectType=product&module=product");
@@ -1124,9 +1132,9 @@ class product extends control
         if(!$projectID)
         {
             $products  = $this->product->getPairs();
-            $productID = $this->product->saveState($productID, $products);
-            $this->product->products = $this->product->saveState($productID, $products);
-            $this->product->setMenu($productID, $branch);
+            $productID = $this->productZen->saveVisitState($productID, $products);
+            $this->product->products = $this->productZen->saveVisitState($productID, $products);
+            $this->productZen->setMenu($productID, $branch);
         }
 
         /* Save session. */
diff --git a/module/product/model.php b/module/product/model.php
index d48c7c96c5..a5851030ab 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -170,46 +170,6 @@ class productModel extends model
         return $output;
     }
 
-    /**
-     * Save the product id user last visited to session.
-     *
-     * @param  int   $productID
-     * @param  array $products
-     * @access public
-     * @return int
-     */
-    public function saveState($productID, $products)
-    {
-        if(defined('TUTORIAL')) return $productID;
-
-        if($productID == 0 and $this->cookie->preProductID and isset($products[$this->cookie->preProductID])) $productID = $this->cookie->preProductID;
-        if($productID == 0 and $this->session->product == '') $productID = (int)key($products);
-        $this->session->set('product', (int)$productID, $this->app->tab);
-
-        if(!isset($products[$this->session->product]))
-        {
-            $product = $this->getById($productID);
-
-            if(empty($product) or $product->deleted == 1) $productID = (int)key($products);
-            $this->session->set('product', (int)$productID, $this->app->tab);
-            if($productID && strpos(",{$this->app->user->view->products},", ",{$productID},") === false)
-            {
-                $productID = (int)key($products);
-                $this->session->set('product', (int)$productID, $this->app->tab);
-                $this->accessDenied($this->lang->product->accessDenied);
-            }
-        }
-
-        setcookie('preProductID', (int)$productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
-
-        if($this->cookie->preProductID != $this->session->product)
-        {
-            $this->cookie->set('preBranch', 0);
-            setcookie('preBranch', 0, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
-        }
-        return $this->session->product;
-    }
-
     /**
      * Check privilege.
      *
@@ -226,27 +186,6 @@ class productModel extends model
         return (strpos(",{$this->app->user->view->products},", ",{$productID},") !== false);
     }
 
-    /**
-     * Show accessDenied response.
-     *
-     * @param  string  $tips
-     * @access private
-     * @return void
-     */
-    public function accessDenied($tips)
-    {
-        if(defined('TUTORIAL')) return true;
-
-        echo(js::alert($tips));
-
-        if(!$this->server->http_referer) return print(js::locate(helper::createLink('product', 'index')));
-
-        $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
-        if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(helper::createLink('product', 'index')));
-
-        echo js::locate('back');
-    }
-
     /**
      * Get product by id.
      *
@@ -276,7 +215,6 @@ class productModel extends model
         return $this->dao->select('*')->from(TABLE_PRODUCT)->where('id')->in($productIDList)->fetchAll('id');
     }
 
-
     /**
      * Get list by search.
      *
@@ -2190,48 +2128,6 @@ class productModel extends model
         }
     }
 
-    /**
-     *
-     * Set menu.
-     *
-     * @param  int         $productID
-     * @param  int|string  $branch
-     * @param  int         $module
-     * @param  string      $moduleType
-     * @param  string      $extra
-     * @access public
-     * @return void
-     */
-    public function setMenu($productID = 0, $branch = '', $module = 0, $moduleType = '', $extra = ''): void
-    {
-        if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL'))
-        {
-            $this->accessDenied($this->lang->product->accessDenied);
-            return;
-        }
-
-        $product = $this->getByID($productID);
-
-        $params = array('branch' => $branch);
-        common::setMenuVars('product', $productID, $params);
-        if(!$product) return;
-
-        $this->lang->switcherMenu = $this->getSwitcher($productID, $extra, $branch);
-
-        if($product->type == 'normal')
-        {
-            unset($this->lang->product->menu->settings['subMenu']->branch);
-        }
-        else
-        {
-            $branchLink = $this->lang->product->menu->settings['subMenu']->branch['link'];
-            $this->lang->product->menu->settings['subMenu']->branch['link'] = str_replace('@branch@', $this->lang->product->branchName[$product->type], $branchLink);
-            $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
-        }
-
-        if(strpos($extra, 'requirement') !== false) unset($this->lang->product->moreSelects['willclose']);
-    }
-
     /**
      * Convert predefined HTML entities to characters
      *
diff --git a/module/product/zen.php b/module/product/zen.php
index 70a270f87d..50259bcbf7 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -27,18 +27,28 @@ class productZen extends product
         /* Set activated menu for mobile view. */
         if($this->app->viewType == 'mhtml')
         {
-            $productID = $this->product->saveState(0, $this->products);
-            $this->product->setMenu($productID);
+            $productID = $this->saveVisitState(0, $this->products);
+            $this->setMenu($productID);
         }
     }
 
+    /**
+     * 设置项目页面导航菜单。
+     * Set navigation menus for project page.
+     *
+     * @param  int       $productID
+     * @param  string    $branch
+     * @param  string    $preBranch
+     * @access protected
+     * @return void
+     */
     protected function setProjectMenu(int $productID, string $branch, string $preBranch)
     {
         $branch = ($preBranch !== '' and $branch === '') ? $preBranch : $branch;
         setcookie('preBranch', $branch, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
         $this->session->set('createProjectLocate', $this->app->getURI(true), 'product');
 
-        $this->product->setMenu($productID, $branch);
+        $this->setMenu($productID, $branch);
     }
 
     /**
@@ -57,7 +67,7 @@ class productZen extends product
         if($this->app->getViewType() != 'mhtml') return;
 
         if($this->app->rawModule == 'projectstory' and $this->app->rawMethod == 'story') return $this->loadModel('project')->setMenu();
-        $this->product->setMenu();
+        $this->setMenu();
     }
 
     /**
@@ -72,7 +82,7 @@ class productZen extends product
     protected function setEditMenu(int $productID, int $programID)
     {
         if($programID) return $this->loadModel('program')->setMenu($programID);
-        $this->product->setMenu($productID);
+        $this->setMenu($productID);
     }
 
     /**
@@ -87,7 +97,7 @@ class productZen extends product
      */
     protected function setShowErrorNoneMenu(string $moduleName, string $activeMenu, int $objectID)
     {
-        if($this->app->getViewType() == 'mhtml') return $this->product->setMenu();
+        if($this->app->getViewType() == 'mhtml') return $this->setMenu();
 
         if($moduleName == 'qa')        $this->setShowErrorNoneMenu4QA($activeMenu);
         if($moduleName == 'project')   $this->setShowErrorNoneMenu4Project($activeMenu, $objectID);
@@ -582,4 +592,132 @@ class productZen extends product
 
         return $data;
     }
+
+    /**
+     * 把访问的产品ID等状态信息保存到session和cookie中。
+     * Save the product id user last visited to session and cookie.
+     *
+     * @param  int       $productID
+     * @param  array     $products
+     * @access protected
+     * @return int
+     */
+    protected function saveVisitState(int $productID, array $products): int
+    {
+        if(defined('TUTORIAL')) return $productID;
+
+        $productID = $this->getAccessableProductID($productID, $products);
+
+        $this->session->set('product', $productID, $this->app->tab);
+
+        setcookie('preProductID', (string)$productID, $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+
+        /* If preProductID changed, then reset preBranch. */
+        if($this->cookie->preProductID != $this->session->product)
+        {
+            $this->cookie->set('preBranch', 0);
+            setcookie('preBranch', '0', $this->config->cookieLife, $this->config->webRoot, '', $this->config->cookieSecure, true);
+        }
+
+        return $productID;
+    }
+
+    /**
+     * 获取可访问的产品ID。
+     * Get accessable product ID.
+     *
+     * @param  int       $productID
+     * @param  array     $products
+     * @access protected
+     * @return int
+     */
+    protected function getAccessableProductID(int $productID, array $products): int
+    {
+        if(empty($productID))
+        {
+            if($this->cookie->preProductID and isset($products[$this->cookie->preProductID])) $productID = $this->cookie->preProductID;
+            if(empty($this->session->product)) $productID = (int)key($products);
+        }
+
+        /* 产品ID已经被删除，不存在于产品列表中。*/
+        /* Product ID does not exsit in products list, it may be deleted. */
+        if(!isset($products[$productID]))
+        {
+            /* Confirm if product exist. */
+            $product = $this->product->getById($productID);
+            if(empty($product) or $product->deleted == 1) $productID = (int)key($products);
+            /* If product is invisable for curren user, then response access denied message. */
+            if($productID && strpos(",{$this->app->user->view->products},", ",{$productID},") === false)
+            {
+                $productID = (int)key($products);
+                $this->accessDenied($this->lang->product->accessDenied);
+            }
+        }
+
+        return $productID;
+    }
+
+    /**
+     * 输出访问被拒绝提示信息。
+     * Show accessDenied response.
+     *
+     * @param  string  $tips
+     * @access private
+     * @return void
+     */
+    public function accessDenied($tips)
+    {
+        if(defined('TUTORIAL')) return true;
+
+        echo(js::alert($tips));
+
+        if(!$this->server->http_referer) return print(js::locate(helper::createLink('product', 'index')));
+
+        $loginLink = $this->config->requestType == 'GET' ? "?{$this->config->moduleVar}=user&{$this->config->methodVar}=login" : "user{$this->config->requestFix}login";
+        if(strpos($this->server->http_referer, $loginLink) !== false) return print(js::locate(helper::createLink('product', 'index')));
+
+        echo js::locate('back');
+    }
+
+    /**
+     * 设置导航菜单。
+     * Set menu.
+     *
+     * @param  int         $productID
+     * @param  int|string  $branch
+     * @param  int         $module
+     * @param  string      $moduleType
+     * @param  string      $extra
+     * @access public
+     * @return void
+     */
+    public function setMenu($productID = 0, $branch = '', $module = 0, $moduleType = '', $extra = ''): void
+    {
+        if(!$this->app->user->admin and strpos(",{$this->app->user->view->products},", ",$productID,") === false and $productID != 0 and !defined('TUTORIAL'))
+        {
+            $this->accessDenied($this->lang->product->accessDenied);
+            return;
+        }
+
+        $product = $this->product->getByID($productID);
+
+        $params = array('branch' => $branch);
+        common::setMenuVars('product', $productID, $params);
+        if(!$product) return;
+
+        $this->lang->switcherMenu = $this->product->getSwitcher($productID, $extra, $branch);
+
+        if($product->type == 'normal')
+        {
+            unset($this->lang->product->menu->settings['subMenu']->branch);
+        }
+        else
+        {
+            $branchLink = $this->lang->product->menu->settings['subMenu']->branch['link'];
+            $this->lang->product->menu->settings['subMenu']->branch['link'] = str_replace('@branch@', $this->lang->product->branchName[$product->type], $branchLink);
+            $this->lang->product->branch = sprintf($this->lang->product->branch, $this->lang->product->branchName[$product->type]);
+        }
+
+        if(strpos($extra, 'requirement') !== false) unset($this->lang->product->moreSelects['willclose']);
+    }
 }

From b559be298dbf4cb4d07c0faaceaa301675399aa9 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 May 2023 15:47:36 +0800
Subject: [PATCH 43/80]  * adjust code for getProjectStatsByProduct method in
 productModel.

---
 module/product/control.php |   4 +-
 module/product/model.php   |  62 +++----------------
 module/product/zen.php     |  20 +++---
 module/program/model.php   | 122 ++++++++++++++++++-------------------
 4 files changed, 83 insertions(+), 125 deletions(-)

diff --git a/module/product/control.php b/module/product/control.php
index 524b2b87d5..2b0a0ba872 100755
--- a/module/product/control.php
+++ b/module/product/control.php
@@ -383,7 +383,7 @@ class product extends control
         if(!empty($_POST))
         {
             $data    = form::data($this->config->product->form->create);
-            $product = $this->productZen->prepareCreateExtras($data);
+            $product = $this->productZen->prepareCreateExtras($data, $this->post->acl, $this->post->uid);
 
             $productID = $this->product->create($product, $this->post->uid, zget($_POST, 'lineName', ''));
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
@@ -414,7 +414,7 @@ class product extends control
         if(!empty($_POST))
         {
             $data    = form::data($this->config->product->form->edit);
-            $product = $this->productZen->prepareEditExtras($data);
+            $product = $this->productZen->prepareEditExtras($data, $this->post->acl, $this->post->uid);
 
             $changes = $this->product->update($productID, $product, $this->post->uid);
             if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError()));
diff --git a/module/product/model.php b/module/product/model.php
index d48c7c96c5..f8a7958f8e 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1214,7 +1214,7 @@ class productModel extends model
      * @param  string    $orderBy
      * @param  object    $pager
      * @access public
-     * @return array
+     * @return int[]
      */
     public function getProjectStatsByProduct(int $productID, string $browseType = 'all', string $branch = '0', bool $involved = false, string $orderBy = 'order_desc', object|null $pager = null): array
     {
@@ -1223,8 +1223,6 @@ class productModel extends model
 
         $projectKeys = array_keys($projects);
         $stats       = array();
-        $hours       = array();
-        $emptyHour   = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
 
         /* Get all tasks and compute totalEstimate, totalConsumed, totalLeft, progress according to them. */
         $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason')
@@ -1233,59 +1231,17 @@ class productModel extends model
             ->andWhere('parent')->lt(1)
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('project', 'id');
-
-        /* Compute totalEstimate, totalConsumed, totalLeft. */
-        foreach($tasks as $projectID => $projectTasks)
-        {
-            $hour = (object)$emptyHour;
-            foreach($projectTasks as $task)
-            {
-                if($task->status != 'cancel')
-                {
-                    $hour->totalEstimate += $task->estimate;
-                    $hour->totalConsumed += $task->consumed;
-                }
-                if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
-            }
-            $hours[$projectID] = $hour;
-        }
-
-        /* Compute totalReal and progress. */
-        $progressList = $this->loadModel('project')->getWaterfallProgress(array_keys($hours));
-        foreach($hours as $projectID => $hour)
-        {
-            $hour->totalEstimate = round($hour->totalEstimate, 1) ;
-            $hour->totalConsumed = round($hour->totalConsumed, 1);
-            $hour->totalLeft     = round($hour->totalLeft, 1);
-            $hour->totalReal     = $hour->totalConsumed + $hour->totalLeft;
-            $hour->progress      = $projects[$projectID]->model == 'waterfall' ? $progressList[$projectID] : ($hour->totalReal ? round($hour->totalConsumed / $hour->totalReal, 2) * 100 : 0);
-        }
+        $hours = $this->loadModel('program')->computeProjectHours($tasks);
 
         /* Get the number of project teams. */
-        $teams = $this->dao->select('root,count(*) as teams')->from(TABLE_TEAM)
-            ->where('root')->in($projectKeys)
-            ->andWhere('type')->eq('project')
-            ->groupBy('root')
-            ->fetchAll('root');
+        $teams = $this->dao->select('t1.root,t1.account')->from(TABLE_TEAM)->alias('t1')
+            ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
+            ->where('t1.root')->in($projectKeys)
+            ->andWhere('t1.type')->eq('project')
+            ->andWhere('t2.deleted')->eq(0)
+            ->fetchGroup('root', 'account');
 
-        /* Process projects. */
-        foreach($projects as $key => $project)
-        {
-            if($project->end == '0000-00-00') $project->end = '';
-
-            /* Judge whether the project is delayed. */
-            if($project->status != 'done' and $project->status != 'closed' and $project->status != 'suspended')
-            {
-                $delay = helper::diffDate(helper::today(), $project->end);
-                if($delay > 0) $project->delay = $delay;
-            }
-
-            /* Process the hours. */
-            $project->hours = isset($hours[$project->id]) ? $hours[$project->id] : (object)$emptyHour;
-
-            $project->teamCount = isset($teams[$project->id]) ? $teams[$project->id]->teams : 0;
-            $stats[] = $project;
-        }
+        $stats = $this->program->appendStatToProjects($projects, 'hours,teamCount', array('hours' => $hours, 'teams' => $teams));
         return $stats;
     }
 
diff --git a/module/product/zen.php b/module/product/zen.php
index 70a270f87d..415cd0fde5 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -407,38 +407,42 @@ class productZen extends product
      * 追加创建信息，处理白名单、项目集字段，还有富文本内容处理。
      * Prepare data for create.
      *
-     * @param  form $data
+     * @param  form   $data
+     * @param  string $acl
+     * @param  string $uid
      * @access protected
      * @return object
      */
-    protected function prepareCreateExtras(form $data): object
+    protected function prepareCreateExtras(form $data, string $acl, string $uid = ''): object
     {
         $product = $data->setDefault('createdBy', $this->app->user->account)
             ->setDefault('createdDate', helper::now())
             ->setDefault('createdVersion', $this->config->version)
             ->setIF($this->config->systemMode == 'light', 'program', (int)zget($this->config->global, 'defaultProgram', 0))
-            ->setIF($data->rawdata->acl == 'open', 'whitelist', '')
+            ->setIF($acl == 'open', 'whitelist', '')
             ->stripTags($this->config->product->editor->create['id'], $this->config->allowedTags)
             ->get();
 
-        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $data->rawdata->uid);
+        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->create['id'], $uid);
     }
 
     /**
      * 处理白名单和富文本内容。
      * Prepare data for edit.
      *
-     * @param  form $data
+     * @param  form   $data
+     * @param  string $acl
+     * @param  string $uid
      * @access protected
      * @return object
      */
-    protected function prepareEditExtras(form $data): object
+    protected function prepareEditExtras(form $data, string $acl, string $uid = ''): object
     {
-        $product = fixer::input('post')->setIF($data->rawdata->acl == 'open', 'whitelist', '')
+        $product = fixer::input('post')->setIF($acl == 'open', 'whitelist', '')
             ->stripTags($this->config->product->editor->edit['id'], $this->config->allowedTags)
             ->get();
 
-        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], zget($data->rawdata, 'uid', ''));
+        return $this->loadModel('file')->processImgURL($product, $this->config->product->editor->edit['id'], $uid);
     }
 
     /**
diff --git a/module/program/model.php b/module/program/model.php
index b3da73ba3e..0be3f59eee 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -344,7 +344,7 @@ class programModel extends model
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('execution', 'id');
 
-        $hours        = $this->computeProgress($tasks);
+        $hours        = $this->computeProjectHours($tasks);
         $projectHours = $this->getProgressList();
 
         /* Group data by product. */
@@ -517,22 +517,25 @@ class programModel extends model
     }
 
     /**
-     * Compute progress for project or execution.
+     * 根据按照项目分组的任务，统计各个项目的工时和进度
+     * Compute hours and progress for project or execution.
      *
      * @param  array $tasks
      * @access public
-     * @return void
+     * @return array
      */
-    public function computeProgress($tasks)
+    public function computeProjectHours(array $tasks): array
     {
         $hours = array();
         foreach($tasks as $projectID => $projectTasks)
         {
+            /* Init hour. */
             $hour = new stdclass();
             $hour->totalConsumed = 0;
             $hour->totalEstimate = 0;
             $hour->totalLeft     = 0;
 
+            /* Compute totalEstimate, totalConsumed, totalLeft to them. */
             foreach($projectTasks as $task)
             {
                 $hour->totalConsumed += $task->consumed;
@@ -542,18 +545,64 @@ class programModel extends model
             $hours[$projectID] = $hour;
         }
 
-        foreach($hours as $hour)
+        /* 计算进度。四舍五入totalEstimate, totalConsumed, totalLeft. */
+        $progressList = $this->loadModel('project')->getWaterfallProgress(array_keys($hours));
+        foreach($hours as $projectID => $hour)
         {
             $hour->totalEstimate = round($hour->totalEstimate, 1) ;
             $hour->totalConsumed = round($hour->totalConsumed, 1);
             $hour->totalLeft     = round($hour->totalLeft, 1);
             $hour->totalReal     = $hour->totalConsumed + $hour->totalLeft;
-            $hour->progress      = $hour->totalReal ? round($hour->totalConsumed / $hour->totalReal, 2) * 100 : 0;
+            $hour->progress      = zget($progressList, $projectID, ($hour->totalReal ? round($hour->totalConsumed / $hour->totalReal, 2) * 100 : 0)) ;
         }
 
         return $hours;
     }
 
+    /**
+     * 将工时、团队人数、剩余任务数、团队成员等统计信息，追加到对应的项目中。
+     * Append statistics fields to projects.
+     *
+     * @param  array  $projects
+     * @param  string $appendFields  hours,teamCount,leftTasks,teamMembers
+     * @param  array  $data          array keys are hours, teams and leftTasks.
+     * @access public
+     * @return array
+     */
+    public function appendStatToProjects(array $projects, string $appendFields = '', array $data = array()): array
+    {
+        $appendFields = explode(',', $appendFields);
+        $emptyHour    = json_decode(json_encode(array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0)));
+        /* Process projects. */
+        $stats = array();
+        foreach($projects as $projectID => $project)
+        {
+            if(helper::isZeroDate($project->end)) $project->end = '';
+
+            /* Judge whether the project is delayed. */
+            if($project->status != 'done' and $project->status != 'closed' and $project->status != 'suspended')
+            {
+                $delay = empty($project->end) ? 0 : helper::diffDate(helper::today(), $project->end);
+                if($delay > 0) $project->delay = $delay;
+            }
+
+            /* Merge the hours. */
+            if(in_array('hours', $appendFields))
+            {
+                $project->hours = $emptyHour;
+                if(isset($data['hours'])) $project->hours = zget($data['hours'], $project->id, $emptyHour);
+            }
+
+            /* Merge the team and left tasks. */
+            if(in_array('teamCount',   $appendFields)) $project->teamCount   = isset($data['teams'][$project->id]) ? count($data['teams'][$project->id]) : 0;
+            if(in_array('teamMembers', $appendFields)) $project->teamMembers = isset($data['teams'][$project->id]) ? array_keys($data['teams'][$project->id]) : array();
+            if(in_array('leftTasks',   $appendFields)) $project->leftTasks   = isset($data['leftTasks'][$project->id]) ? $data['leftTasks'][$project->id]->tasks : '—';
+
+            $stats[$projectID] = $project;
+        }
+        return $stats;
+    }
+
     /**
      * Get project list data.
      *
@@ -1418,15 +1467,10 @@ class programModel extends model
 
         /* Init vars. */
         $projects = $this->getProjectList($programID, $browseType, $queryID, $orderBy, $pager, $programTitle, $involved, $queryAll);
-
         if(empty($projects)) return array();
 
         $projectKeys = array_keys($projects);
-        $stats       = array();
-        $hours       = array();
-        $emptyHour   = array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0);
         $leftTasks   = array();
-        $teamMembers = array();
 
         $executions = $this->dao->select('id')->from(TABLE_EXECUTION)
             ->where('deleted')->eq(0)
@@ -1438,37 +1482,11 @@ class programModel extends model
         $tasks = $this->dao->select('id, project, estimate, consumed, `left`, status, closedReason, execution')
             ->from(TABLE_TASK)
             ->where('project')->in($projectKeys)
+            ->andWhere('execution')->in(array_keys($executions))
             ->andWhere('parent')->lt(1)
             ->andWhere('deleted')->eq(0)
             ->fetchGroup('project', 'id');
-
-        /* Compute totalEstimate, totalConsumed, totalLeft. */
-        foreach($tasks as $projectID => $projectTasks)
-        {
-            $hour = (object)$emptyHour;
-            foreach($projectTasks as $task)
-            {
-                if(isset($executions[$task->execution]))
-                {
-                    $hour->totalConsumed += $task->consumed;
-                    $hour->totalEstimate += $task->estimate;
-
-                    if(strpos('cancel,closed', $task->status) === false) $hour->totalLeft += $task->left;
-                }
-            }
-            $hours[$projectID] = $hour;
-        }
-
-        /* Compute totalReal and progress. */
-        $progressList = $this->loadModel('project')->getWaterfallProgress(array_keys($hours));
-        foreach($hours as $projectID => $hour)
-        {
-            $hour->totalEstimate = round($hour->totalEstimate, 1) ;
-            $hour->totalConsumed = round($hour->totalConsumed, 1);
-            $hour->totalLeft     = round($hour->totalLeft, 1);
-            $hour->totalReal     = $hour->totalConsumed + $hour->totalLeft;
-            $hour->progress      = $projects[$projectID]->model == 'waterfall' ? $progressList[$projectID] : ($hour->totalReal ? round($hour->totalConsumed / $hour->totalReal, 2) * 100 : 0);
-        }
+        $hours = $this->computeProjectHours($tasks);
 
         /* Get the number of left tasks. */
         if($this->cookie->projectType and $this->cookie->projectType == 'bycard')
@@ -1489,30 +1507,10 @@ class programModel extends model
             ->andWhere('t2.deleted')->eq(0)
             ->fetchGroup('root', 'account');
 
-        /* Process projects. */
-        foreach($projects as $key => $project)
-        {
-            if($project->end == '0000-00-00') $project->end = '';
+        $stats = $this->appendStatToProjects($projects, 'hours,teamCount,teamMembers,leftTasks', array('hours' => $hours, 'teams' => $teamMembers, 'leftTasks' => $leftTasks));
+        /* Convert predefined HTML entities to characters. */
+        foreach($stats as $project) $project->name = htmlspecialchars_decode($project->name, ENT_QUOTES);
 
-            /* Judge whether the project is delayed. */
-            if($project->status != 'done' and $project->status != 'closed' and $project->status != 'suspended')
-            {
-                $delay = helper::diffDate(helper::today(), $project->end);
-                if($delay > 0) $project->delay = $delay;
-            }
-
-            /* Process the hours. */
-            $project->hours = isset($hours[$project->id]) ? $hours[$project->id] : (object)$emptyHour;
-
-            $project->teamCount   = isset($teamMembers[$project->id]) ? count($teamMembers[$project->id]) : 0;
-            $project->leftTasks   = isset($leftTasks[$project->id]) ? $leftTasks[$project->id]->tasks : '—';
-            $project->teamMembers = isset($teamMembers[$project->id]) ? array_keys($teamMembers[$project->id]) : array();
-
-            /* Convert predefined HTML entities to characters. */
-            $project->name = htmlspecialchars_decode($project->name, ENT_QUOTES);
-
-            $stats[$key] = $project;
-        }
         return $stats;
     }
 

From 49613fe51dc34f68e1a5b9029c16b576cf4ab1b4 Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 15:47:53 +0800
Subject: [PATCH 44/80] * Adjusted gantt func.

---
 module/programplan/control.php | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/module/programplan/control.php b/module/programplan/control.php
index 83f280143f..0fb5c7b5c8 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -332,23 +332,20 @@ class programplan extends control
     }
 
     /**
+     * 处理甘特图拖拽事件数据。
      * Response gantt drag event.
      *
      * @access public
-     * @return void
      */
     public function ajaxResponseGanttDragEvent()
     {
-        if(!empty($_POST))
-        {
-            if(!isset($_POST['id']) or empty($_POST['id'])) return $this->send(array('result' => 'fail', 'message' => ''));
-            $objectID =  $_POST['id'];
+        if(empty($_POST['id'])) return $this->send(array('result' => 'fail', 'message' => ''));
 
-            $this->loadModel('task')->updateEsDateByGantt($objectID, $_POST['type']);
-            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+        $objectID = $_POST['id'];
+        $this->loadModel('task')->updateEsDateByGantt($objectID, $_POST['type']);
+        if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-            return $this->send(array('result' => 'success'));
-        }
+        return $this->send(array('result' => 'success'));
     }
 
     /**

From c5798f8801045f125cbbcb5de4a51320a8fac3fb Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 15:53:03 +0800
Subject: [PATCH 45/80] * Adjust code.

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

diff --git a/module/project/control.php b/module/project/control.php
index edd4959eda..2c9523bb76 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1963,7 +1963,7 @@ class project extends control
 
             /* Update linked products. */
             $errorTips = $this->projectZen->mergeProducts($projectID, $project, $executionIDs, $postData);
-            if(!empty($errorTips) return $this->send($errorTips);
+            if(!empty($errorTips)) return $this->send($errorTips);
 
             $locateLink = inLink('manageProducts', "projectID=$projectID");
             if($from == 'program')  $locateLink = $this->session->projectList;

From cec69298313a19f18456d24dba3d1f6be8a8ad95 Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 May 2023 15:53:51 +0800
Subject: [PATCH 46/80]  * code for sonar.

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

diff --git a/module/program/model.php b/module/program/model.php
index 0be3f59eee..40b7594511 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -1776,7 +1776,7 @@ class programModel extends model
                 $actionsMap[] = $item;
             }
 
-            if($canSuspendProgram or ($canClose && $program->status != 'doing') or ($canActivateProgram and $program->status != 'closed'))
+            if($canSuspendProgram or ($canCloseProgram and $program->status != 'doing') or ($canActivateProgram and $program->status != 'closed'))
             {
                 $other = new stdclass();
                 $other->name  = 'other';

From 68b3a4e9c50947040f63d4824fd23180c4658bd6 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 15:54:47 +0800
Subject: [PATCH 47/80] * Adjust code

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

diff --git a/module/project/zen.php b/module/project/zen.php
index c9fd920d10..0e1408c974 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -862,7 +862,7 @@ class projectZen extends project
         {
             $this->loadModel('program')->setMenu($project->parent);
         }
-        else if($this->app->tab == 'project')
+        elseif($this->app->tab == 'project')
         {
             $this->project->setMenu($projectID);
         }

From d598ce5f71695e774feb2df43598e44b4a4e0a9a Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 16:04:55 +0800
Subject: [PATCH 48/80] * Submit suspend function.

---
 module/project/config/form.php | 2 ++
 module/project/control.php     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/project/config/form.php b/module/project/config/form.php
index e3eb4978a9..ae3445251f 100644
--- a/module/project/config/form.php
+++ b/module/project/config/form.php
@@ -6,6 +6,8 @@ $config->project->form->edit   =  array();
 $config->project->form->close  =  array();
 $config->project->form->start  =  array();
 
+$config->project->form->suspend =  array();
+
 $config->project->form->create['parent']     = array('type' => 'int',    'required' => false, 'default' => '');
 $config->project->form->create['name']       = array('type' => 'string', 'required' => true, 'filter' => 'trim');
 $config->project->form->create['code']       = array('type' => 'string', 'required' => true, 'filter' => 'trim');
diff --git a/module/project/control.php b/module/project/control.php
index b5c9a701bc..b232111c56 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1733,7 +1733,7 @@ class project extends control
 
         if(!empty($_POST))
         {
-            $postData = form::data();
+            $postData = form::data($this->config->project->form->suspend);
 
             $postData = $this->projectZen->prepareSuspendExtras($projectID, $postData);
 

From f868bb04c24e550d20280103f9f5307614e897e1 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Fri, 5 May 2023 16:09:33 +0800
Subject: [PATCH 49/80] * Merge branch 18.4 code.

---
 module/project/control.php | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/module/project/control.php b/module/project/control.php
index b232111c56..b580c92135 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1986,21 +1986,27 @@ class project extends control
      * AJAX: get executions of a project in html select.
      *
      * @param  string $projectID
-     * @param  int    $executionID
+     * @param  string $executionID
      * @param  string $mode
      * @param  string $type all|sprint|stage|kanban
      *
      * @access public
-     * @return void
+     * @return int
      */
-    public function ajaxGetExecutions(string $projectID, int $executionID = 0, string $mode = '', string $type = 'all'): mixed
+    public function ajaxGetExecutions(string $projectID, string $executionID = '0', string $mode = '', string $type = 'all'): int
     {
-        $project    = $this->project->getByID($projectID);
-        $disabled   = $project->multiple ? '' : 'disabled';
-        $executions = array('' => '') + $this->loadModel('execution')->getPairs($projectID, $type, $mode);
+        $disabled   = '';
+        $executions = array('' => '');
 
-        if($this->app->getViewType() == 'json') return print(json_encode($executions));
+        $projectID = (int)$projectID;
+        if($projectID)
+        {
+            $project     = $this->project->getById($projectID);
+            $executions += (array)$this->loadModel('execution')->getPairs($projectID, $type, $mode);
+            if(!empty($project->multiple)) $disabled = 'disabled';
+        }
 
+        if($this->app->getViewType() == 'json') return print(json_encode($executionList));
         return print(html::select('execution', $executions, $executionID, "class='form-control $disabled' $disabled"));
     }
 

From 51ddaf842b37b115c570d07e30fd02b24375935b Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 16:22:35 +0800
Subject: [PATCH 50/80] * Adjusted gantt func.

---
 module/programplan/control.php | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/module/programplan/control.php b/module/programplan/control.php
index 0fb5c7b5c8..6a8eb36ef6 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -339,34 +339,35 @@ class programplan extends control
      */
     public function ajaxResponseGanttDragEvent()
     {
-        if(empty($_POST['id'])) return $this->send(array('result' => 'fail', 'message' => ''));
+        if(empty($_POST['id']) || empty($_POST['type'])) return $this->send(array('result' => 'fail', 'message' => ''));
 
-        $objectID = $_POST['id'];
-        $this->loadModel('task')->updateEsDateByGantt($objectID, $_POST['type']);
+        $objectID   = $_POST['id'];
+        $objectType = $_POST['type'];
+        $this->loadModel('task')->updateEsDateByGantt($objectID, $objectType);
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
         return $this->send(array('result' => 'success'));
     }
 
     /**
+     * 处理甘特图移动事件数据。
      * Response gantt move event.
      *
      * @access public
-     * @access public
-     * @return void
      */
     public function ajaxResponseGanttMoveEvent()
     {
-        if(!empty($_POST))
-        {
-            $idList = explode('-', $_POST['id']);
-            $taskID = $idList[1];
+        if(empty($_POST['id'])) return $this->send(array('result' => 'fail', 'message' => ''));
 
-            $this->loadModel('task')->updateOrderByGantt();
-            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
-            $this->loadModel('action')->create('task', $taskID, 'ganttMove');
-            return $this->send(array('result' => 'success'));
-        }
+        $idList = explode('-', $_POST['id']);
+        $taskID = !empty($idList[1]) ? $idList[1] : 0;
+        if(empty($taskID)) return $this->send(array('result' => 'fail', 'message' => ''));
+
+        $this->loadModel('task')->updateOrderByGantt();
+        if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
+        $this->loadModel('action')->create('task', $taskID, 'ganttMove');
+        return $this->send(array('result' => 'success'));
     }
 
     /**

From 9bf8f28d7f2ac197221d57313b5f3d70bec590e6 Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Fri, 5 May 2023 16:26:50 +0800
Subject: [PATCH 51/80] + zin: add tabPane wg.

---
 lib/zin/func.php          |  9 +++++++++
 lib/zin/wg/tabpane/v1.php | 21 +++++++++++++++++++++
 2 files changed, 30 insertions(+)
 create mode 100644 lib/zin/wg/tabpane/v1.php

diff --git a/lib/zin/func.php b/lib/zin/func.php
index a098ae2c47..6e64eda15e 100644
--- a/lib/zin/func.php
+++ b/lib/zin/func.php
@@ -843,6 +843,15 @@ function tabs()
     return createWg('tabs', func_get_args());
 }
 
+/**
+ * tab pane widget.
+ * bool isActive?
+ */
+function tabPane()
+{
+    return createWg('tabPane', func_get_args());
+}
+
 /**
  * panel widget.
  *
diff --git a/lib/zin/wg/tabpane/v1.php b/lib/zin/wg/tabpane/v1.php
new file mode 100644
index 0000000000..35c872b123
--- /dev/null
+++ b/lib/zin/wg/tabpane/v1.php
@@ -0,0 +1,21 @@
+<?php
+namespace zin;
+
+class tabPane extends wg
+{
+    protected static $defineProps = array(
+        'isActive?:bool=false',
+    );
+
+    protected function build()
+    {
+        $isActive = $this->prop('isActive');
+        $className = $isActive ? 'tab-pane active' : 'tab-pane';
+        return div
+        (
+            set($this->props->skip(array_keys(static::getDefinedProps()))),
+            setClass($className),
+            $this->children()
+        );
+    }
+}

From 020d72d2c57aef2e2950073d271ffdfa03e78a49 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Fri, 5 May 2023 16:35:26 +0800
Subject: [PATCH 52/80] * Add create method for cache.

---
 lib/cache/cache.class.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/lib/cache/cache.class.php b/lib/cache/cache.class.php
index cf894c1ff8..efd4297ca5 100644
--- a/lib/cache/cache.class.php
+++ b/lib/cache/cache.class.php
@@ -21,6 +21,12 @@ use ZenTao\Cache\SimpleCache\InvalidArgumentException;
 
 class cache
 {
+    const DRIVER_APCU = 'Apcu';
+
+    const DRIVER_FILE = 'File';
+
+    const DRIVER_YAC = 'Yac';
+
     /**
      * @var ZenTao\Cache\SimpleCache\CacheInterface
      */
@@ -50,6 +56,20 @@ class cache
         $this->client = new $className($namespace, $defaultLifetime, $app->getCacheRoot());
     }
 
+    /**
+     * Create a cache instance.
+     *
+     * @param  string $driver
+     * @param  string $namespace
+     * @param  int    $defaultLifetime
+     * @access public
+     * @return object
+     */
+    public static function create($driver = 'File', $namespace = '', $defaultLifetime = 0)
+    {
+        return new self($driver, $namespace, $defaultLifetime);
+    }
+
     public function __call($name, $arguments)
     {
         if(!method_exists($this->client, $name)) throw new InvalidArgumentException("Method {$name} does not exist.");

From eeadeebd19b83981a96cf0b7f3b9fabea899d983 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Fri, 5 May 2023 16:35:43 +0800
Subject: [PATCH 53/80] - Remove @.

---
 framework/base/router.class.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/framework/base/router.class.php b/framework/base/router.class.php
index f24be49ece..7de7d523d4 100644
--- a/framework/base/router.class.php
+++ b/framework/base/router.class.php
@@ -1381,8 +1381,8 @@ class baseRouter
         }
         else
         {
-            $value = @getenv('PATH_INFO');
-            if(empty($value)) $value = @getenv('ORIG_PATH_INFO');
+            $value = getenv('PATH_INFO');
+            if(empty($value)) $value = getenv('ORIG_PATH_INFO');
         }
 
         if(str_contains((string) $value, (string) $_SERVER['SCRIPT_NAME'])) $value = str_replace($_SERVER['SCRIPT_NAME'], '', (string) $value);
@@ -2002,7 +2002,7 @@ class baseRouter
 
         /* 生成一个临时的target扩展文件，并加载，用于后续的hook文件加载使用。Create a tmp merged target file and import it for merge hook codes using. */
         $tmpTargetFile = $mergedTargetDir . "tmp$moduleName.php";
-        if(@file_put_contents($tmpTargetFile, $targetLines))
+        if(file_put_contents($tmpTargetFile, $targetLines))
         {
             if(!class_exists($tmpTargetClass)) include $tmpTargetFile;
             return $targetLines;

From a1d135c76dd9e0dcc4f262736c491034d703747c Mon Sep 17 00:00:00 2001
From: shenshulong <shenshulong@easycorp.ltd>
Date: Fri, 5 May 2023 08:49:36 +0000
Subject: [PATCH 54/80] * Adjusted programplan getByID test case.

---
 module/programplan/test/model/getbyid.php     | 40 +++++++++++++------
 .../test/model/yaml/getbyid/getbyid.yaml      | 40 +++++++++++++++++++
 module/programplan/test/programplan.class.php |  2 +
 3 files changed, 70 insertions(+), 12 deletions(-)
 create mode 100644 module/programplan/test/model/yaml/getbyid/getbyid.yaml

diff --git a/module/programplan/test/model/getbyid.php b/module/programplan/test/model/getbyid.php
index 636bacc210..1b6f95298d 100755
--- a/module/programplan/test/model/getbyid.php
+++ b/module/programplan/test/model/getbyid.php
@@ -7,23 +7,39 @@ su('admin');
 /**
 
 title=测试 programplanModel->getByID();
+timeout=0
 cid=1
-pid=1
 
-获取阶段131 >> 阶段31,project31
-获取阶段132 >> 阶段32,project32
-获取阶段133 >> 阶段33,project33
-获取阶段134 >> 阶段34,project34
-获取阶段135 >> 阶段35,project35
+- 判断项目阶段1的name是否为项目1
+ - 属性name @项目1
+ - 属性code @project1
+
+- 判断项目阶段2的name是否为项目2
+ - 属性name @项目2
+ - 属性code @project2
+
+- 判断项目阶段3的type是否为project属性type @project
+
+- 判断项目阶段1的milestone,setMilestone在另外一种情况下是否为0
+ - 属性milestone @0
+ - 属性setMilestone @0
+
+
 
 */
 
-$planIDList = array('131', '132', '133', '134', '135');
+function initData()
+{
+    zdTable('project')->config('getbyid')->gen(5);
+}
+
+initData();
+
+$planIDList = array('1', '2' ,'3' ,'4', '5');
 
 $programplan = new programplanTest();
 
-r($programplan->getByIDTest($planIDList[0])) && p('name,code') && e('阶段31,project31'); // 获取阶段131
-r($programplan->getByIDTest($planIDList[1])) && p('name,code') && e('阶段32,project32'); // 获取阶段132
-r($programplan->getByIDTest($planIDList[2])) && p('name,code') && e('阶段33,project33'); // 获取阶段133
-r($programplan->getByIDTest($planIDList[3])) && p('name,code') && e('阶段34,project34'); // 获取阶段134
-r($programplan->getByIDTest($planIDList[4])) && p('name,code') && e('阶段35,project35'); // 获取阶段135
\ No newline at end of file
+r($programplan->getByIDTest($planIDList[0])) && p('name,code') && e('项目1,project1'); // 判断项目阶段1的name是否为项目1
+r($programplan->getByIDTest($planIDList[1])) && p('name,code') && e('项目2,project2'); // 判断项目阶段2的name是否为项目2
+r($programplan->getByIDTest($planIDList[2])) && p('type') && e('project');             // 判断项目阶段3的type是否为project
+r($programplan->getByIDTest($planIDList[0])) && p('milestone,setMilestone') && e('0,0');  // 判断项目阶段1的milestone,setMilestone在另外一种情况下是否为0
\ No newline at end of file
diff --git a/module/programplan/test/model/yaml/getbyid/getbyid.yaml b/module/programplan/test/model/yaml/getbyid/getbyid.yaml
new file mode 100644
index 0000000000..5530d7f3bc
--- /dev/null
+++ b/module/programplan/test/model/yaml/getbyid/getbyid.yaml
@@ -0,0 +1,40 @@
+title: zt_getbyid
+author: shenshulong
+version: '1.0'
+fields:
+    - field: id
+      range: 1-5
+    - field: project
+      range: 1-5
+    - field: name
+      range: 1-5
+      prefix: '项目'
+    - field: code
+      range: 1-5
+      prefix: 'project'
+    - field: model
+      range: scrum
+    - field: parent
+      range: 0-3
+    - field: milestone
+      range: 0-1
+    - field: auth
+      range: '[]'
+    - field: type
+      range: 'project'
+    - field: grade
+      range: 1
+    - field: days
+      range: 1
+    - field: status
+      range: 'wait'
+    - field: desc
+      range: 1-5
+      prefix: '项目描述'
+    - field: budget
+      range: '100000,200000'
+    - field: budgetUnit
+      range: 'CNY'
+    - field: percent
+      range: '0-0'
+
diff --git a/module/programplan/test/programplan.class.php b/module/programplan/test/programplan.class.php
index 0ba204b175..1b822e16ca 100644
--- a/module/programplan/test/programplan.class.php
+++ b/module/programplan/test/programplan.class.php
@@ -19,6 +19,8 @@ class programplanTest
     {
         $object = $this->objectModel->getByID($planID);
 
+        if(!$object->setMilestone) $object->setMilestone = 0;
+
         if(dao::isError()) return dao::getError();
 
         return $object;

From 6adce696c69f15f81e507642e19cbd3f7c6343ae Mon Sep 17 00:00:00 2001
From: Wangyuting <851424971@qq.com>
Date: Fri, 5 May 2023 18:05:43 +0800
Subject: [PATCH 55/80] * Optimize block contorl code.

---
 module/block/control.php                      | 1993 +----------------
 module/block/css/projectstatisticblock.ui.css |    1 +
 .../block/ui/projectstatisticblock.html.php   |  342 ++-
 .../block/view/projectstatisticblock.html.php |    1 -
 module/block/zen.php                          | 1683 ++++++++++++++
 5 files changed, 2114 insertions(+), 1906 deletions(-)
 create mode 100644 module/block/css/projectstatisticblock.ui.css

diff --git a/module/block/control.php b/module/block/control.php
index 76cddc6860..ede59744f9 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -160,1877 +160,6 @@ class block extends control
         return $this->send(array('result' => 'success'));
     }
 
-    /**
-     * 展示应用的仪表盘
-     * Display dashboard for app.
-     *
-     * @param  string  $dashboard
-     * @param  string  $projectID
-     * @access public
-     * @return void
-     */
-    public function dashboard(string $dashboard, string $projectID = '0')
-    {
-        $blocks    = $this->block->getMyDashboard($dashboard);
-        $projectID = (int)$projectID;
-
-        $isInitiated = $this->block->fetchBlockInitStatus($dashboard);
-
-        /* Init block when vist index first. */
-        if(empty($blocks) and !$isInitiated and !defined('TUTORIAL') and $this->block->initBlock($dashboard))
-        {
-            return print(js::reload());
-        }
-
-        $blocks = $this->blockZen->processBlockForRender($blocks, $projectID);
-
-        if($this->app->getViewType() == 'json') return print(json_encode($blocks));
-
-        list($shortBlocks, $longBlocks) = $this->blockZen->splitBlocksByLen($blocks);
-
-        $this->view->title       = zget($this->lang->block->dashboard, $dashboard, $this->lang->block->dashboard['default']);
-        $this->view->longBlocks  = $longBlocks;
-        $this->view->shortBlocks = $shortBlocks;
-        $this->view->dashboard   = $dashboard;
-        $this->render();
-    }
-
-    /**
-     * latest dynamic.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDynamicBlock()
-    {
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, 30, 1);
-
-        $this->view->actions = $this->loadModel('action')->getDynamic('all', 'today', 'date_desc', $pager);
-        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter|all');
-    }
-
-    /**
-     * Welcome block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWelcomeBlock()
-    {
-        $this->view->tutorialed = $this->loadModel('tutorial')->getTutorialed();
-
-        $data = $this->block->getWelcomeBlockData();
-
-        $this->view->tasks      = $data['tasks'];
-        $this->view->doneTasks  = $data['doneTasks'];
-        $this->view->bugs       = $data['bugs'];
-        $this->view->stories    = $data['stories'];
-        $this->view->executions = $data['executions'];
-
-        $this->view->delay['task'] = $data['delayTask'];
-        $this->view->delay['bug']  = $data['delayBug'];
-
-        $time = date('H:i');
-        $welcomeType = '19:00';
-        foreach($this->lang->block->welcomeList as $type => $name)
-        {
-            if($time >= $type) $welcomeType = $type;
-        }
-        $this->view->welcomeType = $welcomeType;
-    }
-
-    /**
-     * Print contribute block.
-     *
-     * @access public
-     * @return void
-     */
-    public function contribute()
-    {
-        $this->view->data = $this->loadModel('user')->getPersonalData();
-        $this->display();
-    }
-
-
-    /**
-     * Print block.
-     * 输出区块
-     *
-     * @param  int     $blockID
-     * @access public
-     * @return string
-     */
-    public function printBlock($blockID)
-    {
-        $html    = '';
-        $blockID = (int)$blockID;
-        $block   = $this->block->getByID($blockID);
-
-        if(empty($block)) return $html;
-
-        $code = $block->code;
-        if($code == 'statistic' or $code == 'list' or $code == 'overview') $code = $block->module . ucfirst($code);
-
-        $function = 'print' . ucfirst($code) . 'Block';
-        if(method_exists('block', $function)) $html = $this->$function($blockID);
-
-        $this->display('block', strtolower($code) . 'block');
-    }
-
-    public function printBlockData($module = '', $blockID = 0)
-    {
-        $blockID = (int)$blockID;
-
-        if(!$this->selfCall)
-        {
-            $lang = str_replace('_', '-', $this->get->lang);
-            $this->app->setClientLang($lang);
-            $this->app->loadLang('common');
-            $this->app->loadLang('block');
-
-            if(!$this->block->checkAPI($this->get->hash)) return;
-        }
-
-        $code = strtolower($this->get->blockid);
-
-        $params = $this->get->param;
-        $params = json_decode(base64_decode($params));
-        if(isset($params->num) and !isset($params->count)) $params->count = $params->num;
-        if(!$this->selfCall)
-        {
-            $this->app->user = $this->dao->select('*')->from(TABLE_USER)->where('ranzhi')->eq($params->account)->fetch();
-            if(empty($this->app->user))
-            {
-                $this->app->user = new stdclass();
-                $this->app->user->account = 'guest';
-            }
-            $this->app->user->admin  = strpos($this->app->company->admins, ",{$this->app->user->account},") !== false;
-            $this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account);
-            $this->app->user->groups = $this->user->getGroups($this->app->user->account);
-            $this->app->user->view   = $this->user->grantUserView($this->app->user->account, $this->app->user->rights['acls']);
-
-            $sso = base64_decode($this->get->sso);
-            $this->view->sso  = $sso;
-            $this->view->sign = strpos($sso, '?') === false ? '?' : '&';
-        }
-
-        if($blockID) $block = $this->block->getByID($blockID);
-        $this->view->longBlock = $this->block->isLongBlock($blockID ? $block : $params);
-        $this->view->selfCall  = $this->selfCall;
-        $this->view->block     = $blockID ? $block : '';
-
-        $this->viewType    = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html';
-        $this->params      = $params;
-        $this->view->code  = $this->get->blockid;
-        $this->view->title = $this->get->blockTitle;
-
-        $func = 'print' . ucfirst($code) . 'Block';
-        if(method_exists('block', $func))
-        {
-            $this->$func($module);
-        }
-        else
-        {
-            $this->view->data = $this->block->$func($module, $params);
-        }
-
-        $this->view->moreLink = '';
-        if(isset($this->config->block->modules[$module]->moreLinkList->{$code}))
-        {
-            list($moduleName, $method, $vars) = explode('|', sprintf($this->config->block->modules[$module]->moreLinkList->{$code}, isset($params->type) ? $params->type : ''));
-            $this->view->moreLink = $this->createLink($moduleName, $method, $vars);
-        }
-
-        if($this->viewType == 'json')
-        {
-            unset($this->view->app);
-            unset($this->view->config);
-            unset($this->view->lang);
-            unset($this->view->header);
-            unset($this->view->position);
-            unset($this->view->moduleTree);
-
-            $output['status'] = is_object($this->view) ? 'success' : 'fail';
-            $output['data']   = json_encode($this->view);
-            $output['md5']    = md5(json_encode($this->view));
-            return print(json_encode($output));
-        }
-
-        $this->display('block', $code . 'block');
-    }
-
-    /**
-     * Print List block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printListBlock($module = 'product')
-    {
-        $func = 'print' . ucfirst($module) . 'Block';
-        $this->view->module = $module;
-        $this->$func();
-
-    }
-
-    /**
-     * Print todo block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printTodoBlock()
-    {
-        $limit = ($this->viewType == 'json' or !isset($this->params->count)) ? 0 : (int)$this->params->count;
-        $todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $limit, null, 'date, begin');
-        $uri   = $this->createLink('my', 'index');
-
-        $this->session->set('todoList',     $uri, 'my');
-        $this->session->set('bugList',      $uri, 'qa');
-        $this->session->set('taskList',     $uri, 'execution');
-        $this->session->set('storyList',    $uri, 'product');
-        $this->session->set('testtaskList', $uri, 'qa');
-
-        $todos = $this->blockZen->unsetTodos($todos);
-
-        $this->view->todos = $todos;
-    }
-
-    /**
-     * Print task block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printTaskBlock()
-    {
-        $this->session->set('taskList',  $this->createLink('my', 'index'), 'execution');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $account = $this->app->user->account;
-        $type    = $this->params->type;
-
-        $this->app->loadLang('execution');
-        $this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy);
-    }
-
-    /**
-     * Print bug block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printBugBlock()
-    {
-        $this->session->set('bugList', $this->createLink('my', 'index'), 'qa');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
-        $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
-        $this->view->bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $projectID);
-    }
-
-    /**
-     * Print case block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printCaseBlock()
-    {
-        $this->session->set('caseList', $this->createLink('my', 'index'), 'qa');
-        $this->app->loadLang('testcase');
-        $this->app->loadLang('testtask');
-
-        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
-        $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
-
-        $cases = array();
-        if($this->params->type == 'assigntome')
-        {
-            $cases = $this->dao->select('t1.assignedTo AS assignedTo, t2.*')->from(TABLE_TESTRUN)->alias('t1')
-                ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
-                ->leftJoin(TABLE_TESTTASK)->alias('t3')->on('t1.task = t3.id')
-                ->Where('t1.assignedTo')->eq($this->app->user->account)
-                ->andWhere('t1.status')->ne('done')
-                ->andWhere('t3.status')->ne('done')
-                ->andWhere('t3.deleted')->eq(0)
-                ->andWhere('t2.deleted')->eq(0)
-                ->beginIF($projectID)->andWhere('t2.project')->eq($projectID)->fi()
-                ->orderBy($this->params->orderBy)
-                ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
-                ->fetchAll();
-        }
-        elseif($this->params->type == 'openedbyme')
-        {
-            $cases = $this->dao->findByOpenedBy($this->app->user->account)->from(TABLE_CASE)
-                ->andWhere('deleted')->eq(0)
-                ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
-                ->orderBy($this->params->orderBy)
-                ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
-                ->fetchAll();
-        }
-        $this->view->cases = $cases;
-    }
-
-    /**
-     * Print testtask block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printTesttaskBlock()
-    {
-        $this->app->loadLang('testtask');
-
-        $uri = $this->createLink('my', 'index');
-        $this->session->set('productList',  $uri, 'product');
-        $this->session->set('testtaskList', $uri, 'qa');
-        $this->session->set('buildList',    $uri, 'execution');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $this->view->projects  = $this->loadModel('project')->getPairsByProgram();
-        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t2.shadow,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
-            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
-            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.execution=t4.id')
-            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution=t5.project')
-            ->where('t1.deleted')->eq('0')
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
-            ->andWhere('t1.product = t5.product')
-            ->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
-            ->orderBy('t1.id desc')
-            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
-            ->fetchAll();
-    }
-
-    /**
-     * Print story block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printStoryBlock()
-    {
-        $this->session->set('storyList', $this->createLink('my', 'index'), 'product');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $this->app->loadClass('pager', true);
-        $count   = isset($this->params->count) ? (int)$this->params->count : 0;
-        $pager   = pager::init(0, $count , 1);
-        $type    = isset($this->params->type) ? $this->params->type : 'assignedTo';
-        $orderBy = isset($this->params->type) ? $this->params->orderBy : 'id_asc';
-
-        $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '', 'story');
-    }
-
-    /**
-     * Print plan block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printPlanBlock()
-    {
-        $uri = $this->createLink('my', 'index');
-        $this->session->set('productList', $uri, 'product');
-        $this->session->set('productPlanList', $uri, 'product');
-
-        $this->app->loadLang('productplan');
-        $this->view->plans = $this->dao->select('t1.*,t2.name as productName')->from(TABLE_PRODUCTPLAN)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
-            ->where('t1.deleted')->eq('0')
-            ->andWhere('t2.shadow')->eq(0)
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
-            ->orderBy('t1.begin desc')
-            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
-            ->fetchAll();
-    }
-
-    /**
-     * Print releases block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printReleaseBlock()
-    {
-        $uri = $this->createLink('my', 'index');
-        $this->session->set('releaseList', $uri, 'product');
-        $this->session->set('buildList', $uri, 'execution');
-
-        $this->app->loadLang('release');
-        $this->view->releases = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName')->from(TABLE_RELEASE)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
-            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
-            ->where('t1.deleted')->eq('0')
-            ->andWhere('t2.shadow')->eq(0)
-            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.project')->eq((int)$this->session->project)->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
-            ->orderBy('t1.id desc')
-            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
-            ->fetchAll();
-    }
-
-    /**
-     * Print Build block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printBuildBlock()
-    {
-        $this->session->set('buildList', $this->createLink('my', 'index'), 'execution');
-        $this->app->loadLang('build');
-
-        $builds = $this->dao->select('t1.*, t2.name AS productName, t2.shadow, t3.name AS projectName')->from(TABLE_BUILD)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
-            ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project=t3.id')
-            ->where('t1.deleted')->eq('0')
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
-            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.project')->eq((int)$this->session->project)->fi()
-            ->orderBy('t1.id desc')
-            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
-            ->fetchAll();
-        $this->view->builds = $builds;
-    }
-
-    /**
-     * Print project block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProjectBlock()
-    {
-        $this->app->loadLang('execution');
-        $this->app->loadLang('task');
-        $count   = isset($this->params->count)   ? $this->params->count   : 15;
-        $type    = isset($this->params->type)    ? $this->params->type    : 'all';
-        $orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
-
-        $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $type, $orderBy, $count);
-        $this->view->users    = $this->loadModel('user')->getPairs('noletter');
-    }
-
-    /**
-     * Print product block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProductBlock()
-    {
-        $this->app->loadClass('pager', true);
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-        $count = isset($this->params->count) ? (int)$this->params->count : 0;
-        $type  = isset($this->params->type) ? $this->params->type : '';
-        $pager = pager::init(0, $count , 1);
-
-        $productStats  = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
-        $productIdList = array();
-        foreach($productStats as $product) $productIdList[] = $product->id;
-
-        $this->app->loadLang('project');
-        $executions = $this->dao->select('t1.product,t2.id,t2.project,t2.name,t2.multiple')->from(TABLE_PROJECTPRODUCT)->alias('t1')
-            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
-            ->where('t1.product')->in($productIdList)
-            ->andWhere('t2.type')->in('stage,sprint')
-            ->andWhere('t2.deleted')->eq(0)
-            ->orderBy('t1.project')
-            ->fetchAll('product');
-
-        $executionPairs = array();
-        $noMultiples    = array();
-        foreach($executions as $execution)
-        {
-            if(empty($execution->multiple)) $noMultiples[$execution->product] = $execution->project;
-            $executionPairs[$execution->product] = $execution->name;
-        }
-        if($noMultiples)
-        {
-            $noMultipleProjects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($noMultiples)->fetchPairs('id', 'name');
-            foreach($noMultiples as $productID => $projectID)
-            {
-                if(isset($noMultipleProjects[$projectID])) $executionPairs[$productID] = $noMultipleProjects[$projectID] . "({$this->lang->project->disableExecution})";
-            }
-        }
-
-        $this->view->executions   = $executionPairs;
-        $this->view->productStats = $productStats;
-    }
-
-    /**
-     * Print statistic block.
-     *
-     * @param  string $module
-     * @access public
-     * @return void
-     */
-    public function printStatisticBlock($module = 'product')
-    {
-        $func = 'print' . ucfirst($module) . 'StatisticBlock';
-        $this->view->module = $module;
-        $this->$func();
-    }
-
-    /**
-     * Print project statistic block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProjectStatisticBlock()
-    {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        /* Load models and langs. */
-        $this->loadModel('project');
-        $this->loadModel('weekly');
-        $this->loadModel('execution');
-        $this->app->loadLang('task');
-        $this->app->loadLang('story');
-        $this->app->loadLang('bug');
-
-        /* Set project status and count. */
-        $status = isset($this->params->type)  ? $this->params->type       : 'all';
-        $count  = isset($this->params->count) ? (int)$this->params->count : 15;
-
-        /* Get projects. */
-        $excludedModel = $this->config->edition == 'max' ? '' : 'waterfall';
-        $projects      = $this->project->getOverviewList('byStatus', $status, 'order_asc', $count, $excludedModel);
-        if(empty($projects))
-        {
-            $this->view->projects = $projects;
-            return false;
-        }
-
-        $today  = helper::today();
-        $monday = date('Ymd', strtotime($this->loadModel('weekly')->getThisMonday($today)));
-        $tasks  = $this->dao->select("project,
-            sum(consumed) as totalConsumed,
-            sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")
-            ->from(TABLE_TASK)
-            ->where('project')->in(array_keys($projects))
-            ->andWhere('deleted')->eq(0)
-            ->andWhere('parent')->lt(1)
-            ->groupBy('project')
-            ->fetchAll('project');
-
-        foreach($projects as $projectID => $project)
-        {
-            if(in_array($project->model, array('scrum', 'kanban', 'agileplus')))
-            {
-                $this->app->loadClass('pager', true);
-                $pager = pager::init(0, 3, 1);
-                $project->progress   = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
-                $project->executions = $this->execution->getStatData($projectID, 'all', 0, 0, false, '', 'id_desc', $pager);
-            }
-            elseif(in_array($project->model, array('waterfall', 'waterfallplus')))
-            {
-                $begin   = $project->begin;
-                $weeks   = $this->weekly->getWeekPairs($begin);
-                $current = zget($weeks, $monday, '');
-                $current = substr($current, 0, -11) . substr($current, -6);
-
-                $PVEV = $this->weekly->getPVEV($projectID, $today);
-                $project->pv = $PVEV['PV'];
-                $project->ev = $PVEV['EV'];
-                $project->ac = $this->weekly->getAC($projectID, $today);
-                $project->sv = $this->weekly->getSV($project->ev, $project->pv);
-                $project->cv = $this->weekly->getCV($project->ev, $project->ac);
-
-                $progress = isset($tasks[$projectID]) ? (($tasks[$projectID]->totalConsumed + $tasks[$projectID]->totalLeft)) ? round($tasks[$projectID]->totalConsumed / ($tasks[$projectID]->totalConsumed + $tasks[$projectID]->totalLeft), 3) * 100 : 0 : 0;
-
-                $project->current  = $current;
-                $project->progress = $progress;
-            }
-        }
-
-        $this->view->projects = $projects;
-        $this->view->users    = $this->loadModel('user')->getPairs('noletter');
-    }
-
-    /**
-     * Print product statistic block.
-     *
-     * @access public
-     * @param  string $storyType requirement|story
-     * @return void
-     */
-    public function printProductStatisticBlock($storyType = 'story')
-    {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $status = isset($this->params->type) ? $this->params->type : '';
-        $count  = isset($this->params->count) ? $this->params->count : '';
-
-        $products      = $this->loadModel('product')->getOrderedProducts($status, $count);
-        $productIdList = array_keys($products);
-
-        if(empty($products))
-        {
-            $this->view->products = $products;
-            return false;
-        }
-
-        /* Get stories. */
-        $stories = $this->dao->select('product, stage, COUNT(status) AS count')->from(TABLE_STORY)
-            ->where('deleted')->eq(0)
-            ->andWhere('product')->in($productIdList)
-            ->beginIF($storyType)->andWhere('type')->eq($storyType)->fi()
-            ->groupBy('product, stage')
-            ->fetchGroup('product', 'stage');
-
-        /* Padding the stories to sure all status have records. */
-        foreach($stories as $product => $story)
-        {
-            foreach(array_keys($this->lang->story->stageList) as $stage)
-            {
-                $story[$stage] = isset($story[$stage]) ? $story[$stage]->count : 0;
-            }
-            $stories[$product] = $story;
-        }
-
-        /* Get plans. */
-        $plans = $this->dao->select('product, end')->from(TABLE_PRODUCTPLAN)
-            ->where('deleted')->eq(0)
-            ->andWhere('product')->in($productIdList)
-            ->fetchGroup('product');
-        foreach($plans as $product => $productPlans)
-        {
-            $expired   = 0;
-            $unexpired = 0;
-
-            foreach($productPlans as $plan)
-            {
-                if($plan->end <  helper::today()) $expired++;
-                if($plan->end >= helper::today()) $unexpired++;
-            }
-
-            $plan = array();
-            $plan['expired']   = $expired;
-            $plan['unexpired'] = $unexpired;
-
-            $plans[$product] = $plan;
-        }
-
-        /* Get releases. */
-        $releases = $this->dao->select('product, status, COUNT(*) AS count')->from(TABLE_RELEASE)
-            ->where('deleted')->eq(0)
-            ->andWhere('product')->in($productIdList)
-            ->groupBy('product, status')
-            ->fetchGroup('product', 'status');
-        foreach($releases as $product => $release)
-        {
-            $release['normal']    = isset($release['normal'])    ? $release['normal']->count    : 0;
-            $release['terminate'] = isset($release['terminate']) ? $release['terminate']->count : 0;
-
-            $releases[$product] = $release;
-        }
-
-        /* Get last releases. */
-        $lastReleases = $this->dao->select('product, COUNT(*) AS count')->from(TABLE_RELEASE)
-            ->where('date')->eq(date('Y-m-d', strtotime('-1 day')))
-            ->andWhere('product')->in($productIdList)
-            ->groupBy('product')
-            ->fetchPairs();
-
-        foreach($products as $productID => $product)
-        {
-            $product->stories     = isset($stories[$productID])      ? $stories[$productID]      : 0;
-            $product->plans       = isset($plans[$productID])        ? $plans[$productID]        : 0;
-            $product->releases    = isset($releases[$productID])     ? $releases[$productID]     : 0;
-            $product->lastRelease = isset($lastReleases[$productID]) ? $lastReleases[$productID] : 0;
-        }
-
-        $this->app->loadLang('story');
-        $this->app->loadLang('productplan');
-        $this->app->loadLang('release');
-
-        $this->view->products = $products;
-    }
-
-    /**
-     * Print execution statistic block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printExecutionStatisticBlock()
-    {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $this->app->loadLang('task');
-        $this->app->loadLang('story');
-        $this->app->loadLang('bug');
-
-        $status  = isset($this->params->type)  ? $this->params->type : 'undone';
-        $count   = isset($this->params->count) ? (int)$this->params->count : 0;
-
-        /* Get projects. */
-        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
-        $executions = $this->loadModel('execution')->getOrderedExecutions($projectID, $status, $count, 'skipparent');
-        if(empty($executions))
-        {
-            $this->view->executions = $executions;
-            return false;
-        }
-
-        $executionIdList = array_keys($executions);
-
-        /* Get tasks. Fix bug #2918.*/
-        $yesterday  = date('Y-m-d', strtotime('-1 day'));
-        $taskGroups = $this->dao->select("id,parent,execution,status,finishedDate,estimate,consumed,`left`")->from(TABLE_TASK)
-            ->where('execution')->in($executionIdList)
-            ->andWhere('deleted')->eq(0)
-            ->fetchGroup('execution', 'id');
-
-        $tasks = array();
-        foreach($taskGroups as $executionID => $taskGroup)
-        {
-            $undoneTasks       = 0;
-            $yesterdayFinished = 0;
-            $totalEstimate     = 0;
-            $totalConsumed     = 0;
-            $totalLeft         = 0;
-
-            foreach($taskGroup as $taskID => $task)
-            {
-                if(strpos('wait|doing|pause|cancel', $task->status) !== false) $undoneTasks ++;
-                if(strpos($task->finishedDate, $yesterday) !== false) $yesterdayFinished ++;
-
-                if($task->parent == '-1') continue;
-
-                $totalConsumed += $task->consumed;
-                $totalEstimate += $task->estimate;
-                if($task->status != 'cancel' and $task->status != 'closed') $totalLeft += $task->left;
-            }
-
-            $executions[$executionID]->totalTasks        = count($taskGroup);
-            $executions[$executionID]->undoneTasks       = $undoneTasks;
-            $executions[$executionID]->yesterdayFinished = $yesterdayFinished;
-            $executions[$executionID]->totalEstimate     = round($totalEstimate, 1);
-            $executions[$executionID]->totalConsumed     = round($totalConsumed, 1);
-            $executions[$executionID]->totalLeft         = round($totalLeft, 1);
-        }
-
-        /* Get stories. */
-        $stories = $this->dao->select("t1.project, count(t2.status) as totalStories, count(t2.status != 'closed' or null) as unclosedStories, count(t2.stage = 'released' or null) as releasedStories")->from(TABLE_PROJECTSTORY)->alias('t1')
-            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
-            ->where('t1.project')->in($executionIdList)
-            ->andWhere('t2.deleted')->eq(0)
-            ->groupBy('project')
-            ->fetchAll('project');
-
-        foreach($stories as $executionID => $story)
-        {
-            foreach($story as $key => $value)
-            {
-                if($key == 'project') continue;
-                $executions[$executionID]->$key = $value;
-            }
-        }
-
-        /* Get bugs. */
-        $bugs = $this->dao->select("execution, count(status) as totalBugs, count(status = 'active' or null) as activeBugs, count(resolvedDate like '{$yesterday}%' or null) as yesterdayResolved")->from(TABLE_BUG)
-            ->where('execution')->in($executionIdList)
-            ->andWhere('deleted')->eq(0)
-            ->groupBy('execution')
-            ->fetchAll('execution');
-
-        foreach($bugs as $executionID => $bug)
-        {
-            foreach($bug as $key => $value)
-            {
-                if($key == 'project') continue;
-                $executions[$executionID]->$key = $value;
-            }
-        }
-
-        foreach($executions as $execution)
-        {
-            if(!isset($executions[$execution->id]->totalTasks))
-            {
-                $executions[$execution->id]->totalTasks        = 0;
-                $executions[$execution->id]->undoneTasks       = 0;
-                $executions[$execution->id]->yesterdayFinished = 0;
-                $executions[$execution->id]->totalEstimate     = 0;
-                $executions[$execution->id]->totalConsumed     = 0;
-                $executions[$execution->id]->totalLeft         = 0;
-            }
-            if(!isset($executions[$execution->id]->totalBugs))
-            {
-                $executions[$execution->id]->totalBugs         = 0;
-                $executions[$execution->id]->activeBugs        = 0;
-                $executions[$execution->id]->yesterdayResolved = 0;
-            }
-            if(!isset($executions[$execution->id]->totalStories))
-            {
-                $executions[$execution->id]->totalStories    = 0;
-                $executions[$execution->id]->unclosedStories = 0;
-                $executions[$execution->id]->releasedStories = 0;
-            }
-
-            $executions[$execution->id]->progress      = ($execution->totalConsumed || $execution->totalLeft) ? round($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft), 3) * 100 : 0;
-            $executions[$execution->id]->taskProgress  = $execution->totalTasks ? round(($execution->totalTasks - $execution->undoneTasks) / $execution->totalTasks, 2) * 100 : 0;
-            $executions[$execution->id]->storyProgress = $execution->totalStories ? round(($execution->totalStories - $execution->unclosedStories) / $execution->totalStories, 2) * 100 : 0;
-            $executions[$execution->id]->bugProgress   = $execution->totalBugs ? round(($execution->totalBugs - $execution->activeBugs) / $execution->totalBugs, 2) * 100 : 0;
-        }
-
-        $this->view->executions = $executions;
-    }
-
-    /**
-     * Print waterfall report block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallReportBlock()
-    {
-        $this->app->loadLang('programplan');
-        $project = $this->loadModel('project')->getByID($this->session->project);
-        $today   = helper::today();
-        $date    = date('Ymd', strtotime('this week Monday'));
-        $begin   = $project->begin;
-        $weeks   = $this->loadModel('weekly')->getWeekPairs($begin);
-        $current = zget($weeks, $date, '');
-
-        $this->weekly->save($this->session->project, $date);
-
-        $PVEV = $this->weekly->getPVEV($this->session->project, $today);
-        $this->view->pv = (float)$PVEV['PV'];
-        $this->view->ev = (float)$PVEV['EV'];
-        $this->view->ac = (float)$this->weekly->getAC($this->session->project, $today);
-        $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv);
-        $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac);
-
-        $left     = (float)$this->weekly->getLeft($this->session->project, $today);
-        $progress = (!empty($this->view->ac) or !empty($left)) ? floor($this->view->ac / ($this->view->ac + $left) * 1000) / 1000 * 100 : 0;
-        $this->view->progress = $progress > 100 ? 100 : $progress;
-        $this->view->current  = $current;
-    }
-
-    /**
-     * Print waterfall general report block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallGeneralReportBlock()
-    {
-        $this->app->loadLang('programplan');
-        $this->loadModel('project');
-        $this->loadModel('weekly');
-
-        $data = $this->project->getWaterfallPVEVAC($this->session->project);
-        $this->view->pv = (float)$data['PV'];
-        $this->view->ev = (float)$data['EV'];
-        $this->view->ac = (float)$data['AC'];
-        $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv);
-        $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac);
-
-        $left     = (float)$data['left'];
-        $progress = (!empty($this->view->ac) or !empty($left)) ? floor($this->view->ac / ($this->view->ac + $left) * 1000) / 1000 * 100 : 0;
-        $this->view->progress = $progress > 100 ? 100 : $progress;
-    }
-
-    /**
-     * Print waterfall gantt block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallGanttBlock()
-    {
-        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->project);
-        $productID = $this->session->product ? $this->session->product : 0;
-        $productID = isset($products[$productID]) ? $productID : key($products);
-
-        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->project, $productID, 0, 'task', false);
-        $this->view->products  = $products;
-        $this->view->productID = $productID;
-    }
-
-    /**
-     * Print waterfall issue block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallIssueBlock()
-    {
-        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
-        $this->session->set('issueList', $uri, 'project');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-        $this->view->users  = $this->loadModel('user')->getPairs('noletter');
-        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
-    }
-
-    /**
-     * Print waterfall risk block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallRiskBlock()
-    {
-        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
-        $this->session->set('riskList', $uri, 'project');
-        $this->view->users = $this->loadModel('user')->getPairs('noletter');
-        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
-    }
-
-    /**
-     * Print waterfall estimate block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallEstimateBlock()
-    {
-        $this->app->loadLang('durationestimation');
-        $this->loadModel('project');
-
-        $projectID = $this->session->project;
-        $members   = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
-        $budget    = $this->loadModel('workestimation')->getBudget($projectID);
-        $workhour  = $this->loadModel('project')->getWorkhour($projectID);
-        if(empty($budget)) $budget = new stdclass();
-
-        $this->view->people    = $this->dao->select('sum(people) as people')->from(TABLE_DURATIONESTIMATION)->where('project')->eq($this->session->project)->fetch('people');
-        $this->view->members   = count($members) ? count($members) - 1 : 0;
-        $this->view->consumed  = $this->dao->select('sum(cast(consumed as decimal(10,2))) as consumed')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('parent')->lt(1)->fetch('consumed');
-        $this->view->budget    = $budget;
-        $this->view->totalLeft = (float)$workhour->totalLeft;
-    }
-
-    /**
-     * Print waterfall progress block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printWaterfallProgressBlock()
-    {
-        $this->loadModel('milestone');
-        $this->loadModel('weekly');
-        $this->app->loadLang('execution');
-
-        $projectID = $this->session->project;
-        $project   = $this->loadModel('project')->getByID($projectID);
-
-        $projectWeekly = $this->dao->select('*')->from(TABLE_WEEKLYREPORT)->where('project')->eq($projectID)->orderBy('weekStart_asc')->fetchAll('weekStart');
-
-        $charts['PV'] = '[';
-        $charts['EV'] = '[';
-        $charts['AC'] = '[';
-        foreach($projectWeekly as $weekStart => $data)
-        {
-            $charts['labels'][] = $weekStart;
-            $charts['PV']      .= $data->pv . ',';
-            $charts['EV']      .= $data->ev . ',';
-            $charts['AC']      .= $data->ac . ',';
-        }
-
-        $charts['PV'] .= ']';
-        $charts['EV'] .= ']';
-        $charts['AC'] .= ']';
-
-        $this->view->charts = $charts;
-    }
-
-    /**
-     * Print srcum project block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printScrumOverviewBlock()
-    {
-        $projectID = $this->session->project;
-        $this->app->loadLang('execution');
-        $this->app->loadLang('bug');
-        $totalData = $this->loadModel('project')->getOverviewList('byId', $projectID, 'id_desc', 1);
-
-        $this->view->totalData = $totalData;
-        $this->view->projectID = $projectID;
-    }
-
-    /**
-     * Print srcum project list block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printScrumListBlock()
-    {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-        $count = isset($this->params->count) ? (int)$this->params->count : 15;
-        $type  = isset($this->params->type) ? $this->params->type : 'undone';
-
-        $this->app->loadClass('pager', true);
-        $pager = pager::init(0, $count, 1);
-        $this->loadModel('execution');
-        $this->view->executionStats = !defined('TUTORIAL') ? $this->execution->getStatData($this->session->project, $type, 0, 0, false, '', 'id_desc', $pager) : array($this->loadModel('tutorial')->getExecution());
-    }
-
-    /**
-     * Print srcum product block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printScrumProductBlock()
-    {
-        $stories  = array();
-        $bugs     = array();
-        $releases = array();
-        $count    = isset($this->params->count) ? (int)$this->params->count : 15;
-
-        $products      = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->program)->limit(15)->fetchPairs();
-        $productIdList = array_keys($products);
-        if(!empty($productIdList))
-        {
-            $fields   = 'product, count(*) as total';
-            $stories  = $this->dao->select($fields)->from(TABLE_STORY)->where('product')->in($productIdList)->andWhere('deleted')->eq('0')->groupBy('product')->fetchPairs();
-            $bugs     = $this->dao->select($fields)->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('deleted')->eq('0')->groupBy('product')->fetchPairs();
-            $releases = $this->dao->select($fields)->from(TABLE_RELEASE)->where('product')->in($productIdList)->andWhere('deleted')->eq('0')->groupBy('product')->fetchPairs();
-        }
-
-        $this->view->products = $products;
-        $this->view->stories  = $stories;
-        $this->view->bugs     = $bugs;
-        $this->view->releases = $releases;
-    }
-
-    /**
-     * Print scrum issue block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printScrumIssueBlock()
-    {
-        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
-        $this->session->set('issueList', $uri, 'project');
-        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-        $this->view->users  = $this->loadModel('user')->getPairs('noletter');
-        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
-    }
-
-    /**
-     * Print scrum risk block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printScrumRiskBlock()
-    {
-        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
-        $this->session->set('riskList', $uri, 'project');
-        $this->view->users = $this->loadModel('user')->getPairs('noletter');
-        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
-    }
-
-    /**
-     * Print sprint block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printSprintBlock()
-    {
-        $sprints = $this->dao->select('status, count(*) as sprints')->from(TABLE_EXECUTION)
-            ->where('deleted')->eq(0)
-            ->beginIF($this->config->vision == 'lite')->andWhere('type')->eq('kanban')->fi()
-            ->beginIF($this->config->vision == 'rnd')->andWhere('type')->in('sprint,kanban')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
-            ->andWhere('project')->eq($this->session->project)
-            ->groupBy('status')
-            ->fetchPairs();
-
-        $summary = new stdclass();
-        $summary->total  = array_sum($sprints);
-        $summary->doing  = zget($sprints, 'doing', 0);
-        $summary->closed = zget($sprints, 'closed', 0);
-
-        $progress = new stdclass();
-        $progress->doing  = $summary->total == 0 ? 0 : round($summary->doing  / $summary->total, 3);
-        $progress->closed = $summary->total == 0 ? 0 : round($summary->closed / $summary->total, 3);
-
-        $this->view->summary  = $summary;
-        $this->view->progress = $progress;
-    }
-
-    /**
-     * Print project dynamic block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProjectDynamicBlock()
-    {
-        $projectID = $this->session->project;
-
-        $executions = $this->loadModel('execution')->getPairs($projectID);
-        $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
-        $count      = isset($this->params->count) ? (int)$this->params->count : 10;
-
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, 30, 1);
-
-        $this->view->actions = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $projectID);
-        $this->view->users   = $this->loadModel('user')->getPairs('noletter');
-    }
-
-    /**
-     * Print srcum road map block.
-     *
-     * @param  int    $productID
-     * @param  int    $roadMapID
-     * @access public
-     * @return void
-     */
-    public function printScrumRoadMapBlock($productID = 0, $roadMapID = 0)
-    {
-        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
-        $this->session->set('releaseList',     $uri, 'product');
-        $this->session->set('productPlanList', $uri, 'product');
-
-        $products  = $this->loadModel('product')->getPairs('', $this->session->project);
-        if(!is_numeric($productID)) $productID = key($products);
-
-        $this->view->roadmaps  = $this->product->getRoadmap($productID, 0, 6);
-        $this->view->productID = $productID;
-        $this->view->roadMapID = $roadMapID;
-        $this->view->products  = $products;
-        $this->view->sync      = 1;
-
-        if($_POST)
-        {
-            $this->view->sync = 0;
-            $this->display('block', 'scrumroadmapblock');
-        }
-    }
-
-    /**
-     * Print srcum test block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printScrumTestBlock()
-    {
-        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
-        $this->session->set('testtaskList', $uri, 'qa');
-        $this->session->set('productList',  $uri, 'product');
-        $this->session->set('projectList',  $uri, 'project');
-        $this->session->set('buildList',    $uri, 'execution');
-        $this->app->loadLang('testtask');
-
-        $count  = zget($this->params, 'count', 10);
-        $status = isset($this->params->type)  ? $this->params->type : 'wait';
-
-        $this->view->project   = $this->loadModel('project')->getByID($this->session->project);
-        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')
-            ->from(TABLE_TESTTASK)->alias('t1')
-            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
-            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
-            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id')
-            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project')
-            ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.project')->eq($this->session->project)->fi()
-            ->andWhere('t1.product = t5.product')
-            ->beginIF($status != 'all')->andWhere('t1.status')->eq($status)->fi()
-            ->orderBy('t1.id desc')
-            ->limit($count)
-            ->fetchAll();
-    }
-
-    /**
-     * Print qa statistic block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printQaStatisticBlock()
-    {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $this->app->loadLang('bug');
-        $status = isset($this->params->type)  ? $this->params->type : '';
-        $count  = isset($this->params->count) ? (int)$this->params->count : 0;
-
-        $projectID  = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0;
-        $products   = $this->loadModel('product')->getOrderedProducts($status, $count, $projectID, 'all');
-        $executions = $this->loadModel('execution')->getPairs($projectID, 'all', 'empty|withdelete');
-        if(empty($products))
-        {
-            $this->view->products = $products;
-            return false;
-        }
-
-        $productIdList = array_keys($products);
-        $today         = date(DT_DATE1);
-        $yesterday     = date(DT_DATE1, strtotime('yesterday'));
-        $testtasks     = $this->dao->select('*')->from(TABLE_TESTTASK)->where('product')->in($productIdList)->andWhere('project')->ne(0)->andWhere('deleted')->eq(0)->orderBy('id')->fetchAll('product');
-        $bugs          = $this->dao->select("product, count(id) as total,
-            count(IF(assignedTo = '{$this->app->user->account}', 1, null)) as assignedToMe,
-            count(IF(status != 'closed', 1, null)) as unclosed,
-            count(IF(status != 'closed' and status != 'resolved', 1, null)) as unresolved,
-            count(IF(confirmed = '0' and toStory = '0', 1, null)) as unconfirmed,
-            count(IF(resolvedDate >= '$yesterday' and resolvedDate < '$today', 1, null)) as yesterdayResolved,
-            count(IF(closedDate >= '$yesterday' and closedDate < '$today', 1, null)) as yesterdayClosed")
-            ->from(TABLE_BUG)
-            ->where('product')->in($productIdList)
-            ->andWhere('execution')->in(array_keys($executions))
-            ->andWhere('deleted')->eq(0)
-            ->groupBy('product')
-            ->fetchAll('product');
-
-        $confirmedBugs = $this->dao->select('product')->from(TABLE_ACTION)
-            ->where('objectType')->eq('bug')
-            ->andWhere('action')->eq('bugconfirmed')
-            ->andWhere('date')->ge($yesterday)
-            ->andWhere('date')->lt($today)
-            ->fetchAll();
-        $productConfirmedBugs = array();
-        foreach($confirmedBugs as $bug)
-        {
-            if(!isset($productConfirmedBugs[$bug->product])) $productConfirmedBugs[$bug->product] = 0;
-            $productConfirmedBugs[$bug->product]++;
-        }
-
-        foreach($products as $productID => $product)
-        {
-            $bug = isset($bugs[$productID]) ? $bugs[$productID] : '';
-            $product->total              = empty($bug) ? 0 : $bug->total;
-            $product->assignedToMe       = empty($bug) ? 0 : $bug->assignedToMe;
-            $product->unclosed           = empty($bug) ? 0 : $bug->unclosed;
-            $product->unresolved         = empty($bug) ? 0 : $bug->unresolved;
-            $product->unconfirmed        = empty($bug) ? 0 : $bug->unconfirmed;
-            $product->yesterdayResolved  = empty($bug) ? 0 : $bug->yesterdayResolved;
-            $product->yesterdayClosed    = empty($bug) ? 0 : $bug->yesterdayClosed;
-            $product->yesterdayConfirmed = empty($productConfirmedBugs[",$productID,"]) ? 0 : $productConfirmedBugs[",$productID,"];
-
-            $product->assignedRate    = $product->total ? round($product->assignedToMe  / $product->total * 100, 2) : 0;
-            $product->unresolvedRate  = $product->total ? round($product->unresolved    / $product->total * 100, 2) : 0;
-            $product->unconfirmedRate = $product->total ? round($product->unconfirmed   / $product->total * 100, 2) : 0;
-            $product->unclosedRate    = $product->total ? round($product->unclosed      / $product->total * 100, 2) : 0;
-            $product->testtask        = isset($testtasks[$productID]) ? $testtasks[$productID] : '';
-        }
-
-        $this->view->products = $products;
-    }
-
-    /**
-     * Print overview block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printOverviewBlock($module = 'product')
-    {
-        $func = 'print' . ucfirst($module) . 'OverviewBlock';
-        $this->view->module = $module;
-        $this->$func();
-    }
-
-    /**
-     * Print product overview block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProductOverviewBlock()
-    {
-        $normal = 0;
-        $closed = 0;
-
-        $products = $this->loadModel('product')->getList();
-        foreach($products as $product)
-        {
-            if(!$this->product->checkPriv($product->id)) continue;
-
-            if($product->status == 'normal') $normal++;
-            if($product->status == 'closed') $closed++;
-        }
-
-        $total  = $normal + $closed;
-
-        $this->view->total         = $total;
-        $this->view->normal        = $normal;
-        $this->view->closed        = $closed;
-        $this->view->normalPercent = $total ? round(($normal / $total), 2) * 100 : 0;
-    }
-
-    /**
-     * Print execution overview block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printExecutionOverviewBlock()
-    {
-        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
-        $executions = $this->loadModel('execution')->getList($projectID);
-
-        $total = 0;
-        foreach($executions as $execution)
-        {
-            if(empty($execution->multiple)) continue;
-            if(!isset($overview[$execution->status])) $overview[$execution->status] = 0;
-            $overview[$execution->status]++;
-            $total++;
-        }
-
-        $overviewPercent = array();
-        $this->app->loadLang('project');
-        foreach($this->lang->project->statusList as $statusKey => $statusName)
-        {
-            if(!isset($overview[$statusKey])) $overview[$statusKey] = 0;
-            $overviewPercent[$statusKey] = $total ? round($overview[$statusKey] / $total, 2) * 100 . '%' : '0%';
-        }
-
-        $this->view->total           = $total;
-        $this->view->overview        = $overview;
-        $this->view->overviewPercent = $overviewPercent;
-    }
-
-    /**
-     * Print qa overview block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printQaOverviewBlock()
-    {
-        $casePairs = $this->dao->select('lastRunResult, COUNT(*) AS count')->from(TABLE_CASE)
-            ->where('1=1')
-            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('project')->eq((int)$this->session->project)->fi()
-            ->groupBy('lastRunResult')
-            ->fetchPairs();
-
-        $total = array_sum($casePairs);
-
-        $this->app->loadLang('testcase');
-        foreach($this->lang->testcase->resultList as $result => $label)
-        {
-            if(!isset($casePairs[$result])) $casePairs[$result] = 0;
-        }
-
-        $casePercents = array();
-        foreach($casePairs as $result => $count)
-        {
-            $casePercents[$result] = $total ? round($count / $total * 100, 2) : 0;
-        }
-
-        $this->view->total        = $total;
-        $this->view->casePairs    = $casePairs;
-        $this->view->casePercents = $casePercents;
-    }
-
-    /**
-     * Print execution block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printExecutionBlock()
-    {
-        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
-
-        $count  = isset($this->params->count) ? (int)$this->params->count : 0;
-        $status = isset($this->params->type)  ? $this->params->type : 'all';
-
-        $this->loadModel('execution');
-        $this->app->loadClass('pager', true);
-        $pager = pager::init(0, $count, 1);
-
-        $projectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchPairs('id', 'name');
-        $projectID    = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
-
-        $this->view->executionStats = $this->execution->getStatData($projectID, $status, 0, 0, false, 'skipParent', 'id_asc', $pager);
-    }
-
-    /**
-     * Print assign to me block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printAssignToMeBlock($longBlock = true)
-    {
-        $hasIssue   = helper::hasFeature('issue');
-        $hasRisk    = helper::hasFeature('risk');
-        $hasMeeting = helper::hasFeature('meeting');
-
-        $hasViewPriv = array();
-        if(common::hasPriv('todo',  'view'))                                                                                          $hasViewPriv['todo']        = true;
-        if(common::hasPriv('task',  'view'))                                                                                          $hasViewPriv['task']        = true;
-        if(common::hasPriv('bug',   'view') and $this->config->vision != 'lite')                                                      $hasViewPriv['bug']         = true;
-        if(common::hasPriv('story', 'view') and $this->config->vision != 'lite')                                                      $hasViewPriv['story']       = true;
-        if($this->config->URAndSR and common::hasPriv('story', 'view') and $this->config->vision != 'lite')                           $hasViewPriv['requirement'] = true;
-        if(common::hasPriv('risk',  'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasRisk)      $hasViewPriv['risk']        = true;
-        if(common::hasPriv('issue', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasIssue)     $hasViewPriv['issue']       = true;
-        if(common::hasPriv('meeting', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasMeeting) $hasViewPriv['meeting']     = true;
-        if(common::hasPriv('feedback', 'view') and in_array($this->config->edition, array('max', 'biz')))                             $hasViewPriv['feedback']    = true;
-        if(common::hasPriv('ticket', 'view') and in_array($this->config->edition, array('max', 'biz')))                               $hasViewPriv['ticket']      = true;
-
-        $params          = $this->get->param;
-        $params          = json_decode(base64_decode($params));
-        $count           = array();
-        $objectList      = array('todo' => 'todos', 'task' => 'tasks', 'bug' => 'bugs', 'story' => 'stories', 'requirement' => 'requirements');
-        $objectCountList = array('todo' => 'todoCount', 'task' => 'taskCount', 'bug' => 'bugCount', 'story' => 'storyCount', 'requirement' => 'requirementCount');
-        if($this->config->edition == 'max')
-        {
-            if($hasRisk)
-            {
-                $objectList      += array('risk' => 'risks');
-                $objectCountList += array('risk' => 'riskCount');
-            }
-
-            if($hasIssue)
-            {
-                $objectList      += array('issue' => 'issues');
-                $objectCountList += array('issue' => 'issueCount');
-            }
-
-            $objectList      += array('feedback' => 'feedbacks', 'ticket' => 'tickets');
-            $objectCountList += array('feedback' => 'feedbackCount', 'ticket' => 'ticketCount');
-        }
-
-        if($this->config->edition == 'biz')
-        {
-            $objectList      += array('feedback' => 'feedbacks', 'ticket' => 'tickets');
-            $objectCountList += array('feedback' => 'feedbackCount', 'ticket' => 'ticketCount');
-        }
-
-        $tasks = $this->loadModel('task')->getUserSuspendedTasks($this->app->user->account);
-        foreach($objectCountList as $objectType => $objectCount)
-        {
-            if(!isset($hasViewPriv[$objectType])) continue;
-
-            $table      = $objectType == 'requirement' ? TABLE_STORY : $this->config->objectTables[$objectType];
-            $orderBy    = $objectType == 'todo' ? "`date` desc" : 'id_desc';
-            $limitCount = isset($params->{$objectCount}) ? $params->{$objectCount} : 0;
-            $objects    = $this->dao->select('t1.*')->from($table)->alias('t1')
-                ->beginIF($objectType == 'story' or $objectType == 'requirement')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')->fi()
-                ->beginIF($objectType == 'bug')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')->fi()
-                ->beginIF($objectType == 'task')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution=t2.id')->fi()
-                ->beginIF($objectType == 'issue' or $objectType == 'risk')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')->fi()
-                ->beginIF($objectType == 'ticket')->leftJoin(TABLE_USER)->alias('t2')->on('t1.openedBy = t2.account')->fi()
-                ->where('t1.deleted')->eq(0)
-                ->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi()
-                ->beginIF($objectType == 'story')->andWhere('t1.type')->eq('story')->andWhere('t2.deleted')->eq('0')->fi()
-                ->beginIF($objectType == 'requirement')->andWhere('t1.type')->eq('requirement')->andWhere('t2.deleted')->eq('0')->fi()
-                ->beginIF($objectType == 'bug')->andWhere('t2.deleted')->eq('0')->fi()
-                ->beginIF($objectType == 'story' or $objectType == 'requirement')->andWhere('t2.deleted')->eq('0')->fi()
-                ->beginIF($objectType == 'todo')->andWhere('t1.cycle')->eq(0)->andWhere('t1.status')->eq('wait')->andWhere('t1.vision')->eq($this->config->vision)->fi()
-                ->beginIF($objectType != 'todo')->andWhere('t1.status')->ne('closed')->fi()
-                ->beginIF($objectType == 'feedback')->andWhere('t1.status')->in('wait, noreview')->fi()
-                ->beginIF($objectType == 'issue' or $objectType == 'risk')->andWhere('t2.deleted')->eq(0)->fi()
-                ->beginIF($objectType == 'ticket')->andWhere('t1.status')->in('wait,doing,done')->fi()
-                ->orderBy($orderBy)
-                ->beginIF($limitCount)->limit($limitCount)->fi()
-                ->fetchAll();
-
-            if($objectType == 'todo')
-            {
-                $this->app->loadClass('date');
-                $this->app->loadLang('todo');
-                foreach($objects as $key => $todo)
-                {
-                    if($todo->status == 'done' and $todo->finishedBy == $this->app->user->account)
-                    {
-                        unset($objects[$key]);
-                        continue;
-                    }
-                    if($todo->type == 'task' and isset($tasks[$todo->idvalue]))
-                    {
-                        unset($objects[$key]);
-                        continue;
-                    }
-
-                    $todo->begin = date::formatTime($todo->begin);
-                    $todo->end   = date::formatTime($todo->end);
-                }
-            }
-
-            if($objectType == 'task')
-            {
-                $this->app->loadLang('task');
-                $this->app->loadLang('execution');
-
-                $objects = $this->loadModel('task')->getUserTasks($this->app->user->account, 'assignedTo');
-
-                foreach($objects as $k => $task)
-                {
-                    if(in_array($task->status, array('closed', 'cancel'))) unset($objects[$k]);
-                }
-                if($limitCount > 0) $objects = array_slice($objects, 0, $limitCount);
-            }
-
-            if($objectType == 'bug')   $this->app->loadLang('bug');
-            if($objectType == 'risk')  $this->app->loadLang('risk');
-            if($objectType == 'issue') $this->app->loadLang('issue');
-
-            if($objectType == 'feedback' or $objectType == 'ticket')
-            {
-                $this->app->loadLang('feedback');
-                $this->app->loadLang('ticket');
-                $this->view->users    = $this->loadModel('user')->getPairs('all,noletter');
-                $this->view->products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->fetchPairs('id', 'name');
-            }
-
-            $count[$objectType] = count($objects);
-            $this->view->{$objectList[$objectType]} = $objects;
-        }
-
-        if(isset($hasViewPriv['meeting']))
-        {
-            $this->app->loadLang('meeting');
-            $today        = helper::today();
-            $now          = date('H:i:s', strtotime(helper::now()));
-            $meetingCount = isset($params->meetingCount) ? isset($params->meetingCount) : 0;
-
-            $meetings = $this->dao->select('*')->from(TABLE_MEETING)->alias('t1')
-                ->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
-                ->where('t1.deleted')->eq('0')
-                ->andWhere('t2.deleted')->eq('0')
-                ->andWhere('(t1.date')->gt($today)
-                ->orWhere('(t1.begin')->gt($now)
-                ->andWhere('t1.date')->eq($today)
-                ->markRight(2)
-                ->andwhere('(t1.host')->eq($this->app->user->account)
-                ->orWhere('t1.participant')->in($this->app->user->account)
-                ->markRight(1)
-                ->orderBy('t1.id_desc')
-                ->beginIF($meetingCount)->limit($meetingCount)->fi()
-                ->fetchAll();
-
-            $count['meeting'] = count($meetings);
-            $this->view->meetings = $meetings;
-            $this->view->depts    = $this->loadModel('dept')->getOptionMenu();
-            $this->view->users    = $this->loadModel('user')->getPairs('all,noletter');
-        }
-
-        $limitCount = !empty($params->reviewCount) ? $params->reviewCount : 20;
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, $limitCount, 1);
-        $reviews = $this->loadModel('my')->getReviewingList('all', 'time_desc', $pager);
-        if($reviews)
-        {
-            $hasViewPriv['review'] = true;
-            $count['review']       = count($reviews);
-            $this->view->reviews   = $reviews;
-            if($this->config->edition == 'max')
-            {
-                $this->app->loadLang('approval');
-                $this->view->flows = $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('buildin')->eq(0)->fetchPairs('module', 'name');
-            }
-        }
-
-        $this->view->selfCall    = $this->selfCall;
-        $this->view->hasViewPriv = $hasViewPriv;
-        $this->view->count       = $count;
-        $this->view->longBlock   = $longBlock;
-        $this->display();
-    }
-
-    /**
-     * Print recent project block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printRecentProjectBlock()
-    {
-        /* load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, 3, 1);
-        $this->view->projects = $this->loadModel('project')->getList('all', 'id_desc', true, $pager);
-    }
-
-    /**
-     * Print project team block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProjectTeamBlock()
-    {
-        $count   = isset($this->params->count)   ? $this->params->count   : 15;
-        $status  = isset($this->params->type)    ? $this->params->type    : 'all';
-        $orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
-
-        /* Get projects. */
-        $this->app->loadLang('task');
-        $this->app->loadLang('program');
-        $this->app->loadLang('execution');
-        $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $status, $orderBy, $count);
-    }
-
-    /**
-     * Print document statistic block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDocStatisticBlock()
-    {
-        $this->view->statistic = $this->loadModel('doc')->getStatisticInfo();
-    }
-
-    /**
-     * Print document dynamic block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDocDynamicBlock()
-    {
-        /* Load pager. */
-        $this->app->loadClass('pager', true);
-        $pager = new pager(0, 30, 1);
-
-        $this->view->actions = $this->loadModel('doc')->getDynamic($pager);
-        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter|all');
-    }
-
-    /**
-     * Print my collection of documents block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDocMyCollectionBlock()
-    {
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, 6, 1);
-
-        $docList = $this->loadModel('doc')->getDocsByBrowseType('collectedbyme', 0, 0, 'editedDate_desc', $pager);
-        $libList = array();
-        foreach($docList as $doc)
-        {
-            $doc->editedDate   = substr($doc->editedDate, 0, 10);
-            $doc->editInterval = helper::getDateInterval($doc->editedDate);
-
-            $libList[] = $doc->lib;
-        }
-
-        $this->view->docList  = $docList;
-    }
-
-    /**
-     * Print recent update block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDocRecentUpdateBlock()
-    {
-        /* Load pager. */
-        $this->app->loadClass('pager', $static = true);
-        $pager = new pager(0, 6, 1);
-
-        $docList = $this->loadModel('doc')->getDocsByBrowseType('byediteddate', 0, 0, 'editedDate_desc', $pager);
-        $libList = array();
-        foreach($docList as $doc)
-        {
-            $doc->editedDate   = substr($doc->editedDate, 0, 10);
-            $doc->editInterval = helper::getDateInterval($doc->editedDate);
-
-            $libList[] = $doc->lib;
-        }
-
-        $this->view->docList  = $docList;
-    }
-
-    /**
-     * Print view list block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDocViewListBlock()
-    {
-        /* Load pager. */
-        $this->app->loadClass('pager', true);
-        $pager = new pager(0, 6, 1);
-
-        $this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0,'views_desc', $pager);
-    }
-
-    /**
-     * Print collect list block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printDocCollectListBlock()
-    {
-        /* Load pager. */
-        $this->app->loadClass('pager', true);
-        $pager = new pager(0, 6, 1);
-
-        $this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0, 'collects_desc', $pager);
-    }
-
-    /**
-     * Print product's document block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProductDocBlock()
-    {
-        $this->loadModel('doc');
-        $this->session->set('docList', $this->createLink('doc', 'index'), 'doc');
-
-        /* Set project status and count. */
-        $count         = isset($this->params->count) ? (int)$this->params->count : 15;
-        $products      = $this->loadModel('product')->getOrderedProducts('all');
-        $involveds     = $this->product->getOrderedProducts('involved');
-        $productIdList = array_merge(array_keys($products), array_keys($involveds));
-
-        $stmt = $this->dao->select('id,product,lib,title,type,addedBy,addedDate,editedDate,status,acl,groups,users,deleted')->from(TABLE_DOC)->alias('t1')
-            ->where('deleted')->eq(0)
-            ->andWhere('product')->in($productIdList)
-            ->orderBy('product,status,editedDate_desc')
-            ->query();
-        $docGroup = array();
-        while($doc = $stmt->fetch())
-        {
-            if(!isset($docGroup[$doc->product])) $docGroup[$doc->product] = array();
-            if(count($docGroup[$doc->product]) >= $count) continue;
-            if($this->doc->checkPrivDoc($doc)) $docGroup[$doc->product][$doc->id] = $doc;
-        }
-
-        $hasDataProducts = $hasDataInvolveds = array();
-        foreach($products as $productID => $product)
-        {
-            if(isset($docGroup[$productID]) and count($docGroup[$productID]) > 0)
-            {
-                $hasDataProducts[$productID] = $product;
-                if(isset($involveds[$productID])) $hasDataInvolveds[$productID] = $product;
-            }
-        }
-
-        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
-        $this->view->products  = $hasDataProducts;
-        $this->view->involveds = $hasDataInvolveds;
-        $this->view->docGroup  = $docGroup;
-    }
-
-    /**
-     * Print project's document block.
-     *
-     * @access public
-     * @return void
-     */
-    public function printProjectDocBlock()
-    {
-        $this->loadModel('doc');
-        $this->app->loadLang('project');
-        $this->session->set('docList', $this->createLink('doc', 'index'), 'doc');
-
-        /* Set project status and count. */
-        $count    = isset($this->params->count) ? (int)$this->params->count : 15;
-        $projects = $this->dao->select('*')->from(TABLE_PROJECT)
-            ->where('deleted')->eq('0')
-            ->andWhere('vision')->eq($this->config->vision)
-            ->andWhere('type')->eq('project')
-            ->beginIF($this->config->vision == 'rnd')->andWhere('model')->ne('kanban')->fi()
-            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
-            ->orderBy('order_asc,id_desc')
-            ->fetchAll('id');
-
-        $involveds = $this->dao->select('t1.*')->from(TABLE_PROJECT)->alias('t1')
-            ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
-            ->where('t1.deleted')->eq('0')
-            ->andWhere('t1.vision')->eq($this->config->vision)
-            ->andWhere('t1.type')->eq('project')
-            ->beginIF($this->config->vision == 'rnd')->andWhere('t1.model')->ne('kanban')->fi()
-            ->andWhere('t2.type')->eq('project')
-            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi()
-            ->andWhere('t1.openedBy', true)->eq($this->app->user->account)
-            ->orWhere('t1.PM')->eq($this->app->user->account)
-            ->orWhere('t2.account')->eq($this->app->user->account)
-            ->markRight(1)
-            ->orderBy('t1.order_asc,t1.id_desc')
-            ->fetchAll('id');
-
-        $projectIdList = array_keys($projects);
-
-        $stmt = $this->dao->select('t1.id,t1.lib,t1.title,t1.type,t1.addedBy,t1.addedDate,t1.editedDate,t1.status,t1.acl,t1.groups,t1.users,t1.deleted,if(t1.project = 0, t2.project, t1.project) as project')->from(TABLE_DOC)->alias('t1')
-            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
-            ->where('t1.deleted')->eq(0)
-            ->andWhere('t2.deleted', true)->eq(0)
-            ->orWhere('t2.deleted is null')
-            ->markRight(1)
-            ->andWhere('t1.project', true)->in($projectIdList)
-            ->orWhere('t2.project')->in($projectIdList)
-            ->markRight(1)
-            ->orderBy('project,t1.status,t1.editedDate_desc')
-            ->query();
-        $docGroup = array();
-        while($doc = $stmt->fetch())
-        {
-            if(!isset($docGroup[$doc->project])) $docGroup[$doc->project] = array();
-            if(count($docGroup[$doc->project]) >= $count) continue;
-            if($this->doc->checkPrivDoc($doc)) $docGroup[$doc->project][$doc->id] = $doc;
-        }
-
-        $hasDataProjects = $hasDataInvolveds = array();
-        foreach($projects as $projectID => $project)
-        {
-            if(isset($docGroup[$projectID]) and count($docGroup[$projectID]) > 0)
-            {
-                $hasDataProjects[$projectID] = $project;
-                if(isset($involveds[$projectID])) $hasDataInvolveds[$projectID] = $project;
-            }
-        }
-
-        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
-        $this->view->projects  = $hasDataProjects;
-        $this->view->involveds = $hasDataInvolveds;
-        $this->view->docGroup  = $docGroup;
-    }
-
-    /**
-     * Print guide block
-     *
-     * @param  int    $blockID
-     * @access public
-     * @return void
-     */
-    public function guide($blockID = 0)
-    {
-        $this->app->loadLang('custom');
-        $this->app->loadLang('my');
-        $this->loadModel('setting');
-
-        $this->view->blockID       = $blockID;
-        $this->view->programs      = $this->loadModel('program')->getTopPairs('', 'noclosed', true);
-        $this->view->programID     = isset($this->config->global->defaultProgram) ? $this->config->global->defaultProgram : 0;
-        $this->view->URSRList      = $this->loadModel('custom')->getURSRPairs();
-        $this->view->URSR          = $this->setting->getURSR();
-        $this->view->programLink   = isset($this->config->programLink)   ? $this->config->programLink   : 'program-browse';
-        $this->view->productLink   = isset($this->config->productLink)   ? $this->config->productLink   : 'product-all';
-        $this->view->projectLink   = isset($this->config->projectLink)   ? $this->config->projectLink   : 'project-browse';
-        $this->view->executionLink = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task';
-
-        $this->display();
-    }
-
     /**
      * Close block forever.
      *
@@ -2083,4 +212,126 @@ class block extends control
             $this->loadModel('setting')->setItem("{$this->app->user->account}.$module.block.initVersion", $this->config->block->version);
         }
     }
+
+    /**
+     * 展示应用的仪表盘
+     * Display dashboard for app.
+     *
+     * @param  string  $dashboard
+     * @param  string  $projectID
+     * @access public
+     * @return void
+     */
+    public function dashboard(string $dashboard, string $projectID = '0')
+    {
+        $projectID   = (int)$projectID;
+        $blocks      = $this->block->getMyDashboard($dashboard);
+        $isInitiated = $this->block->fetchBlockInitStatus($dashboard);
+
+        /* Init block when vist index first. */
+        if(empty($blocks) and !$isInitiated and !defined('TUTORIAL') and $this->block->initBlock($dashboard))
+        {
+            return print(js::reload());
+        }
+
+        $blocks = $this->blockZen->processBlockForRender($blocks, $projectID);
+
+        if($this->app->getViewType() == 'json') return print(json_encode($blocks));
+
+        list($shortBlocks, $longBlocks) = $this->blockZen->splitBlocksByLen($blocks);
+
+        $this->view->title       = zget($this->lang->block->dashboard, $dashboard, $this->lang->block->dashboard['default']);
+        $this->view->longBlocks  = $longBlocks;
+        $this->view->shortBlocks = $shortBlocks;
+        $this->view->dashboard   = $dashboard;
+        $this->render();
+    }
+
+
+
+
+    /**
+     * Print block.
+     * 输出区块
+     *
+     * @param  int     $blockID
+     * @access public
+     * @return string
+     */
+    public function printBlock($blockID)
+    {
+        if(!$this->selfCall)
+        {
+            $lang = str_replace('_', '-', $this->get->lang);
+            $this->app->setClientLang($lang);
+            $this->app->loadLang('common');
+            $this->app->loadLang('block');
+
+            if(!$this->block->checkAPI($this->get->hash)) return;
+        }
+
+        $html    = '';
+        $blockID = (int)$blockID;
+        $block   = $this->block->getByID($blockID);
+
+        if(empty($block)) return $html;
+
+        $code = $block->code;
+        if($code == 'statistic' or $code == 'list' or $code == 'overview') $code = $block->module . ucfirst($code);
+
+        $function = 'print' . ucfirst($code) . 'Block';
+        if(method_exists('blockZen', $function)) $this->blockZen->$function($blockID);
+
+        $params = $block->params;
+        if(isset($params->num) and !isset($params->count)) $params->count = $params->num;
+        if(!$this->selfCall)
+        {
+            $this->app->user = $this->dao->select('*')->from(TABLE_USER)->where('ranzhi')->eq($params->account)->fetch();
+            if(empty($this->app->user))
+            {
+                $this->app->user = new stdclass();
+                $this->app->user->account = 'guest';
+            }
+            $this->app->user->admin  = strpos($this->app->company->admins, ",{$this->app->user->account},") !== false;
+            $this->app->user->rights = $this->loadModel('user')->authorize($this->app->user->account);
+            $this->app->user->groups = $this->user->getGroups($this->app->user->account);
+            $this->app->user->view   = $this->user->grantUserView($this->app->user->account, $this->app->user->rights['acls']);
+
+            $sso = base64_decode($this->get->sso);
+            $this->view->sso  = $sso;
+            $this->view->sign = strpos($sso, '?') === false ? '?' : '&';
+        }
+
+        $this->view->title     = $block->title;
+        $this->view->block     = $block;
+        $this->view->longBlock = $this->block->isLongBlock($block);
+        $this->view->selfCall  = $this->selfCall;
+
+        $module   = $block->module;
+        $moreLink = '';
+        if(isset($this->config->block->modules[$module]->moreLinkList->{$code}))
+        {
+            list($moduleName, $method, $vars) = explode('|', sprintf($this->config->block->modules[$module]->moreLinkList->{$code}, isset($params->type) ? $params->type : ''));
+            $this->view->moreLink = $this->createLink($moduleName, $method, $vars);
+        }
+        $this->view->moreLink = $moreLink;
+
+        $viewType = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html';
+        if($viewType == 'json')
+        {
+            unset($this->view->app);
+            unset($this->view->config);
+            unset($this->view->lang);
+            unset($this->view->header);
+            unset($this->view->position);
+            unset($this->view->moduleTree);
+
+            $output['status'] = is_object($this->view) ? 'success' : 'fail';
+            $output['data']   = json_encode($this->view);
+            $output['md5']    = md5(json_encode($this->view));
+            return print(json_encode($output));
+        }
+
+        $this->display('block', strtolower($code) . 'block');
+    }
 }
diff --git a/module/block/css/projectstatisticblock.ui.css b/module/block/css/projectstatisticblock.ui.css
new file mode 100644
index 0000000000..7cc3a64d9c
--- /dev/null
+++ b/module/block/css/projectstatisticblock.ui.css
@@ -0,0 +1 @@
+.projectstatistic-block .tab-content {width: 100%}
diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php
index 4f15140101..200b0b274d 100644
--- a/module/block/ui/projectstatisticblock.html.php
+++ b/module/block/ui/projectstatisticblock.html.php
@@ -11,47 +11,321 @@ declare(strict_types=1);
 
 namespace zin;
 
+$blockNavID = 'nav-' . uniqid();
+$selected   = key($projects);
+$navTabs    = array();
+foreach($projects as $project)
+{
+    $navTabs[] = li
+    (
+        set('class', 'nav-item' . ($project->id == $selected ? ' active' : '')),
+        a
+        (
+            set('data-toggle', 'tab'),
+            set('href', "#tab3{$blockNavID}Content{$project->id}"),
+            $project->name
+        )
+    );
+}
+
+$tabItems = array();
+foreach($projects as $project)
+{
+    $tabItems[] = div
+    (
+        set('class', 'tab-pane' . ($project->id == $selected ? ' active' : '')),
+        set('id', "tab3{$blockNavID}Content{$project->id}"),
+        in_array($project->model, array('scrum', 'kanban', 'agileplus')) ? div
+        (
+            div
+            (
+                set('class', 'flex justify-around'),
+                div
+                (
+                    set('class', 'text-center'),
+                    h4($lang->block->storyCount),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->allStories . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->allStories,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->finish . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->doneStories,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->project->surplus . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->leftStories,
+                        )
+                    )
+                ),
+                div
+                (
+                    set('class', 'text-center'),
+                    h4($lang->block->investment),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->totalPeople . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->teamCount,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->estimate . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->estimate . $lang->execution->workHourUnit,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->consumedHours . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->consumed . $lang->execution->workHourUnit,
+                        )
+                    )
+                ),
+                div
+                (
+                    set('class', 'text-center'),
+                    h4($lang->block->taskCount),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->wait . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->waitTasks,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->doing . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->doingTasks,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'statistic-title'),
+                            $lang->block->done . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'statistic-data'),
+                            $project->rndDoneTasks,
+                        )
+                    )
+                ),
+                div
+                (
+                    set('class', 'text-center'),
+                    h4($lang->block->bugCount),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'col col-title'),
+                            $lang->block->totalBug . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'col col-data'),
+                            $project->allBugs,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'col col-title'),
+                            $lang->bug->statusList['resolved'] . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'col col-data'),
+                            $project->doneBugs,
+                        )
+                    ),
+                    div
+                    (
+                        div
+                        (
+                            set('class', 'col col-title'),
+                            $lang->bug->unResolved . ":",
+                        ),
+                        div
+                        (
+                            set('class', 'col col-data'),
+                            $project->leftBugs,
+                        )
+                    )
+                )
+            ),
+            (!empty($project->executions) and $project->multiple) ? div
+            (
+                set('class', 'flex'),
+                div
+                (
+                    set('class', 'flex-1 text-right'), 
+                    h4($lang->block->last)
+                ),
+                div
+                (
+                    set('class', 'flex-1 text-center'),
+                    a
+                    (
+                        set('href', $this->createLink('execution', 'task', "executionID={$project->executions[0]->id}")),
+                        set('title', $project->executions[0]->name),
+                        $project->executions[0]->name,
+                    )
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    div
+                    (
+                        set('class', 'progress'),
+                        span
+                        (
+                            set('class', 'mr-4'),
+                            $project->executions[0]->hours->progress . '%'
+                        ),
+                        div
+                        (
+                            set('class', 'progress-bar'),
+                            set('role', 'progressbar'),
+                            setStyle(['width' => $project->executions[0]->hours->progress . '%']),
+                        )
+                    )
+                )
+            ) : null
+        ) : div
+        (
+            set('class', 'weekly-row'),
+            div
+            (
+                span
+                (
+                    set('class', 'weekly-title'),
+                    $lang->project->weekly
+                ),
+                span
+                (
+                    set('class', 'weekly-stage'),
+                    $project->current
+                )
+            ),
+            div
+            (
+                set('class', 'flex'),
+                div
+                (
+                    set('class', 'flex-1'),
+                    div
+                    (
+                        set('class', 'progress'),
+                        span
+                        (
+                            set('class', 'mr-4'),
+                            $lang->project->progress . ' : ' . $project->progress . '%'
+                        ),
+                        div
+                        (
+                            set('class', 'progress-bar'),
+                            set('role', 'progressbar'),
+                            setStyle(['width' => $project->progress . '%']),
+                        )
+                    )
+                ),
+                div
+                (
+                    set('class', 'flex-1 text-center'),
+                    $lang->project->teamCount . ' : ' . $project->teamCount
+                ),
+                div
+                (
+                    set('class', 'flex-1 text-left'),
+                    $lang->project->budget . ' : ' . ($project->budget != 0 ? $project->budget : $this->lang->project->future)
+                ),
+                div(set('class', 'flex-1'))
+            )
+        )
+    );
+}
+
 panel
 (
-    set('class', 'welcome-block'),
-    ul
-    (
-        set('class', 'nav nav-tabs'),
-        li
-        (
-            set('class', 'nav-item'),
-            a
-            (
-                set('href', '#tabCount1'),
-                '标签1'
-            )
-        ),
-        li
-        (
-            set('class', 'nav-item'),
-            a
-            (
-                set('href', '#tabCount2'),
-                '标签2'
-            )
-        )
-    ),
+    set('class', 'projectstatistic-block'),
     div
     (
-        set('class', 'tab-content'),
+        set('class', 'flex'),
+        ul
+        (
+            set('class', 'nav nav-tabs nav-stacked'),
+            $navTabs
+        ),
         div
         (
-            set('class', 'tab-pane'),
-            set('id', 'tabCount1'),
-            "我是标签1"
-        )
-        div
-        (
-            set('class', 'tab-pane'),
-            set('id', 'tabCount2'),
-            "我是标签2"
+            set('class', 'tab-content'),
+            $tabItems
         )
     )
-)
+);
 
 render();
diff --git a/module/block/view/projectstatisticblock.html.php b/module/block/view/projectstatisticblock.html.php
index b19671ee3c..acc2b7f7b5 100755
--- a/module/block/view/projectstatisticblock.html.php
+++ b/module/block/view/projectstatisticblock.html.php
@@ -88,7 +88,6 @@ html[lang="en"] .product-info .type-info {color: #A6AAB8; text-align: center; po
 .forty-percent {width: 40%;}
 </style>
 <script>
-<?php $blockNavId = 'nav-' . uniqid(); ?>
 $(function()
 {
     var $nav = $('#<?php echo $blockNavId;?>');
diff --git a/module/block/zen.php b/module/block/zen.php
index 2180e4476c..5dc0e341a2 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -313,4 +313,1687 @@ class blockZen extends block
         }
         return $todos;
     }
+
+    /**
+     * latest dynamic.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDynamicBlock()
+    {
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 30, 1);
+
+        $this->view->actions = $this->loadModel('action')->getDynamic('all', 'today', 'date_desc', $pager);
+        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter|all');
+    }
+
+    /**
+     * Welcome block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWelcomeBlock()
+    {
+        $this->view->tutorialed = $this->loadModel('tutorial')->getTutorialed();
+
+        $data = $this->block->getWelcomeBlockData();
+
+        $this->view->tasks      = $data['tasks'];
+        $this->view->doneTasks  = $data['doneTasks'];
+        $this->view->bugs       = $data['bugs'];
+        $this->view->stories    = $data['stories'];
+        $this->view->executions = $data['executions'];
+
+        $this->view->delay['task'] = $data['delayTask'];
+        $this->view->delay['bug']  = $data['delayBug'];
+
+        $time = date('H:i');
+        $welcomeType = '19:00';
+        foreach($this->lang->block->welcomeList as $type => $name)
+        {
+            if($time >= $type) $welcomeType = $type;
+        }
+        $this->view->welcomeType = $welcomeType;
+    }
+
+    /**
+     * Print contribute block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printContributeBlock()
+    {
+        $this->view->data = $this->loadModel('user')->getPersonalData();
+    }
+
+    /**
+     * Print todo block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printTodoBlock()
+    {
+        $limit = ($this->viewType == 'json' or !isset($this->params->count)) ? 0 : (int)$this->params->count;
+        $todos = $this->loadModel('todo')->getList('all', $this->app->user->account, 'wait, doing', $limit, null, 'date, begin');
+        $uri   = $this->createLink('my', 'index');
+
+        $this->session->set('todoList',     $uri, 'my');
+        $this->session->set('bugList',      $uri, 'qa');
+        $this->session->set('taskList',     $uri, 'execution');
+        $this->session->set('storyList',    $uri, 'product');
+        $this->session->set('testtaskList', $uri, 'qa');
+
+        $todos = $this->blockZen->unsetTodos($todos);
+
+        $this->view->todos = $todos;
+    }
+
+    /**
+     * Print task block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printTaskBlock()
+    {
+        $this->session->set('taskList',  $this->createLink('my', 'index'), 'execution');
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $account = $this->app->user->account;
+        $type    = $this->params->type;
+
+        $this->app->loadLang('execution');
+        $this->view->tasks = $this->loadModel('task')->getUserTasks($account, $type, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $this->params->orderBy);
+    }
+
+    /**
+     * Print bug block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printBugBlock()
+    {
+        $this->session->set('bugList', $this->createLink('my', 'index'), 'qa');
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
+        $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
+        $this->view->bugs = $this->loadModel('bug')->getUserBugs($this->app->user->account, $this->params->type, $this->params->orderBy, $this->viewType == 'json' ? 0 : (int)$this->params->count, null, $projectID);
+    }
+
+    /**
+     * Print case block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printCaseBlock()
+    {
+        $this->session->set('caseList', $this->createLink('my', 'index'), 'qa');
+        $this->app->loadLang('testcase');
+        $this->app->loadLang('testtask');
+
+        $projectID = $this->lang->navGroup->qa  == 'project' ? $this->session->project : 0;
+        $projectID = $this->view->block->module == 'my' ? 0 : $projectID;
+
+        $cases = array();
+        if($this->params->type == 'assigntome')
+        {
+            $cases = $this->dao->select('t1.assignedTo AS assignedTo, t2.*')->from(TABLE_TESTRUN)->alias('t1')
+                ->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
+                ->leftJoin(TABLE_TESTTASK)->alias('t3')->on('t1.task = t3.id')
+                ->Where('t1.assignedTo')->eq($this->app->user->account)
+                ->andWhere('t1.status')->ne('done')
+                ->andWhere('t3.status')->ne('done')
+                ->andWhere('t3.deleted')->eq(0)
+                ->andWhere('t2.deleted')->eq(0)
+                ->beginIF($projectID)->andWhere('t2.project')->eq($projectID)->fi()
+                ->orderBy($this->params->orderBy)
+                ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
+                ->fetchAll();
+        }
+        elseif($this->params->type == 'openedbyme')
+        {
+            $cases = $this->dao->findByOpenedBy($this->app->user->account)->from(TABLE_CASE)
+                ->andWhere('deleted')->eq(0)
+                ->beginIF($projectID)->andWhere('project')->eq($projectID)->fi()
+                ->orderBy($this->params->orderBy)
+                ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
+                ->fetchAll();
+        }
+        $this->view->cases = $cases;
+    }
+
+    /**
+     * Print testtask block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printTesttaskBlock()
+    {
+        $this->app->loadLang('testtask');
+
+        $uri = $this->createLink('my', 'index');
+        $this->session->set('productList',  $uri, 'product');
+        $this->session->set('testtaskList', $uri, 'qa');
+        $this->session->set('buildList',    $uri, 'execution');
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $this->view->projects  = $this->loadModel('project')->getPairsByProgram();
+        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t2.shadow,t3.name as buildName,t4.name as projectName')->from(TABLE_TESTTASK)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.execution=t4.id')
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.execution=t5.project')
+            ->where('t1.deleted')->eq('0')
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
+            ->andWhere('t1.product = t5.product')
+            ->beginIF($this->params->type != 'all')->andWhere('t1.status')->eq($this->params->type)->fi()
+            ->orderBy('t1.id desc')
+            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
+            ->fetchAll();
+    }
+
+    /**
+     * Print story block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printStoryBlock()
+    {
+        $this->session->set('storyList', $this->createLink('my', 'index'), 'product');
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $this->app->loadClass('pager', true);
+        $count   = isset($this->params->count) ? (int)$this->params->count : 0;
+        $pager   = pager::init(0, $count , 1);
+        $type    = isset($this->params->type) ? $this->params->type : 'assignedTo';
+        $orderBy = isset($this->params->type) ? $this->params->orderBy : 'id_asc';
+
+        $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $orderBy, $this->viewType != 'json' ? $pager : '', 'story');
+    }
+
+    /**
+     * Print plan block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printPlanBlock()
+    {
+        $uri = $this->createLink('my', 'index');
+        $this->session->set('productList', $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+
+        $this->app->loadLang('productplan');
+        $this->view->plans = $this->dao->select('t1.*,t2.name as productName')->from(TABLE_PRODUCTPLAN)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->where('t1.deleted')->eq('0')
+            ->andWhere('t2.shadow')->eq(0)
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
+            ->orderBy('t1.begin desc')
+            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
+            ->fetchAll();
+    }
+
+    /**
+     * Print releases block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printReleaseBlock()
+    {
+        $uri = $this->createLink('my', 'index');
+        $this->session->set('releaseList', $uri, 'product');
+        $this->session->set('buildList', $uri, 'execution');
+
+        $this->app->loadLang('release');
+        $this->view->releases = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName')->from(TABLE_RELEASE)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
+            ->where('t1.deleted')->eq('0')
+            ->andWhere('t2.shadow')->eq(0)
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.project')->eq((int)$this->session->project)->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.product')->in($this->app->user->view->products)->fi()
+            ->orderBy('t1.id desc')
+            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
+            ->fetchAll();
+    }
+
+    /**
+     * Print Build block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printBuildBlock()
+    {
+        $this->session->set('buildList', $this->createLink('my', 'index'), 'execution');
+        $this->app->loadLang('build');
+
+        $builds = $this->dao->select('t1.*, t2.name AS productName, t2.shadow, t3.name AS projectName')->from(TABLE_BUILD)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t3')->on('t1.project=t3.id')
+            ->where('t1.deleted')->eq('0')
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.execution')->in($this->app->user->view->sprints)->fi()
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('t1.project')->eq((int)$this->session->project)->fi()
+            ->orderBy('t1.id desc')
+            ->beginIF($this->viewType != 'json')->limit((int)$this->params->count)->fi()
+            ->fetchAll();
+        $this->view->builds = $builds;
+    }
+
+    /**
+     * Print project block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProjectBlock()
+    {
+        $this->app->loadLang('execution');
+        $this->app->loadLang('task');
+        $count   = isset($this->params->count)   ? $this->params->count   : 15;
+        $type    = isset($this->params->type)    ? $this->params->type    : 'all';
+        $orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
+
+        $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $type, $orderBy, $count);
+        $this->view->users    = $this->loadModel('user')->getPairs('noletter');
+    }
+
+    /**
+     * Print product block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProductBlock()
+    {
+        $this->app->loadClass('pager', true);
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+        $count = isset($this->params->count) ? (int)$this->params->count : 0;
+        $type  = isset($this->params->type) ? $this->params->type : '';
+        $pager = pager::init(0, $count , 1);
+
+        $productStats  = $this->loadModel('product')->getStats('order_desc', $this->viewType != 'json' ? $pager : '', $type);
+        $productIdList = array();
+        foreach($productStats as $product) $productIdList[] = $product->id;
+
+        $this->app->loadLang('project');
+        $executions = $this->dao->select('t1.product,t2.id,t2.project,t2.name,t2.multiple')->from(TABLE_PROJECTPRODUCT)->alias('t1')
+            ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
+            ->where('t1.product')->in($productIdList)
+            ->andWhere('t2.type')->in('stage,sprint')
+            ->andWhere('t2.deleted')->eq(0)
+            ->orderBy('t1.project')
+            ->fetchAll('product');
+
+        $executionPairs = array();
+        $noMultiples    = array();
+        foreach($executions as $execution)
+        {
+            if(empty($execution->multiple)) $noMultiples[$execution->product] = $execution->project;
+            $executionPairs[$execution->product] = $execution->name;
+        }
+        if($noMultiples)
+        {
+            $noMultipleProjects = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('id')->in($noMultiples)->fetchPairs('id', 'name');
+            foreach($noMultiples as $productID => $projectID)
+            {
+                if(isset($noMultipleProjects[$projectID])) $executionPairs[$productID] = $noMultipleProjects[$projectID] . "({$this->lang->project->disableExecution})";
+            }
+        }
+
+        $this->view->executions   = $executionPairs;
+        $this->view->productStats = $productStats;
+    }
+
+    /**
+     * Print project statistic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProjectStatisticBlock()
+    {
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        /* Load models and langs. */
+        $this->loadModel('project');
+        $this->loadModel('weekly');
+        $this->loadModel('execution');
+        $this->app->loadLang('task');
+        $this->app->loadLang('story');
+        $this->app->loadLang('bug');
+
+        /* Set project status and count. */
+        $status = isset($this->params->type)  ? $this->params->type       : 'all';
+        $count  = isset($this->params->count) ? (int)$this->params->count : 15;
+
+        /* Get projects. */
+        $excludedModel = $this->config->edition == 'max' ? '' : 'waterfall';
+        $projects      = $this->project->getOverviewList('byStatus', $status, 'order_asc', $count, $excludedModel);
+        if(empty($projects))
+        {
+            $this->view->projects = $projects;
+            return false;
+        }
+
+        $today  = helper::today();
+        $monday = date('Ymd', strtotime($this->loadModel('weekly')->getThisMonday($today)));
+        $tasks  = $this->dao->select("project,
+            sum(consumed) as totalConsumed,
+            sum(if(status != 'cancel' and status != 'closed', `left`, 0)) as totalLeft")
+            ->from(TABLE_TASK)
+            ->where('project')->in(array_keys($projects))
+            ->andWhere('deleted')->eq(0)
+            ->andWhere('parent')->lt(1)
+            ->groupBy('project')
+            ->fetchAll('project');
+
+        foreach($projects as $projectID => $project)
+        {
+            if(in_array($project->model, array('scrum', 'kanban', 'agileplus')))
+            {
+                $this->app->loadClass('pager', true);
+                $pager = pager::init(0, 3, 1);
+                $project->progress   = $project->allStories == 0 ? 0 : round($project->doneStories / $project->allStories, 3) * 100;
+                $project->executions = $this->execution->getStatData($projectID, 'all', 0, 0, false, '', 'id_desc', $pager);
+            }
+            elseif(in_array($project->model, array('waterfall', 'waterfallplus')))
+            {
+                $begin   = $project->begin;
+                $weeks   = $this->weekly->getWeekPairs($begin);
+                $current = zget($weeks, $monday, '');
+                $current = substr($current, 0, -11) . substr($current, -6);
+
+                $PVEV = $this->weekly->getPVEV($projectID, $today);
+                $project->pv = $PVEV['PV'];
+                $project->ev = $PVEV['EV'];
+                $project->ac = $this->weekly->getAC($projectID, $today);
+                $project->sv = $this->weekly->getSV($project->ev, $project->pv);
+                $project->cv = $this->weekly->getCV($project->ev, $project->ac);
+
+                $progress = isset($tasks[$projectID]) ? (($tasks[$projectID]->totalConsumed + $tasks[$projectID]->totalLeft)) ? round($tasks[$projectID]->totalConsumed / ($tasks[$projectID]->totalConsumed + $tasks[$projectID]->totalLeft), 3) * 100 : 0 : 0;
+
+                $project->current  = $current;
+                $project->progress = $progress;
+            }
+        }
+
+        $this->view->projects = $projects;
+        $this->view->users    = $this->loadModel('user')->getPairs('noletter');
+    }
+
+    /**
+     * Print product statistic block.
+     *
+     * @access public
+     * @param  string $storyType requirement|story
+     * @return void
+     */
+    public function printProductStatisticBlock($storyType = 'story')
+    {
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $status = isset($this->params->type) ? $this->params->type : '';
+        $count  = isset($this->params->count) ? $this->params->count : '';
+
+        $products      = $this->loadModel('product')->getOrderedProducts($status, $count);
+        $productIdList = array_keys($products);
+
+        if(empty($products))
+        {
+            $this->view->products = $products;
+            return false;
+        }
+
+        /* Get stories. */
+        $stories = $this->dao->select('product, stage, COUNT(status) AS count')->from(TABLE_STORY)
+            ->where('deleted')->eq(0)
+            ->andWhere('product')->in($productIdList)
+            ->beginIF($storyType)->andWhere('type')->eq($storyType)->fi()
+            ->groupBy('product, stage')
+            ->fetchGroup('product', 'stage');
+
+        /* Padding the stories to sure all status have records. */
+        foreach($stories as $product => $story)
+        {
+            foreach(array_keys($this->lang->story->stageList) as $stage)
+            {
+                $story[$stage] = isset($story[$stage]) ? $story[$stage]->count : 0;
+            }
+            $stories[$product] = $story;
+        }
+
+        /* Get plans. */
+        $plans = $this->dao->select('product, end')->from(TABLE_PRODUCTPLAN)
+            ->where('deleted')->eq(0)
+            ->andWhere('product')->in($productIdList)
+            ->fetchGroup('product');
+        foreach($plans as $product => $productPlans)
+        {
+            $expired   = 0;
+            $unexpired = 0;
+
+            foreach($productPlans as $plan)
+            {
+                if($plan->end <  helper::today()) $expired++;
+                if($plan->end >= helper::today()) $unexpired++;
+            }
+
+            $plan = array();
+            $plan['expired']   = $expired;
+            $plan['unexpired'] = $unexpired;
+
+            $plans[$product] = $plan;
+        }
+
+        /* Get releases. */
+        $releases = $this->dao->select('product, status, COUNT(*) AS count')->from(TABLE_RELEASE)
+            ->where('deleted')->eq(0)
+            ->andWhere('product')->in($productIdList)
+            ->groupBy('product, status')
+            ->fetchGroup('product', 'status');
+        foreach($releases as $product => $release)
+        {
+            $release['normal']    = isset($release['normal'])    ? $release['normal']->count    : 0;
+            $release['terminate'] = isset($release['terminate']) ? $release['terminate']->count : 0;
+
+            $releases[$product] = $release;
+        }
+
+        /* Get last releases. */
+        $lastReleases = $this->dao->select('product, COUNT(*) AS count')->from(TABLE_RELEASE)
+            ->where('date')->eq(date('Y-m-d', strtotime('-1 day')))
+            ->andWhere('product')->in($productIdList)
+            ->groupBy('product')
+            ->fetchPairs();
+
+        foreach($products as $productID => $product)
+        {
+            $product->stories     = isset($stories[$productID])      ? $stories[$productID]      : 0;
+            $product->plans       = isset($plans[$productID])        ? $plans[$productID]        : 0;
+            $product->releases    = isset($releases[$productID])     ? $releases[$productID]     : 0;
+            $product->lastRelease = isset($lastReleases[$productID]) ? $lastReleases[$productID] : 0;
+        }
+
+        $this->app->loadLang('story');
+        $this->app->loadLang('productplan');
+        $this->app->loadLang('release');
+
+        $this->view->products = $products;
+    }
+
+    /**
+     * Print execution statistic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printExecutionStatisticBlock()
+    {
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $this->app->loadLang('task');
+        $this->app->loadLang('story');
+        $this->app->loadLang('bug');
+
+        $status  = isset($this->params->type)  ? $this->params->type : 'undone';
+        $count   = isset($this->params->count) ? (int)$this->params->count : 0;
+
+        /* Get projects. */
+        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
+        $executions = $this->loadModel('execution')->getOrderedExecutions($projectID, $status, $count, 'skipparent');
+        if(empty($executions))
+        {
+            $this->view->executions = $executions;
+            return false;
+        }
+
+        $executionIdList = array_keys($executions);
+
+        /* Get tasks. Fix bug #2918.*/
+        $yesterday  = date('Y-m-d', strtotime('-1 day'));
+        $taskGroups = $this->dao->select("id,parent,execution,status,finishedDate,estimate,consumed,`left`")->from(TABLE_TASK)
+            ->where('execution')->in($executionIdList)
+            ->andWhere('deleted')->eq(0)
+            ->fetchGroup('execution', 'id');
+
+        $tasks = array();
+        foreach($taskGroups as $executionID => $taskGroup)
+        {
+            $undoneTasks       = 0;
+            $yesterdayFinished = 0;
+            $totalEstimate     = 0;
+            $totalConsumed     = 0;
+            $totalLeft         = 0;
+
+            foreach($taskGroup as $taskID => $task)
+            {
+                if(strpos('wait|doing|pause|cancel', $task->status) !== false) $undoneTasks ++;
+                if(strpos($task->finishedDate, $yesterday) !== false) $yesterdayFinished ++;
+
+                if($task->parent == '-1') continue;
+
+                $totalConsumed += $task->consumed;
+                $totalEstimate += $task->estimate;
+                if($task->status != 'cancel' and $task->status != 'closed') $totalLeft += $task->left;
+            }
+
+            $executions[$executionID]->totalTasks        = count($taskGroup);
+            $executions[$executionID]->undoneTasks       = $undoneTasks;
+            $executions[$executionID]->yesterdayFinished = $yesterdayFinished;
+            $executions[$executionID]->totalEstimate     = round($totalEstimate, 1);
+            $executions[$executionID]->totalConsumed     = round($totalConsumed, 1);
+            $executions[$executionID]->totalLeft         = round($totalLeft, 1);
+        }
+
+        /* Get stories. */
+        $stories = $this->dao->select("t1.project, count(t2.status) as totalStories, count(t2.status != 'closed' or null) as unclosedStories, count(t2.stage = 'released' or null) as releasedStories")->from(TABLE_PROJECTSTORY)->alias('t1')
+            ->leftJoin(TABLE_STORY)->alias('t2')->on('t1.story = t2.id')
+            ->where('t1.project')->in($executionIdList)
+            ->andWhere('t2.deleted')->eq(0)
+            ->groupBy('project')
+            ->fetchAll('project');
+
+        foreach($stories as $executionID => $story)
+        {
+            foreach($story as $key => $value)
+            {
+                if($key == 'project') continue;
+                $executions[$executionID]->$key = $value;
+            }
+        }
+
+        /* Get bugs. */
+        $bugs = $this->dao->select("execution, count(status) as totalBugs, count(status = 'active' or null) as activeBugs, count(resolvedDate like '{$yesterday}%' or null) as yesterdayResolved")->from(TABLE_BUG)
+            ->where('execution')->in($executionIdList)
+            ->andWhere('deleted')->eq(0)
+            ->groupBy('execution')
+            ->fetchAll('execution');
+
+        foreach($bugs as $executionID => $bug)
+        {
+            foreach($bug as $key => $value)
+            {
+                if($key == 'project') continue;
+                $executions[$executionID]->$key = $value;
+            }
+        }
+
+        foreach($executions as $execution)
+        {
+            if(!isset($executions[$execution->id]->totalTasks))
+            {
+                $executions[$execution->id]->totalTasks        = 0;
+                $executions[$execution->id]->undoneTasks       = 0;
+                $executions[$execution->id]->yesterdayFinished = 0;
+                $executions[$execution->id]->totalEstimate     = 0;
+                $executions[$execution->id]->totalConsumed     = 0;
+                $executions[$execution->id]->totalLeft         = 0;
+            }
+            if(!isset($executions[$execution->id]->totalBugs))
+            {
+                $executions[$execution->id]->totalBugs         = 0;
+                $executions[$execution->id]->activeBugs        = 0;
+                $executions[$execution->id]->yesterdayResolved = 0;
+            }
+            if(!isset($executions[$execution->id]->totalStories))
+            {
+                $executions[$execution->id]->totalStories    = 0;
+                $executions[$execution->id]->unclosedStories = 0;
+                $executions[$execution->id]->releasedStories = 0;
+            }
+
+            $executions[$execution->id]->progress      = ($execution->totalConsumed || $execution->totalLeft) ? round($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft), 3) * 100 : 0;
+            $executions[$execution->id]->taskProgress  = $execution->totalTasks ? round(($execution->totalTasks - $execution->undoneTasks) / $execution->totalTasks, 2) * 100 : 0;
+            $executions[$execution->id]->storyProgress = $execution->totalStories ? round(($execution->totalStories - $execution->unclosedStories) / $execution->totalStories, 2) * 100 : 0;
+            $executions[$execution->id]->bugProgress   = $execution->totalBugs ? round(($execution->totalBugs - $execution->activeBugs) / $execution->totalBugs, 2) * 100 : 0;
+        }
+
+        $this->view->executions = $executions;
+    }
+
+    /**
+     * Print waterfall report block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallReportBlock()
+    {
+        $this->app->loadLang('programplan');
+        $project = $this->loadModel('project')->getByID($this->session->project);
+        $today   = helper::today();
+        $date    = date('Ymd', strtotime('this week Monday'));
+        $begin   = $project->begin;
+        $weeks   = $this->loadModel('weekly')->getWeekPairs($begin);
+        $current = zget($weeks, $date, '');
+
+        $this->weekly->save($this->session->project, $date);
+
+        $PVEV = $this->weekly->getPVEV($this->session->project, $today);
+        $this->view->pv = (float)$PVEV['PV'];
+        $this->view->ev = (float)$PVEV['EV'];
+        $this->view->ac = (float)$this->weekly->getAC($this->session->project, $today);
+        $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv);
+        $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac);
+
+        $left     = (float)$this->weekly->getLeft($this->session->project, $today);
+        $progress = (!empty($this->view->ac) or !empty($left)) ? floor($this->view->ac / ($this->view->ac + $left) * 1000) / 1000 * 100 : 0;
+        $this->view->progress = $progress > 100 ? 100 : $progress;
+        $this->view->current  = $current;
+    }
+
+    /**
+     * Print waterfall general report block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallGeneralReportBlock()
+    {
+        $this->app->loadLang('programplan');
+        $this->loadModel('project');
+        $this->loadModel('weekly');
+
+        $data = $this->project->getWaterfallPVEVAC($this->session->project);
+        $this->view->pv = (float)$data['PV'];
+        $this->view->ev = (float)$data['EV'];
+        $this->view->ac = (float)$data['AC'];
+        $this->view->sv = $this->weekly->getSV($this->view->ev, $this->view->pv);
+        $this->view->cv = $this->weekly->getCV($this->view->ev, $this->view->ac);
+
+        $left     = (float)$data['left'];
+        $progress = (!empty($this->view->ac) or !empty($left)) ? floor($this->view->ac / ($this->view->ac + $left) * 1000) / 1000 * 100 : 0;
+        $this->view->progress = $progress > 100 ? 100 : $progress;
+    }
+
+    /**
+     * Print waterfall gantt block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallGanttBlock()
+    {
+        $products  = $this->loadModel('product')->getProductPairsByProject($this->session->project);
+        $productID = $this->session->product ? $this->session->product : 0;
+        $productID = isset($products[$productID]) ? $productID : key($products);
+
+        $this->view->plans     = $this->loadModel('programplan')->getDataForGantt($this->session->project, $productID, 0, 'task', false);
+        $this->view->products  = $products;
+        $this->view->productID = $productID;
+    }
+
+    /**
+     * Print waterfall issue block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallIssueBlock()
+    {
+        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
+        $this->session->set('issueList', $uri, 'project');
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+        $this->view->users  = $this->loadModel('user')->getPairs('noletter');
+        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+    }
+
+    /**
+     * Print waterfall risk block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallRiskBlock()
+    {
+        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
+        $this->session->set('riskList', $uri, 'project');
+        $this->view->users = $this->loadModel('user')->getPairs('noletter');
+        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+    }
+
+    /**
+     * Print waterfall estimate block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallEstimateBlock()
+    {
+        $this->app->loadLang('durationestimation');
+        $this->loadModel('project');
+
+        $projectID = $this->session->project;
+        $members   = $this->loadModel('user')->getTeamMemberPairs($projectID, 'project');
+        $budget    = $this->loadModel('workestimation')->getBudget($projectID);
+        $workhour  = $this->loadModel('project')->getWorkhour($projectID);
+        if(empty($budget)) $budget = new stdclass();
+
+        $this->view->people    = $this->dao->select('sum(people) as people')->from(TABLE_DURATIONESTIMATION)->where('project')->eq($this->session->project)->fetch('people');
+        $this->view->members   = count($members) ? count($members) - 1 : 0;
+        $this->view->consumed  = $this->dao->select('sum(cast(consumed as decimal(10,2))) as consumed')->from(TABLE_TASK)->where('project')->eq($projectID)->andWhere('deleted')->eq(0)->andWhere('parent')->lt(1)->fetch('consumed');
+        $this->view->budget    = $budget;
+        $this->view->totalLeft = (float)$workhour->totalLeft;
+    }
+
+    /**
+     * Print waterfall progress block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printWaterfallProgressBlock()
+    {
+        $this->loadModel('milestone');
+        $this->loadModel('weekly');
+        $this->app->loadLang('execution');
+
+        $projectID = $this->session->project;
+        $project   = $this->loadModel('project')->getByID($projectID);
+
+        $projectWeekly = $this->dao->select('*')->from(TABLE_WEEKLYREPORT)->where('project')->eq($projectID)->orderBy('weekStart_asc')->fetchAll('weekStart');
+
+        $charts['PV'] = '[';
+        $charts['EV'] = '[';
+        $charts['AC'] = '[';
+        foreach($projectWeekly as $weekStart => $data)
+        {
+            $charts['labels'][] = $weekStart;
+            $charts['PV']      .= $data->pv . ',';
+            $charts['EV']      .= $data->ev . ',';
+            $charts['AC']      .= $data->ac . ',';
+        }
+
+        $charts['PV'] .= ']';
+        $charts['EV'] .= ']';
+        $charts['AC'] .= ']';
+
+        $this->view->charts = $charts;
+    }
+
+    /**
+     * Print srcum project block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumOverviewBlock()
+    {
+        $projectID = $this->session->project;
+        $this->app->loadLang('execution');
+        $this->app->loadLang('bug');
+        $totalData = $this->loadModel('project')->getOverviewList('byId', $projectID, 'id_desc', 1);
+
+        $this->view->totalData = $totalData;
+        $this->view->projectID = $projectID;
+    }
+
+    /**
+     * Print srcum project list block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumListBlock()
+    {
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+        $count = isset($this->params->count) ? (int)$this->params->count : 15;
+        $type  = isset($this->params->type) ? $this->params->type : 'undone';
+
+        $this->app->loadClass('pager', true);
+        $pager = pager::init(0, $count, 1);
+        $this->loadModel('execution');
+        $this->view->executionStats = !defined('TUTORIAL') ? $this->execution->getStatData($this->session->project, $type, 0, 0, false, '', 'id_desc', $pager) : array($this->loadModel('tutorial')->getExecution());
+    }
+
+    /**
+     * Print srcum product block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumProductBlock()
+    {
+        $stories  = array();
+        $bugs     = array();
+        $releases = array();
+        $count    = isset($this->params->count) ? (int)$this->params->count : 15;
+
+        $products      = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('program')->eq($this->session->program)->limit(15)->fetchPairs();
+        $productIdList = array_keys($products);
+        if(!empty($productIdList))
+        {
+            $fields   = 'product, count(*) as total';
+            $stories  = $this->dao->select($fields)->from(TABLE_STORY)->where('product')->in($productIdList)->andWhere('deleted')->eq('0')->groupBy('product')->fetchPairs();
+            $bugs     = $this->dao->select($fields)->from(TABLE_BUG)->where('product')->in($productIdList)->andWhere('deleted')->eq('0')->groupBy('product')->fetchPairs();
+            $releases = $this->dao->select($fields)->from(TABLE_RELEASE)->where('product')->in($productIdList)->andWhere('deleted')->eq('0')->groupBy('product')->fetchPairs();
+        }
+
+        $this->view->products = $products;
+        $this->view->stories  = $stories;
+        $this->view->bugs     = $bugs;
+        $this->view->releases = $releases;
+    }
+
+    /**
+     * Print scrum issue block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumIssueBlock()
+    {
+        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
+        $this->session->set('issueList', $uri, 'project');
+        if(preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+        $this->view->users  = $this->loadModel('user')->getPairs('noletter');
+        $this->view->issues = $this->loadModel('issue')->getBlockIssues($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+    }
+
+    /**
+     * Print scrum risk block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumRiskBlock()
+    {
+        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
+        $this->session->set('riskList', $uri, 'project');
+        $this->view->users = $this->loadModel('user')->getPairs('noletter');
+        $this->view->risks = $this->loadModel('risk')->getBlockRisks($this->session->project, $this->params->type, $this->viewType == 'json' ? 0 : (int)$this->params->count, $this->params->orderBy);
+    }
+
+    /**
+     * Print sprint block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printSprintBlock()
+    {
+        $sprints = $this->dao->select('status, count(*) as sprints')->from(TABLE_EXECUTION)
+            ->where('deleted')->eq(0)
+            ->beginIF($this->config->vision == 'lite')->andWhere('type')->eq('kanban')->fi()
+            ->beginIF($this->config->vision == 'rnd')->andWhere('type')->in('sprint,kanban')->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi()
+            ->andWhere('project')->eq($this->session->project)
+            ->groupBy('status')
+            ->fetchPairs();
+
+        $summary = new stdclass();
+        $summary->total  = array_sum($sprints);
+        $summary->doing  = zget($sprints, 'doing', 0);
+        $summary->closed = zget($sprints, 'closed', 0);
+
+        $progress = new stdclass();
+        $progress->doing  = $summary->total == 0 ? 0 : round($summary->doing  / $summary->total, 3);
+        $progress->closed = $summary->total == 0 ? 0 : round($summary->closed / $summary->total, 3);
+
+        $this->view->summary  = $summary;
+        $this->view->progress = $progress;
+    }
+
+    /**
+     * Print project dynamic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProjectDynamicBlock()
+    {
+        $projectID = $this->session->project;
+
+        $executions = $this->loadModel('execution')->getPairs($projectID);
+        $products   = $this->loadModel('product')->getProductPairsByProject($projectID);
+        $count      = isset($this->params->count) ? (int)$this->params->count : 10;
+
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 30, 1);
+
+        $this->view->actions = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $projectID);
+        $this->view->users   = $this->loadModel('user')->getPairs('noletter');
+    }
+
+    /**
+     * Print srcum road map block.
+     *
+     * @param  int    $productID
+     * @param  int    $roadMapID
+     * @access public
+     * @return void
+     */
+    public function printScrumRoadMapBlock($productID = 0, $roadMapID = 0)
+    {
+        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
+        $this->session->set('releaseList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+
+        $products  = $this->loadModel('product')->getPairs('', $this->session->project);
+        if(!is_numeric($productID)) $productID = key($products);
+
+        $this->view->roadmaps  = $this->product->getRoadmap($productID, 0, 6);
+        $this->view->productID = $productID;
+        $this->view->roadMapID = $roadMapID;
+        $this->view->products  = $products;
+        $this->view->sync      = 1;
+
+        if($_POST)
+        {
+            $this->view->sync = 0;
+            $this->display('block', 'scrumroadmapblock');
+        }
+    }
+
+    /**
+     * Print srcum test block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printScrumTestBlock()
+    {
+        $uri = $this->app->tab == 'my' ? $this->createLink('my', 'index') : $this->server->http_referer;
+        $this->session->set('testtaskList', $uri, 'qa');
+        $this->session->set('productList',  $uri, 'product');
+        $this->session->set('projectList',  $uri, 'project');
+        $this->session->set('buildList',    $uri, 'execution');
+        $this->app->loadLang('testtask');
+
+        $count  = zget($this->params, 'count', 10);
+        $status = isset($this->params->type)  ? $this->params->type : 'wait';
+
+        $this->view->project   = $this->loadModel('project')->getByID($this->session->project);
+        $this->view->testtasks = $this->dao->select('t1.*,t2.name as productName,t3.name as buildName,t4.name as projectName')
+            ->from(TABLE_TESTTASK)->alias('t1')
+            ->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')
+            ->leftJoin(TABLE_BUILD)->alias('t3')->on('t1.build=t3.id')
+            ->leftJoin(TABLE_PROJECT)->alias('t4')->on('t1.project=t4.id')
+            ->leftJoin(TABLE_PROJECTPRODUCT)->alias('t5')->on('t1.project=t5.project')
+            ->where('t1.deleted')->eq('0')
+            ->andWhere('t1.project')->eq($this->session->project)->fi()
+            ->andWhere('t1.product = t5.product')
+            ->beginIF($status != 'all')->andWhere('t1.status')->eq($status)->fi()
+            ->orderBy('t1.id desc')
+            ->limit($count)
+            ->fetchAll();
+    }
+
+    /**
+     * Print qa statistic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printQaStatisticBlock()
+    {
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $this->app->loadLang('bug');
+        $status = isset($this->params->type)  ? $this->params->type : '';
+        $count  = isset($this->params->count) ? (int)$this->params->count : 0;
+
+        $projectID  = $this->lang->navGroup->qa == 'project' ? $this->session->project : 0;
+        $products   = $this->loadModel('product')->getOrderedProducts($status, $count, $projectID, 'all');
+        $executions = $this->loadModel('execution')->getPairs($projectID, 'all', 'empty|withdelete');
+        if(empty($products))
+        {
+            $this->view->products = $products;
+            return false;
+        }
+
+        $productIdList = array_keys($products);
+        $today         = date(DT_DATE1);
+        $yesterday     = date(DT_DATE1, strtotime('yesterday'));
+        $testtasks     = $this->dao->select('*')->from(TABLE_TESTTASK)->where('product')->in($productIdList)->andWhere('project')->ne(0)->andWhere('deleted')->eq(0)->orderBy('id')->fetchAll('product');
+        $bugs          = $this->dao->select("product, count(id) as total,
+            count(IF(assignedTo = '{$this->app->user->account}', 1, null)) as assignedToMe,
+            count(IF(status != 'closed', 1, null)) as unclosed,
+            count(IF(status != 'closed' and status != 'resolved', 1, null)) as unresolved,
+            count(IF(confirmed = '0' and toStory = '0', 1, null)) as unconfirmed,
+            count(IF(resolvedDate >= '$yesterday' and resolvedDate < '$today', 1, null)) as yesterdayResolved,
+            count(IF(closedDate >= '$yesterday' and closedDate < '$today', 1, null)) as yesterdayClosed")
+            ->from(TABLE_BUG)
+            ->where('product')->in($productIdList)
+            ->andWhere('execution')->in(array_keys($executions))
+            ->andWhere('deleted')->eq(0)
+            ->groupBy('product')
+            ->fetchAll('product');
+
+        $confirmedBugs = $this->dao->select('product')->from(TABLE_ACTION)
+            ->where('objectType')->eq('bug')
+            ->andWhere('action')->eq('bugconfirmed')
+            ->andWhere('date')->ge($yesterday)
+            ->andWhere('date')->lt($today)
+            ->fetchAll();
+        $productConfirmedBugs = array();
+        foreach($confirmedBugs as $bug)
+        {
+            if(!isset($productConfirmedBugs[$bug->product])) $productConfirmedBugs[$bug->product] = 0;
+            $productConfirmedBugs[$bug->product]++;
+        }
+
+        foreach($products as $productID => $product)
+        {
+            $bug = isset($bugs[$productID]) ? $bugs[$productID] : '';
+            $product->total              = empty($bug) ? 0 : $bug->total;
+            $product->assignedToMe       = empty($bug) ? 0 : $bug->assignedToMe;
+            $product->unclosed           = empty($bug) ? 0 : $bug->unclosed;
+            $product->unresolved         = empty($bug) ? 0 : $bug->unresolved;
+            $product->unconfirmed        = empty($bug) ? 0 : $bug->unconfirmed;
+            $product->yesterdayResolved  = empty($bug) ? 0 : $bug->yesterdayResolved;
+            $product->yesterdayClosed    = empty($bug) ? 0 : $bug->yesterdayClosed;
+            $product->yesterdayConfirmed = empty($productConfirmedBugs[",$productID,"]) ? 0 : $productConfirmedBugs[",$productID,"];
+
+            $product->assignedRate    = $product->total ? round($product->assignedToMe  / $product->total * 100, 2) : 0;
+            $product->unresolvedRate  = $product->total ? round($product->unresolved    / $product->total * 100, 2) : 0;
+            $product->unconfirmedRate = $product->total ? round($product->unconfirmed   / $product->total * 100, 2) : 0;
+            $product->unclosedRate    = $product->total ? round($product->unclosed      / $product->total * 100, 2) : 0;
+            $product->testtask        = isset($testtasks[$productID]) ? $testtasks[$productID] : '';
+        }
+
+        $this->view->products = $products;
+    }
+
+    /**
+     * Print product overview block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProductOverviewBlock()
+    {
+        $normal = 0;
+        $closed = 0;
+
+        $products = $this->loadModel('product')->getList();
+        foreach($products as $product)
+        {
+            if(!$this->product->checkPriv($product->id)) continue;
+
+            if($product->status == 'normal') $normal++;
+            if($product->status == 'closed') $closed++;
+        }
+
+        $total  = $normal + $closed;
+
+        $this->view->total         = $total;
+        $this->view->normal        = $normal;
+        $this->view->closed        = $closed;
+        $this->view->normalPercent = $total ? round(($normal / $total), 2) * 100 : 0;
+    }
+
+    /**
+     * Print execution overview block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printExecutionOverviewBlock()
+    {
+        $projectID  = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
+        $executions = $this->loadModel('execution')->getList($projectID);
+
+        $total = 0;
+        foreach($executions as $execution)
+        {
+            if(empty($execution->multiple)) continue;
+            if(!isset($overview[$execution->status])) $overview[$execution->status] = 0;
+            $overview[$execution->status]++;
+            $total++;
+        }
+
+        $overviewPercent = array();
+        $this->app->loadLang('project');
+        foreach($this->lang->project->statusList as $statusKey => $statusName)
+        {
+            if(!isset($overview[$statusKey])) $overview[$statusKey] = 0;
+            $overviewPercent[$statusKey] = $total ? round($overview[$statusKey] / $total, 2) * 100 . '%' : '0%';
+        }
+
+        $this->view->total           = $total;
+        $this->view->overview        = $overview;
+        $this->view->overviewPercent = $overviewPercent;
+    }
+
+    /**
+     * Print qa overview block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printQaOverviewBlock()
+    {
+        $casePairs = $this->dao->select('lastRunResult, COUNT(*) AS count')->from(TABLE_CASE)
+            ->where('1=1')
+            ->beginIF($this->view->block->module != 'my' and $this->session->project)->andWhere('project')->eq((int)$this->session->project)->fi()
+            ->groupBy('lastRunResult')
+            ->fetchPairs();
+
+        $total = array_sum($casePairs);
+
+        $this->app->loadLang('testcase');
+        foreach($this->lang->testcase->resultList as $result => $label)
+        {
+            if(!isset($casePairs[$result])) $casePairs[$result] = 0;
+        }
+
+        $casePercents = array();
+        foreach($casePairs as $result => $count)
+        {
+            $casePercents[$result] = $total ? round($count / $total * 100, 2) : 0;
+        }
+
+        $this->view->total        = $total;
+        $this->view->casePairs    = $casePairs;
+        $this->view->casePercents = $casePercents;
+    }
+
+    /**
+     * Print execution block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printExecutionBlock()
+    {
+        if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) return;
+
+        $count  = isset($this->params->count) ? (int)$this->params->count : 0;
+        $status = isset($this->params->type)  ? $this->params->type : 'all';
+
+        $this->loadModel('execution');
+        $this->app->loadClass('pager', true);
+        $pager = pager::init(0, $count, 1);
+
+        $projectPairs = $this->dao->select('id,name')->from(TABLE_PROJECT)->where('type')->eq('project')->fetchPairs('id', 'name');
+        $projectID    = $this->view->block->module == 'my' ? 0 : (int)$this->session->project;
+
+        $this->view->executionStats = $this->execution->getStatData($projectID, $status, 0, 0, false, 'skipParent', 'id_asc', $pager);
+    }
+
+    /**
+     * Print assign to me block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printAssignToMeBlock($longBlock = true)
+    {
+        $hasIssue   = helper::hasFeature('issue');
+        $hasRisk    = helper::hasFeature('risk');
+        $hasMeeting = helper::hasFeature('meeting');
+
+        $hasViewPriv = array();
+        if(common::hasPriv('todo',  'view'))                                                                                          $hasViewPriv['todo']        = true;
+        if(common::hasPriv('task',  'view'))                                                                                          $hasViewPriv['task']        = true;
+        if(common::hasPriv('bug',   'view') and $this->config->vision != 'lite')                                                      $hasViewPriv['bug']         = true;
+        if(common::hasPriv('story', 'view') and $this->config->vision != 'lite')                                                      $hasViewPriv['story']       = true;
+        if($this->config->URAndSR and common::hasPriv('story', 'view') and $this->config->vision != 'lite')                           $hasViewPriv['requirement'] = true;
+        if(common::hasPriv('risk',  'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasRisk)      $hasViewPriv['risk']        = true;
+        if(common::hasPriv('issue', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasIssue)     $hasViewPriv['issue']       = true;
+        if(common::hasPriv('meeting', 'view') and $this->config->edition == 'max' and $this->config->vision != 'lite' && $hasMeeting) $hasViewPriv['meeting']     = true;
+        if(common::hasPriv('feedback', 'view') and in_array($this->config->edition, array('max', 'biz')))                             $hasViewPriv['feedback']    = true;
+        if(common::hasPriv('ticket', 'view') and in_array($this->config->edition, array('max', 'biz')))                               $hasViewPriv['ticket']      = true;
+
+        $params          = $this->get->param;
+        $params          = json_decode(base64_decode($params));
+        $count           = array();
+        $objectList      = array('todo' => 'todos', 'task' => 'tasks', 'bug' => 'bugs', 'story' => 'stories', 'requirement' => 'requirements');
+        $objectCountList = array('todo' => 'todoCount', 'task' => 'taskCount', 'bug' => 'bugCount', 'story' => 'storyCount', 'requirement' => 'requirementCount');
+        if($this->config->edition == 'max')
+        {
+            if($hasRisk)
+            {
+                $objectList      += array('risk' => 'risks');
+                $objectCountList += array('risk' => 'riskCount');
+            }
+
+            if($hasIssue)
+            {
+                $objectList      += array('issue' => 'issues');
+                $objectCountList += array('issue' => 'issueCount');
+            }
+
+            $objectList      += array('feedback' => 'feedbacks', 'ticket' => 'tickets');
+            $objectCountList += array('feedback' => 'feedbackCount', 'ticket' => 'ticketCount');
+        }
+
+        if($this->config->edition == 'biz')
+        {
+            $objectList      += array('feedback' => 'feedbacks', 'ticket' => 'tickets');
+            $objectCountList += array('feedback' => 'feedbackCount', 'ticket' => 'ticketCount');
+        }
+
+        $tasks = $this->loadModel('task')->getUserSuspendedTasks($this->app->user->account);
+        foreach($objectCountList as $objectType => $objectCount)
+        {
+            if(!isset($hasViewPriv[$objectType])) continue;
+
+            $table      = $objectType == 'requirement' ? TABLE_STORY : $this->config->objectTables[$objectType];
+            $orderBy    = $objectType == 'todo' ? "`date` desc" : 'id_desc';
+            $limitCount = isset($params->{$objectCount}) ? $params->{$objectCount} : 0;
+            $objects    = $this->dao->select('t1.*')->from($table)->alias('t1')
+                ->beginIF($objectType == 'story' or $objectType == 'requirement')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')->fi()
+                ->beginIF($objectType == 'bug')->leftJoin(TABLE_PRODUCT)->alias('t2')->on('t1.product=t2.id')->fi()
+                ->beginIF($objectType == 'task')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution=t2.id')->fi()
+                ->beginIF($objectType == 'issue' or $objectType == 'risk')->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')->fi()
+                ->beginIF($objectType == 'ticket')->leftJoin(TABLE_USER)->alias('t2')->on('t1.openedBy = t2.account')->fi()
+                ->where('t1.deleted')->eq(0)
+                ->andWhere('t1.assignedTo')->eq($this->app->user->account)->fi()
+                ->beginIF($objectType == 'story')->andWhere('t1.type')->eq('story')->andWhere('t2.deleted')->eq('0')->fi()
+                ->beginIF($objectType == 'requirement')->andWhere('t1.type')->eq('requirement')->andWhere('t2.deleted')->eq('0')->fi()
+                ->beginIF($objectType == 'bug')->andWhere('t2.deleted')->eq('0')->fi()
+                ->beginIF($objectType == 'story' or $objectType == 'requirement')->andWhere('t2.deleted')->eq('0')->fi()
+                ->beginIF($objectType == 'todo')->andWhere('t1.cycle')->eq(0)->andWhere('t1.status')->eq('wait')->andWhere('t1.vision')->eq($this->config->vision)->fi()
+                ->beginIF($objectType != 'todo')->andWhere('t1.status')->ne('closed')->fi()
+                ->beginIF($objectType == 'feedback')->andWhere('t1.status')->in('wait, noreview')->fi()
+                ->beginIF($objectType == 'issue' or $objectType == 'risk')->andWhere('t2.deleted')->eq(0)->fi()
+                ->beginIF($objectType == 'ticket')->andWhere('t1.status')->in('wait,doing,done')->fi()
+                ->orderBy($orderBy)
+                ->beginIF($limitCount)->limit($limitCount)->fi()
+                ->fetchAll();
+
+            if($objectType == 'todo')
+            {
+                $this->app->loadClass('date');
+                $this->app->loadLang('todo');
+                foreach($objects as $key => $todo)
+                {
+                    if($todo->status == 'done' and $todo->finishedBy == $this->app->user->account)
+                    {
+                        unset($objects[$key]);
+                        continue;
+                    }
+                    if($todo->type == 'task' and isset($tasks[$todo->idvalue]))
+                    {
+                        unset($objects[$key]);
+                        continue;
+                    }
+
+                    $todo->begin = date::formatTime($todo->begin);
+                    $todo->end   = date::formatTime($todo->end);
+                }
+            }
+
+            if($objectType == 'task')
+            {
+                $this->app->loadLang('task');
+                $this->app->loadLang('execution');
+
+                $objects = $this->loadModel('task')->getUserTasks($this->app->user->account, 'assignedTo');
+
+                foreach($objects as $k => $task)
+                {
+                    if(in_array($task->status, array('closed', 'cancel'))) unset($objects[$k]);
+                }
+                if($limitCount > 0) $objects = array_slice($objects, 0, $limitCount);
+            }
+
+            if($objectType == 'bug')   $this->app->loadLang('bug');
+            if($objectType == 'risk')  $this->app->loadLang('risk');
+            if($objectType == 'issue') $this->app->loadLang('issue');
+
+            if($objectType == 'feedback' or $objectType == 'ticket')
+            {
+                $this->app->loadLang('feedback');
+                $this->app->loadLang('ticket');
+                $this->view->users    = $this->loadModel('user')->getPairs('all,noletter');
+                $this->view->products = $this->dao->select('id, name')->from(TABLE_PRODUCT)->where('deleted')->eq('0')->fetchPairs('id', 'name');
+            }
+
+            $count[$objectType] = count($objects);
+            $this->view->{$objectList[$objectType]} = $objects;
+        }
+
+        if(isset($hasViewPriv['meeting']))
+        {
+            $this->app->loadLang('meeting');
+            $today        = helper::today();
+            $now          = date('H:i:s', strtotime(helper::now()));
+            $meetingCount = isset($params->meetingCount) ? isset($params->meetingCount) : 0;
+
+            $meetings = $this->dao->select('*')->from(TABLE_MEETING)->alias('t1')
+                ->leftjoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+                ->where('t1.deleted')->eq('0')
+                ->andWhere('t2.deleted')->eq('0')
+                ->andWhere('(t1.date')->gt($today)
+                ->orWhere('(t1.begin')->gt($now)
+                ->andWhere('t1.date')->eq($today)
+                ->markRight(2)
+                ->andwhere('(t1.host')->eq($this->app->user->account)
+                ->orWhere('t1.participant')->in($this->app->user->account)
+                ->markRight(1)
+                ->orderBy('t1.id_desc')
+                ->beginIF($meetingCount)->limit($meetingCount)->fi()
+                ->fetchAll();
+
+            $count['meeting'] = count($meetings);
+            $this->view->meetings = $meetings;
+            $this->view->depts    = $this->loadModel('dept')->getOptionMenu();
+            $this->view->users    = $this->loadModel('user')->getPairs('all,noletter');
+        }
+
+        $limitCount = !empty($params->reviewCount) ? $params->reviewCount : 20;
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, $limitCount, 1);
+        $reviews = $this->loadModel('my')->getReviewingList('all', 'time_desc', $pager);
+        if($reviews)
+        {
+            $hasViewPriv['review'] = true;
+            $count['review']       = count($reviews);
+            $this->view->reviews   = $reviews;
+            if($this->config->edition == 'max')
+            {
+                $this->app->loadLang('approval');
+                $this->view->flows = $this->dao->select('module,name')->from(TABLE_WORKFLOW)->where('buildin')->eq(0)->fetchPairs('module', 'name');
+            }
+        }
+
+        $this->view->selfCall    = $this->selfCall;
+        $this->view->hasViewPriv = $hasViewPriv;
+        $this->view->count       = $count;
+        $this->view->longBlock   = $longBlock;
+    }
+
+    /**
+     * Print recent project block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printRecentProjectBlock()
+    {
+        /* load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 3, 1);
+        $this->view->projects = $this->loadModel('project')->getList('all', 'id_desc', true, $pager);
+    }
+
+    /**
+     * Print project team block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProjectTeamBlock()
+    {
+        $count   = isset($this->params->count)   ? $this->params->count   : 15;
+        $status  = isset($this->params->type)    ? $this->params->type    : 'all';
+        $orderBy = isset($this->params->orderBy) ? $this->params->orderBy : 'id_desc';
+
+        /* Get projects. */
+        $this->app->loadLang('task');
+        $this->app->loadLang('program');
+        $this->app->loadLang('execution');
+        $this->view->projects = $this->loadModel('project')->getOverviewList('byStatus', $status, $orderBy, $count);
+    }
+
+    /**
+     * Print document statistic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDocStatisticBlock()
+    {
+        $this->view->statistic = $this->loadModel('doc')->getStatisticInfo();
+    }
+
+    /**
+     * Print document dynamic block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDocDynamicBlock()
+    {
+        /* Load pager. */
+        $this->app->loadClass('pager', true);
+        $pager = new pager(0, 30, 1);
+
+        $this->view->actions = $this->loadModel('doc')->getDynamic($pager);
+        $this->view->users   = $this->loadModel('user')->getPairs('nodeleted|noletter|all');
+    }
+
+    /**
+     * Print my collection of documents block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDocMyCollectionBlock()
+    {
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 6, 1);
+
+        $docList = $this->loadModel('doc')->getDocsByBrowseType('collectedbyme', 0, 0, 'editedDate_desc', $pager);
+        $libList = array();
+        foreach($docList as $doc)
+        {
+            $doc->editedDate   = substr($doc->editedDate, 0, 10);
+            $doc->editInterval = helper::getDateInterval($doc->editedDate);
+
+            $libList[] = $doc->lib;
+        }
+
+        $this->view->docList  = $docList;
+    }
+
+    /**
+     * Print recent update block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDocRecentUpdateBlock()
+    {
+        /* Load pager. */
+        $this->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 6, 1);
+
+        $docList = $this->loadModel('doc')->getDocsByBrowseType('byediteddate', 0, 0, 'editedDate_desc', $pager);
+        $libList = array();
+        foreach($docList as $doc)
+        {
+            $doc->editedDate   = substr($doc->editedDate, 0, 10);
+            $doc->editInterval = helper::getDateInterval($doc->editedDate);
+
+            $libList[] = $doc->lib;
+        }
+
+        $this->view->docList  = $docList;
+    }
+
+    /**
+     * Print view list block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDocViewListBlock()
+    {
+        /* Load pager. */
+        $this->app->loadClass('pager', true);
+        $pager = new pager(0, 6, 1);
+
+        $this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0,'views_desc', $pager);
+    }
+
+    /**
+     * Print collect list block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printDocCollectListBlock()
+    {
+        /* Load pager. */
+        $this->app->loadClass('pager', true);
+        $pager = new pager(0, 6, 1);
+
+        $this->view->docList = $this->loadModel('doc')->getDocsByBrowseType('all', 0, 0, 'collects_desc', $pager);
+    }
+
+    /**
+     * Print product's document block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProductDocBlock()
+    {
+        $this->loadModel('doc');
+        $this->session->set('docList', $this->createLink('doc', 'index'), 'doc');
+
+        /* Set project status and count. */
+        $count         = isset($this->params->count) ? (int)$this->params->count : 15;
+        $products      = $this->loadModel('product')->getOrderedProducts('all');
+        $involveds     = $this->product->getOrderedProducts('involved');
+        $productIdList = array_merge(array_keys($products), array_keys($involveds));
+
+        $stmt = $this->dao->select('id,product,lib,title,type,addedBy,addedDate,editedDate,status,acl,groups,users,deleted')->from(TABLE_DOC)->alias('t1')
+            ->where('deleted')->eq(0)
+            ->andWhere('product')->in($productIdList)
+            ->orderBy('product,status,editedDate_desc')
+            ->query();
+        $docGroup = array();
+        while($doc = $stmt->fetch())
+        {
+            if(!isset($docGroup[$doc->product])) $docGroup[$doc->product] = array();
+            if(count($docGroup[$doc->product]) >= $count) continue;
+            if($this->doc->checkPrivDoc($doc)) $docGroup[$doc->product][$doc->id] = $doc;
+        }
+
+        $hasDataProducts = $hasDataInvolveds = array();
+        foreach($products as $productID => $product)
+        {
+            if(isset($docGroup[$productID]) and count($docGroup[$productID]) > 0)
+            {
+                $hasDataProducts[$productID] = $product;
+                if(isset($involveds[$productID])) $hasDataInvolveds[$productID] = $product;
+            }
+        }
+
+        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
+        $this->view->products  = $hasDataProducts;
+        $this->view->involveds = $hasDataInvolveds;
+        $this->view->docGroup  = $docGroup;
+    }
+
+    /**
+     * Print project's document block.
+     *
+     * @access public
+     * @return void
+     */
+    public function printProjectDocBlock()
+    {
+        $this->loadModel('doc');
+        $this->app->loadLang('project');
+        $this->session->set('docList', $this->createLink('doc', 'index'), 'doc');
+
+        /* Set project status and count. */
+        $count    = isset($this->params->count) ? (int)$this->params->count : 15;
+        $projects = $this->dao->select('*')->from(TABLE_PROJECT)
+            ->where('deleted')->eq('0')
+            ->andWhere('vision')->eq($this->config->vision)
+            ->andWhere('type')->eq('project')
+            ->beginIF($this->config->vision == 'rnd')->andWhere('model')->ne('kanban')->fi()
+            ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->projects)->fi()
+            ->orderBy('order_asc,id_desc')
+            ->fetchAll('id');
+
+        $involveds = $this->dao->select('t1.*')->from(TABLE_PROJECT)->alias('t1')
+            ->leftJoin(TABLE_TEAM)->alias('t2')->on('t1.id=t2.root')
+            ->where('t1.deleted')->eq('0')
+            ->andWhere('t1.vision')->eq($this->config->vision)
+            ->andWhere('t1.type')->eq('project')
+            ->beginIF($this->config->vision == 'rnd')->andWhere('t1.model')->ne('kanban')->fi()
+            ->andWhere('t2.type')->eq('project')
+            ->beginIF(!$this->app->user->admin)->andWhere('t1.id')->in($this->app->user->view->projects)->fi()
+            ->andWhere('t1.openedBy', true)->eq($this->app->user->account)
+            ->orWhere('t1.PM')->eq($this->app->user->account)
+            ->orWhere('t2.account')->eq($this->app->user->account)
+            ->markRight(1)
+            ->orderBy('t1.order_asc,t1.id_desc')
+            ->fetchAll('id');
+
+        $projectIdList = array_keys($projects);
+
+        $stmt = $this->dao->select('t1.id,t1.lib,t1.title,t1.type,t1.addedBy,t1.addedDate,t1.editedDate,t1.status,t1.acl,t1.groups,t1.users,t1.deleted,if(t1.project = 0, t2.project, t1.project) as project')->from(TABLE_DOC)->alias('t1')
+            ->leftJoin(TABLE_EXECUTION)->alias('t2')->on('t1.execution=t2.id')
+            ->where('t1.deleted')->eq(0)
+            ->andWhere('t2.deleted', true)->eq(0)
+            ->orWhere('t2.deleted is null')
+            ->markRight(1)
+            ->andWhere('t1.project', true)->in($projectIdList)
+            ->orWhere('t2.project')->in($projectIdList)
+            ->markRight(1)
+            ->orderBy('project,t1.status,t1.editedDate_desc')
+            ->query();
+        $docGroup = array();
+        while($doc = $stmt->fetch())
+        {
+            if(!isset($docGroup[$doc->project])) $docGroup[$doc->project] = array();
+            if(count($docGroup[$doc->project]) >= $count) continue;
+            if($this->doc->checkPrivDoc($doc)) $docGroup[$doc->project][$doc->id] = $doc;
+        }
+
+        $hasDataProjects = $hasDataInvolveds = array();
+        foreach($projects as $projectID => $project)
+        {
+            if(isset($docGroup[$projectID]) and count($docGroup[$projectID]) > 0)
+            {
+                $hasDataProjects[$projectID] = $project;
+                if(isset($involveds[$projectID])) $hasDataInvolveds[$projectID] = $project;
+            }
+        }
+
+        $this->view->users     = $this->loadModel('user')->getPairs('noletter');
+        $this->view->projects  = $hasDataProjects;
+        $this->view->involveds = $hasDataInvolveds;
+        $this->view->docGroup  = $docGroup;
+    }
+
+    /**
+     * Print guide block
+     *
+     * @param  int    $blockID
+     * @access public
+     * @return void
+     */
+    public function printGuideBlock($blockID = 0)
+    {
+        $this->app->loadLang('custom');
+        $this->app->loadLang('my');
+        $this->loadModel('setting');
+
+        $this->view->blockID       = $blockID;
+        $this->view->programs      = $this->loadModel('program')->getTopPairs('', 'noclosed', true);
+        $this->view->programID     = isset($this->config->global->defaultProgram) ? $this->config->global->defaultProgram : 0;
+        $this->view->URSRList      = $this->loadModel('custom')->getURSRPairs();
+        $this->view->URSR          = $this->setting->getURSR();
+        $this->view->programLink   = isset($this->config->programLink)   ? $this->config->programLink   : 'program-browse';
+        $this->view->productLink   = isset($this->config->productLink)   ? $this->config->productLink   : 'product-all';
+        $this->view->projectLink   = isset($this->config->projectLink)   ? $this->config->projectLink   : 'project-browse';
+        $this->view->executionLink = isset($this->config->executionLink) ? $this->config->executionLink : 'execution-task';
+    }
 }

From 555c1b469a458a0eab0cddb79bcc1bc4d81e2eaa Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 10:06:13 +0000
Subject: [PATCH 56/80] * Optimize the code for todoModel::createByCycle().

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

diff --git a/module/todo/model.php b/module/todo/model.php
index 126998fa92..deab7530a6 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -359,14 +359,14 @@ class todoModel extends model
 
         foreach($todoList as $todoID => $todo)
         {
+            $todo->config = json_decode($todo->config);
             if(!isset($validUsers[$todo->account])) continue;
 
-            $todo->config = json_decode($todo->config);
             $begin      = $todo->config->begin;
             $end        = $todo->config->end;
             $beforeDays = (int)$todo->config->beforeDays;
             if(!empty($beforeDays) && $beforeDays > 0) $begin = date('Y-m-d', strtotime("$begin -{$beforeDays} days"));
-            if($today < $begin or (!empty($end) && $today > $end)) continue;
+            if($today < $begin || (!empty($end) && $today > $end)) continue;
 
             $newTodo = $this->todoTao->buildCycleTodo($todo);
             if(isset($todo->assignedTo) && $todo->assignedTo) $newTodo->assignedDate = $now;

From 2a24f374414f44de61051e66a34f014d5efdd700 Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 10:16:18 +0000
Subject: [PATCH 57/80] * Adjust the unit test script for
 todoModel::cretaeBycycle().

---
 module/todo/test/model/createbycycle.php      | 32 ++++------------
 .../yaml/createbycycle/createbycycle.yaml     | 35 +++++++++++++++++
 module/todo/test/todo.class.php               | 38 ++++++-------------
 3 files changed, 55 insertions(+), 50 deletions(-)
 create mode 100644 module/todo/test/model/yaml/createbycycle/createbycycle.yaml

diff --git a/module/todo/test/model/createbycycle.php b/module/todo/test/model/createbycycle.php
index e8087bd0c9..692d2f5749 100755
--- a/module/todo/test/model/createbycycle.php
+++ b/module/todo/test/model/createbycycle.php
@@ -1,39 +1,23 @@
 #!/usr/bin/env php
 <?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
+include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/todo.class.php';
 su('admin');
 
+function initData()
+{
+    zdTable('todo')->config('createbycycle')->gen(3);
+}
+
 /**
 
 title=测试 todoModel->createByCycle();
 cid=1
 pid=1
 
- >> + days
-测试创建周期日待办 >> 11
-测试创建周期周待办 >> 9
-测试创建周期月待办 >> `%d`
-
 */
 
-$days  = 31;
-$begin = call_user_func_array('date', array('Y-m-d'));
-$end   = call_user_func_array('date', array('Y-m-d', strtotime("+$days days")));
-$todo1 = new stdclass();
-$todo1->name               = 'cycle生成的待办1';
-$todo1->config             = '{"specify":{"month":"0","day":"1"},"day":"1","type":"day","beforeDays":11,"end":"' . $end . '","begin":"' . $begin  . '"}';
-
-$todo2 = new stdclass();
-$todo2->name               = 'cycle生成的待办2';
-$todo2->config             = '{"specify":{"month":"0","day":"1"},"week":"2,4,7","type":"week","beforeDays":31,"end":"' . $end . '","begin":"' . $begin  . '"}';
-
-$todo3 = new stdclass();
-$todo3->name               = 'cycle生成的待办3';
-$todo3->config             = '{"specify":{"month":"0","day":"1"},"month":"1,8,13,15,27,29,30","type":"month","beforeDays":301,"end":"' . $end . '","begin":"' . $begin  . '"}';
+initData();
 
 $todo = new todoTest();
-
-r($todo->createByCycleTest($todo1)) && p() && e('11');   // 测试创建周期日待办
-r($todo->createByCycleTest($todo2)) && p() && e('9');    // 测试创建周期周待办
-r($todo->createByCycleTest($todo3)) && p() && e('`%d`'); // 测试创建周期月待办
+r($todo->createByCycleTest()) && p() && e('1');
diff --git a/module/todo/test/model/yaml/createbycycle/createbycycle.yaml b/module/todo/test/model/yaml/createbycycle/createbycycle.yaml
new file mode 100644
index 0000000000..3242ba9308
--- /dev/null
+++ b/module/todo/test/model/yaml/createbycycle/createbycycle.yaml
@@ -0,0 +1,35 @@
+title: Create cycle todos for todoModel::createCycle UTC.
+desc: Create cycle todos for todoModel::createCycle UTC.
+author: xushenjie
+version: 1.0.0
+
+fields:
+  - field: account
+    range: 'admin'
+  - field: name
+    range: '`周期待办：提前1天，间隔一天生成`, `周期待办：每月的每天，提前1天生成`, `周期待办：每周的每天，提前1天生成`'
+  - field: date
+    range: 1-5
+    prefix: '2023-05-0'
+  - field: type
+    range: 'cycle'
+  - field: cycle
+    range: 1
+  - field: begin
+    range: 0800-1100
+  - field: end
+    range: 1800-2000
+  - field: assignedTo
+    range: 'admin'
+  - field: desc
+    range: '周期待办描述'
+  - field: status
+    range: 'doing'
+  - field: objectID
+    range: 0
+  - field: assignedBy
+    range: 'admin'
+  - field: pri
+    range: 1-4
+  - field: config
+    range: '`{"specify":{"month":"0","day":"1"},"day":"1","type":"day","beforeDays":1,"end":"2030-05-31","begin":"2023-05-01"}`, `{"specify":{"month":"0","day":"1"},"month":"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","type":"month","beforeDays":1,"end":"2030-05-31","begin":"2023-05-01"}`, `{"specify":{"month":"0","day":"1"},"week":"1,2,3,4,5,6,0","type":"week","beforeDays":1,"end":"2030-05-31","begin":"2023-05-01"}`'
diff --git a/module/todo/test/todo.class.php b/module/todo/test/todo.class.php
index b4775d9b17..6bc6a314da 100755
--- a/module/todo/test/todo.class.php
+++ b/module/todo/test/todo.class.php
@@ -243,36 +243,22 @@ class todoTest
         return $object ? 1 : 2;
     }
 
-    public function createByCycleTest($todo)
+    /**
+     * Create by cycle test.
+     *
+     * @access public
+     * @return int
+     */
+    public function createByCycleTest()
     {
-        $todo->cycle        = '1';
-        $todo->type         = 'cycle';
-        $todo->pri          = 3;
-        $todo->desc         = '';
-        $todo->status       = 'wait';
-        $todo->begin        = '0830';
-        $todo->end          = '0900';
-        $todo->account      = 'admin';
-        $todo->objectID     = '0';
-        $todo->vision       = 'rnd';
-        $todo->assignedTo   = 'admin';
-        $todo->assignedBy   = 'admin';
-        $todo->assignedDate = date('Y-m-d', time());
-        $todo->date         = date('Y-m-d', time());
-
-        $todo->config = str_replace('2022-03-23', date('Y-m-d', time()), $todo->config);
+        $todoList = $this->objectModel->getValidCycleList();
+        $this->objectModel->createByCycle($todoList);
 
         global $tester;
-        $tester->dao->insert(TABLE_TODO)->data($todo)->autoCheck()->exec();
-        $todoID = $tester->dao->lastInsertID();
+        $todoIDList = array_keys($todoList);
+        $count      = $tester->dao->select('count(`id`) as count')->from(TABLE_TODO)->where('objectID')->in($todoIDList)->andWhere('deleted')->eq('0')->fetch('count');
 
-        $this->objectModel->createByCycle(array($todoID => $todo));
-
-        $objects = $tester->dao->select('id')->from(TABLE_TODO)->where('objectID')->eq($todoID)->andWhere('deleted')->eq('0')->fetchAll();
-
-        if(dao::isError()) return dao::getError();
-
-        return count($objects);
+        return dao::isError() ? 0 :1;
     }
 
     /**

From abe9641cbe157f37bd0308fa183073f4b241bb26 Mon Sep 17 00:00:00 2001
From: Lufei <lufei@easycorp.ltd>
Date: Fri, 5 May 2023 18:31:52 +0800
Subject: [PATCH 58/80] - Remove a function for form.

---
 lib/form/form.class.php | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/lib/form/form.class.php b/lib/form/form.class.php
index 94e871c3ef..97785a1a34 100644
--- a/lib/form/form.class.php
+++ b/lib/form/form.class.php
@@ -26,7 +26,7 @@ class form extends baseFixer
      * 错误信息列表。
      * Error list.
      *
-     * @var object
+     * @var array
      */
     public $errors;
 
@@ -138,17 +138,6 @@ class form extends baseFixer
         $this->data->$field = $data;
     }
 
-    /**
-     * 打印表单数据。
-     * Print the form data.
-     *
-     * @return void
-     */
-    public function a()
-    {
-        a($this->data);
-    }
-
     /**
      * 过滤表单字段数据。
      * Filter the form field data.

From 597447466565c1e8b8ab36d5e088b779f965f2cf Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 18:33:19 +0800
Subject: [PATCH 59/80] * Adjusted function param.

---
 module/todo/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/todo/model.php b/module/todo/model.php
index 126998fa92..ad92100966 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -560,7 +560,8 @@ class todoModel extends model
      * 根据待办ID更新待办数据。
      * Update todo data by id.
      *
-     * @param  array $todoIdList
+     * @param  int    $todoID
+     * @param  object $todo
      * @access public
      * @return bool
      */

From ada6ed9b879fd2a59f734ccdf224ddfea80ecb9e Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 10:35:21 +0000
Subject: [PATCH 60/80] * Reorder code of todoModel::createByCycle().

---
 module/todo/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/todo/model.php b/module/todo/model.php
index e3f1dfc39a..2c62335ee1 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -359,9 +359,10 @@ class todoModel extends model
 
         foreach($todoList as $todoID => $todo)
         {
-            $todo->config = json_decode($todo->config);
             if(!isset($validUsers[$todo->account])) continue;
 
+            $todo->config = json_decode($todo->config);
+
             $begin      = $todo->config->begin;
             $end        = $todo->config->end;
             $beforeDays = (int)$todo->config->beforeDays;

From d39d3c45e565dc0213156e2dc97946f75a7d0ff4 Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Fri, 5 May 2023 10:38:48 +0000
Subject: [PATCH 61/80] * Optimize the code of todoTao.

---
 module/todo/tao.php | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/module/todo/tao.php b/module/todo/tao.php
index 7b195d44e0..27fdf33e2c 100644
--- a/module/todo/tao.php
+++ b/module/todo/tao.php
@@ -279,7 +279,7 @@ class todoTao extends todoModel
         $todo->account = $this->app->user->account;
 
         $todo->date = $formData->rawdata->date;
-        if($formData->rawdata->switchDate == 'on' || $formData->rawdata->date == false) $todo->date = '2030-01-01';
+        if($formData->rawdata->switchDate == 'on' || !$formData->rawdata->date) $todo->date = '2030-01-01';
 
         $todo->type         = $todos->types[$loop];
         $todo->pri          = $todos->pris[$loop];
@@ -368,8 +368,8 @@ class todoTao extends todoModel
     }
 
     /**
+     * 设置周期待办数据。
      * Set cycle todo data.
-     * 设置周期待办数据
      *
      * @param  object $todoData
      * @access private
@@ -397,12 +397,12 @@ class todoTao extends todoModel
         if($todoData->config['type'] == 'week')
         {
             unset($todoData->config['day'], $todoData->config['month']);
-            $todoData->config['week'] = join(',', $todoData->config['week']);
+            $todoData->config['week'] = implode(',', $todoData->config['week']);
         }
         if($todoData->config['type'] == 'month')
         {
             unset($todoData->config['day'], $todoData->config['week']);
-            $todoData->config['month'] = join(',', $todoData->config['month']);
+            $todoData->config['month'] = implode(',', $todoData->config['month']);
         }
 
         if($todoData->config['beforeDays'] and !validater::checkInt($todoData->config['beforeDays']))
@@ -476,10 +476,7 @@ class todoTao extends todoModel
             if($todo->type == 'opportunity') $todo->name = $this->dao->findByID($todo->objectID)->from(TABLE_OPPORTUNITY)->fetch('name');
         }
 
-        if($this->config->edition != 'open')
-        {
-            if($todo->type == 'feedback') $todo->name = $this->dao->findByID($todo->objectID)->from(TABLE_FEEDBACK)->fetch('title');
-        }
+        if($this->config->edition != 'open' && $todo->type == 'feedback') $todo->name = $this->dao->findByID($todo->objectID)->from(TABLE_FEEDBACK)->fetch('title');
 
         return $todo;
     }

From aa4bc30df9029e832bd70b293363671ec1d8aa0b Mon Sep 17 00:00:00 2001
From: wangyidong <wangyidong@cnezsoft.com>
Date: Fri, 5 May 2023 18:44:28 +0800
Subject: [PATCH 62/80]  * add unit test.

---
 module/product/model.php                      |  2 +
 .../test/model/getprojectlistbyproduct.php    | 31 ++++++--
 .../test/model/getprojectstatsbyproduct.php   | 79 +++++++++----------
 module/product/test/product.class.php         | 37 +++++----
 module/program/model.php                      |  7 +-
 .../test/model/appendstattoprojects.php       | 63 +++++++++++++++
 module/program/test/model/computeprogress.php | 51 ------------
 .../test/model/computeprojecthours.php        | 31 ++++++++
 8 files changed, 187 insertions(+), 114 deletions(-)
 create mode 100755 module/program/test/model/appendstattoprojects.php
 delete mode 100755 module/program/test/model/computeprogress.php
 create mode 100755 module/program/test/model/computeprojecthours.php

diff --git a/module/product/model.php b/module/product/model.php
index 0a6fe6fa2a..ab6b3484e3 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1115,6 +1115,7 @@ class productModel extends model
     }
 
     /**
+     * 获取与该产品关联的项目列表。
      * Get project list by product.
      *
      * @param  int         $productID
@@ -1143,6 +1144,7 @@ class productModel extends model
     }
 
     /**
+     * 根据产品，获取与该产品关联的项目的统计信息。
      * Get project stats by product.
      *
      * @param  int       $productID
diff --git a/module/product/test/model/getprojectlistbyproduct.php b/module/product/test/model/getprojectlistbyproduct.php
index a5f05cbf15..5ab167822d 100755
--- a/module/product/test/model/getprojectlistbyproduct.php
+++ b/module/product/test/model/getprojectlistbyproduct.php
@@ -46,8 +46,29 @@ $product->app->user->admin = true;
 $product->app->moduleName = 'product';
 $product->app->methodName = 'project';
 
-r(count($product->getProjectListByProduct($productID = 0, 'all',    '',    'order_desc')))   && p() && e('0');
-r(count($product->getProjectListByProduct($productID = 1, 'all',    '',    'order_desc')))   && p() && e('20');
-r(count($product->getProjectListByProduct($productID = 1, 'all',    '0',   'order_desc')))   && p() && e('17');
-r(count($product->getProjectListByProduct($productID = 1, 'undone', '',    'order_desc')))   && p() && e('15');
-r(count($product->getProjectListByProduct($productID = 1, 'wait',   'all', 'order_desc')))   && p() && e('5');
+r(count($product->getProjectListByProduct($productID = 0, 'all',    '',    false, 'order_desc')))   && p() && e('0');
+r(count($product->getProjectListByProduct($productID = 1, 'all',    '',    false, 'order_desc')))   && p() && e('20');
+r(count($product->getProjectListByProduct($productID = 1, 'all',    '0',   false, 'order_desc')))   && p() && e('17');
+r(count($product->getProjectListByProduct($productID = 1, 'undone', '',    false, 'order_desc')))   && p() && e('15');
+r(count($product->getProjectListByProduct($productID = 1, 'wait',   'all', false, 'order_desc')))   && p() && e('5');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc', $pager))) && p() && e('20');
+
+$pager = new pager(0, 5, 1);
+r(count($product->getProjectListByProduct($productID = 1, 'all', '', false, 'order_desc', $pager))) && p() && e('5');
+
+$product->app->user->admin = false;
+$product->app->user->view->projects = '1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21,48,49,50';
+r(count($product->getProjectListByProduct($productID = 1, 'all',    '',    true, 'order_desc')))   && p() && e('4');
+r(count($product->getProjectListByProduct($productID = 1, 'all',    '0',   true, 'order_desc')))   && p() && e('4');
+r(count($product->getProjectListByProduct($productID = 1, 'undone', '',    true, 'order_desc')))   && p() && e('2');
+r(count($product->getProjectListByProduct($productID = 1, 'wait',   'all', true, 'order_desc')))   && p() && e('0');
+
+$product->app->loadClass('pager', $static = true);
+$pager = new pager(0, 50, 1);
+r(count($product->getProjectListByProduct($productID = 1, 'all', '', true, 'order_desc', $pager))) && p() && e('4');
+
+$pager = new pager(0, 5, 1);
+r(count($product->getProjectListByProduct($productID = 1, 'all', '', true, 'order_desc', $pager))) && p() && e('4');
diff --git a/module/product/test/model/getprojectstatsbyproduct.php b/module/product/test/model/getprojectstatsbyproduct.php
index 2aa0334415..9ec4b69bbb 100755
--- a/module/product/test/model/getprojectstatsbyproduct.php
+++ b/module/product/test/model/getprojectstatsbyproduct.php
@@ -3,55 +3,48 @@
 include dirname(__FILE__, 5) . "/test/lib/init.php";
 include dirname(__FILE__, 2) . '/product.class.php';
 
+zdTable('product')->gen(50);
+zdTable('user')->gen(50);
+
+$project = zdTable('project');
+$project->PM->range('user2,user3');
+$project->gen(50);
+
+$task = zdTable('task');
+$task->project->range('1-20');
+$task->gen(100);
+
+$team = zdTable('team');
+$team->root->range('1-50');
+$team->type->range('project');
+$team->account->range('admin,admin,user1,user1');
+$team->days->range('5');
+$team->hours->range('6,7');
+$team->gen(50);
+
+$stakeholder = zdTable('stakeholder');
+$stakeholder->objectType->range('project');
+$stakeholder->objectID->range('1-50');
+$stakeholder->user->range('user4,user5');
+$stakeholder->type->range('inside');
+$stakeholder->from->range('');
+$stakeholder->gen(50);
+
+$projectproduct = zdTable('projectproduct');
+$projectproduct->product->range('1-2');
+$projectproduct->project->range('1-50');
+$projectproduct->gen(50);
+
 /**
 
-title=productModel->getProjectStatsByProduct();
+title=productModel->getProjectStatsByProductTest();
 cid=1
 pid=1
 
-测试获取产品1的 browseType为all的信息 >> 项目1;项目11
-测试获取产品1的 browseType为unclosed的信息 >> 0
-测试获取产品1的 browseType为unplan的信息 >> 0
-测试获取产品1的 browseType为allstory的信息 >> 0
-测试获取产品2的 browseType为all的信息 >> 项目2;项目12
-测试获取产品2的 browseType为assignedtome的信息 >> 0
-测试获取产品2的 browseType为openedbyme的信息 >> 0
-测试获取产品2的 browseType为reviewedbyme的信息 >> 0
-测试获取产品3的 browseType为all的信息 >> 项目3;项目13
-测试获取产品3的 browseType为reviewbyme的信息 >> 0
-测试获取产品3的 browseType为closedbyme的信息 >> 0
-测试获取产品3的 browseType为draftstory的信息 >> 0
-测试获取产品4的 browseType为all的信息 >> 项目4;项目14
-测试获取产品4的 browseType为activestory的信息 >> 0
-测试获取产品4的 browseType为changedstory的信息 >> 0
-测试获取产品5的 browseType为all的信息 >> 项目5;项目15
-测试获取产品5的 browseType为willclose的信息 >> 0
-测试获取产品5的 browseType为closedstory的信息 >> 0
-测试获取不存在产品的信息 >> 0
-
 */
 
-$productIDList = array('1', '2', '3', '4', '5', '1000001');
-$browseType    = array('unclosed', 'unplan', 'allstory', 'assignedtome', 'openedbyme', 'reviewedbyme', 'reviewbyme', 'closedbyme', 'draftstory', 'activestory', 'changedstory', 'willclose', 'closedstory');
-
 $product = new productTest('admin');
 
-r($product->getProjectStatsByProductTest($productIDList[0]))                  && p('11;21') && e('项目1;项目11');   // 测试获取产品1的 browseType为all的信息
-r($product->getProjectStatsByProductTest($productIDList[0], $browseType[0]))  && p()        && e('0');              // 测试获取产品1的 browseType为unclosed的信息
-r($product->getProjectStatsByProductTest($productIDList[0], $browseType[1]))  && p()        && e('0');              // 测试获取产品1的 browseType为unplan的信息
-r($product->getProjectStatsByProductTest($productIDList[0], $browseType[2]))  && p()        && e('0');              // 测试获取产品1的 browseType为allstory的信息
-r($product->getProjectStatsByProductTest($productIDList[1]))                  && p('12;22') && e('项目2;项目12');   // 测试获取产品2的 browseType为all的信息
-r($product->getProjectStatsByProductTest($productIDList[1], $browseType[3]))  && p()        && e('0');              // 测试获取产品2的 browseType为assignedtome的信息
-r($product->getProjectStatsByProductTest($productIDList[1], $browseType[4]))  && p()        && e('0');              // 测试获取产品2的 browseType为openedbyme的信息
-r($product->getProjectStatsByProductTest($productIDList[1], $browseType[5]))  && p()        && e('0');              // 测试获取产品2的 browseType为reviewedbyme的信息
-r($product->getProjectStatsByProductTest($productIDList[2]))                  && p('13;23') && e('项目3;项目13');   // 测试获取产品3的 browseType为all的信息
-r($product->getProjectStatsByProductTest($productIDList[2], $browseType[6]))  && p()        && e('0');              // 测试获取产品3的 browseType为reviewbyme的信息
-r($product->getProjectStatsByProductTest($productIDList[2], $browseType[7]))  && p()        && e('0');              // 测试获取产品3的 browseType为closedbyme的信息
-r($product->getProjectStatsByProductTest($productIDList[2], $browseType[8]))  && p()        && e('0');              // 测试获取产品3的 browseType为draftstory的信息
-r($product->getProjectStatsByProductTest($productIDList[3]))                  && p('14;24') && e('项目4;项目14');   // 测试获取产品4的 browseType为all的信息
-r($product->getProjectStatsByProductTest($productIDList[3], $browseType[9]))  && p()        && e('0');              // 测试获取产品4的 browseType为activestory的信息
-r($product->getProjectStatsByProductTest($productIDList[3], $browseType[10])) && p()        && e('0');              // 测试获取产品4的 browseType为changedstory的信息
-r($product->getProjectStatsByProductTest($productIDList[4]))                  && p('15;25') && e('项目5;项目15');   // 测试获取产品5的 browseType为all的信息
-r($product->getProjectStatsByProductTest($productIDList[4], $browseType[11])) && p()        && e('0');              // 测试获取产品5的 browseType为willclose的信息
-r($product->getProjectStatsByProductTest($productIDList[4], $browseType[12])) && p()        && e('0');              // 测试获取产品5的 browseType为closedstory的信息
-r($product->getProjectStatsByProductTest($productIDList[5]))                  && p()        && e('0');              // 测试获取不存在产品的信息
\ No newline at end of file
+r($product->getProjectStatsByProductTest($productID = 0, 'all', '', false, 'order_desc')) && p() && e('0');
+r($product->getProjectStatsByProductTest($productID = 1, 'all', '', false, 'order_desc')) && p('11:totalConsumed,totalEstimate,totalLeft,progress,teamCount') && e('15,30,10,60,1');
+r($product->getProjectStatsByProductTest($productID = 1, 'all', '', true,  'order_desc')) && p('17:totalConsumed,totalEstimate,totalLeft,progress,teamCount') && e('45,27,11,80,1');
diff --git a/module/product/test/product.class.php b/module/product/test/product.class.php
index d84aff0887..ac8734e644 100644
--- a/module/product/test/product.class.php
+++ b/module/product/test/product.class.php
@@ -699,28 +699,37 @@ class productTest
     }
 
     /**
-     * Test get project stats by product.
+     * 测试 getProjectStatsByProduct 方法。
+     * Test getProjectStatsByProduct method.
      *
-     * @param  int    $productID
-     * @param  string $browseType
+     * @param  int         $productID
+     * @param  string      $browseType
+     * @param  string      $branch
+     * @param  bool        $involved
+     * @param  string      $order
+     * @param  object|null $pager
      * @access public
      * @return array
      */
-    public function getProjectStatsByProductTest($productID, $browseType = 'all')
+    public function getProjectStatsByProductTest(int $productID, string $browseType = 'all', string $branch = '', bool $involved = false, string $orderBy = 'order_desc', object|null $pager = null): array
     {
-        $objects = $this->objectModel->getProjectStatsByProduct($productID, $browseType);
+        $objects = $this->objectModel->getProjectStatsByProduct($productID, $browseType, $branch, $involved, $orderBy, $pager);
 
-        foreach($objects as $object) $projects[$object->id] = $object->name;
-
-
-        if(dao::isError())
+        $projects = array();
+        foreach($objects as $object)
         {
-            return dao::getError();
-        }
-        else
-        {
-            return isset($projects) ? $projects : array();
+            $project = new stdclass();
+            $project->id            = $object->id;
+            $project->totalConsumed = $object->hours->totalConsumed;
+            $project->totalEstimate = $object->hours->totalEstimate;
+            $project->totalLeft     = $object->hours->totalLeft;
+            $project->progress      = $object->hours->progress;
+            $project->teamCount     = $object->teamCount;
+            $projects[$project->id] = $project;
         }
+
+        if(dao::isError()) return dao::getError();
+        return $projects;
     }
 
     /**
diff --git a/module/program/model.php b/module/program/model.php
index 40b7594511..61234a2d5d 100644
--- a/module/program/model.php
+++ b/module/program/model.php
@@ -526,6 +526,8 @@ class programModel extends model
      */
     public function computeProjectHours(array $tasks): array
     {
+        if(empty($tasks)) return array();
+
         $hours = array();
         foreach($tasks as $projectID => $projectTasks)
         {
@@ -540,7 +542,7 @@ class programModel extends model
             {
                 $hour->totalConsumed += $task->consumed;
                 $hour->totalEstimate += $task->estimate;
-                if($task->status != 'cancel' and $task->status != 'closed') $hour->totalLeft += $task->left;
+                if(strpos('|cancel|closed|done|', "|{$task->status}|") === false) $hour->totalLeft += $task->left;
             }
             $hours[$projectID] = $hour;
         }
@@ -571,6 +573,9 @@ class programModel extends model
      */
     public function appendStatToProjects(array $projects, string $appendFields = '', array $data = array()): array
     {
+        if(empty($projects)) return array();
+        if(empty($appendFields) or empty($data)) return $projects;
+
         $appendFields = explode(',', $appendFields);
         $emptyHour    = json_decode(json_encode(array('totalEstimate' => 0, 'totalConsumed' => 0, 'totalLeft' => 0, 'progress' => 0)));
         /* Process projects. */
diff --git a/module/program/test/model/appendstattoprojects.php b/module/program/test/model/appendstattoprojects.php
new file mode 100755
index 0000000000..7b1fbb9816
--- /dev/null
+++ b/module/program/test/model/appendstattoprojects.php
@@ -0,0 +1,63 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+
+zdTable('project')->gen(50);
+
+$task = zdTable('task');
+$task->project->range('1-20');
+$task->gen(100);
+
+/**
+
+title=测试 programModel::create();
+cid=1
+pid=1
+
+*/
+
+global $tester;
+$tester->loadModel('program');
+
+$projectID = 11;
+$hour      = new stdclass();
+$hour->totalConsumed = 15;
+$hour->totalEstimate = 30;
+$hour->totalLeft     = 10;
+$hour->progress      = 60;
+$hours[$projectID]   = $hour;
+
+$projects = $tester->program->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetchAll('id');
+$teams    = $tester->program->dao->select('t1.root,t1.account')->from(TABLE_TEAM)->alias('t1')
+    ->leftJoin(TABLE_USER)->alias('t2')->on('t1.account=t2.account')
+    ->where('t1.root')->eq($projectID)
+    ->andWhere('t1.type')->eq('project')
+    ->andWhere('t2.deleted')->eq(0)
+    ->fetchGroup('root', 'account');
+$leftTasks = $tester->program->dao->select('t2.parent as project, count(*) as tasks')->from(TABLE_TASK)->alias('t1')
+    ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
+    ->where('t1.project')->eq($projectID)
+    ->andWhere('t1.status')->notIn('cancel,closed')
+    ->groupBy('t2.parent')
+    ->fetchAll('project');
+
+
+r($tester->program->appendStatToProjects(array()))   && p() && e('0');    //不传入任何数据
+r($tester->program->appendStatToProjects($projects)) && p('11:id') && e('11'); //只传入项目数据
+
+$stats = $tester->program->appendStatToProjects($projects, 'hours');
+r(isset($stats[$projectID]->hours)) && p() && e('0');      //只传入项目数据和hours追加字段
+$stats = $tester->program->appendStatToProjects($projects, 'teamCount');
+r(isset($stats[$projectID]->teamCount)) && p() && e('0');  //只传入项目数据和teamCount追加字段
+$stats = $tester->program->appendStatToProjects($projects, 'teamMembers');
+r(isset($stats[$projectID]->teamMembers)) && p() && e('0'); //只传入项目数据和teamMembers追加字段
+$stats = $tester->program->appendStatToProjects($projects, 'leftTasks');
+r(isset($stats[$projectID]->leftTasks)) && p() && e('0'); //只传入项目数据和leftTasks追加字段
+
+$stats = $tester->program->appendStatToProjects($projects, 'hours,teamCount,teamMembers,leftTasks', array('hours' => $hours, 'teams' => $teams, 'leftTasks' => $leftTasks));
+$stat  = $stats[$projectID];
+r(isset($stat->hours))       && p() && e('1'); //正常传入数据，检查hours字段
+r(isset($stat->teamCount))   && p() && e('1'); //正常传入数据，检查teamCount字段
+r(isset($stat->teamMembers)) && p() && e('1'); //正常传入数据，检查teamMembers字段
+r(isset($stat->leftTasks))   && p() && e('1'); //正常传入数据，检查leftTasks字段
+
diff --git a/module/program/test/model/computeprogress.php b/module/program/test/model/computeprogress.php
deleted file mode 100755
index c8332362f3..0000000000
--- a/module/program/test/model/computeprogress.php
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . "/test/lib/init.php";
-
-/**
-
-title=测试 programModel::create();
-cid=1
-pid=1
-
-传入任务数组，返回计算后的总消耗 >> 13
-传入任务数组，返回计算后的总预计 >> 15
-传入任务数组，返回计算后的总剩余 >> 7
-传入任务数组，返回计算后的总工时 >> 20
-传入任务数组，返回计算后的进度 >> 65
-
-*/
-
-global $tester;
-$tester->loadModel('program');
-$task1 = new stdclass();
-$task1->consumed = 2;
-$task1->left     = 2;
-$task1->estimate = 2;
-$task1->status   = 'active';
-
-$task2 = new stdclass();
-$task2->consumed = 4;
-$task2->left     = 5;
-$task2->estimate = 6;
-$task2->status   = 'active';
-
-$task3 = new stdclass();
-$task3->consumed = 7;
-$task3->left     = 7;
-$task3->estimate = 7;
-$task3->status   = 'closed';
-
-$tasks[] = $task1;
-$tasks[] = $task2;
-$tasks[] = $task3;
-
-$projectTasks[1] = $tasks;
-
-$hours = $tester->program->computeProgress($projectTasks);
-
-r($hours) && p('1:totalConsumed') && e('13'); // 传入任务数组，返回计算后的总消耗
-r($hours) && p('1:totalEstimate') && e('15'); // 传入任务数组，返回计算后的总预计
-r($hours) && p('1:totalLeft')     && e('7');  // 传入任务数组，返回计算后的总剩余
-r($hours) && p('1:totalReal')     && e('20'); // 传入任务数组，返回计算后的总工时
-r($hours) && p('1:progress')      && e('65'); // 传入任务数组，返回计算后的进度
\ No newline at end of file
diff --git a/module/program/test/model/computeprojecthours.php b/module/program/test/model/computeprojecthours.php
new file mode 100755
index 0000000000..90b8161140
--- /dev/null
+++ b/module/program/test/model/computeprojecthours.php
@@ -0,0 +1,31 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+
+zdTable('project')->gen(50);
+
+$task = zdTable('task');
+$task->project->range('1-20');
+$task->gen(100);
+
+/**
+
+title=测试 programModel::create();
+cid=1
+pid=1
+
+*/
+
+global $tester;
+$tester->loadModel('program');
+$tasks = $tester->program->dao->select('id, project, estimate, consumed, `left`, status, closedReason, execution')
+    ->from(TABLE_TASK)
+    ->where('project')->eq('11')
+    ->andWhere('parent')->lt(1)
+    ->andWhere('deleted')->eq(0)
+    ->fetchGroup('project', 'id');
+
+$hours = $tester->program->computeProjectHours($tasks);
+
+r($tester->program->computeProjectHours(array())) && p() && e('0');
+r($tester->program->computeProjectHours($tasks))  && p('11:totalConsumed,totalEstimate,totalLeft,progress') && e('15,30,10,60');

From 0521d95fb0db6b9cdc3a716a7e68f32df6f83643 Mon Sep 17 00:00:00 2001
From: sunhao <sunhao@easycorp.ltd>
Date: Fri, 5 May 2023 18:56:24 +0800
Subject: [PATCH 63/80] * zin: split form widget to form and formbase

---
 lib/zin/wg/form/v1.php     | 81 ++++++++++++---------------------
 lib/zin/wg/formbase/v1.php | 91 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 120 insertions(+), 52 deletions(-)
 create mode 100644 lib/zin/wg/formbase/v1.php

diff --git a/lib/zin/wg/form/v1.php b/lib/zin/wg/form/v1.php
index ee0bb3a158..4121410604 100644
--- a/lib/zin/wg/form/v1.php
+++ b/lib/zin/wg/form/v1.php
@@ -3,29 +3,28 @@ namespace zin;
 
 require_once dirname(__DIR__) . DS . 'formgroup' . DS . 'v1.php';
 require_once dirname(__DIR__) . DS . 'formrow' . DS . 'v1.php';
+require_once dirname(__DIR__) . DS . 'formbase' . DS . 'v1.php';
 
-class form extends wg
+/**
+ * 通用表单（form）部件类，支持 Ajax 提交
+ * The common form widget class
+ */
+class form extends formBase
 {
-    protected static $defineProps = array(
-        'method?: string',
-        'url?: string',
-        'actions?: array',
-        'target?: string',
+    protected static $defineProps = array
+    (
         'items?: array',
         'grid?: bool',
-        'labelWidth?: int',
-        'submitBtnText?: string',
-        'cancelBtnText?: string',
+        'labelWidth?: int'
     );
 
-    protected static $defaultProps = array(
+    protected static $defaultProps = array
+    (
         'grid'          => true,
-        'method'        => 'post',
-        'target'        => 'ajax',
-        'actions'       => ['submit', 'cancel'],
+        'actionsClass'  => 'form-group gap-4 no-label'
     );
 
-    public function onBuildItem($item)
+    public function onBuildItem(item|array $item): wg
     {
         if(!($item instanceof item))
         {
@@ -38,32 +37,26 @@ class form extends wg
         return new formGroup(inherit($item));
     }
 
-    protected function buildFormActions()
+    protected function buildActions(): wg
     {
-        $actions = $this->prop('actions');
-        if(empty($actions)) return NULL;
+        $actions = parent::buildActions();
+        if($this->prop('grid') && !empty($actions)) $actions = div(setClass('form-row'), $actions);
+        return $actions;
+    }
+    
+    protected function buildProps(): array
+    {
+        list($grid, $labelWidth) = $this->prop(array('grid', 'labelWidth'));
+        $props = parent::buildProps();
+        if($grid)               $props[] = set::class('form-grid');
+        if(!empty($labelWidth)) $props[] = setCssVar('form-label-width', $labelWidth);
 
-        global $lang;
-        foreach($actions as $key => $action)
-        {
-            if($action === 'submit')     $actions[$key] = ['text' => $this->prop('submitBtnText') ?? $lang->save, 'btnType' => 'submit', 'type' => 'primary'];
-            elseif($action === 'cancel') $actions[$key] = ['text' => $this->prop('cancelBtnText') ?? $lang->goback, 'url' => html::getGobackLink()];
-            elseif(is_string($action))   $actions[$key] = ['text' => $action];
-        }
-
-        return toolbar
-        (
-            set::class('form-actions form-group gap-4 no-label'),
-            set::items($actions)
-        );
+        return $props;
     }
 
-    protected function build()
+    protected function buildContent(): array
     {
-        list($items, $grid, $labelWidth, $url, $target, $method, $id) = $this->prop(['items', 'grid', 'labelWidth', 'url', 'target', 'method', 'id']);
-
-        $actions = $this->buildFormActions();
-        if($grid && !empty($actions)) $actions = div(setClass('form-row'), $actions);
+        list($items, $grid) = $this->prop(['items', 'grid']);
 
         $list     = is_array($items) ? array_map(array($this, 'onBuildItem'), $items) : [];
         $children = $this->children();
@@ -76,23 +69,7 @@ class form extends wg
                 if($item instanceof formGroup) $list[$key] = new formRow($item);
             }
         }
-        $isAjax = $target === 'ajax';
-        if($isAjax)
-        {
-            $target = NULL;
-            if(empty($id)) $id = $this->gid;
-        }
-        if(empty($url)) $url = $_SERVER['REQUEST_URI'];
 
-        return h::form
-        (
-            set::class('form load-indicator', $grid ? 'form-grid' : NULL, $isAjax ? 'form-ajax' : ''),
-            set(['id' => $id, 'action' => $url, 'target' => $target, 'method' => $method]),
-            set($this->getRestProps()),
-            empty($labelWidth) ? NULL : setCssVar('form-label-width', $labelWidth),
-            $list,
-            $actions,
-            $isAjax ? zui::ajaxForm(set::_to("#$id")) : NULL
-        );
+        return $list;
     }
 }
diff --git a/lib/zin/wg/formbase/v1.php b/lib/zin/wg/formbase/v1.php
new file mode 100644
index 0000000000..3e7f41a893
--- /dev/null
+++ b/lib/zin/wg/formbase/v1.php
@@ -0,0 +1,91 @@
+<?php
+declare(strict_types=1);
+/**
+ * The formBase widget class file of zin module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+ * @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      sunhao<sunhao@easycorp.ltd>
+ * @package     zin
+ * @link        http://www.zentao.net
+ */
+namespace zin;
+
+/**
+ * 基础表单（formBase）部件类，支持 Ajax 提交
+ * The formBase widget class
+ */
+class formBase extends wg
+{
+    protected static $defineProps = array
+    (
+        'method?: string',
+        'url?: string',
+        'actions?: array',
+        'actionsClass?: string',
+        'target?: string',
+        'submitBtnText?: string',
+        'cancelBtnText?: string',
+    );
+
+    protected static $defaultProps = array
+    (
+        'method'        => 'post',
+        'target'        => 'ajax',
+        'actions'       => ['submit', 'cancel'],
+    );
+
+    protected function buildActions(): wg
+    {
+        $actions = $this->prop('actions');
+        if(empty($actions)) return NULL;
+
+        global $lang;
+        foreach($actions as $key => $action)
+        {
+            if($action === 'submit')     $actions[$key] = ['text' => $this->prop('submitBtnText') ?? $lang->save, 'btnType' => 'submit', 'type' => 'primary'];
+            elseif($action === 'cancel') $actions[$key] = ['text' => $this->prop('cancelBtnText') ?? $lang->goback, 'url' => html::getGobackLink()];
+            elseif(is_string($action))   $actions[$key] = ['text' => $action];
+        }
+
+        return toolbar
+        (
+            set::class('form-actions', $this->prop('actionsClass')),
+            set::items($actions)
+        );
+    }
+
+    protected function buildContent(): array|wg
+    {
+        return $this->children();
+    }
+
+    protected function buildProps(): array
+    {
+        return array();
+    }
+
+    protected function build(): wg
+    {
+        list($url, $target, $method, $id) = $this->prop(['url', 'target', 'method', 'id']);
+
+        $isAjax = $target === 'ajax';
+        if($isAjax)
+        {
+            $target = NULL;
+            if(empty($id)) $id = $this->gid;
+        }
+        if(empty($url)) $url = $_SERVER['REQUEST_URI'];
+
+        return h::form
+        (
+            set::class('form load-indicator', $isAjax ? 'form-ajax' : ''),
+            set(['id' => $id, 'action' => $url, 'target' => $target, 'method' => $method]),
+            set($this->getRestProps()),
+            $this->buildProps(),
+            $this->buildContent(),
+            $this->buildActions(),
+            $isAjax ? zui::ajaxForm(set::_to("#$id")) : NULL
+        );
+    }
+}

From b0b1e45dbc0894f3ace0085c9ddac05aa7aea173 Mon Sep 17 00:00:00 2001
From: dingyongliang <dingyongliang@easycorp.ltd>
Date: Fri, 5 May 2023 18:56:37 +0800
Subject: [PATCH 64/80] * refactor tabs wg.

---
 lib/zin/wg/tabs/css/v1.css |  2 +
 lib/zin/wg/tabs/v1.php     | 92 ++++++++++++++++++++++++++------------
 2 files changed, 66 insertions(+), 28 deletions(-)
 create mode 100644 lib/zin/wg/tabs/css/v1.css

diff --git a/lib/zin/wg/tabs/css/v1.css b/lib/zin/wg/tabs/css/v1.css
new file mode 100644
index 0000000000..b97d80eb2b
--- /dev/null
+++ b/lib/zin/wg/tabs/css/v1.css
@@ -0,0 +1,2 @@
+.nav-tabs>.nav-item.active>a {color: var(--color-primary-500);}
+.nav-tabs>.nav-item.active>a:after {border-bottom-color: var(--color-primary-500) !important; border-bottom-width: 2px;}
diff --git a/lib/zin/wg/tabs/v1.php b/lib/zin/wg/tabs/v1.php
index 8cbc51ca60..1316caeb0e 100644
--- a/lib/zin/wg/tabs/v1.php
+++ b/lib/zin/wg/tabs/v1.php
@@ -10,6 +10,11 @@ class tabs extends wg
         'activeID?string'
     );
 
+    public static function getPageCSS()
+    {
+        return file_get_contents(__DIR__ . DS . 'css' . DS . 'v1.css');
+    }
+
     protected function getItemID(array $item): string
     {
         return isset($item['id']) ? $item['id'] : $this->gid;
@@ -17,7 +22,8 @@ class tabs extends wg
 
     protected function buildLabelView(string $id, array $item)
     {
-        $isActive = $this->prop('activeID') == $id;
+        if(!isset($item['label'])) return null;
+        $isActive = $this->prop('activeID') == $id || (isset($item['active']) && $item['active']);
         return li
         (
             setClass('nav-item'),
@@ -25,6 +31,7 @@ class tabs extends wg
             a
             (
                 set('data-toggle', 'tab'),
+                setClass('font-medium'),
                 set::href("#$id"),
                 $item['label']
             )
@@ -33,57 +40,86 @@ class tabs extends wg
 
     protected function buildContentView(string $id, array $item)
     {
-        $isActive = $this->prop('activeID') == $id;
+        if(!isset($item['data'])) return null;
+        $isActive = $this->prop('activeID') == $id || (isset($item['active']) && $item['active']);
         return div
         (
             setClass('tab-pane'),
             setID($id),
             $isActive ? setClass('active') : null,
-            isset($item['data']) ? $item['data'] : null
+            $item['data']
+        );
+    }
+
+    protected function buildTabHeader($labelViews)
+    {
+        if(empty($labelViews)) return null;
+
+        $isVertical = $this->prop('direction') === 'v';
+        return ul
+        (
+            setClass('nav nav-tabs'),
+            $isVertical ? setClass('nav-stacked') : null,
+            $labelViews
+        );
+    }
+
+    protected function buildTabBody($contentViews)
+    {
+        if(empty($contentViews)) return null;
+
+        return div
+        (
+            setClass('tab-content'),
+            $contentViews
         );
     }
 
     protected function build()
     {
-        $items     = $this->prop('items');
-        $direction = $this->prop('direction');
-        $activeID  = $this->prop('activeID');
+        $items = $this->prop('items');
+        // $activeID  = $this->prop('activeID');
+        $isVertical = $this->prop('direction') === 'v';
 
-        if(empty($items)) return null;
+        if(empty($items))
+        {
+            return div
+            (
+                set($this->props->skip(array_keys(static::getDefinedProps()))),
+                $isVertical ? setClass('flex') : null,
+
+                $this->children()
+            );
+        }
 
         $labelViews  = array();
         $contentViews = array();
         foreach($items as $item)
         {
             $id = $this->getItemID($item);
-            $labelViews[] = $this->buildLabelView($id, $item);
-            $contentViews[] = $this->buildContentView($id, $item);
+
+            $labelView   = $this->buildLabelView($id, $item);
+            $contentView = $this->buildContentView($id, $item);
+            if(!empty($labelView))   $labelViews[]   = $labelView;
+            if(!empty($contentView)) $contentViews[] = $contentView;
+
         }
 
         /* There is no active item, then set index 0 to be actived. */
-        if(empty($activeID))
-        {
-            $labelViews[0]->setProp('class', 'active');
-            $contentViews[0]->setProp('class', 'active');
-        }
+        // if(empty($activeID))
+        // {
+        //     $labelViews[0]->setProp('class', 'active');
+        //     $contentViews[0]->setProp('class', 'active');
+        // }
 
         return div
         (
             set($this->props->skip(array_keys(static::getDefinedProps()))),
-            $direction == 'v' ? setClass('flex') : null,
-            /* Tabs. */
-            ul
-            (
-                setClass('nav nav-tabs'),
-                $direction == 'v' ? setClass('nav-stacked') : null,
-                $labelViews
-            ),
-            /* Content. */
-            div
-            (
-                setClass('tab-content'),
-                $contentViews
-            )
+            $isVertical ? setClass('flex') : null,
+
+            $this->buildTabHeader($labelViews),
+            $this->buildTabBody($contentViews),
+            $this->children()
         );
     }
 }

From 845e55974c5011d13ca8880c89dc5b4c9d10b27a Mon Sep 17 00:00:00 2001
From: Wangyuting <851424971@qq.com>
Date: Fri, 5 May 2023 18:56:52 +0800
Subject: [PATCH 65/80] * Finish projectstatisticblock css.

---
 module/block/control.php                      |  2 +-
 .../block/ui/projectstatisticblock.html.php   | 65 ++++++++++++++++++-
 2 files changed, 63 insertions(+), 4 deletions(-)

diff --git a/module/block/control.php b/module/block/control.php
index ede59744f9..b4d7d8f5e4 100755
--- a/module/block/control.php
+++ b/module/block/control.php
@@ -93,7 +93,7 @@ class block extends control
         $this->view->dashboard = $block->dashboard;
         $this->view->module    = $module ? $module : $block->module;
         $this->view->modules   = $this->blockZen->getAvailableModules($block->dashboard);
-        $this->view->codes     = $this->blockZen->getAvailableBlocks($block->dashboard, $this->view->module);
+        $this->view->codes     = $this->blockZen->getAvailableCodes($block->dashboard, $this->view->module);
         $this->view->code      = $this->view->codes ? (in_array($code, array_keys($this->view->codes)) ? $code : '') : $code;
         $this->view->params    = $this->blockZen->getAvailableParams($block->dashboard, $this->view->module, $this->view->code);
         $this->display();
diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php
index 200b0b274d..56c03cc4d3 100644
--- a/module/block/ui/projectstatisticblock.html.php
+++ b/module/block/ui/projectstatisticblock.html.php
@@ -11,9 +11,10 @@ declare(strict_types=1);
 
 namespace zin;
 
-$blockNavID = 'nav-' . uniqid();
-$selected   = key($projects);
-$navTabs    = array();
+$isChineseLang = in_array($this->app->getClientLang(), array('zh-cn','zh-tw'));
+$blockNavID    = 'nav-' . uniqid();
+$selected      = key($projects);
+$navTabs       = array();
 foreach($projects as $project)
 {
     $navTabs[] = li
@@ -304,6 +305,64 @@ foreach($projects as $project)
                     $lang->project->budget . ' : ' . ($project->budget != 0 ? $project->budget : $this->lang->project->future)
                 ),
                 div(set('class', 'flex-1'))
+            ),
+            div
+            (
+                set('class', 'flex'),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $isChineseLang ? $lang->project->pv . '(' . $lang->project->pvTitle . ')' : $lang->project->pv
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $isChineseLang ? $lang->project->ev . '(' . $lang->project->evTitle . ')' : $lang->project->ev
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $isChineseLang ? $lang->project->ac . '(' . $lang->project->acTitle . ')' : $lang->project->ac
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $isChineseLang ? $lang->project->sv . '(' . $lang->project->svTitle . ')' : $lang->project->sv
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $isChineseLang ? $lang->project->cv . '(' . $lang->project->cvTitle . ')' : $lang->project->cv
+                )
+            ),
+            div
+            (
+                set('class', 'flex'),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $project->pv
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $project->ev
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $project->ac
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $project->sv
+                ),
+                div
+                (
+                    set('class', 'flex-1'),
+                    $project->cv
+                )
             )
         )
     );

From c1be1a1e9b977a808b2810361c7f2ce18a7c1449 Mon Sep 17 00:00:00 2001
From: jukui <jukui@easycorp.ltd>
Date: Fri, 5 May 2023 19:09:13 +0800
Subject: [PATCH 66/80] * Modify getList function param type for todo model.

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

diff --git a/module/todo/model.php b/module/todo/model.php
index 2c62335ee1..fc9589f78e 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -238,12 +238,12 @@ class todoModel extends model
     /**
      * Get todo list of a user.
      *
-     * @param  string $type
-     * @param  string $account
-     * @param  string $status   all|today|thisweek|lastweek|before, or a date.
-     * @param  int    $limit
-     * @param  object $pager
-     * @param  string $orderBy
+     * @param  string  $type
+     * @param  string  $account
+     * @param  string|array $status   all|today|thisweek|lastweek|before, or a date.
+     * @param  int     $limit
+     * @param  ?object $pager
+     * @param  string  $orderBy
      * @access public
      * @return array
      */

From 36e723769db3c4bdc17322ab55dc7f0601c2b1fb Mon Sep 17 00:00:00 2001
From: lanzongjun <lanzongjun@easycorp.ltd>
Date: Fri, 5 May 2023 19:14:48 +0800
Subject: [PATCH 67/80] * Adjusted gantt data func.

---
 module/programplan/model.php | 51 +++++++++++++++++++++++-------------
 1 file changed, 33 insertions(+), 18 deletions(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 97899d5f98..2e82c2780b 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -150,6 +150,7 @@ class programplanModel extends model
     }
 
     /**
+     * 获取甘特图页面数据。
      * Get gantt data.
      *
      * @param  int     $executionID
@@ -160,27 +161,14 @@ class programplanModel extends model
      * @access public
      * @return string
      */
-    public function getDataForGantt($executionID, $productID, $baselineID = 0, $selectCustom = '', $returnJson = true)
+    public function getDataForGantt(int $executionID, int $productID, int $baselineID = 0, string $selectCustom = '', bool $returnJson = true): string
     {
         $this->loadModel('stage');
         $this->loadModel('execution');
 
         $plans = $this->getStage($executionID, $productID, 'all', 'order');
-        if($baselineID)
-        {
-            $baseline = $this->loadModel('cm')->getByID($baselineID);
-            $oldData  = json_decode($baseline->data);
-            $oldPlans = $oldData->stage;
-            foreach($oldPlans as $id => $oldPlan)
-            {
-                if(!isset($plans[$id])) continue;
-                $plans[$id]->version   = $oldPlan->version;
-                $plans[$id]->name      = $oldPlan->name;
-                $plans[$id]->milestone = $oldPlan->milestone;
-                $plans[$id]->begin     = $oldPlan->begin;
-                $plans[$id]->end       = $oldPlan->end;
-            }
-        }
+
+        if($baselineID) $plans = $this->getBaselineData($baselineID, $plans);
 
         $today       = helper::today();
         $datas       = array();
@@ -380,6 +368,33 @@ class programplanModel extends model
         return $returnJson ? json_encode($datas) : $datas;
     }
 
+    /**
+     * 获取基线数据。
+     * Get baseline data.
+     *
+     * @param  int     $baselineID
+     * @param  array   $plans
+     * @access private
+     * @return array
+     */
+    private function getBaselineData(int $baselineID, array $plans): array
+    {
+        $baseline = $this->loadModel('cm')->getByID($baselineID);
+        $oldData  = json_decode($baseline->data);
+        $oldPlans = $oldData->stage;
+        foreach($oldPlans as $id => $oldPlan)
+        {
+            if(!isset($plans[$id])) continue;
+            $plans[$id]->version   = $oldPlan->version;
+            $plans[$id]->name      = $oldPlan->name;
+            $plans[$id]->milestone = $oldPlan->milestone;
+            $plans[$id]->begin     = $oldPlan->begin;
+            $plans[$id]->end       = $oldPlan->end;
+        }
+
+        return $plans;
+    }
+
     /**
      * Get gantt data group by assigned.
      *
@@ -617,11 +632,11 @@ class programplanModel extends model
     /**
      * Process plans.
      *
-     * @param  int    $plans
+     * @param  array  $plans
      * @access public
      * @return object
      */
-    public function processPlans($plans)
+    private function processPlans(array $plans)
     {
         foreach($plans as $planID => $plan) $plans[$planID] = $this->processPlan($plan);
         return $plans;

From b70e6c54b81b8e15d4f40838b6adffd6250033c7 Mon Sep 17 00:00:00 2001
From: zhaoke <zhaoke@easycorp.ltd>
Date: Fri, 5 May 2023 19:15:25 +0800
Subject: [PATCH 68/80]  * Adjust poolID name.

---
 test/lib/init.php       | 3 ++-
 test/lib/yaml.class.php | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/lib/init.php b/test/lib/init.php
index 7cce2b1fb7..1de60d8704 100644
--- a/test/lib/init.php
+++ b/test/lib/init.php
@@ -57,7 +57,7 @@ include $frameworkRoot . 'model.class.php';
 include $frameworkRoot . 'helper.class.php';
 
 $app    = router::createApp('pms', dirname(dirname(__FILE__)), 'router');
-$poolID = getenv('poolID');
+$poolID = getenv('ZTF_POOL_ID');
 $testDB = empty($config->testDB) ? array() : $config->testDB;
 
 /* 根据ztf设置的poolID环境变量设置连接的数据库 */
@@ -73,6 +73,7 @@ if(!empty($testDB) && !empty($poolID))
 
     $app->connectDB();
 }
+
 $tester = $app->loadCommon();
 
 /* Set configs. */
diff --git a/test/lib/yaml.class.php b/test/lib/yaml.class.php
index ffe31c41c7..7d2d21c4b9 100644
--- a/test/lib/yaml.class.php
+++ b/test/lib/yaml.class.php
@@ -449,7 +449,7 @@ class yaml
         $dbUser    = $this->config->db->user;
         $dbPWD     = $this->config->db->password;
 
-        $command    = "mysql -u%s -p%s -h%s -P%s -D%s < %s";
+        $command    = "mysql -u%s -p%s -h%s -P%s --default-character-set=utf8 -D%s < %s";
         $execInsert = sprintf($command, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $sqlPath);
         $execDump   = sprintf($dumpCommand, $dbUser, $dbPWD, $dbHost, $dbPort, $dbName, $tableName);
         

From d00b2a039472d46ad289d3c01bc65fbe884a397e Mon Sep 17 00:00:00 2001
From: jukui <jukui@easycorp.ltd>
Date: Fri, 5 May 2023 19:19:03 +0800
Subject: [PATCH 69/80] * Modify getSiblings function and test case for
 programplan model.

---
 module/programplan/model.php                  |  5 ++--
 module/programplan/test/model/getsiblings.php | 25 +++----------------
 .../model/yaml/getsiblings/getsiblings.yaml   | 25 +++++++++++++++++++
 3 files changed, 32 insertions(+), 23 deletions(-)
 create mode 100644 module/programplan/test/model/yaml/getsiblings/getsiblings.yaml

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 2e82c2780b..130f49d3bf 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -1678,13 +1678,14 @@ class programplanModel extends model
     }
 
     /**
+     * 获取阶段同一层级信息。
      * Get plan's siblings.
      *
-     * @param  string|int|array    $planIdList
+     * @param  string|int|array $planIdList
      * @access public
      * @return array
      */
-    public function getSiblings($planIdList)
+    public function getSiblings(array|string|int $planIdList): array
     {
         if(is_numeric($planIdList)) $planIdList = (array)$planIdList;
 
diff --git a/module/programplan/test/model/getsiblings.php b/module/programplan/test/model/getsiblings.php
index 94e7892135..d47a79e115 100755
--- a/module/programplan/test/model/getsiblings.php
+++ b/module/programplan/test/model/getsiblings.php
@@ -5,33 +5,16 @@ include dirname(__FILE__, 2) . '/programplan.class.php';
 zdTable('user')->gen(5);
 su('admin');
 
-$execution = zdTable('project');
-$execution->id->range('1-5');
-$execution->name->range('瀑布项目1,阶段a,阶段a子1,阶段a子1子1,阶段b');
-$execution->type->range('project,stage{4}');
-$execution->project->range('0,1{4}');
-$execution->parent->range('0,1,2,3,1');
-$execution->path->range("`,1,`,`,1,2,`,`,1,2,3,`,`,1,2,3,4,`,`,1,5,`");
-$execution->status->range('doing,doing,doing,closed,suspended');
-$execution->openedBy->range('admin,user1');
-$execution->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD');
-$execution->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
-$execution->realBegan->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD');
-$execution->gen(5);
-
 /**
 
 title=测试programplanModel->getSiblings();
 cid=1
-pid=1
-
-测试id为2时获取兄弟阶段的的名称 >> 阶段b
-测试id为2时获取自己兄弟阶段的个数 >> 1
-测试id为4时获取自己兄弟阶段的个数 >> 0
-
+pid=0
 */
 
-$plan         = new programplanTest();
+zdTable('project')->config('getsiblings')->gen(5);
+$plan = new programplanTest();
+
 $topPlan      = $plan->getSiblingsTest(2);
 $topPlanCount = count($topPlan[2]);
 
diff --git a/module/programplan/test/model/yaml/getsiblings/getsiblings.yaml b/module/programplan/test/model/yaml/getsiblings/getsiblings.yaml
new file mode 100644
index 0000000000..3126902a10
--- /dev/null
+++ b/module/programplan/test/model/yaml/getsiblings/getsiblings.yaml
@@ -0,0 +1,25 @@
+title: zt_getsibiings
+author: jukui
+version: '1.0'
+fields:
+    - field: id
+      range: 1-5
+    - field: project
+      range: 1-5
+    - field: name
+      range: '瀑布项目1,阶段a,阶段a子1,阶段a子1子1,阶段b'
+    - field: parent
+      range: '0,1,2,3,1'
+    - field: type
+      range: '0,1{4}'
+    - field: grade
+      range: 1
+    - field: days
+      range: 1
+    - field: status
+      range: 'doing,doing,doing,closed,suspended'
+    - field: desc
+      range: 1-5
+      prefix: '项目描述'
+    - field: path
+      range: "`,1,`,`,1,2,`,`,1,2,3,`,`,1,2,3,4,`,`,1,5,`"

From e19b9e68570a0b9698a8b77a08b3af012bf89ca0 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Fri, 5 May 2023 16:27:05 +0800
Subject: [PATCH 70/80]  * Do task #92556.

---
 .../block/ui/executionoverviewblock.html.php  | 64 +++++++++++++++++++
 1 file changed, 64 insertions(+)
 create mode 100644 module/block/ui/executionoverviewblock.html.php

diff --git a/module/block/ui/executionoverviewblock.html.php b/module/block/ui/executionoverviewblock.html.php
new file mode 100644
index 0000000000..783076c640
--- /dev/null
+++ b/module/block/ui/executionoverviewblock.html.php
@@ -0,0 +1,64 @@
+<?php
+declare(strict_types=1);
+/**
+* The execution overview block view file of block module of ZenTaoPMS.
+* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+* @author      LiuRuoGu <liuruogu@easycorp.ltd>
+* @package     block
+* @link        https://www.zentao.net
+*/
+
+namespace zin;
+
+panel
+(
+    div
+    (
+        set('class', 'flex'),
+        cell
+        (
+            set('class', 'border-right'),
+            set('style', ['width' => '25%']),
+            col
+            (
+                set('class', 'text-center'),
+                span
+                (
+                    set('class', 'text-2xl font-bold leading-10 text-primary'),
+                    132
+                ),
+                span
+                (
+                    set('class', 'text-light'),
+                    '执行总量'
+                )
+            )
+        ),
+        cell
+        (
+            set('class', 'border-right'),
+            set('style', ['width' => '25%']),
+            col
+            (
+                set('class', 'text-center'),
+                span
+                (
+                    set('class', 'text-2xl font-bold leading-10'),
+                    12
+                ),
+                span
+                (
+                    set('class', 'text-light'),
+                    '今年完成'
+                )
+            )
+        ),
+        cell
+        (
+
+        )
+    )
+);
+
+render();

From e33c9b2f0e27dc57a349903c124ba33c8a93f2f3 Mon Sep 17 00:00:00 2001
From: liuruogu <liuruogu@easycorp.ltd>
Date: Fri, 5 May 2023 19:24:47 +0800
Subject: [PATCH 71/80]  * Finish task #92563.

---
 module/block/ui/contributeblock.html.php      | 44 +++++++++++++
 .../block/ui/executionoverviewblock.html.php  | 64 -------------------
 module/block/zen.php                          |  1 +
 3 files changed, 45 insertions(+), 64 deletions(-)
 create mode 100644 module/block/ui/contributeblock.html.php
 delete mode 100644 module/block/ui/executionoverviewblock.html.php

diff --git a/module/block/ui/contributeblock.html.php b/module/block/ui/contributeblock.html.php
new file mode 100644
index 0000000000..1a713bd6ca
--- /dev/null
+++ b/module/block/ui/contributeblock.html.php
@@ -0,0 +1,44 @@
+<?php
+declare(strict_types=1);
+/**
+* The contribute block view file of block module of ZenTaoPMS.
+* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+* @author      LiuRuoGu <liuruogu@easycorp.ltd>
+* @package     block
+* @link        https://www.zentao.net
+*/
+
+namespace zin;
+
+$blocks = array();
+
+foreach($data as $code => $value)
+{
+    $blocks[] = cell
+    (
+        set('flex', '0 0 33.33%'),
+        col
+        (
+            set('justify', 'around'),
+            set('class', 'text-center'),
+            span(zget($lang->block, $code)),
+            a
+            (
+                set('class', 'font-bold text-2xl text-darker leading-loose'), // TODO:zu1
+                $value
+            )
+        )
+    );
+}
+
+panel
+(
+    div
+    (
+        set('class', 'flex flex-wrap gap-y-2'),
+        $blocks
+    )
+);
+
+render();
diff --git a/module/block/ui/executionoverviewblock.html.php b/module/block/ui/executionoverviewblock.html.php
deleted file mode 100644
index 783076c640..0000000000
--- a/module/block/ui/executionoverviewblock.html.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-declare(strict_types=1);
-/**
-* The execution overview block view file of block module of ZenTaoPMS.
-* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
-* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
-* @author      LiuRuoGu <liuruogu@easycorp.ltd>
-* @package     block
-* @link        https://www.zentao.net
-*/
-
-namespace zin;
-
-panel
-(
-    div
-    (
-        set('class', 'flex'),
-        cell
-        (
-            set('class', 'border-right'),
-            set('style', ['width' => '25%']),
-            col
-            (
-                set('class', 'text-center'),
-                span
-                (
-                    set('class', 'text-2xl font-bold leading-10 text-primary'),
-                    132
-                ),
-                span
-                (
-                    set('class', 'text-light'),
-                    '执行总量'
-                )
-            )
-        ),
-        cell
-        (
-            set('class', 'border-right'),
-            set('style', ['width' => '25%']),
-            col
-            (
-                set('class', 'text-center'),
-                span
-                (
-                    set('class', 'text-2xl font-bold leading-10'),
-                    12
-                ),
-                span
-                (
-                    set('class', 'text-light'),
-                    '今年完成'
-                )
-            )
-        ),
-        cell
-        (
-
-        )
-    )
-);
-
-render();
diff --git a/module/block/zen.php b/module/block/zen.php
index 5dc0e341a2..1313e15e08 100644
--- a/module/block/zen.php
+++ b/module/block/zen.php
@@ -368,6 +368,7 @@ class blockZen extends block
      */
     public function printContributeBlock()
     {
+        /* TODO:zu1*/
         $this->view->data = $this->loadModel('user')->getPersonalData();
     }
 

From 228bd13b2c36f4c9679a1b0a5509d29457677b5f Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 19:56:59 +0800
Subject: [PATCH 72/80] * Submit manageProduct function.

---
 module/project/config/form.php | 10 +++---
 module/project/control.php     | 27 +++++++-------
 module/project/zen.php         | 66 ++++++++++++++++------------------
 3 files changed, 50 insertions(+), 53 deletions(-)

diff --git a/module/project/config/form.php b/module/project/config/form.php
index ae3445251f..449824936d 100644
--- a/module/project/config/form.php
+++ b/module/project/config/form.php
@@ -1,12 +1,12 @@
 <?php
 $config->project->form = new stdclass();
 
-$config->project->form->create =  array();
-$config->project->form->edit   =  array();
-$config->project->form->close  =  array();
-$config->project->form->start  =  array();
+$config->project->form->create = array();
+$config->project->form->edit   = array();
+$config->project->form->close  = array();
+$config->project->form->start  = array();
 
-$config->project->form->suspend =  array();
+$config->project->form->suspend = array();
 
 $config->project->form->create['parent']     = array('type' => 'int',    'required' => false, 'default' => '');
 $config->project->form->create['name']       = array('type' => 'string', 'required' => true, 'filter' => 'trim');
diff --git a/module/project/control.php b/module/project/control.php
index b580c92135..1931de1612 100755
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1676,7 +1676,7 @@ class project extends control
      * @access public
      * @return void
      */
-    public function editGroup($groupID): mixed
+    public function editGroup($groupID)
     {
         $groupID = (int)$groupID;
         $this->loadModel('group');
@@ -1933,7 +1933,7 @@ class project extends control
     }
 
     /**
-     * 管理项目的关联产品
+     * 管理项目的关联产品。
      * Manage products under project.
      *
      * @param  string $projectID
@@ -1942,28 +1942,27 @@ class project extends control
      * @access public
      * @return void
      */
-    public function manageProducts(string $projectID, $from = 'project'): mixed
+    public function manageProducts(string $projectID, string $from = 'project')
     {
         /* Access the nonProduct project alter tips. */
         $projectID = (int)$projectID;
         $project   = $this->project->getById($projectID);
         if(!$project->hasProduct) return print(js::error($this->lang->project->cannotManageProducts) . js::locate('back'));
 
-        $executions   = $this->loadModel('execution')->getPairs($projectID);
-        $executionIDs = array_keys($executions);
+        $executions = $this->loadModel('execution')->getPairs($projectID);
+        $idList     = array_keys($executions);
 
         if(!empty($_POST))
         {
             $postData = form::data();
-            if(!isset($postData->rawdata->products) and !isset($postData->rawdata->otherProducts))
+            if(!isset($this->post->products) and !isset($this->post->otherProducts))
             {
-                dao::$errors['message'][] = $this->lang->project->errorNoProducts;
-                return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+                return $this->send(array('result' => 'fail', 'message' => $this->lang->project->errorNoProducts));
             }
 
-            /* Update linked products. */
-            $errorTips = $this->projectZen->mergeProducts($projectID, $project, $executionIDs, $postData);
-            if(!empty($errorTips)) return $this->send($errorTips);
+            /* Merge and build linked products. */
+            $this->projectZen->mergeProducts($projectID, $project, $idList, $postData);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
             $locateLink = inLink('manageProducts', "projectID=$projectID");
             if($from == 'program')  $locateLink = $this->session->projectList;
@@ -1972,7 +1971,9 @@ class project extends control
 
         /* Set menu. */
         $this->setProjectMenu($projectID, $project);
-        $this->projectZen->dealLinkProduct($projectID, $project);
+
+        /* Extract cannot be removed product and branch. */
+        $this->projectZen->extractUnModifyForm($projectID, $project);
 
         $this->view->title      = $this->lang->project->manageProducts . $this->lang->colon . $project->name;
         $this->view->project    = $project;
@@ -1993,7 +1994,7 @@ class project extends control
      * @access public
      * @return int
      */
-    public function ajaxGetExecutions(string $projectID, string $executionID = '0', string $mode = '', string $type = 'all'): int
+    public function ajaxGetExecutions(string $projectID, string $executionID = '0', string $mode = '', string $type = 'all')
     {
         $disabled   = '';
         $executions = array('' => '');
diff --git a/module/project/zen.php b/module/project/zen.php
index 0e1408c974..bcffdf47c0 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -641,20 +641,17 @@ class projectZen extends project
      *
      * @param  int       $projectID
      * @param  object    $project
-     * @param  int|array $executionIDs
+     * @param  array     $idList
      * @param  array     $postData
      *
      * @access protected
-     * @return array
+     * @return bool
      */
-    protected function mergeProducts(int $projectID, object $project, int|array $executionIDs, array $postData): array
+    protected function mergeProducts(int $projectID, object $project, array $idList, array $postData): bool
     {
-        $this->loadModel('product');
-        $this->loadModel('execution');
-
-        $oldProducts = $this->product->getProducts($projectID);
+        $oldProducts = $this->loadModel('product')->getProducts($projectID);
         $this->project->updateProducts($projectID);
-        if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
+        if(dao::isError()) return false;
 
         /* Merge old and new linked products under the project. */
         $newProducts   = $this->product->getProducts($projectID);
@@ -666,13 +663,13 @@ class projectZen extends project
         /* Multiple and Division project update linked products. */
         if(empty($project->multiple))
         {
-            $executionID = $this->execution->getNoMultipleID($projectID);
+            $executionID = $this->loadModel('execution')->getNoMultipleID($projectID);
             if($executionID) $this->execution->updateProducts($executionID);
         }
 
         if(empty($project->division))
         {
-            foreach($executionIDs as $executionID)
+            foreach($idList as $executionID)
             {
                 $this->execution->updateProducts($executionID);
                 if($diffProducts) $this->loadModel('action')->create('execution', $executionID, 'Managed', '', implode(',', array_keys($newProducts)));
@@ -682,26 +679,26 @@ class projectZen extends project
         /* Record multiple and waterfall project unlinked products. */
         if($project->multiple and $project->model != 'waterfall' and $project->model != 'waterfallplus')
         {
-            $this->dealUnlinkedProduct($oldProducts, $newProductIDs, $executionIDs);
+            $this->dealUnlinkedProduct($oldProducts, $newProductIDs, $idList);
         }
 
-        return array();
+        return true;
     }
 
     /**
      * 记录多迭代及瀑布类项目移除的产品
      * Record multiple and waterfall project unlinked products
      *
-     * @param  array     $oldProducts
-     * @param  array     $newProductIDs
-     * @param  int|array $executionIDs
+     * @param  array $oldProducts
+     * @param  array $newProductIDs
+     * @param  array $idList
      *
      * @access protected
      * @return void
      */
-    protected function dealUnlinkedProduct(array $oldProducts, array $newProductIDs, array $executionIDs): void
+    protected function dealUnlinkedProduct(array $oldProducts, array $newProductIDs, array $idList): void
     {
-        $oldExecutionProducts = $this->projectTao->getExecutionProductGroup($executionIDs);
+        $oldExecutionProducts = $this->projectTao->getExecutionProductGroup($idList);
         $unlinkedProducts     = array_diff(array_keys($oldProducts), $newProductIDs);
         if(!empty($unlinkedProducts))
         {
@@ -720,8 +717,8 @@ class projectZen extends project
     }
 
     /**
-     * 项目关联用户故事则无法移除产品
-     * dealLinkProduct
+     * 提取关联用户故事无法移除的项目产品
+     * Extract related stories cannot be removed product.
      *
      * @param  int    $projectID
      * @param  object $project
@@ -729,17 +726,14 @@ class projectZen extends project
      * @access protected
      * @return void
      */
-    protected function dealLinkProduct(int $projectID, object $project): void
+    protected function extractUnModifyForm(int $projectID, object $project): void
     {
-        $this->loadModel('product');
-        $this->loadModel('program');
-
         $linkedBranches      = array();
         $linkedBranchIdList  = array();
         $branches            = $this->project->getBranchesByProject($projectID);
         $linkedProductIdList = empty($branches) ? '' : array_keys($branches);
-        $allProducts         = $this->program->getProductPairs($project->parent, 'all', 'noclosed', $linkedProductIdList);
-        $linkedProducts      = $this->product->getProducts($projectID, 'all', '', true, $linkedProductIdList);
+        $allProducts         = $this->loadModel('program')->getProductPairs($project->parent, 'all', 'noclosed', $linkedProductIdList);
+        $linkedProducts      = $this->loadModel('product')->getProducts($projectID, 'all', '', true, $linkedProductIdList);
         $projectStories      = $this->project->getStoriesByProject($projectID);
         $projectBranches     = $this->project->getBranchGroupByProject($projectID, array_keys($linkedProducts));
 
@@ -764,8 +758,8 @@ class projectZen extends project
             }
         }
 
-        /* Initializes the product from other linked products. */
-        if($this->config->systemMode == 'ALM') $this->initOtherLinkProduct($project, $allProducts, $linkedBranchIdList, $linkedBranches, $linkedProducts);
+        /* Build the product from other linked products. */
+        if($this->config->systemMode == 'ALM') $this->buildProductForm($project, $allProducts, $linkedBranchIdList, $linkedBranches, $linkedProducts);
 
         $this->view->unmodifiableProducts     = $unmodifiableProducts;
         $this->view->unmodifiableBranches     = $unmodifiableBranches;
@@ -774,7 +768,7 @@ class projectZen extends project
 
     /**
      * 初始化项目集下其他关联产品中当前产品
-     * Initializes the current product under the projectprogram.
+     * Build the current product under the projectprogram.
      *
      * @param  object $project
      * @param  array  $allProducts
@@ -785,7 +779,7 @@ class projectZen extends project
      * @access protected
      * @return void
      */
-    protected function initOtherLinkProduct(object $project, array $allProducts, array $linkedBranchIdList, array $linkedBranches, array $linkedProducts): void
+    protected function buildProductForm(object $project, array $allProducts, array $linkedBranchIdList, array $linkedBranches, array $linkedProducts): void
     {
         $branchGroups           = $this->loadModel('branch')->getByProducts(array_keys($allProducts), 'ignoreNormal|noclosed', $linkedBranchIdList);
         $topProgramID           = $project->parent ? $this->program->getTopByPath($project->path) : 0;
@@ -796,16 +790,16 @@ class projectZen extends project
         {
             if($programID != $topProgramID)
             {
-                $otherProducts = $this->initBranchProduct($programProducts, $branchGroups, $linkedBranches, $linkedProducts);
+                $otherProducts = $this->getOtherProducts($programProducts, $branchGroups, $linkedBranches, $linkedProducts);
             }
             else
             {
                 $currentProducts += $programProducts;
             }
         }
+
         $this->view->currentProducts = $currentProducts;
         $this->view->otherProducts   = $otherProducts;
-
         $this->view->branchGroups    = $branchGroups;
         $this->view->linkedBranches  = $linkedBranches;
         $this->view->linkedProducts  = $linkedProducts;
@@ -814,8 +808,8 @@ class projectZen extends project
     }
 
     /**
-     * 初始化项目集下其他关联产品中多分支产品
-     * Initializes the multi-branch product under the projectprogram.
+     * 获取其他的关联产品
+     * Get other products under the projectprogram.
      *
      * @param  object $programProducts
      * @param  array  $branchGroups
@@ -825,7 +819,7 @@ class projectZen extends project
      * @access protected
      * @return array
      */
-    protected function initBranchProduct(object $programProducts, array $branchGroups, array $linkedBranches, array $linkedProducts): array
+    protected function getOtherProducts(object $programProducts, array $branchGroups, array $linkedBranches, array $linkedProducts): array
     {
         $otherProducts = array();
         foreach($programProducts as $productID => $productName)
@@ -849,10 +843,12 @@ class projectZen extends project
     }
 
     /**
-     * setProjectMenu
+     * 根据当前所在模块更新二级菜单
+     * set project menu
      *
      * @param  int    $projectID
      * @param  object $project
+     *
      * @access protected
      * @return void
      */

From 50f528ad7a3005ee328d3cbc22836bc08f1b3455 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Fri, 5 May 2023 20:17:56 +0800
Subject: [PATCH 73/80] * Submit control layer activate function.

---
 module/project/config/form.php | 12 ++++++------
 module/project/model.php       |  2 +-
 module/project/zen.php         |  8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/module/project/config/form.php b/module/project/config/form.php
index 449824936d..c5ca91565f 100644
--- a/module/project/config/form.php
+++ b/module/project/config/form.php
@@ -1,12 +1,12 @@
 <?php
 $config->project->form = new stdclass();
 
-$config->project->form->create = array();
-$config->project->form->edit   = array();
-$config->project->form->close  = array();
-$config->project->form->start  = array();
-
-$config->project->form->suspend = array();
+$config->project->form->create   =  array();
+$config->project->form->edit     =  array();
+$config->project->form->close    =  array();
+$config->project->form->start    =  array();
+$config->project->form->suspend  =  array();
+$config->project->form->activate =  array();
 
 $config->project->form->create['parent']     = array('type' => 'int',    'required' => false, 'default' => '');
 $config->project->form->create['name']       = array('type' => 'string', 'required' => true, 'filter' => 'trim');
diff --git a/module/project/model.php b/module/project/model.php
index 6e8ae5065d..1a8638148d 100755
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -1586,7 +1586,7 @@ class projectModel extends model
         /* Update start and end date of tasks in this project. */
         if($project->readjustTime and $project->readjustTask)
         {
-            $tasks          = $this->projectTao->fetchUndoneTasks((int)$projectID);
+            $tasks = $this->projectTao->fetchUndoneTasks((int)$projectID);
             $this->projectTao->updateTasksStartAndEndDate($tasks, $oldProject, $project);
         }
         /* Activate the shadow product of the project. (only change product status) */
diff --git a/module/project/zen.php b/module/project/zen.php
index bcffdf47c0..205d8e7ffd 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -544,7 +544,8 @@ class projectZen extends project
     {
         $newBegin = date('Y-m-d');
         $dateDiff = helper::diffDate($newBegin, $project->begin);
-        $newEnd   = date('Y-m-d', strtotime($project->end) + $dateDiff * 24 * 3600);
+        $dateTime = (int)(strtotime($project->end) + $dateDiff * 24 * 3600);
+        $newEnd   = date('Y-m-d', $dateTime);
 
         $this->view->title      = $this->lang->project->activate;
         $this->view->users      = $this->loadModel('user')->getPairs('noletter');
@@ -586,12 +587,11 @@ class projectZen extends project
      */
     protected function prepareActivateExtras(int $projectID, object $postData): object
     {
-        $oldProject = $this->project->getByID($projectID);
-
+        $oldProject   = $this->project->getByID($projectID);
         $editorIdList = $this->config->project->editor->activate['id'];
 
         return $postData->add('id', $projectID)
-            ->setDefault('realEnd', '')
+            ->setDefault('realEnd', $oldProject->realEnd)
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())

From c46c48f0e6107e3ebe12228a0f0a44f7b9638705 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Sat, 6 May 2023 08:37:15 +0800
Subject: [PATCH 74/80] * Prepare refactor programplanModel::create.

---
 module/programplan/config/form.php |  7 ++++
 module/programplan/control.php     |  3 +-
 module/programplan/model.php       | 63 ++++++++++++++++--------------
 3 files changed, 42 insertions(+), 31 deletions(-)
 create mode 100644 module/programplan/config/form.php

diff --git a/module/programplan/config/form.php b/module/programplan/config/form.php
new file mode 100644
index 0000000000..ae272d467b
--- /dev/null
+++ b/module/programplan/config/form.php
@@ -0,0 +1,7 @@
+<?php
+declare(strict_types = 1);
+
+if(!isset($config->programplan->create)) $config->programplan->create = new stdclass;
+$config->programplan->create->form       = array();
+$config->programplan->create->formFields = array('planIDList', 'names', 'PM', 'percents', 'attributes', 'acl', 'milestone', 'begin', 'end', 'realBegan', 'realEnd', 'desc', 'orders', 'type');
+foreach($config->programplan->create->formFields as $field) $config->programplan->create->form[$field] = array('required' => false, 'type' => 'array');
diff --git a/module/programplan/control.php b/module/programplan/control.php
index 6a8eb36ef6..d7d867110b 100644
--- a/module/programplan/control.php
+++ b/module/programplan/control.php
@@ -148,7 +148,8 @@ class programplan extends control
         $this->app->loadLang('project');
         if($_POST)
         {
-            $this->programplan->create($projectID, $this->productID, $planID);
+            $formData = form::data($this->config->programplan->create->form);
+            $this->programplan->create($formData, $projectID, $this->productID, $planID);
             if(dao::isError())
             {
                 $errors = dao::getError();
diff --git a/module/programplan/model.php b/module/programplan/model.php
index 97899d5f98..81175d4302 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -13,19 +13,6 @@
 <?php
 class programplanModel extends model
 {
-    /**
-     * Set menu.
-     *
-     * @param  int  $projectID
-     * @param  int  $productID
-     * @access public
-     * @return bool
-     */
-    public function setMenu($projectID, $productID)
-    {
-        return true;
-    }
-
     /**
      * Get plan by id.
      *
@@ -683,42 +670,59 @@ class programplanModel extends model
     }
 
     /**
-     * Create a plan.
+     * 创建/设置一个项目阶段。
+     * Create/Set a project plan/phase.
      *
-     * @param  int  $projectID
-     * @param  int  $productID
-     * @param  int  $parentID
+     * @param  array  $formData
+     * @param  int    $projectID
+     * @param  int    $productID
+     * @param  int    $parentID
      * @access public
      * @return bool
      */
-    public function create($projectID = 0, $productID = 0, $parentID = 0)
+    public function create(array $formData, int $projectID = 0, int $productID = 0, int $parentID = 0): bool
     {
-        $data = (array)fixer::input('post')->get();
-        extract($data);
+        /* Get every value from formData without use extract(). */
+        $planIDList     = $formData['planIDList'];
+        $names          = $formData['names'];
+        $PM             = $formData['PM'];
+        $percents       = $formData['percents'];
+        $attributes     = $formData['attributes'];
+        $acl            = $formData['acl'];
+        $milestone      = $formData['milestone'];
+        $begin          = $formData['begin'];
+        $end            = $formData['end'];
+        $realBegan      = $formData['realBegan'];
+        $realEnd        = $formData['realEnd'];
+        $desc           = $formData['desc'];
+        $orders         = $formData['orders'];
+        $type           = $formData['type'];
+        $codes          = $formData['codes'];
 
         /* Determine if a task has been created under the parent phase. */
         if(!$this->isCreateTask($parentID)) return dao::$errors['message'][] = $this->lang->programplan->error->createdTask;
 
         /* The child phase type setting is the same as the parent phase. */
         $parentAttribute = '';
-        $parentPercent   = 0;
         if($parentID)
         {
             $parentStage     = $this->getByID($parentID);
             $parentAttribute = $parentStage->attribute;
-            $parentPercent   = $parentStage->percent;
             $parentACL       = $parentStage->acl;
         }
 
+        /* Remove empty items and get same items in array. */
         $names     = array_filter($names);
         $sameNames = array_diff_assoc($names, array_unique($names));
 
-        $project   = $this->loadModel('project')->getByID($projectID);
+        /* Check weather need to set code and compute same code. */
         $setCode   = (isset($this->config->setCode) and $this->config->setCode == 1) ? true : false;
         $sameCodes = $setCode ? $this->checkCodeUnique($codes, isset($planIDList) ? $planIDList : '') : false;
 
+        /* Prepare the plans user inputted. Process the plan which names not empty only. */
+        $project    = $this->loadModel('project')->getByID($projectID);
         $setPercent = (isset($this->config->setPercent) and $this->config->setPercent == 1) ? true : false;
-        $datas = array();
+        $plans      = array();
         foreach($names as $key => $name)
         {
             if(empty($name)) continue;
@@ -729,8 +733,6 @@ class programplanModel extends model
             $plan->project    = $projectID;
             $plan->parent     = $parentID ? $parentID : $projectID;
             $plan->name       = $names[$key];
-            if($setCode)    $plan->code    = $codes[$key];
-            if($setPercent) $plan->percent = $percents[$key];
             $plan->attribute  = (empty($parentID) or $parentAttribute == 'mix') ? $attributes[$key] : $parentAttribute;
             $plan->milestone  = $milestone[$key];
             $plan->output     = empty($output[$key]) ? '' : implode(',', $output[$key]);
@@ -738,25 +740,26 @@ class programplanModel extends model
             $plan->PM         = empty($PM[$key]) ? '' : $PM[$key];
             $plan->desc       = empty($desc[$key]) ? '' : $desc[$key];
             $plan->hasProduct = $project->hasProduct;
+            if($setCode)    $plan->code    = $codes[$key];
+            if($setPercent) $plan->percent = $percents[$key];
 
             if(!empty($begin[$key]))     $plan->begin     = $begin[$key];
             if(!empty($end[$key]))       $plan->end       = $end[$key];
             if(!empty($realBegan[$key])) $plan->realBegan = $realBegan[$key];
             if(!empty($realEnd[$key]))   $plan->realEnd   = $realEnd[$key];
 
-            $datas[] = $plan;
+            $plans[] = $plan;
         }
 
-        if(empty($datas))
+        if(empty($plans))
         {
             dao::$errors['message'][] = sprintf($this->lang->error->notempty, $this->lang->programplan->name);
             return false;
         }
 
         $totalPercent = 0;
-        $totalDevType = 0;
         $milestone    = 0;
-        foreach($datas as $index => $plan)
+        foreach($plans as $index => $plan)
         {
             if(!empty($sameNames) and in_array($plan->name, $sameNames)) dao::$errors[$index]['name'] = empty($type) ? $this->lang->programplan->error->sameName : str_replace($this->lang->execution->stage, '', $this->lang->programplan->error->sameName);
             if($setCode and $sameCodes !== true and !empty($sameCodes) and in_array($plan->code, $sameCodes)) dao::$errors[$index]['code'] = sprintf($this->lang->error->repeat, $plan->type == 'stage' ? $this->lang->execution->code : $this->lang->code, $plan->code);

From c5e33f00cd1ef52f0f41cf6f9b8ef2f566fd8cae Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Sat, 6 May 2023 00:47:03 +0000
Subject: [PATCH 75/80] * Adjust the split of the logic associated with
 todoController::create().

---
 module/todo/control.php |  6 ++-
 module/todo/model.php   | 22 +++++++---
 module/todo/tao.php     | 97 -----------------------------------------
 module/todo/zen.php     | 91 ++++++++++++++++++++++++++++----------
 4 files changed, 90 insertions(+), 126 deletions(-)

diff --git a/module/todo/control.php b/module/todo/control.php
index 8f7b9d0538..494ed1216d 100755
--- a/module/todo/control.php
+++ b/module/todo/control.php
@@ -41,7 +41,11 @@ class todo extends control
         if(!empty($_POST))
         {
             $formData = form::data($this->config->todo->create->form);
-            $todo     = $this->todoZen->beforeCreate($formData);
+            $todoData = $this->todoZen->beforeCreate($formData);
+
+            $uid  = isset($formData->rawdata->uid) ? $formData->rawdata->uid : '';
+            $todo = $this->todoZen->prepareCreateData($todoData, $uid);
+            if(!$todo) return print(js::error(dao::getError()));
 
             $todoID = $this->todo->create($todo, $formData);
             if($todoID === false) return print(js::error(dao::getError()));
diff --git a/module/todo/model.php b/module/todo/model.php
index fc9589f78e..79a1223a2b 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -16,16 +16,12 @@ class todoModel extends model
      * Create todo data.
      *
      * @param  object $todo
-     * @param  object $formData
      * @access public
      * @return int|false
      */
-    public function create(object $todo, object $formData): int|false
+    public function create(object $todo): int|false
     {
-        $processedTodo = $this->todoTao->processCreateData($todo, $formData);
-        if(!$processedTodo) return false;
-
-        $todoID = $this->todoTao->insert($processedTodo);
+        $todoID = $this->todoTao->insert($todo);
         if(dao::isError()) return false;
 
         return $todoID;
@@ -570,4 +566,18 @@ class todoModel extends model
     {
         return $this->todoTao->updateRow($todoID, $todo);
     }
+
+    /**
+     * 根据待办类型获取优先级。
+     * Get pri by todo type.
+     *
+     * @param  string $todoType
+     * @param  int    $todoObjectID
+     * @access public
+     * @return int
+     */
+    public function getPriByTodoType(string $todoType, int $todoObjectID): int
+    {
+        return $this->dao->select('pri')->from($this->config->objectTables[$todoType])->where('id')->eq($todoObjectID)->fetch('pri');
+    }
 }
diff --git a/module/todo/tao.php b/module/todo/tao.php
index 27fdf33e2c..aa8bb00c2d 100644
--- a/module/todo/tao.php
+++ b/module/todo/tao.php
@@ -131,52 +131,6 @@ class todoTao extends todoModel
         return !dao::isError();
     }
 
-    /**
-     * 处理要创建的todo的数据。
-     * Process the data for the todo to be created.
-     *
-     * @param  object $todo
-     * @param  object $formData
-     * @access protected
-     * @return object|false
-     */
-    protected function processCreateData(object $todo, object $formData): object|false
-    {
-        if(!isset($todo->pri) and in_array($todo->type, $this->config->todo->moduleList) and !in_array($todo->type, array('review', 'feedback')))
-        {
-            $todo->pri = $this->dao->select('pri')->from($this->config->objectTables[$todo->type])->where('id')->eq($todo->objectID)->fetch('pri');
-
-            if($todo->pri == 'high')   $todo->pri = 1;
-            if($todo->pri == 'middle') $todo->pri = 2;
-            if($todo->pri == 'low')    $todo->pri = 3;
-        }
-
-        if($todo->type != 'custom' and $todo->objectID)
-        {
-            $type   = $todo->type;
-            $object = $this->loadModel($type)->getByID($todo->{$type});
-            if(isset($object->name))  $todo->name = $object->name;
-            if(isset($object->title)) $todo->name = $object->title;
-        }
-
-        if($todo->end < $todo->begin)
-        {
-            dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
-            return false;
-        }
-
-        if(!empty($todo->cycle))
-        {
-            $todo = $this->setCycle($todo);
-            if(!$todo) return false;
-        }
-        if(empty($todo->cycle)) unset($todo->config);
-
-        if(isset($formData->rawdata->uid)) $this->loadModel('file')->processImgURL($todo, $this->config->todo->editor->create['id'], $formData->rawdata->uid);
-
-        return $todo;
-    }
-
     /**
      * 获取周期待办列表。
      * Get cycle list.
@@ -367,57 +321,6 @@ class todoTao extends todoModel
         return $date;
     }
 
-    /**
-     * 设置周期待办数据。
-     * Set cycle todo data.
-     *
-     * @param  object $todoData
-     * @access private
-     * @return false|object
-     */
-    private function setCycle(object $todoData): false|object
-    {
-        $todoData->date = helper::today();
-        $todoData->config['begin'] = $todoData->date;
-
-        if($todoData->config['type'] == 'day')
-        {
-            unset($todoData->config['week'], $todoData->config['month']);
-            if(!$todoData->config['day'])
-            {
-                dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDaysLabel);
-                return false;
-            }
-            if(!validater::checkInt($todoData->config['day']))
-            {
-                dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDaysLabel);
-                return false;
-            }
-        }
-        if($todoData->config['type'] == 'week')
-        {
-            unset($todoData->config['day'], $todoData->config['month']);
-            $todoData->config['week'] = implode(',', $todoData->config['week']);
-        }
-        if($todoData->config['type'] == 'month')
-        {
-            unset($todoData->config['day'], $todoData->config['week']);
-            $todoData->config['month'] = implode(',', $todoData->config['month']);
-        }
-
-        if($todoData->config['beforeDays'] and !validater::checkInt($todoData->config['beforeDays']))
-        {
-            dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->beforeDaysLabel);
-            return false;
-        }
-        $todoData->config['beforeDays'] = (int)$todoData->config['beforeDays'];
-
-        $todoData->config = json_encode($todoData->config);
-        $todoData->type   = 'cycle';
-
-        return $todoData;
-    }
-
     /**
      * 修改待办事项的时间。
      * Update the date of todo.
diff --git a/module/todo/zen.php b/module/todo/zen.php
index 6842d88f32..e82e425211 100755
--- a/module/todo/zen.php
+++ b/module/todo/zen.php
@@ -131,6 +131,52 @@ class todoZen extends todo
             ->get();
     }
 
+    /**
+     * 准备要创建的todo的数据。
+     * Prepare the creation data.
+     *
+     * @param  object $todo
+     * @param  string $uid
+     * @access protected
+     * @return object|false
+     */
+    protected function prepareCreateData(object $todo, string $uid = ''): object|false
+    {
+        if(!isset($todo->pri) && in_array($todo->type, $this->config->todo->moduleList) && !in_array($todo->type, array('review', 'feedback')))
+        {
+            $todo->pri = $this->todo->getPriByTodoType($this->config->objectTables[$todo->type], $todo->objectID);
+
+            if($todo->pri == 'high')   $todo->pri = 1;
+            if($todo->pri == 'middle') $todo->pri = 2;
+            if($todo->pri == 'low')    $todo->pri = 3;
+        }
+
+        if($todo->type != 'custom' && $todo->objectID)
+        {
+            $type   = $todo->type;
+            $object = $this->loadModel($type)->getByID($todo->{$type});
+            if(isset($object->name))  $todo->name = $object->name;
+            if(isset($object->title)) $todo->name = $object->title;
+        }
+
+        if($todo->end < $todo->begin)
+        {
+            dao::$errors[] = sprintf($this->lang->error->gt, $this->lang->todo->end, $this->lang->todo->begin);
+            return false;
+        }
+
+        if(!empty($todo->cycle))
+        {
+            $todo = $this->setCycle($todo);
+            if(!$todo) return false;
+        }
+        if(empty($todo->cycle)) unset($todo->config);
+
+        if($uid) $this->loadModel('file')->processImgURL($todo, $this->config->todo->editor->create['id'], $uid);
+
+        return $todo;
+    }
+
     /**
      * 创建完成待办后数据处理。
      * Create a todo after data processing.
@@ -452,53 +498,54 @@ class todoZen extends todo
     }
 
     /**
-     * 设置周期待办
-     * Set cycle todo.
+     * 设置周期待办数据。
+     * Set cycle todo data.
      *
-     * @param  object $formData
+     * @param  object $todoData
      * @access private
-     * @return object
+     * @return false|object
      */
-    private function setCycle(object $formData): object
+    private function setCycle(object $todoData): false|object
     {
-        $formData->date = date('Y-m-d');
+        $todoData->date = helper::today();
+        $todoData->config['begin'] = $todoData->date;
 
-        $formData->config['begin'] = $formData->date;
-        if($formData->config['type'] == 'day')
+        if($todoData->config['type'] == 'day')
         {
-            unset($formData->config['week'], $formData->config['month']);
-            if(!$formData->config['day'])
+            unset($todoData->config['week'], $todoData->config['month']);
+            if(!$todoData->config['day'])
             {
                 dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->todo->cycleDaysLabel);
                 return false;
             }
-            if(!validater::checkInt($formData->config['day']))
+            if(!validater::checkInt($todoData->config['day']))
             {
                 dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->cycleDaysLabel);
                 return false;
             }
         }
-        if($formData->config['type'] == 'week')
+        if($todoData->config['type'] == 'week')
         {
-            unset($formData->config['day'], $formData->config['month']);
-            $formData->config['week'] = join(',', $formData->config['week']);
+            unset($todoData->config['day'], $todoData->config['month']);
+            $todoData->config['week'] = implode(',', $todoData->config['week']);
         }
-        if($formData->config['type'] == 'month')
+        if($todoData->config['type'] == 'month')
         {
-            unset($formData->config['day'], $formData->config['week']);
-            $formData->config['month'] = join(',', $formData->config['month']);
+            unset($todoData->config['day'], $todoData->config['week']);
+            $todoData->config['month'] = implode(',', $todoData->config['month']);
         }
 
-        if($formData->config['beforeDays'] and !validater::checkInt($formData->config['beforeDays']))
+        if($todoData->config['beforeDays'] and !validater::checkInt($todoData->config['beforeDays']))
         {
             dao::$errors[] = sprintf($this->lang->error->int[0], $this->lang->todo->beforeDaysLabel);
             return false;
         }
-        $formData->config['beforeDays'] = (int)$formData->config['beforeDays'];
-        $formData->config = json_encode($formData->config);
-        $formData->type   = 'cycle';
+        $todoData->config['beforeDays'] = (int)$todoData->config['beforeDays'];
 
-        return $formData;
+        $todoData->config = json_encode($todoData->config);
+        $todoData->type   = 'cycle';
+
+        return $todoData;
     }
 
     /**

From 678d65f10422aad37445d3646bb25ca15d2c0a03 Mon Sep 17 00:00:00 2001
From: dingguodong <dingguodong@easycorp.ltd>
Date: Sat, 6 May 2023 08:49:17 +0800
Subject: [PATCH 76/80] * Correct code refer to sonar.

---
 module/programplan/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/programplan/model.php b/module/programplan/model.php
index 26457e2c02..43ac210d17 100755
--- a/module/programplan/model.php
+++ b/module/programplan/model.php
@@ -713,6 +713,7 @@ class programplanModel extends model
         $orders         = $formData['orders'];
         $type           = $formData['type'];
         $codes          = $formData['codes'];
+        $output         = $formData['output'];
 
         /* Determine if a task has been created under the parent phase. */
         if(!$this->isCreateTask($parentID)) return dao::$errors['message'][] = $this->lang->programplan->error->createdTask;
@@ -856,7 +857,7 @@ class programplanModel extends model
 
         if(!isset($orders)) $orders = array();
         asort($orders);
-        if(count($orders) < count($datas))
+        if(count($orders) < count($plans))
         {
             $orderIndex = empty($orders) ? 0 : count($orders);
             $lastID     = $this->dao->select('id')->from(TABLE_EXECUTION)->orderBy('id_desc')->fetch('id');

From f3c38c1de63ff848f17cbb4d6f5e5edcef3ca8b9 Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Sat, 6 May 2023 01:02:38 +0000
Subject: [PATCH 77/80] * Optimize the code for the todo zen file.

---
 module/todo/zen.php | 30 ++++++++++++++----------------
 1 file changed, 14 insertions(+), 16 deletions(-)

diff --git a/module/todo/zen.php b/module/todo/zen.php
index e82e425211..ac88df88d9 100755
--- a/module/todo/zen.php
+++ b/module/todo/zen.php
@@ -121,9 +121,9 @@ class todoZen extends todo
             ->setDefault('assignedDate', helper::now())
             ->cleanInt('pri, begin, end, private')
             ->setIF($hasObject && $objectType,  'objectID', $objectID)
-            ->setIF($rowData->date == false,  'date', '2030-01-01')
-            ->setIF($rowData->begin == false, 'begin', '2400')
-            ->setIF($rowData->begin == false or $rowData->end == false, 'end', '2400')
+            ->setIF(!$rowData->date,  'date', '2030-01-01')
+            ->setIF(!$rowData->begin, 'begin', '2400')
+            ->setIF(!$rowData->begin || !$rowData->end, 'end', '2400')
             ->setIF($rowData->status == 'done', 'finishedBy', $this->app->user->account)
             ->setIF($rowData->status == 'done', 'finishedDate', helper::now())
             ->stripTags($this->config->todo->editor->create['id'], $this->config->allowedTags)
@@ -196,10 +196,6 @@ class todoZen extends todo
 
         $this->loadModel('action')->create('todo', $todo->id, 'opened');
 
-        $date = str_replace('-', '', $todo->date);
-        if($date == '')          $date = 'future';
-        if($date == date('Ymd')) $date = 'today';
-
         return $todo;
     }
 
@@ -239,10 +235,10 @@ class todoZen extends todo
             ->cleanInt('pri, begin, end, private')
             ->setIF(in_array($rowData->type, array('bug', 'task', 'story')), 'name', '')
             ->setIF($hasObject && $objectType,  'objectID', $objectID)
-            ->setIF($rowData->date  == false, 'date', '2030-01-01')
-            ->setIF($rowData->begin == false, 'begin', '2400')
-            ->setIF($rowData->end   == false, 'end', '2400')
-            ->setIF($rowData->type  == false, 'type', $oldTodo->type)
+            ->setIF(!$rowData->date, 'date', '2030-01-01')
+            ->setIF(!$rowData->begin, 'begin', '2400')
+            ->setIF(!$rowData->end, 'end', '2400')
+            ->setIF(!$rowData->type, 'type', $oldTodo->type)
             ->setDefault('private', 0)
             ->stripTags($this->config->todo->editor->edit['id'], $this->config->allowedTags)
             ->remove(implode(',', $this->config->todo->moduleList) . ',uid')
@@ -344,7 +340,6 @@ class todoZen extends todo
         }
 
         $this->buildBatchEditView();
-        return;
     }
 
     /**
@@ -485,12 +480,12 @@ class todoZen extends todo
         if($todo->config['type'] == 'week')
         {
             unset($todo->config['day'], $todo->config['month']);
-            $todo->config['week'] = join(',', $todo->config['week']);
+            $todo->config['week'] = implode(',', $todo->config['week']);
         }
         if($todo->config['type'] == 'month')
         {
             unset($todo->config['day'], $todo->config['week']);
-            $todo->config['month'] = join(',', $todo->config['month']);
+            $todo->config['month'] = implode(',', $todo->config['month']);
         }
 
         $todo->config['beforeDays'] = (int)$todo->config['beforeDays'];
@@ -753,9 +748,12 @@ class todoZen extends todo
     {
         foreach($todos as $todo)
         {
+            $begin = (isset($times[$todo->begin]) ? $times[$todo->begin] : $todo->begin);
+            $end   = (isset($times[$todo->end])   ? $times[$todo->end] : $todo->end);
+
             /* fill some field with useful value. */
-            $todo->begin = $todo->begin == '2400' ? '' : (isset($times[$todo->begin]) ? $times[$todo->begin] : $todo->begin);
-            $todo->end   = $todo->end   == '2400' ? '' : (isset($times[$todo->end])   ? $times[$todo->end] : $todo->end);
+            $todo->begin = $todo->begin == '2400' ? '' $begin;
+            $todo->end   = $todo->end   == '2400' ? '' $end;
 
             $type = $todo->type;
             if(isset($assemble->users[$todo->account])) $todo->account = $assemble->users[$todo->account];

From 5cb75109a8e466f98b375cb548b03f6c45ae0485 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Sat, 6 May 2023 09:18:32 +0800
Subject: [PATCH 78/80] * Adjust code for activate control function.

---
 module/project/config/form.php | 5 +++++
 module/project/zen.php         | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/module/project/config/form.php b/module/project/config/form.php
index c5ca91565f..2970993058 100644
--- a/module/project/config/form.php
+++ b/module/project/config/form.php
@@ -46,3 +46,8 @@ $config->project->form->edit['product']    = array('type' => 'array',  'required
 $config->project->form->start['realBegan'] = array('type' => 'date', 'required' => true, 'filter' => 'trim');
 
 $config->project->form->close['realEnd'] = array('type' => 'date', 'required' => true, 'filter' => 'trim');
+
+$config->project->form->activate['begin']        = array('type' => 'date',   'required' => true);
+$config->project->form->activate['end']          = array('type' => 'date',   'required' => true);
+$config->project->form->activate['readjustTime'] = array('type' => 'int',    'required' => false, 'default' => '');
+$config->project->form->activate['readjustTask'] = array('type' => 'array',    'required' => false, 'default' => '');
diff --git a/module/project/zen.php b/module/project/zen.php
index 205d8e7ffd..f3543af4a8 100644
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -569,7 +569,7 @@ class projectZen extends project
     {
         if($this->post->comment != '' or !empty($changes))
         {
-            $actionID = $this->action->create('project', $projectID, 'Activated', $this->post->comment);
+            $actionID = $this->loadModel('action')->create('project', $projectID, 'Activated', $this->post->comment);
             $this->action->logHistory($actionID, $changes);
         }
 
@@ -587,6 +587,7 @@ class projectZen extends project
      */
     protected function prepareActivateExtras(int $projectID, object $postData): object
     {
+        $rawdata      = $postData->rawdata;
         $oldProject   = $this->project->getByID($projectID);
         $editorIdList = $this->config->project->editor->activate['id'];
 
@@ -595,6 +596,8 @@ class projectZen extends project
             ->setDefault('status', 'doing')
             ->setDefault('lastEditedBy', $this->app->user->account)
             ->setDefault('lastEditedDate', helper::now())
+            ->setIF($rawdata->begin == '0000-00-00', 'begin', '')
+            ->setIF($rawdata->end   == '0000-00-00', 'end', '')
             ->setIF(!helper::isZeroDate($oldProject->realBegan), 'realBegan', helper::today())
             ->stripTags($editorIdList, $this->config->allowedTags)
             ->get();

From eb0f96c4e01544f3da03e8dce0a338ce2c76f39b Mon Sep 17 00:00:00 2001
From: xushenjie <xueshenjie@easycorp.ltd>
Date: Sat, 6 May 2023 01:18:22 +0000
Subject: [PATCH 79/80] * Adjust the method notes of todo module file.

---
 module/todo/model.php | 2 +-
 module/todo/tao.php   | 7 ++++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/module/todo/model.php b/module/todo/model.php
index 79a1223a2b..2984d8e56e 100755
--- a/module/todo/model.php
+++ b/module/todo/model.php
@@ -543,7 +543,7 @@ class todoModel extends model
 
     /**
      * 获取所有有效的周期待办列表。
-     * Get valid cycle todo listi.
+     * Get valid cycle todo list.
      *
      * @access public
      * @return array
diff --git a/module/todo/tao.php b/module/todo/tao.php
index aa8bb00c2d..f43a6113a1 100644
--- a/module/todo/tao.php
+++ b/module/todo/tao.php
@@ -71,7 +71,7 @@ class todoTao extends todoModel
     }
 
     /**
-     * 插入待办数据
+     * 插入待办数据。
      * Insert todo data.
      *
      * @param  object $todo
@@ -90,7 +90,7 @@ class todoTao extends todoModel
     }
 
     /**
-     * 更新待办数据
+     * 更新待办数据。
      * Update todo data.
      *
      * @param  int    $todoID
@@ -111,6 +111,7 @@ class todoTao extends todoModel
     }
 
     /**
+     * 关闭一个待办。
      * Close one todo.
      *
      * @param int $todoID
@@ -151,7 +152,7 @@ class todoTao extends todoModel
     }
 
     /**
-     * 通过待办构建周期待办数据
+     * 通过待办构建周期待办数据。
      * Build cycle todo.
      *
      * @param  object $todo

From 9d91c3e0cd8dcb67533963e9ecd421723f9694c4 Mon Sep 17 00:00:00 2001
From: Wangyuting <851424971@qq.com>
Date: Sat, 6 May 2023 09:20:10 +0800
Subject: [PATCH 80/80] * Optimize block code.

---
 .../block/ui/projectstatisticblock.html.php   |  2 +-
 module/block/ui/recentprojectblock.html.php   | 54 +++++++++++++++++++
 2 files changed, 55 insertions(+), 1 deletion(-)
 create mode 100644 module/block/ui/recentprojectblock.html.php

diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php
index 56c03cc4d3..292013c52c 100644
--- a/module/block/ui/projectstatisticblock.html.php
+++ b/module/block/ui/projectstatisticblock.html.php
@@ -19,7 +19,7 @@ foreach($projects as $project)
 {
     $navTabs[] = li
     (
-        set('class', 'nav-item' . ($project->id == $selected ? ' active' : '')),
+        set('class', 'nav-item ellipsis' . ($project->id == $selected ? ' active' : '')),
         a
         (
             set('data-toggle', 'tab'),
diff --git a/module/block/ui/recentprojectblock.html.php b/module/block/ui/recentprojectblock.html.php
new file mode 100644
index 0000000000..677e33c472
--- /dev/null
+++ b/module/block/ui/recentprojectblock.html.php
@@ -0,0 +1,54 @@
+<?php
+declare(strict_types=1);
+/**
+* The project block view file of block module of ZenTaoPMS.
+* @copyright   Copyright 2009-2023 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.zentao.net)
+* @license     ZPL(https://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+* @author      Wangyuting <wangyuting@easycorp.ltd>
+* @package     block
+* @link        https://www.zentao.net
+*/
+
+namespace zin;
+
+$cards = array();
+foreach($projects as $projectID => $project)
+{
+    $viewLink = $this->createLink('project', 'index', "projectID=$project->id");
+    $cards[] = div
+    (
+        set('class', 'card flex-1'), 
+        div
+        (
+            set('class', 'card-header'),
+            span($lang->project->{$project->model}),
+            a
+            (
+                set('href', $viewLink),
+                $project->name
+            )
+        ),
+        div
+        (
+            set('class', 'card-body'),
+            div
+            (
+                set('class', 'project-infos'),
+                span(sprintf($lang->project->membersUnit, $project->teamCount)),
+                span(sprintf($lang->project->hoursUnit, $project->estimate))
+            )
+        )
+    );
+}
+
+panel
+(
+    set('class', 'recentproject-block'),
+    div
+    (
+        set('class', 'flex cards'),
+        $cards
+    )
+);
+
+render();