From 82fe380a4cacb6f6e3631f3ba418ac27816ceca6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 10:03:41 +0800
Subject: [PATCH 01/12] * Refactor.

---
 extension/lite/custom/ext/lang/de/lite.php    | 2 +-
 extension/lite/custom/ext/lang/en/lite.php    | 2 +-
 extension/lite/custom/ext/lang/fr/lite.php    | 2 +-
 extension/lite/custom/ext/lang/zh-cn/lite.php | 2 +-
 module/admin/model.php                        | 1 -
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/extension/lite/custom/ext/lang/de/lite.php b/extension/lite/custom/ext/lang/de/lite.php
index f3ee432ea4..42dd81bdee 100644
--- a/extension/lite/custom/ext/lang/de/lite.php
+++ b/extension/lite/custom/ext/lang/de/lite.php
@@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user';
 $lang->custom->menuOrder[35] = 'block';
 
 $lang->custom->task = new stdClass();
-$lang->custom->task->fields['required'] = 'Required Field';
+$lang->custom->task->fields['required'] = $lang->custom->required;
 $lang->custom->task->fields['priList']  = 'Priority';
 $lang->custom->task->fields['typeList'] = 'Type';
 
diff --git a/extension/lite/custom/ext/lang/en/lite.php b/extension/lite/custom/ext/lang/en/lite.php
index f3ee432ea4..42dd81bdee 100644
--- a/extension/lite/custom/ext/lang/en/lite.php
+++ b/extension/lite/custom/ext/lang/en/lite.php
@@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user';
 $lang->custom->menuOrder[35] = 'block';
 
 $lang->custom->task = new stdClass();
-$lang->custom->task->fields['required'] = 'Required Field';
+$lang->custom->task->fields['required'] = $lang->custom->required;
 $lang->custom->task->fields['priList']  = 'Priority';
 $lang->custom->task->fields['typeList'] = 'Type';
 
diff --git a/extension/lite/custom/ext/lang/fr/lite.php b/extension/lite/custom/ext/lang/fr/lite.php
index f3ee432ea4..42dd81bdee 100644
--- a/extension/lite/custom/ext/lang/fr/lite.php
+++ b/extension/lite/custom/ext/lang/fr/lite.php
@@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user';
 $lang->custom->menuOrder[35] = 'block';
 
 $lang->custom->task = new stdClass();
-$lang->custom->task->fields['required'] = 'Required Field';
+$lang->custom->task->fields['required'] = $lang->custom->required;
 $lang->custom->task->fields['priList']  = 'Priority';
 $lang->custom->task->fields['typeList'] = 'Type';
 
diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php
index fc184d77d3..79a5a3ae29 100644
--- a/extension/lite/custom/ext/lang/zh-cn/lite.php
+++ b/extension/lite/custom/ext/lang/zh-cn/lite.php
@@ -22,7 +22,7 @@ $lang->custom->menuOrder[30] = 'user';
 $lang->custom->menuOrder[35] = 'block';
 
 $lang->custom->task = new stdClass();
-$lang->custom->task->fields['required'] = '必填项';
+$lang->custom->task->fields['required'] = $lang->custom->required;
 $lang->custom->task->fields['priList']  = '优先级';
 $lang->custom->task->fields['typeList'] = '类型';
 
diff --git a/module/admin/model.php b/module/admin/model.php
index 473552b348..7758f89356 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -293,7 +293,6 @@ class adminModel extends model
 
                     $this->lang->admin->menu->$subMenuKey = $subMenu;
                 }
-
             }
 
             if(isset($this->lang->admin->menuList->$menuKey['menuOrder']))   $this->lang->admin->menuOrder   = $this->lang->admin->menuList->$menuKey['menuOrder'];

From 3c4c046f5f47c2837c00922e7c6b19590610a157 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 10:43:38 +0800
Subject: [PATCH 02/12] * Delete space.

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

diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 7a728a8858..caa2c93e2c 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -30,7 +30,7 @@ include 'chosen.html.php';
   </div>
   <?php if(isset($lang->{$app->tab}->menu->$activeMenu) and is_array($lang->{$app->tab}->menu->$activeMenu) and isset($lang->{$app->tab}->menu->{$activeMenu}['subMenu'])):?>
   <?php $subMenuClass = $app->tab == 'admin' ? 'admin-tab-menu' : '';?>
-  <div id='subHeader'  class="<?php echo $subMenuClass?>">
+  <div id='subHeader' class="<?php echo $subMenuClass;?>">
     <div class='container'>
       <div id="pageNav" class='btn-toolbar'><?php if(isset($lang->modulePageNav)) echo $lang->modulePageNav;?></div>
       <nav id='subNavbar'><?php common::printModuleMenu($activeMenu);?></nav>

From 592550fa6aa788ee85631e9f1094a60117234b04 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 10:54:31 +0800
Subject: [PATCH 03/12] * Code for finish task #83723.

---
 module/admin/lang/menu.php   | 9 +++++++--
 module/admin/model.php       | 1 +
 module/custom/lang/de.php    | 1 +
 module/custom/lang/en.php    | 1 +
 module/custom/lang/fr.php    | 1 +
 module/custom/lang/zh-cn.php | 1 +
 6 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 17cbfcaca8..1b0308ebda 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -100,6 +100,9 @@ $lang->admin->menuList->feature['tabMenu']['product']['story']       = array('li
 $lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productplan->shortCommon}|custom|required|module=productplan", 'exclude' => 'custom-required');
 $lang->admin->menuList->feature['tabMenu']['product']['release']     = array('link' => "{$lang->release->common}|custom|required|module=release", 'exclude' => 'custom-required');
 
+$lang->admin->menuList->feature['tabMenu']['execution']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
+$lang->admin->menuList->feature['tabMenu']['execution']['task']      = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));
+
 $lang->admin->menuList->feature['menuOrder']['5']  = 'my';
 $lang->admin->menuList->feature['menuOrder']['10'] = 'product';
 $lang->admin->menuList->feature['menuOrder']['15'] = 'execution';
@@ -162,6 +165,8 @@ if($config->vision == 'lite')
     unset($lang->admin->menuList->feature['menuOrder']['15']);
     unset($lang->admin->menuList->feature['menuOrder']['20']);
 
-    $lang->admin->menuList->feature['subMenu']['project']   = array('link' => "{$lang->project->common}|custom|execution|");
-    $lang->admin->menuList->feature['menuOrder']['15'] = 'project';
+    $lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->project->common}|custom|execution|");
+    $lang->admin->menuList->feature['tabMenu']['project']['project']   = array('link' => "{$lang->project->common}|custom|required|module=project");
+    $lang->admin->menuList->feature['tabMenu']['project']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
+    $lang->admin->menuList->feature['menuOrder']['15']    = 'project';
 }
diff --git a/module/admin/model.php b/module/admin/model.php
index 7758f89356..04c9631687 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -281,6 +281,7 @@ class adminModel extends model
                     {
                         if(strpos(',todo,block,', $paramName) !== false and $subMenuKey == 'my') $subModule = 'custom';
                         if(strpos(',product,story,productplan,release,', $paramName) !== false and $subMenuKey == 'product') $subModule = 'custom';
+                        if(strpos(',task,', $paramName) !== false and $subMenuKey == 'execution') $subModule = 'custom';
                         if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom';
                     }
 
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 8368ead6cc..0d2bc0a85d 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -151,6 +151,7 @@ $lang->custom->story->fields['reviewResultList'] = 'Review Result';
 $lang->custom->story->fields['review']           = 'Review Required';
 
 $lang->custom->task = new stdClass();
+$lang->custom->task->fields['required']   = $lang->custom->required;
 $lang->custom->task->fields['priList']    = 'Priority';
 $lang->custom->task->fields['typeList']   = 'Type';
 $lang->custom->task->fields['reasonList'] = 'Close Reason';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 88e012b3c4..0f159c6349 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -151,6 +151,7 @@ $lang->custom->story->fields['reviewResultList'] = 'Review Result';
 $lang->custom->story->fields['review']           = 'Need Review';
 
 $lang->custom->task = new stdClass();
+$lang->custom->task->fields['required']   = $lang->custom->required;
 $lang->custom->task->fields['priList']    = 'Priority';
 $lang->custom->task->fields['typeList']   = 'Type';
 $lang->custom->task->fields['reasonList'] = 'Close Reason';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 9f95330f98..2b7d5261a7 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -151,6 +151,7 @@ $lang->custom->story->fields['reviewResultList'] = 'Valider Résultats';
 $lang->custom->story->fields['review']           = 'Validation Requise';
 
 $lang->custom->task = new stdClass();
+$lang->custom->task->fields['required']   = $lang->custom->required;
 $lang->custom->task->fields['priList']    = 'Priorité';
 $lang->custom->task->fields['typeList']   = 'Type';
 $lang->custom->task->fields['reasonList'] = 'Raison Fermeture';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 53648d2072..8f05819728 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -151,6 +151,7 @@ $lang->custom->story->fields['reviewResultList'] = '评审结果';
 $lang->custom->story->fields['review']           = '评审流程';
 
 $lang->custom->task = new stdClass();
+$lang->custom->task->fields['required']   = $lang->custom->required;
 $lang->custom->task->fields['priList']    = '优先级';
 $lang->custom->task->fields['typeList']   = '类型';
 $lang->custom->task->fields['reasonList'] = '关闭原因';

From 987e5c6fa96e41ea70b77d113d277b644d5ad267 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 11:11:03 +0800
Subject: [PATCH 04/12] * Code for finish task #83736.

---
 module/custom/lang/de.php    | 1 +
 module/custom/lang/en.php    | 1 +
 module/custom/lang/fr.php    | 1 +
 module/custom/lang/zh-cn.php | 1 +
 4 files changed, 4 insertions(+)

diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 0d2bc0a85d..6403e43be2 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -131,6 +131,7 @@ $lang->custom->block->fields['closed'] = 'Closed Block';
 $lang->custom->project = new stdClass();
 $lang->custom->project->currencySetting    = 'Currency Setting';
 $lang->custom->project->defaultCurrency    = 'Default Currency';
+$lang->custom->project->fields['required'] = $lang->custom->required;
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->product = new stdClass();
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 0f159c6349..4fa87d9251 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -131,6 +131,7 @@ $lang->custom->block->fields['closed'] = 'Closed Block';
 $lang->custom->project = new stdClass();
 $lang->custom->project->currencySetting    = 'Currency Setting';
 $lang->custom->project->defaultCurrency    = 'Default Currency';
+$lang->custom->project->fields['required'] = $lang->custom->required;
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->product = new stdClass();
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 2b7d5261a7..25b00de540 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -131,6 +131,7 @@ $lang->custom->block->fields['closed'] = 'Bloc Fermé';
 $lang->custom->project = new stdClass();
 $lang->custom->project->currencySetting    = 'Currency Setting';
 $lang->custom->project->defaultCurrency    = 'Default Currency';
+$lang->custom->project->fields['required'] = $lang->custom->required;
 $lang->custom->project->fields['unitList'] = 'Unit List';
 
 $lang->custom->product = new stdClass();
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 8f05819728..6d7e2e1a2e 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -131,6 +131,7 @@ $lang->custom->block->fields['closed'] = '关闭的区块';
 $lang->custom->project = new stdClass();
 $lang->custom->project->currencySetting    = '货币设置';
 $lang->custom->project->defaultCurrency    = '默认货币';
+$lang->custom->project->fields['required'] = $lang->custom->required;
 $lang->custom->project->fields['unitList'] = '预算单位';
 
 $lang->custom->product = new stdClass();

From dddee69dc643f3decd483de79c3f05eea3b1b5e6 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 11:12:49 +0800
Subject: [PATCH 05/12] * Code for finish task #83725.

---
 module/admin/lang/menu.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 1b0308ebda..621abb4d3b 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -161,9 +161,11 @@ if($config->vision == 'lite')
     unset($lang->admin->menuList->feature['subMenu']['product']);
     unset($lang->admin->menuList->feature['subMenu']['execution']);
     unset($lang->admin->menuList->feature['subMenu']['qa']);
+    unset($lang->admin->menuList->feature['subMenu']['kanban']);
     unset($lang->admin->menuList->feature['menuOrder']['10']);
     unset($lang->admin->menuList->feature['menuOrder']['15']);
     unset($lang->admin->menuList->feature['menuOrder']['20']);
+    unset($lang->admin->menuList->feature['menuOrder']['25']);
 
     $lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->project->common}|custom|execution|");
     $lang->admin->menuList->feature['tabMenu']['project']['project']   = array('link' => "{$lang->project->common}|custom|required|module=project");

From 03ed75a2d3857318698de3b5d2c110a1b4ca867e Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Feb 2023 12:44:50 +0800
Subject: [PATCH 06/12] * Code for task #83742.

---
 module/group/lang/resource.php      |  3 ++
 module/holiday/config.php           |  2 +
 module/holiday/control.php          | 36 ++++++++++++++
 module/holiday/css/browse.css       |  3 ++
 module/holiday/js/browse.js         |  7 +++
 module/holiday/lang/de.php          |  5 +-
 module/holiday/lang/en.php          |  5 +-
 module/holiday/lang/fr.php          |  5 +-
 module/holiday/lang/zh-cn.php       | 11 +++--
 module/holiday/model.php            | 76 +++++++++++++++++++++++++++++
 module/holiday/view/browse.html.php | 43 ++++++++--------
 module/holiday/view/create.html.php |  4 +-
 module/holiday/view/edit.html.php   |  4 +-
 module/holiday/view/import.html.php | 55 +++++++++++++++++++++
 www/theme/default/style.css         |  2 +-
 15 files changed, 225 insertions(+), 36 deletions(-)
 create mode 100644 module/holiday/js/browse.js
 create mode 100644 module/holiday/view/import.html.php

diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index 3636592d83..40d2c07675 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -75,6 +75,7 @@ $lang->moduleOrder[225] = 'mr';
 $lang->moduleOrder[230] = 'app';
 $lang->moduleOrder[235] = 'gogs';
 $lang->moduleOrder[240] = 'gitea';
+$lang->moduleOrder[245] = 'holiday';
 
 $lang->resource = new stdclass();
 
@@ -1931,11 +1932,13 @@ $lang->resource->holiday->create = 'createAction';
 $lang->resource->holiday->edit   = 'editAction';
 $lang->resource->holiday->delete = 'deleteAction';
 $lang->resource->holiday->browse = 'browse';
+$lang->resource->holiday->import = 'importAction';
 
 $lang->holiday->methodOrder[0]  = 'browse';
 $lang->holiday->methodOrder[5]  = 'create';
 $lang->holiday->methodOrder[10] = 'edit';
 $lang->holiday->methodOrder[15] = 'delete';
+$lang->holiday->methodOrder[20] = 'import';
 
 /* Action. */
 $lang->resource->action = new stdclass();
diff --git a/module/holiday/config.php b/module/holiday/config.php
index f46a285b1e..6c171384f7 100644
--- a/module/holiday/config.php
+++ b/module/holiday/config.php
@@ -3,3 +3,5 @@ if(!isset($config->holiday)) $config->holiday = new stdclass();
 $config->holiday->require = new stdclass();
 $config->holiday->require->create = 'name,begin,end';
 $config->holiday->require->edit   = 'name,begin,end';
+
+$config->holiday->apiRoot = 'https://ghproxy.com/https://raw.githubusercontent.com/NateScarlet/holiday-cn/master/%d.json';
diff --git a/module/holiday/control.php b/module/holiday/control.php
index 26658d3d81..9a0dcb2fce 100644
--- a/module/holiday/control.php
+++ b/module/holiday/control.php
@@ -31,9 +31,21 @@ class holiday extends control
      */
     public function browse($year = '')
     {
+        if(empty($year)) $year = date('Y');
+
         $holidays = $this->holiday->getList($year);
         $yearList = $this->holiday->getYearPairs();
 
+        $yearAndNext = array(date('Y'), date('Y') + 1);
+        foreach($yearAndNext as $date)
+        {
+            if(!in_array($date, $yearList))
+            {
+                $yearList[$date] = $date;
+            }
+        }
+        krsort($yearList);
+
         $this->view->title       = $this->lang->holiday->browse;
         $this->view->holidays    = $holidays;
         $this->view->yearList    = $yearList;
@@ -114,4 +126,28 @@ class holiday extends control
             return print(js::reload('parent'));
         }
     }
+
+    /**
+     * Import holiday.
+     *
+     * @param  string $year
+     * @access public
+     * @return void
+     */
+    public function import($year = '')
+    {
+        if(empty($year)) $year = date('Y');
+
+        $holidays = $this->holiday->getHolidayByAPI($year);
+        if(helper::isAjaxRequest())
+        {
+            $this->holiday->batchCreate($holidays);
+
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'parent'));
+        }
+
+        $this->view->holidays = $holidays;
+        $this->display();
+    }
 }
diff --git a/module/holiday/css/browse.css b/module/holiday/css/browse.css
index 9fb6ee448c..9c76821f51 100644
--- a/module/holiday/css/browse.css
+++ b/module/holiday/css/browse.css
@@ -3,3 +3,6 @@
 .with-side .main {padding-left: 145px; float: left;}
 .side-col {width: 160px;}
 .panel-sm .panel-body {padding: 10px;}
+#mainMenu .input-control {display: flex; width: 200px;}
+#mainMenu .input-control .form-name {margin: 8px 10px; white-space: pre;}
+.table-import {padding-top: 6px;}
diff --git a/module/holiday/js/browse.js b/module/holiday/js/browse.js
new file mode 100644
index 0000000000..0cfe06705a
--- /dev/null
+++ b/module/holiday/js/browse.js
@@ -0,0 +1,7 @@
+$(function()
+{
+    $(document).on('change', '#year', function()
+    {
+        window.location.href = createLink('holiday', 'browse', 'year=' + $(this).val()) + '?_single=1';
+    });
+});
diff --git a/module/holiday/lang/de.php b/module/holiday/lang/de.php
index c922267c1c..f6e9bb99fd 100644
--- a/module/holiday/lang/de.php
+++ b/module/holiday/lang/de.php
@@ -9,6 +9,7 @@ $lang->holiday->delete = 'Delete';
 $lang->holiday->createAction = 'Create Holiday';
 $lang->holiday->editAction   = 'Edit Holiday';
 $lang->holiday->deleteAction = 'Delete Holiday';
+$lang->holiday->importAction = 'Import Holiday';
 
 $lang->holiday->id    = 'ID';
 $lang->holiday->name  = 'Name';
@@ -18,10 +19,12 @@ $lang->holiday->begin = 'Begin';
 $lang->holiday->end   = 'End';
 $lang->holiday->all   = 'All';
 
-$lang->holiday->holiday = 'Holiday';
+$lang->holiday->holiday   = 'Holiday';
+$lang->holiday->checkYear = 'Year selection';
 
 $lang->holiday->typeList['holiday'] = 'Holiday';
 $lang->holiday->typeList['working'] = 'Working Day';
 
 $lang->holiday->emptyTip      = 'No Holiday';
 $lang->holiday->confirmDelete = 'Confirm removal of holidays?';
+$lang->holiday->importTip     = '';
diff --git a/module/holiday/lang/en.php b/module/holiday/lang/en.php
index c922267c1c..f6e9bb99fd 100644
--- a/module/holiday/lang/en.php
+++ b/module/holiday/lang/en.php
@@ -9,6 +9,7 @@ $lang->holiday->delete = 'Delete';
 $lang->holiday->createAction = 'Create Holiday';
 $lang->holiday->editAction   = 'Edit Holiday';
 $lang->holiday->deleteAction = 'Delete Holiday';
+$lang->holiday->importAction = 'Import Holiday';
 
 $lang->holiday->id    = 'ID';
 $lang->holiday->name  = 'Name';
@@ -18,10 +19,12 @@ $lang->holiday->begin = 'Begin';
 $lang->holiday->end   = 'End';
 $lang->holiday->all   = 'All';
 
-$lang->holiday->holiday = 'Holiday';
+$lang->holiday->holiday   = 'Holiday';
+$lang->holiday->checkYear = 'Year selection';
 
 $lang->holiday->typeList['holiday'] = 'Holiday';
 $lang->holiday->typeList['working'] = 'Working Day';
 
 $lang->holiday->emptyTip      = 'No Holiday';
 $lang->holiday->confirmDelete = 'Confirm removal of holidays?';
+$lang->holiday->importTip     = '';
diff --git a/module/holiday/lang/fr.php b/module/holiday/lang/fr.php
index c922267c1c..f6e9bb99fd 100644
--- a/module/holiday/lang/fr.php
+++ b/module/holiday/lang/fr.php
@@ -9,6 +9,7 @@ $lang->holiday->delete = 'Delete';
 $lang->holiday->createAction = 'Create Holiday';
 $lang->holiday->editAction   = 'Edit Holiday';
 $lang->holiday->deleteAction = 'Delete Holiday';
+$lang->holiday->importAction = 'Import Holiday';
 
 $lang->holiday->id    = 'ID';
 $lang->holiday->name  = 'Name';
@@ -18,10 +19,12 @@ $lang->holiday->begin = 'Begin';
 $lang->holiday->end   = 'End';
 $lang->holiday->all   = 'All';
 
-$lang->holiday->holiday = 'Holiday';
+$lang->holiday->holiday   = 'Holiday';
+$lang->holiday->checkYear = 'Year selection';
 
 $lang->holiday->typeList['holiday'] = 'Holiday';
 $lang->holiday->typeList['working'] = 'Working Day';
 
 $lang->holiday->emptyTip      = 'No Holiday';
 $lang->holiday->confirmDelete = 'Confirm removal of holidays?';
+$lang->holiday->importTip     = '';
diff --git a/module/holiday/lang/zh-cn.php b/module/holiday/lang/zh-cn.php
index 5f38ebbcda..7e9fd2499e 100644
--- a/module/holiday/lang/zh-cn.php
+++ b/module/holiday/lang/zh-cn.php
@@ -6,9 +6,10 @@ $lang->holiday->create = '新建';
 $lang->holiday->edit   = '编辑';
 $lang->holiday->delete = '删除';
 
-$lang->holiday->createAction  = '创建节假日';
-$lang->holiday->editAction    = '编辑节假日';
-$lang->holiday->deleteAction  = '删除节假日';
+$lang->holiday->createAction = '创建节假日';
+$lang->holiday->editAction   = '编辑节假日';
+$lang->holiday->deleteAction = '删除节假日';
+$lang->holiday->importAction = '导入节假日';
 
 $lang->holiday->id    = '编号';
 $lang->holiday->name  = '名称';
@@ -18,10 +19,12 @@ $lang->holiday->begin = '开始日期';
 $lang->holiday->end   = '结束日期';
 $lang->holiday->all   = '所有';
 
-$lang->holiday->holiday = '假期';
+$lang->holiday->holiday   = '假期';
+$lang->holiday->checkYear = '年份选择';
 
 $lang->holiday->typeList['holiday'] = '假期';
 $lang->holiday->typeList['working'] = '补班';
 
 $lang->holiday->emptyTip      = '暂时没有节假日。';
 $lang->holiday->confirmDelete = '确认删除节假日？';
+$lang->holiday->importTip     = '可以在此 %s国家法定节假日。';
diff --git a/module/holiday/model.php b/module/holiday/model.php
index 2b4a05d0f3..3b6e66f1e1 100644
--- a/module/holiday/model.php
+++ b/module/holiday/model.php
@@ -408,4 +408,80 @@ class holidayModel extends model
             $this->dao->update(TABLE_TASK)->set('realDuration')->eq($realDuration)->where('id')->eq($task->id)->exec();
         }
     }
+
+    /**
+     * Get holidays by api.
+     *
+     * @param  string $year
+     * @access public
+     * @return array
+     */
+    public function getHolidayByAPI($year = '')
+    {
+        if(empty($year)) $year = date('Y');
+        $apiRoot = sprintf($this->config->holiday->apiRoot, $year);
+        $data    = json_decode(common::http($apiRoot));
+        $days    = isset($data->days) ? (array)$data->days : array();
+
+        $holidays   = array();
+        $privDay    = 0;
+        $prevDayOff = true;
+        $daysIndex  = count($days) - 1;
+        foreach($days as $index => $day)
+        {
+            if($index < $daysIndex and (strtotime($day->date) - $privDay > 86400 or $day->isOffDay != $prevDayOff))
+            {
+                $holiday = new stdClass();
+                $holiday->type  = $day->isOffDay ? 'holiday' : 'working';
+                $holiday->name  = $day->name . zget($this->lang->holiday->typeList, $holiday->type);
+                $holiday->begin = $day->date;
+                $holiday->end   = '';
+                $holidays[] = $holiday;
+            }
+
+            if(isset($holiday) or $index == $daysIndex)
+            {
+                $holidayNum = count($holidays);
+                if($holidayNum > 1)
+                {
+                    if(isset($holiday))
+                    {
+                        $holidays[$holidayNum - 2]->end = date('Y-m-d', $privDay);
+                    }
+                    else
+                    {
+                        $holidays[$holidayNum - 1]->end = $day->date;
+                    }
+                }
+                if(isset($holiday)) unset($holiday);
+            }
+
+            $privDay    = strtotime($day->date);
+            $prevDayOff = $day->isOffDay;
+        }
+        return $holidays;
+    }
+
+    /**
+     * Batch create holiday.
+     *
+     * @param  array  $holidays
+     * @access public
+     * @return int|bool
+     */
+    public function batchCreate($holidays)
+    {
+        foreach($holidays as $holiday)
+        {
+            $this->dao->insert(TABLE_HOLIDAY)->data($holiday)
+                ->autoCheck()
+                ->batchCheck($this->config->holiday->require->create, 'notempty')
+                ->check('end', 'ge', $holiday->begin)
+                ->exec();
+        }
+        if(dao::isError()) return false;
+
+        $lastInsertID = $this->dao->lastInsertID();
+        return $lastInsertID;
+    }
 }
diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php
index 637a4ac554..624f3e0e8a 100644
--- a/module/holiday/view/browse.html.php
+++ b/module/holiday/view/browse.html.php
@@ -13,38 +13,26 @@
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
   <div class='pull-left btn-toolbar'>
-    <?php
-    echo html::a($this->createLink('holiday', 'browse'), '<span class="text">' . $lang->holiday->all . '</span>', '', "class='btn btn-link btn-active-text' data-app='oa'");
-    ?>
+    <div class='input-control'>
+      <span class="form-name"><strong><?php echo $lang->holiday->checkYear;?></strong></span>
+      <?php echo html::select('year', $yearList, $currentYear, "class='form-control chosen'");?>
+    </div>
   </div>
   <div class='pull-right'>
     <?php common::printLink('holiday', 'create', "", "<i class='icon icon-plus'> </i>" . $lang->holiday->create, '', "class='btn btn-primary iframe'", '', true)?>
   </div>
 </div>
 <div id='mainContent' class='main-row fade in'>
-  <div class='side-col'>
-    <div class='panel panel-sm'>
-      <div class='panel-body'>
-        <ul class='tree' data-ride='tree' data-collapsed='true'>
-          <?php foreach($yearList as $year):?>
-          <li class='<?php echo $year == $currentYear ? 'active' : ''?>'>
-            <?php common::printLink('holiday', 'browse', "year=$year", $year);?>
-          </li>
-          <?php endforeach;?>
-        </ul>
-      </div>
-    </div>
-  </div>
   <div class='main-col main-table'>
-  <?php if(!empty($holidays)):?>
+    <?php if(!empty($holidays)):?>
     <table class='table has-sort-head'>
       <thead>
         <tr>
-          <th class='w-150px'><?php echo $lang->holiday->name;?></th>
-          <th class='w-200px'><?php echo $lang->holiday->holiday;?></th>
-          <th class='w-80px'><?php echo $lang->holiday->type;?></th>
-          <th><?php echo $lang->holiday->desc;?></th>
-          <th class='w-100px'><?php echo $lang->actions;?></th>
+          <th class='c-name'><?php echo $lang->holiday->name;?></th>
+          <th class='c-time-limit'><?php echo $lang->holiday->holiday;?></th>
+          <th class='c-status'><?php echo $lang->holiday->type;?></th>
+          <th class='c-object'><?php echo $lang->holiday->desc;?></th>
+          <th class='c-actions-2'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
       <?php foreach($holidays as $holiday):?>
@@ -60,13 +48,20 @@
       </tr>
       <?php endforeach;?>
     </table>
-  <?php else:?>
+    <?php else:?>
     <div class="table-empty-tip">
       <p>
         <span class="text-muted"><?php echo $lang->holiday->emptyTip;?></span>
       </p>
     </div>
-  <?php endif;?>
+    <?php endif;?>
+    <?php if(!common::checkNotCN() and common::hasPriv('holiday', 'import') and $currentYear >= date('Y')):?>
+    <div class="table-footer">
+      <div class="table-import">
+        <?php echo sprintf($lang->holiday->importTip, html::a(helper::createLink('holiday', 'import', "year=$currentYear", '', true), $lang->import, '', "class='text-primary iframe' data-width='40%'"));?>
+      </div>
+    </div>
+    <?php endif;?>
   </div>
 </div>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/holiday/view/create.html.php b/module/holiday/view/create.html.php
index a286293d64..9ad43d0195 100644
--- a/module/holiday/view/create.html.php
+++ b/module/holiday/view/create.html.php
@@ -45,8 +45,8 @@
           <th><?php echo $lang->holiday->desc?></th>
           <td><?php echo html::textarea('desc', '', "class='form-control'")?></td>
           <td></td>
-        </tr> 
-        <tr><th></th><td clospan='2'><?php echo baseHTML::submitButton();?></td></tr>
+        </tr>
+        <tr><th></th><td colspan='2'><?php echo baseHTML::submitButton();?></td></tr>
       </table>
     </form>
   </div>
diff --git a/module/holiday/view/edit.html.php b/module/holiday/view/edit.html.php
index 4dd0c050b2..511598302b 100644
--- a/module/holiday/view/edit.html.php
+++ b/module/holiday/view/edit.html.php
@@ -45,8 +45,8 @@
           <th><?php echo $lang->holiday->desc?></th>
           <td><?php echo html::textarea('desc', $holiday->desc, "class='form-control'")?></td>
           <td></td>
-        </tr> 
-        <tr><th></th><td clospan='2'><?php echo baseHTML::submitButton();?></td></tr>
+        </tr>
+        <tr><th></th><td colspan='2'><?php echo baseHTML::submitButton();?></td></tr>
       </table>
     </form>
   </div>
diff --git a/module/holiday/view/import.html.php b/module/holiday/view/import.html.php
new file mode 100644
index 0000000000..ed2d812d6f
--- /dev/null
+++ b/module/holiday/view/import.html.php
@@ -0,0 +1,55 @@
+<?php
+/**
+ * The browse view file of holiday module of ZenTao.
+ *
+ * @copyright   Copyright 2009-2018 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
+ * @author      chujilu <chujilu@cnezsoft.com>
+ * @package     holiday
+ * @version     $Id$
+ * @link        https://www.zentao.net
+ */
+?>
+<?php include '../../common/view/header.html.php';?>
+<style>
+.body-modal #mainContent {padding-top: 28px;}
+#mainContent td.text-center {border: none;}
+#mainContent td.text-center .btn-cancel {margin-left: 20px;}
+</style>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <?php if(!empty($holidays)):?>
+    <form class='form-ajax' method='post'>
+      <table class='table'>
+        <thead>
+          <tr>
+            <th><?php echo $lang->holiday->name;?></th>
+            <th><?php echo $lang->holiday->holiday;?></th>
+          </tr>
+        </thead>
+        <tbody>
+          <?php foreach($holidays as $holiday):?>
+          <tr>
+            <td><?php echo $holiday->name;?></td>
+            <td><?php echo formatTime($holiday->begin, DT_DATE1) . ' ~ ' . formatTime($holiday->end, DT_DATE1);?></td>
+          </tr>
+          <?php endforeach;?>
+        <tr>
+          <td colspan='2' class='text-center'>
+            <?php echo html::submitButton($lang->import);?>
+            <?php echo html::commonButton($lang->cancel, 'data-dismiss="modal"', 'btn btn-wide btn-cancel');?>
+          </td>
+        </tr>
+        </tbody>
+      </table>
+    </form>
+    <?php else:?>
+    <div class="table-empty-tip">
+      <p>
+        <span class="text-muted"><?php echo $lang->holiday->emptyTip;?></span>
+      </p>
+    </div>
+    <?php endif;?>
+  </div>
+</div>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/www/theme/default/style.css b/www/theme/default/style.css
index 3e9d518d0f..b2b9ca32cd 100644
--- a/www/theme/default/style.css
+++ b/www/theme/default/style.css
@@ -68,7 +68,7 @@ th.c-confirmed, th.c-confirm {text-align: center;}
 .c-object-type {width: 130px;}
 .c-full-date, .c-mobile, .c-email, .c-text, .c-subject, .c-assigned-box, .c-user-box {width: 150px;}
 .c-module, .c-date-box {width: 180px;}
-.c-ip {width: 200px;}
+.c-ip, .c-time-limit {width: 200px;}
 .c-object {width: 250px;}
 .c-case-step {width: 300px;}
 .c-actions-8 {width: 240px;}

From adfc82feef888678c3decaf0e9469c0374ce4ce5 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Feb 2023 13:10:07 +0800
Subject: [PATCH 07/12] * Optimize holiday import style.

---
 module/holiday/view/browse.html.php |  2 +-
 module/holiday/view/import.html.php | 35 ++++++++++++++++-------------
 2 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/module/holiday/view/browse.html.php b/module/holiday/view/browse.html.php
index 624f3e0e8a..073878af8e 100644
--- a/module/holiday/view/browse.html.php
+++ b/module/holiday/view/browse.html.php
@@ -58,7 +58,7 @@
     <?php if(!common::checkNotCN() and common::hasPriv('holiday', 'import') and $currentYear >= date('Y')):?>
     <div class="table-footer">
       <div class="table-import">
-        <?php echo sprintf($lang->holiday->importTip, html::a(helper::createLink('holiday', 'import', "year=$currentYear", '', true), $lang->import, '', "class='text-primary iframe' data-width='40%'"));?>
+        <?php echo sprintf($lang->holiday->importTip, html::a(helper::createLink('holiday', 'import', "year=$currentYear", '', true), $lang->import, '', "class='text-primary iframe' data-width='400px'"));?>
       </div>
     </div>
     <?php endif;?>
diff --git a/module/holiday/view/import.html.php b/module/holiday/view/import.html.php
index ed2d812d6f..4a1c38cca1 100644
--- a/module/holiday/view/import.html.php
+++ b/module/holiday/view/import.html.php
@@ -12,36 +12,41 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <style>
-.body-modal #mainContent {padding-top: 28px;}
-#mainContent td.text-center {border: none;}
-#mainContent td.text-center .btn-cancel {margin-left: 20px;}
+#main > .container {padding: 0;}
+.body-modal #mainContent {padding: 0;}
+.modal-iframe .modal-header {display: none;}
+#mainContent .table {margin-bottom: 0;}
+#mainContent .table thead th {padding-top: 20px;}
+#mainContent .table tr {height: 40px;}
+#mainContent .table .c-name {padding-left: 40px;}
+#mainContent .table .c-time-limit {padding-right: 40px;}
+.body-modal .table-footer {margin-top: 20px;}
+#mainContent .table-footer .btn-cancel {margin-left: 16px;}
 </style>
 <div id='mainContent' class='main-content'>
-  <div class='center-block'>
+  <div class='center-block main-table'>
     <?php if(!empty($holidays)):?>
     <form class='form-ajax' method='post'>
-      <table class='table'>
+      <table class='table table-fixed'>
         <thead>
           <tr>
-            <th><?php echo $lang->holiday->name;?></th>
-            <th><?php echo $lang->holiday->holiday;?></th>
+            <th class="c-name"><?php echo $lang->holiday->name;?></th>
+            <th class="c-time-limit"><?php echo $lang->holiday->holiday;?></th>
           </tr>
         </thead>
         <tbody>
           <?php foreach($holidays as $holiday):?>
           <tr>
-            <td><?php echo $holiday->name;?></td>
-            <td><?php echo formatTime($holiday->begin, DT_DATE1) . ' ~ ' . formatTime($holiday->end, DT_DATE1);?></td>
+            <td class="c-name"><?php echo $holiday->name;?></td>
+            <td class="c-time-limit"><?php echo formatTime($holiday->begin, DT_DATE1) . ' ~ ' . formatTime($holiday->end, DT_DATE1);?></td>
           </tr>
           <?php endforeach;?>
-        <tr>
-          <td colspan='2' class='text-center'>
-            <?php echo html::submitButton($lang->import);?>
-            <?php echo html::commonButton($lang->cancel, 'data-dismiss="modal"', 'btn btn-wide btn-cancel');?>
-          </td>
-        </tr>
         </tbody>
       </table>
+      <div class="table-footer text-center">
+        <?php echo html::submitButton($lang->import, '', 'btn btn-primary');?>
+        <?php echo html::commonButton($lang->cancel, 'data-dismiss="modal"', 'btn btn-cancel');?>
+    </div>
     </form>
     <?php else:?>
     <div class="table-empty-tip">

From c97774f8a05d174c1790bd7229c70123d727cd39 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Feb 2023 13:26:16 +0800
Subject: [PATCH 08/12] * Optimize admin page style.

---
 module/admin/config.php          |  2 ++
 module/admin/css/index.css       |  8 ++++----
 module/admin/view/index.html.php | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index 0c3cc75852..7de8810a39 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -57,6 +57,8 @@ $config->admin->plugins[194]->viewLink = 'https://www.zentao.net/extension-viewE
 $config->admin->apiRoot      = 'https://www.zentao.net/';
 $config->admin->classURL     = 'https://www.zentao.net/publicclass.html';
 $config->admin->extensionURL = 'https://www.zentao.net/extension-browse.html';
+$config->admin->patchURL     = 'https://www.zentao.net/extension-browse-byModule-1218.html';
+$config->admin->downloadURL  = 'https://www.zentao.net/download.html';
 $config->admin->liteMenuList = array('system', 'user', 'feature', 'message', 'extension', 'dev');
 
 $config->admin->helpURL['system']    = 'https://www.zentao.net/book/zentaopms/538.html';
diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 06ba1c9a99..815c5a3265 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -78,15 +78,15 @@
 .main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;}
 
 /* css in side */
-.time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px;}
+.time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;}
 .dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
 .dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white;}
-.time-count {letter-spacing: 2px;}
+.time-count {letter-spacing: 1px;}
 
-.patch-block {padding: 12px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
+.patch-block {padding: 10px 16px 12px; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .patch-content {height: 40px; overflow: hidden;}
 
-.upgrade-block {padding: 16px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
+.upgrade-block {padding: 6px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .upgrade-content {height: 20px; padding-left: 20px; position: relative; margin: 5px 0;}
 .upgrade-content:before {content: ' '; width: 8px; height: 8px; background: #E3E4E9; border-radius: 50%; position: absolute; left: 0px; top: 5px;}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 7fae6c12d4..79060aee20 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -95,7 +95,7 @@
     <div class="border-gray mb-16 radius-4">
       <div class="h-40 pl-16 flex align-center justify-between">
         <div class="panel-title"><?php echo $lang->admin->updateDynamics?></div>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
+        <?php echo html::a($config->admin->downloadURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <div class="dynamic-block">
         <div class="dynamic-content"><i class="icon icon-horn text-primary pr-4 font-20"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
@@ -113,7 +113,7 @@
     <div class="border-gray mb-16 radius-4">
       <div class="h-40 pl-16 flex align-center justify-between">
         <div class="panel-title"><?php echo $lang->admin->updatePatch?></div>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
+        <?php echo html::a($config->admin->patchURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <?php foreach($this->view->patches as $patch):?>
       <div class="patch-block">
@@ -130,22 +130,22 @@
     <div class="border-gray mb-16 radius-4">
       <div class="h-40 pl-16 flex align-center justify-between">
         <div class="panel-title"><?php echo $lang->admin->upgradeRecommend?></div>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
+        <?php echo html::a($config->admin->downloadURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <div class="upgrade-block">
-	<div class="title text-primary flex justify-between">
+        <a class="title text-primary flex justify-between" href="<?php echo $config->admin->downloadURL;?>" target="_blank">
           <div class="panel-title"><i class="icon icon-zentao text-primary pr-4 font-18"></i>禅道企业版</div>
           <div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary pb-3"></i></div>
-        </div>
+        </a>
         <div class="upgrade-content">工时管理、甘特图、导入导出</div>
         <div class="upgrade-content">40+内置统计报表、自定义报表功能</div>
         <div class="upgrade-content">强大的自定义工作流、反馈管理功能</div>
       </div>
       <div class="upgrade-block">
-	<div class="title text-primary flex justify-between">
+        <a class="title text-primary flex justify-between" href='<?php echo $config->admin->downloadURL;?>' target="_blank">
           <div class="panel-title"><i class="icon icon-zentao text-primary pr-4 font-18"></i>禅道旗舰版</div>
           <div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary pb-3"></i></div>
-        </div>
+        </a>
         <div class="upgrade-content">工时管理、甘特图、导入导出</div>
         <div class="upgrade-content">40+内置统计报表、自定义报表功能</div>
         <div class="upgrade-content">强大的自定义工作流、反馈管理功能</div>

From d5cfe179801ea88275133e0690dad33cc1c83d56 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 14:11:23 +0800
Subject: [PATCH 09/12] * Code for finish task #83743.

---
 extension/lite/custom/ext/lang/de/lite.php    | 2 ++
 extension/lite/custom/ext/lang/en/lite.php    | 2 ++
 extension/lite/custom/ext/lang/fr/lite.php    | 2 ++
 extension/lite/custom/ext/lang/zh-cn/lite.php | 2 ++
 module/admin/config.php                       | 7 +++++++
 module/admin/lang/menu.php                    | 9 +++++----
 module/admin/model.php                        | 9 +++++----
 module/custom/lang/de.php                     | 1 -
 module/custom/lang/en.php                     | 1 -
 module/custom/lang/fr.php                     | 1 -
 module/custom/lang/zh-cn.php                  | 1 -
 module/custom/view/required.html.php          | 2 +-
 12 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/extension/lite/custom/ext/lang/de/lite.php b/extension/lite/custom/ext/lang/de/lite.php
index 42dd81bdee..a11fc0cd5f 100644
--- a/extension/lite/custom/ext/lang/de/lite.php
+++ b/extension/lite/custom/ext/lang/de/lite.php
@@ -12,6 +12,7 @@ $lang->custom->object['task']      = 'Task';
 $lang->custom->object['todo']      = 'Todo';
 $lang->custom->object['user']      = 'User';
 $lang->custom->object['block']     = 'Block';
+$lang->custom->object['project']   = $lang->projectCommon;
 
 $lang->custom->menuOrder = array();
 $lang->custom->menuOrder[10] = 'execution';
@@ -27,6 +28,7 @@ $lang->custom->task->fields['priList']  = 'Priority';
 $lang->custom->task->fields['typeList'] = 'Type';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['reasonList']       = 'Close Reason';
 $lang->custom->story->fields['statusList']       = 'Status';
diff --git a/extension/lite/custom/ext/lang/en/lite.php b/extension/lite/custom/ext/lang/en/lite.php
index 42dd81bdee..a11fc0cd5f 100644
--- a/extension/lite/custom/ext/lang/en/lite.php
+++ b/extension/lite/custom/ext/lang/en/lite.php
@@ -12,6 +12,7 @@ $lang->custom->object['task']      = 'Task';
 $lang->custom->object['todo']      = 'Todo';
 $lang->custom->object['user']      = 'User';
 $lang->custom->object['block']     = 'Block';
+$lang->custom->object['project']   = $lang->projectCommon;
 
 $lang->custom->menuOrder = array();
 $lang->custom->menuOrder[10] = 'execution';
@@ -27,6 +28,7 @@ $lang->custom->task->fields['priList']  = 'Priority';
 $lang->custom->task->fields['typeList'] = 'Type';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['reasonList']       = 'Close Reason';
 $lang->custom->story->fields['statusList']       = 'Status';
diff --git a/extension/lite/custom/ext/lang/fr/lite.php b/extension/lite/custom/ext/lang/fr/lite.php
index 42dd81bdee..a11fc0cd5f 100644
--- a/extension/lite/custom/ext/lang/fr/lite.php
+++ b/extension/lite/custom/ext/lang/fr/lite.php
@@ -12,6 +12,7 @@ $lang->custom->object['task']      = 'Task';
 $lang->custom->object['todo']      = 'Todo';
 $lang->custom->object['user']      = 'User';
 $lang->custom->object['block']     = 'Block';
+$lang->custom->object['project']   = $lang->projectCommon;
 
 $lang->custom->menuOrder = array();
 $lang->custom->menuOrder[10] = 'execution';
@@ -27,6 +28,7 @@ $lang->custom->task->fields['priList']  = 'Priority';
 $lang->custom->task->fields['typeList'] = 'Type';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['priList']          = 'Priority';
 $lang->custom->story->fields['reasonList']       = 'Close Reason';
 $lang->custom->story->fields['statusList']       = 'Status';
diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php
index 79a5a3ae29..fd96d6bb8e 100644
--- a/extension/lite/custom/ext/lang/zh-cn/lite.php
+++ b/extension/lite/custom/ext/lang/zh-cn/lite.php
@@ -12,6 +12,7 @@ $lang->custom->object['task']      = '任务';
 $lang->custom->object['todo']      = '待办';
 $lang->custom->object['user']      = '用户';
 $lang->custom->object['block']     = '区块';
+$lang->custom->object['project']   = $lang->projectCommon;
 
 $lang->custom->menuOrder = array();
 $lang->custom->menuOrder[10] = 'execution';
@@ -27,6 +28,7 @@ $lang->custom->task->fields['priList']  = '优先级';
 $lang->custom->task->fields['typeList'] = '类型';
 
 $lang->custom->story = new stdClass();
+$lang->custom->story->fields['required']         = $lang->custom->required;
 $lang->custom->story->fields['priList']          = '优先级';
 $lang->custom->story->fields['reasonList']       = '关闭原因';
 $lang->custom->story->fields['statusList']       = '状态';
diff --git a/module/admin/config.php b/module/admin/config.php
index 0c3cc75852..1bf1ed4af6 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -23,6 +23,13 @@ $config->admin->menuModuleGroup['model']['custom|required']   = array('project',
 $config->admin->menuModuleGroup['feature']['custom|set']      = array('todo', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
 $config->admin->menuModuleGroup['feature']['custom|required'] = array('bug', 'doc', 'product', 'story', 'productplan', 'release', 'task', 'bug', 'testcase', 'testsuite', 'testtask', 'testreport', 'caselib', 'doc', 'feedback', 'user');
 $config->admin->menuModuleGroup['template']['custom|set']     = array('baseline');
+if($config->vision == 'lite')
+{
+    $config->admin->menuModuleGroup['model']['custom|set']        = array('issue', 'risk', 'opportunity', 'nc');
+    $config->admin->menuModuleGroup['model']['custom|required']   = array('build');
+    $config->admin->menuModuleGroup['feature']['custom|set']      = array('project', 'todo', 'feedback', 'user', 'block', 'story', 'task', 'bug', 'testcase', 'testtask', 'feedback', 'user');
+    $config->admin->menuModuleGroup['feature']['custom|required'] = array('project', 'task', 'story');
+}
 
 $config->admin->plugins[203] = new stdClass();
 $config->admin->plugins[203]->name     = '人力资源日历';
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 621abb4d3b..b15654f033 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -93,7 +93,7 @@ $lang->admin->menuList->feature['subMenu']['user']        = array('link' => "{$l
 
 $lang->admin->menuList->feature['tabMenu']['my']['todo']  = array('link' => "{$lang->todo->common}|custom|set|module=todo&field=priList", 'exclude' => 'custom-set');
 $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed", 'exclude' => 'custom-set');
-if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));
+if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'), 'exclude' => 'custom-required');
 
 $lang->admin->menuList->feature['tabMenu']['product']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept,product', 'exclude' => 'custom-required');
 $lang->admin->menuList->feature['tabMenu']['product']['story']       = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"), 'exclude' => 'custom-required');
@@ -167,8 +167,9 @@ if($config->vision == 'lite')
     unset($lang->admin->menuList->feature['menuOrder']['20']);
     unset($lang->admin->menuList->feature['menuOrder']['25']);
 
-    $lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->project->common}|custom|execution|");
-    $lang->admin->menuList->feature['tabMenu']['project']['project']   = array('link' => "{$lang->project->common}|custom|required|module=project");
+    $lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->projectCommon}|custom|execution|", 'exclude' => 'set,required', 'alias' => 'execution');
+    $lang->admin->menuList->feature['tabMenu']['project']['project']   = array('link' => "{$lang->projectCommon}|custom|required|module=project", 'exclude' => 'custom-required');
     $lang->admin->menuList->feature['tabMenu']['project']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
-    $lang->admin->menuList->feature['menuOrder']['15']    = 'project';
+    $lang->admin->menuList->feature['tabMenu']['project']['story']     = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=priList"), 'exclude' => 'custom-required');
+    $lang->admin->menuList->feature['menuOrder']['15'] = 'project';
 }
diff --git a/module/admin/model.php b/module/admin/model.php
index 04c9631687..9cc9047442 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -279,16 +279,17 @@ class adminModel extends model
                     $subModule = '';
                     if($moduleName == 'custom' and strpos(',required,set,', $methodName) !== false)
                     {
-                        if(strpos(',todo,block,', $paramName) !== false and $subMenuKey == 'my') $subModule = 'custom';
-                        if(strpos(',product,story,productplan,release,', $paramName) !== false and $subMenuKey == 'product') $subModule = 'custom';
-                        if(strpos(',task,', $paramName) !== false and $subMenuKey == 'execution') $subModule = 'custom';
+                        if(strpos(',todo,block,', ",$paramName,") !== false and $subMenuKey == 'my') $subModule = 'custom';
+                        if(strpos(',product,story,productplan,release,', ",$paramName,") !== false and $subMenuKey == 'product') $subModule = 'custom';
+                        if(strpos(',task,', ",$paramName,") !== false and $subMenuKey == 'execution') $subModule = 'custom';
+                        if(strpos(',project,story,', ",$paramName,") !== false and $subMenuKey == 'project') $subModule = 'custom';
                         if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom';
                     }
 
                     if(!empty($subModule)) $subMenu['subModule'] = $subModule;
                     if(isset($this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey]))
                     {
-                        $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$paramName]['subModule'] = $subModule;
+                        if(!empty($subModule)) $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey][$paramName]['subModule'] = $subModule;
                         $subMenu['subMenu'] = $this->lang->admin->menuList->$menuKey['tabMenu'][$subMenuKey];
                     }
 
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 6403e43be2..24fc89d58b 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -157,7 +157,6 @@ $lang->custom->task->fields['priList']    = 'Priority';
 $lang->custom->task->fields['typeList']   = 'Type';
 $lang->custom->task->fields['reasonList'] = 'Close Reason';
 $lang->custom->task->fields['statusList'] = 'Status';
-$lang->custom->task->fields['hours']      = 'Mannstunden';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['priList']        = 'Priority';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 4fa87d9251..37219d453b 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -157,7 +157,6 @@ $lang->custom->task->fields['priList']    = 'Priority';
 $lang->custom->task->fields['typeList']   = 'Type';
 $lang->custom->task->fields['reasonList'] = 'Close Reason';
 $lang->custom->task->fields['statusList'] = 'Status';
-$lang->custom->task->fields['hours']      = 'Effort';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['priList']        = 'Priority';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 25b00de540..8be5c1c4de 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -157,7 +157,6 @@ $lang->custom->task->fields['priList']    = 'Priorité';
 $lang->custom->task->fields['typeList']   = 'Type';
 $lang->custom->task->fields['reasonList'] = 'Raison Fermeture';
 $lang->custom->task->fields['statusList'] = 'Statut';
-$lang->custom->task->fields['hours']      = 'Effort';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['priList']        = 'Priorité';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 6d7e2e1a2e..882771e96d 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -157,7 +157,6 @@ $lang->custom->task->fields['priList']    = '优先级';
 $lang->custom->task->fields['typeList']   = '类型';
 $lang->custom->task->fields['reasonList'] = '关闭原因';
 $lang->custom->task->fields['statusList'] = '状态';
-$lang->custom->task->fields['hours']      = '工时';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['priList']        = '优先级';
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index 37458bdcbc..05f21498a8 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-row'>
-  <?php if(!in_array($module, array('productplan', 'release'))) include 'sidebar.html.php';?>
+  <?php if(!in_array($module, array('productplan', 'release')) and ($module != 'project' or ($module == 'project' and $config->vision == 'rnd'))) include 'sidebar.html.php';?>
   <div class='main-col main-content'>
     <form class="load-indicator main-form form-ajax" method='post'>
       <div class='main-header'>

From 32623d25607e03b26bb82fd59bc097ccdd2f12f0 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Feb 2023 13:26:16 +0800
Subject: [PATCH 10/12] * Optimize admin page style.

---
 module/admin/config.php          |  2 ++
 module/admin/css/index.css       |  8 ++++----
 module/admin/view/index.html.php | 14 +++++++-------
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/module/admin/config.php b/module/admin/config.php
index 0c3cc75852..7de8810a39 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -57,6 +57,8 @@ $config->admin->plugins[194]->viewLink = 'https://www.zentao.net/extension-viewE
 $config->admin->apiRoot      = 'https://www.zentao.net/';
 $config->admin->classURL     = 'https://www.zentao.net/publicclass.html';
 $config->admin->extensionURL = 'https://www.zentao.net/extension-browse.html';
+$config->admin->patchURL     = 'https://www.zentao.net/extension-browse-byModule-1218.html';
+$config->admin->downloadURL  = 'https://www.zentao.net/download.html';
 $config->admin->liteMenuList = array('system', 'user', 'feature', 'message', 'extension', 'dev');
 
 $config->admin->helpURL['system']    = 'https://www.zentao.net/book/zentaopms/538.html';
diff --git a/module/admin/css/index.css b/module/admin/css/index.css
index 06ba1c9a99..815c5a3265 100755
--- a/module/admin/css/index.css
+++ b/module/admin/css/index.css
@@ -78,15 +78,15 @@
 .main.without-internet > .bottom > .official.panel > .main-panel {flex-direction: row-reverse;}
 
 /* css in side */
-.time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px;}
+.time-block {background: #EDEEF2; padding:2px 4px; border-radius: 4px; color: #0B0F18; font-size: 15px; margin: 0 4px;}
 .dynamic-block {height: 74px; padding: 12px 16px; display: flex; justify-content: space-between; position: relative; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .dynamic-content {height: 50px; line-height: 25px; overflow: hidden;}
 .dynamic-time {white-space: nowrap; position: absolute; right: 12px; bottom: 10px; padding-right: 12px; background: white;}
-.time-count {letter-spacing: 2px;}
+.time-count {letter-spacing: 1px;}
 
-.patch-block {padding: 12px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
+.patch-block {padding: 10px 16px 12px; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .patch-content {height: 40px; overflow: hidden;}
 
-.upgrade-block {padding: 16px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
+.upgrade-block {padding: 6px 16px; line-height: 20px; border-top: 1px solid #E3E4E9;}
 .upgrade-content {height: 20px; padding-left: 20px; position: relative; margin: 5px 0;}
 .upgrade-content:before {content: ' '; width: 8px; height: 8px; background: #E3E4E9; border-radius: 50%; position: absolute; left: 0px; top: 5px;}
diff --git a/module/admin/view/index.html.php b/module/admin/view/index.html.php
index 7fae6c12d4..79060aee20 100755
--- a/module/admin/view/index.html.php
+++ b/module/admin/view/index.html.php
@@ -95,7 +95,7 @@
     <div class="border-gray mb-16 radius-4">
       <div class="h-40 pl-16 flex align-center justify-between">
         <div class="panel-title"><?php echo $lang->admin->updateDynamics?></div>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
+        <?php echo html::a($config->admin->downloadURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <div class="dynamic-block">
         <div class="dynamic-content"><i class="icon icon-horn text-primary pr-4 font-20"></i>禅道18.0发布,新增自动化测试方案、使用帮助及全新IDE风格</div>
@@ -113,7 +113,7 @@
     <div class="border-gray mb-16 radius-4">
       <div class="h-40 pl-16 flex align-center justify-between">
         <div class="panel-title"><?php echo $lang->admin->updatePatch?></div>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
+        <?php echo html::a($config->admin->patchURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <?php foreach($this->view->patches as $patch):?>
       <div class="patch-block">
@@ -130,22 +130,22 @@
     <div class="border-gray mb-16 radius-4">
       <div class="h-40 pl-16 flex align-center justify-between">
         <div class="panel-title"><?php echo $lang->admin->upgradeRecommend?></div>
-        <?php echo html::a($config->admin->extensionURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
+        <?php echo html::a($config->admin->downloadURL, "{$lang->more} <i class='icon icon-caret-right pb-3'></i>", '_blank', 'class="more text-muted flex align-center"');?>
       </div>
       <div class="upgrade-block">
-	<div class="title text-primary flex justify-between">
+        <a class="title text-primary flex justify-between" href="<?php echo $config->admin->downloadURL;?>" target="_blank">
           <div class="panel-title"><i class="icon icon-zentao text-primary pr-4 font-18"></i>禅道企业版</div>
           <div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary pb-3"></i></div>
-        </div>
+        </a>
         <div class="upgrade-content">工时管理、甘特图、导入导出</div>
         <div class="upgrade-content">40+内置统计报表、自定义报表功能</div>
         <div class="upgrade-content">强大的自定义工作流、反馈管理功能</div>
       </div>
       <div class="upgrade-block">
-	<div class="title text-primary flex justify-between">
+        <a class="title text-primary flex justify-between" href='<?php echo $config->admin->downloadURL;?>' target="_blank">
           <div class="panel-title"><i class="icon icon-zentao text-primary pr-4 font-18"></i>禅道旗舰版</div>
           <div class="flex align-center"><div>查看详情</div><i class="icon icon-caret-right text-primary pb-3"></i></div>
-        </div>
+        </a>
         <div class="upgrade-content">工时管理、甘特图、导入导出</div>
         <div class="upgrade-content">40+内置统计报表、自定义报表功能</div>
         <div class="upgrade-content">强大的自定义工作流、反馈管理功能</div>

From 3c2e056d465fe8f579ff8e561ecf04333aa11160 Mon Sep 17 00:00:00 2001
From: caoyanyi <caoyanyi@easycorp.ltd>
Date: Wed, 8 Feb 2023 14:45:22 +0800
Subject: [PATCH 11/12] * Adjust code.

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

diff --git a/module/holiday/control.php b/module/holiday/control.php
index 9a0dcb2fce..5b425835cb 100644
--- a/module/holiday/control.php
+++ b/module/holiday/control.php
@@ -39,10 +39,7 @@ class holiday extends control
         $yearAndNext = array(date('Y'), date('Y') + 1);
         foreach($yearAndNext as $date)
         {
-            if(!in_array($date, $yearList))
-            {
-                $yearList[$date] = $date;
-            }
+            if(!in_array($date, $yearList)) $yearList[$date] = $date;
         }
         krsort($yearList);
 

From aeea82dae9c3fa7fb8f54e5d535b3beb5a337f08 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 8 Feb 2023 14:46:13 +0800
Subject: [PATCH 12/12] * Code for finish task #83724.

---
 module/admin/lang/menu.php           | 13 ++++++++++---
 module/admin/model.php               |  1 +
 module/custom/lang/de.php            | 12 ++++++++++++
 module/custom/lang/en.php            | 12 ++++++++++++
 module/custom/lang/fr.php            | 12 ++++++++++++
 module/custom/lang/zh-cn.php         | 12 ++++++++++++
 module/custom/view/required.html.php |  2 +-
 7 files changed, 60 insertions(+), 4 deletions(-)

diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index b15654f033..ad2f640473 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -93,16 +93,23 @@ $lang->admin->menuList->feature['subMenu']['user']        = array('link' => "{$l
 
 $lang->admin->menuList->feature['tabMenu']['my']['todo']  = array('link' => "{$lang->todo->common}|custom|set|module=todo&field=priList", 'exclude' => 'custom-set');
 $lang->admin->menuList->feature['tabMenu']['my']['block'] = array('link' => "{$lang->block->common}|custom|set|module=block&field=closed", 'exclude' => 'custom-set');
-if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'), 'exclude' => 'custom-required');
+if($config->vision == 'lite') $lang->admin->menuList->feature['tabMenu']['my']['task'] = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'), 'exclude' => 'custom-required,custom-set');
 
 $lang->admin->menuList->feature['tabMenu']['product']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product", 'links' => array("custom|browsestoryconcept|", 'custom|product|'), 'alias' => 'browsestoryconcept,product', 'exclude' => 'custom-required');
-$lang->admin->menuList->feature['tabMenu']['product']['story']       = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"), 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['product']['story']       = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=categoryList"), 'exclude' => 'custom-required,custom-set');
 $lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('link' => "{$lang->productplan->shortCommon}|custom|required|module=productplan", 'exclude' => 'custom-required');
 $lang->admin->menuList->feature['tabMenu']['product']['release']     = array('link' => "{$lang->release->common}|custom|required|module=release", 'exclude' => 'custom-required');
 
 $lang->admin->menuList->feature['tabMenu']['execution']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
 $lang->admin->menuList->feature['tabMenu']['execution']['task']      = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList'));
 
+$lang->admin->menuList->feature['tabMenu']['qa']['bug']        = array('link' => "{$lang->bug->common}|custom|required|module=bug", 'links' => array("custom|set|module=bug&field=priList"), 'exclude' => 'custom-required,custom-set');
+$lang->admin->menuList->feature['tabMenu']['qa']['testcase']   = array('link' => "{$lang->testcase->common}|custom|required|module=testcase", 'links' => array("custom|set|module=testcase&field=priList"), 'exclude' => 'custom-required,custom-set');
+$lang->admin->menuList->feature['tabMenu']['qa']['testsuite']  = array('link' => "{$lang->testcase->testsuite}|custom|required|module=testsuite", 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['qa']['testtask']   = array('link' => "{$lang->testtask->common}|custom|required|module=testtask", 'links' => array('custom|set|module=testtask&field=statusList'), 'exclude' => 'custom-required,custom-set');
+$lang->admin->menuList->feature['tabMenu']['qa']['testreport'] = array('link' => "{$lang->testreport->common}|custom|required|module=testreport", 'exclude' => 'custom-required');
+$lang->admin->menuList->feature['tabMenu']['qa']['caselib']    = array('link' => "{$lang->testcase->caselib}|custom|required|module=caselib", 'exclude' => 'custom-required');
+
 $lang->admin->menuList->feature['menuOrder']['5']  = 'my';
 $lang->admin->menuList->feature['menuOrder']['10'] = 'product';
 $lang->admin->menuList->feature['menuOrder']['15'] = 'execution';
@@ -170,6 +177,6 @@ if($config->vision == 'lite')
     $lang->admin->menuList->feature['subMenu']['project'] = array('link' => "{$lang->projectCommon}|custom|execution|", 'exclude' => 'set,required', 'alias' => 'execution');
     $lang->admin->menuList->feature['tabMenu']['project']['project']   = array('link' => "{$lang->projectCommon}|custom|required|module=project", 'exclude' => 'custom-required');
     $lang->admin->menuList->feature['tabMenu']['project']['execution'] = array('link' => "{$lang->execution->common}|custom|execution|");
-    $lang->admin->menuList->feature['tabMenu']['project']['story']     = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=priList"), 'exclude' => 'custom-required');
+    $lang->admin->menuList->feature['tabMenu']['project']['story']     = array('link' => "{$lang->SRCommon}|custom|required|module=story", 'links' => array("custom|set|module=story&field=priList"), 'exclude' => 'custom-required,custom-set');
     $lang->admin->menuList->feature['menuOrder']['15'] = 'project';
 }
diff --git a/module/admin/model.php b/module/admin/model.php
index 9cc9047442..5a14dcb131 100755
--- a/module/admin/model.php
+++ b/module/admin/model.php
@@ -283,6 +283,7 @@ class adminModel extends model
                         if(strpos(',product,story,productplan,release,', ",$paramName,") !== false and $subMenuKey == 'product') $subModule = 'custom';
                         if(strpos(',task,', ",$paramName,") !== false and $subMenuKey == 'execution') $subModule = 'custom';
                         if(strpos(',project,story,', ",$paramName,") !== false and $subMenuKey == 'project') $subModule = 'custom';
+                        if(strpos(',bug,testcase,testsuite,testtask,testreport,caselib,', ",$paramName,") !== false and $subMenuKey == 'qa') $subModule = 'custom';
                         if($this->config->vision == 'lite' and $paramName == 'task' and $subMenuKey == 'my') $subModule = 'custom';
                     }
 
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 24fc89d58b..d924816895 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -106,6 +106,9 @@ $lang->custom->object['score']       = 'Score';
 $lang->custom->object['mode']        = 'Mode';
 $lang->custom->object['productplan'] = 'Plan';
 $lang->custom->object['release']     = 'Release';
+$lang->custom->object['testsuite']   = 'Test Suite';
+$lang->custom->object['testreport']  = 'Test Report';
+$lang->custom->object['caselib']     = 'Case Library';
 
 $lang->custom->menuOrder[5]  = 'project';
 $lang->custom->menuOrder[10] = 'product';
@@ -159,6 +162,7 @@ $lang->custom->task->fields['reasonList'] = 'Close Reason';
 $lang->custom->task->fields['statusList'] = 'Status';
 
 $lang->custom->bug = new stdClass();
+$lang->custom->bug->fields['required']       = $lang->custom->required;
 $lang->custom->bug->fields['priList']        = 'Priority';
 $lang->custom->bug->fields['severityList']   = 'Severity';
 $lang->custom->bug->fields['osList']         = 'OS';
@@ -169,6 +173,7 @@ $lang->custom->bug->fields['statusList']     = 'Status';
 $lang->custom->bug->fields['longlife']       = 'Stalled Days';
 
 $lang->custom->testcase = new stdClass();
+$lang->custom->testcase->fields['required']   = $lang->custom->required;
 $lang->custom->testcase->fields['priList']    = 'Priority';
 $lang->custom->testcase->fields['typeList']   = 'Type';
 $lang->custom->testcase->fields['stageList']  = 'Phase';
@@ -177,10 +182,17 @@ $lang->custom->testcase->fields['statusList'] = 'Status';
 $lang->custom->testcase->fields['review']     = 'Review Required';
 
 $lang->custom->testtask = new stdClass();
+$lang->custom->testtask->fields['required']   = $lang->custom->required;
 $lang->custom->testtask->fields['statusList'] = 'Status';
 $lang->custom->testtask->fields['typeList']   = 'Type';
 $lang->custom->testtask->fields['priList']    = 'Priority';
 
+$lang->custom->testreport = new stdClass();
+$lang->custom->testreport->fields['required'] = $lang->custom->required;
+
+$lang->custom->caselib = new stdClass();
+$lang->custom->caselib->fields['required'] = $lang->custom->required;
+
 $lang->custom->todo = new stdClass();
 $lang->custom->todo->fields['priList']    = 'Priority';
 $lang->custom->todo->fields['typeList']   = 'Type';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 37219d453b..83af4e4c6a 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -106,6 +106,9 @@ $lang->custom->object['score']       = 'Score';
 $lang->custom->object['mode']        = 'Mode';
 $lang->custom->object['productplan'] = 'Plan';
 $lang->custom->object['release']     = 'Release';
+$lang->custom->object['testsuite']   = 'Test Suite';
+$lang->custom->object['testreport']  = 'Test Report';
+$lang->custom->object['caselib']     = 'Case Library';
 
 $lang->custom->menuOrder[5]  = 'project';
 $lang->custom->menuOrder[10] = 'product';
@@ -159,6 +162,7 @@ $lang->custom->task->fields['reasonList'] = 'Close Reason';
 $lang->custom->task->fields['statusList'] = 'Status';
 
 $lang->custom->bug = new stdClass();
+$lang->custom->bug->fields['required']       = $lang->custom->required;
 $lang->custom->bug->fields['priList']        = 'Priority';
 $lang->custom->bug->fields['severityList']   = 'Severity';
 $lang->custom->bug->fields['osList']         = 'OS';
@@ -169,6 +173,7 @@ $lang->custom->bug->fields['statusList']     = 'Status';
 $lang->custom->bug->fields['longlife']       = 'Stalled Days';
 
 $lang->custom->testcase = new stdClass();
+$lang->custom->testcase->fields['required']   = $lang->custom->required;
 $lang->custom->testcase->fields['priList']    = 'Priority';
 $lang->custom->testcase->fields['typeList']   = 'Type';
 $lang->custom->testcase->fields['stageList']  = 'Phase';
@@ -177,10 +182,17 @@ $lang->custom->testcase->fields['statusList'] = 'Status';
 $lang->custom->testcase->fields['review']     = 'Need Review';
 
 $lang->custom->testtask = new stdClass();
+$lang->custom->testtask->fields['required']   = $lang->custom->required;
 $lang->custom->testtask->fields['statusList'] = 'Status';
 $lang->custom->testtask->fields['typeList']   = 'Type';
 $lang->custom->testtask->fields['priList']    = 'Priority';
 
+$lang->custom->testreport = new stdClass();
+$lang->custom->testreport->fields['required'] = $lang->custom->required;
+
+$lang->custom->caselib = new stdClass();
+$lang->custom->caselib->fields['required'] = $lang->custom->required;
+
 $lang->custom->todo = new stdClass();
 $lang->custom->todo->fields['priList']    = 'Priority';
 $lang->custom->todo->fields['typeList']   = 'Type';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 8be5c1c4de..1367a158e9 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -106,6 +106,9 @@ $lang->custom->object['score']       = 'Score';
 $lang->custom->object['mode']        = 'Mode';
 $lang->custom->object['productplan'] = 'Plan';
 $lang->custom->object['release']     = 'Release';
+$lang->custom->object['testsuite']   = 'Test Suite';
+$lang->custom->object['testreport']  = 'Test Report';
+$lang->custom->object['caselib']     = 'Case Library';
 
 $lang->custom->menuOrder[5]  = 'project';
 $lang->custom->menuOrder[10] = 'product';
@@ -159,6 +162,7 @@ $lang->custom->task->fields['reasonList'] = 'Raison Fermeture';
 $lang->custom->task->fields['statusList'] = 'Statut';
 
 $lang->custom->bug = new stdClass();
+$lang->custom->bug->fields['required']       = $lang->custom->required;
 $lang->custom->bug->fields['priList']        = 'Priorité';
 $lang->custom->bug->fields['severityList']   = 'Sévérité';
 $lang->custom->bug->fields['osList']         = 'OS';
@@ -169,6 +173,7 @@ $lang->custom->bug->fields['statusList']     = 'Statut';
 $lang->custom->bug->fields['longlife']       = 'Jours Calage';
 
 $lang->custom->testcase = new stdClass();
+$lang->custom->testcase->fields['required']   = $lang->custom->required;
 $lang->custom->testcase->fields['priList']    = 'Priorité';
 $lang->custom->testcase->fields['typeList']   = 'Type';
 $lang->custom->testcase->fields['stageList']  = 'Phase';
@@ -177,10 +182,17 @@ $lang->custom->testcase->fields['statusList'] = 'Statut';
 $lang->custom->testcase->fields['review']     = 'Validation Requise';
 
 $lang->custom->testtask = new stdClass();
+$lang->custom->testtask->fields['required']   = $lang->custom->required;
 $lang->custom->testtask->fields['statusList'] = 'Statut';
 $lang->custom->testtask->fields['typeList']   = 'Type de test';
 $lang->custom->testtask->fields['priList']    = 'Priorité';
 
+$lang->custom->testreport = new stdClass();
+$lang->custom->testreport->fields['required'] = $lang->custom->required;
+
+$lang->custom->caselib = new stdClass();
+$lang->custom->caselib->fields['required'] = $lang->custom->required;
+
 $lang->custom->todo = new stdClass();
 $lang->custom->todo->fields['priList']    = 'Priorité';
 $lang->custom->todo->fields['typeList']   = 'Type';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index 882771e96d..d46fd342a9 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -106,6 +106,9 @@ $lang->custom->object['score']       = '积分';
 $lang->custom->object['mode']        = '模式';
 $lang->custom->object['productplan'] = '计划';
 $lang->custom->object['release']     = '发布';
+$lang->custom->object['testsuite']   = '套件';
+$lang->custom->object['testreport']  = '测试报告';
+$lang->custom->object['caselib']     = '用例库';
 
 $lang->custom->menuOrder[5]  = 'project';
 $lang->custom->menuOrder[10] = 'product';
@@ -159,6 +162,7 @@ $lang->custom->task->fields['reasonList'] = '关闭原因';
 $lang->custom->task->fields['statusList'] = '状态';
 
 $lang->custom->bug = new stdClass();
+$lang->custom->bug->fields['required']       = $lang->custom->required;
 $lang->custom->bug->fields['priList']        = '优先级';
 $lang->custom->bug->fields['severityList']   = '严重程度';
 $lang->custom->bug->fields['osList']         = '操作系统';
@@ -169,6 +173,7 @@ $lang->custom->bug->fields['statusList']     = '状态';
 $lang->custom->bug->fields['longlife']       = '久未处理天数';
 
 $lang->custom->testcase = new stdClass();
+$lang->custom->testcase->fields['required']   = $lang->custom->required;
 $lang->custom->testcase->fields['priList']    = '优先级';
 $lang->custom->testcase->fields['typeList']   = '类型';
 $lang->custom->testcase->fields['stageList']  = '阶段';
@@ -177,10 +182,17 @@ $lang->custom->testcase->fields['statusList'] = '状态';
 $lang->custom->testcase->fields['review']     = '评审流程';
 
 $lang->custom->testtask = new stdClass();
+$lang->custom->testtask->fields['required']   = $lang->custom->required;
 $lang->custom->testtask->fields['statusList'] = '状态';
 $lang->custom->testtask->fields['typeList']   = '测试类型';
 $lang->custom->testtask->fields['priList']    = '优先级';
 
+$lang->custom->testreport = new stdClass();
+$lang->custom->testreport->fields['required'] = $lang->custom->required;
+
+$lang->custom->caselib = new stdClass();
+$lang->custom->caselib->fields['required'] = $lang->custom->required;
+
 $lang->custom->todo = new stdClass();
 $lang->custom->todo->fields['priList']    = '优先级';
 $lang->custom->todo->fields['typeList']   = '类型';
diff --git a/module/custom/view/required.html.php b/module/custom/view/required.html.php
index 05f21498a8..12994ae411 100644
--- a/module/custom/view/required.html.php
+++ b/module/custom/view/required.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
 <div id='mainContent' class='main-row'>
-  <?php if(!in_array($module, array('productplan', 'release')) and ($module != 'project' or ($module == 'project' and $config->vision == 'rnd'))) include 'sidebar.html.php';?>
+  <?php if(!in_array($module, array('productplan', 'release', 'testsuite', 'testreport', 'caselib')) and ($module != 'project' or ($module == 'project' and $config->vision == 'rnd'))) include 'sidebar.html.php';?>
   <div class='main-col main-content'>
     <form class="load-indicator main-form form-ajax" method='post'>
       <div class='main-header'>