From 637b0912a7c593ffde67f7ff078f0f96916a671a Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 13 Mar 2023 07:07:13 +0000
Subject: [PATCH] * Finish task #87013.

---
 module/admin/config.php                   |  2 +-
 module/admin/lang/menu.php                |  4 +-
 module/custom/config.php                  |  2 +-
 module/custom/control.php                 | 22 +++++++++++
 module/custom/css/limittaskdate.css       |  2 +
 module/custom/css/limittaskdate.en.css    |  2 +
 module/custom/lang/de.php                 | 16 +++++---
 module/custom/lang/en.php                 | 16 +++++---
 module/custom/lang/fr.php                 | 16 +++++---
 module/custom/lang/zh-cn.php              | 16 +++++---
 module/custom/view/limittaskdate.html.php | 48 +++++++++++++++++++++++
 module/custom/view/sidebar.html.php       |  2 +-
 module/group/lang/resource.php            |  2 +
 13 files changed, 125 insertions(+), 25 deletions(-)
 create mode 100644 module/custom/css/limittaskdate.css
 create mode 100644 module/custom/css/limittaskdate.en.css
 create mode 100644 module/custom/view/limittaskdate.html.php

diff --git a/module/admin/config.php b/module/admin/config.php
index 3466847c1f..fed9cf56bf 100755
--- a/module/admin/config.php
+++ b/module/admin/config.php
@@ -11,7 +11,7 @@ $config->admin->menuGroup['system']    = array('custom|mode', 'backup', 'cron',
 $config->admin->menuGroup['company']   = array('dept', 'company', 'user', 'group', 'tutorial');
 $config->admin->menuGroup['switch']    = array('admin|setmodule');
 $config->admin->menuGroup['model']     = array('auditcl', 'stage', 'design', 'cmcl', 'reviewcl', 'custom|required', 'custom|set', 'custom|flow', 'custom|code', 'custom|percent','custom|estimate', 'custom|hours', 'subject', 'process', 'activity', 'zoutput', 'classify', 'holiday', 'reviewsetting');
-$config->admin->menuGroup['feature']   = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report');
+$config->admin->menuGroup['feature']   = array('custom|set', 'custom|product', 'custom|execution', 'custom|required', 'custom|kanban', 'approvalflow', 'measurement', 'meetingroom', 'custom|browsestoryconcept', 'custom|kanban', 'sqlbuilder', 'report', 'custom|limittaskdate');
 $config->admin->menuGroup['template']  = array('custom|set', 'baseline');
 $config->admin->menuGroup['message']   = array('mail', 'webhook', 'sms', 'message');
 $config->admin->menuGroup['dev']       = array('dev', 'entry', 'editor');
diff --git a/module/admin/lang/menu.php b/module/admin/lang/menu.php
index 3c2ff3b8ef..a9580b0a4f 100644
--- a/module/admin/lang/menu.php
+++ b/module/admin/lang/menu.php
@@ -106,7 +106,7 @@ if(helper::hasFeature('waterfallplus')) $lang->admin->menuList->model['tabMenu']
 
 $lang->admin->menuList->feature['subMenu']['my']          = array('link' => "{$lang->my->common}|custom|set|module=todo&field=priList", 'exclude' => 'set,required');
 $lang->admin->menuList->feature['subMenu']['product']     = array('link' => "{$lang->productCommon}|custom|required|module=product", 'exclude' => 'set,required', 'alias' => 'browsestoryconcept,product');
-$lang->admin->menuList->feature['subMenu']['execution']   = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'exclude' => 'required,set', 'alias' => 'execution');
+$lang->admin->menuList->feature['subMenu']['execution']   = array('link' => "{$lang->execution->common}|custom|required|module=execution", 'exclude' => 'required,set', 'alias' => 'execution,limittaskdate');
 $lang->admin->menuList->feature['subMenu']['qa']          = array('link' => "{$lang->qa->common}|custom|required|module=bug", 'exclude' => 'set,required');
 $lang->admin->menuList->feature['subMenu']['kanban']      = array('link' => "{$lang->kanban->common}|custom|kanban|");
 $lang->admin->menuList->feature['subMenu']['doc']         = array('link' => "{$lang->doc->common}|custom|required|module=doc", 'exclude' => 'required');
@@ -121,7 +121,7 @@ $lang->admin->menuList->feature['tabMenu']['product']['productplan'] = array('li
 $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|required|module=execution", 'links' => array("custom|execution|"), 'alias' => 'execution', 'exclude' => 'custom-required');
-$lang->admin->menuList->feature['tabMenu']['execution']['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']['execution']['task']      = array('link' => "{$lang->task->common}|custom|required|module=task", 'links' => array('custom|set|module=task&field=priList', 'custom|limittaskdate'), 'alias' => 'limittaskdate','exclude' => 'custom-required');
 
 $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');
diff --git a/module/custom/config.php b/module/custom/config.php
index 71eb08ceaf..899cca858e 100644
--- a/module/custom/config.php
+++ b/module/custom/config.php
@@ -71,7 +71,7 @@ $config->custom->fieldList['doc']                    = 'keywords,content';
 $config->custom->fieldList['user']['create']         = 'dept,role,email,commiter';
 $config->custom->fieldList['user']['edit']           = 'dept,role,email,commiter,skype,qq,mobile,phone,address,zipcode,dingding,slack,whatsapp,weixin';
 
-$config->custom->notSetMethods = array('required', 'browsestoryconcept', 'product', 'role', 'execution');
+$config->custom->notSetMethods = array('required', 'browsestoryconcept', 'product', 'role', 'execution', 'limittaskdate');
 
 global $lang;
 $config->custom->commonLang = array('$URCOMMON' => $lang->URCommon, '$SRCOMMON' => $lang->SRCommon, '$PRODUCTCOMMON' => $lang->productCommon, '$PROJECTCOMMON' => $lang->projectCommon, '$EXECUTIONCOMMON' => $lang->executionCommon);
diff --git a/module/custom/control.php b/module/custom/control.php
index 8ef684b846..bd707c630d 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -914,4 +914,26 @@ class custom extends control
         $this->view->restDay   = zget($this->config->execution, 'restDay', 0);
         $this->display();
     }
+
+    /**
+     * Set whether the task begin and end date is limited to the execution begin and end date.
+     *
+     * @access public
+     * @return void
+     */
+    public function limitTaskDate()
+    {
+        if($_POST)
+        {
+            $this->loadModel('setting')->setItem('system.common.limitTaskDate', $this->post->limitTaskDate);
+            return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => 'reload'));
+        }
+
+        $this->view->title      = $this->lang->custom->beginAndEndDate;
+        $this->view->position[] = $this->lang->custom->common;
+        $this->view->position[] = $this->view->title;
+        $this->view->module     = 'task';
+
+        $this->display();
+    }
 }
diff --git a/module/custom/css/limittaskdate.css b/module/custom/css/limittaskdate.css
new file mode 100644
index 0000000000..f50c40bb35
--- /dev/null
+++ b/module/custom/css/limittaskdate.css
@@ -0,0 +1,2 @@
+#limitTaskDateForm .c-name {width: 120px;}
+#limitTaskDateForm .c-select {width: 350px;}
diff --git a/module/custom/css/limittaskdate.en.css b/module/custom/css/limittaskdate.en.css
new file mode 100644
index 0000000000..4a49d86c91
--- /dev/null
+++ b/module/custom/css/limittaskdate.en.css
@@ -0,0 +1,2 @@
+#limitTaskDateForm .c-name {width: 180px;}
+#limitTaskDateForm .c-select {width: 440px;}
diff --git a/module/custom/lang/de.php b/module/custom/lang/de.php
index 299ca41420..ac49fa7cce 100644
--- a/module/custom/lang/de.php
+++ b/module/custom/lang/de.php
@@ -61,6 +61,8 @@ $lang->custom->defaultProgram       = 'Default program';
 $lang->custom->modeManagement       = 'Mode Management';
 $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
+$lang->custom->beginAndEndDate      = 'Begin & End';
+$lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
@@ -122,11 +124,12 @@ $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';
-$lang->custom->task->fields['statusList'] = 'Status';
+$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';
+$lang->custom->task->fields['statusList']    = 'Status';
+$lang->custom->task->fields['limitTaskDate'] = 'Begin & End';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['required']       = $lang->custom->required;
@@ -324,3 +327,6 @@ $lang->custom->scrum->setConcept = 'Set concept';
 
 $lang->custom->reviewRules['allpass']  = 'All passed';
 $lang->custom->reviewRules['halfpass'] = 'More than half passed';
+
+$lang->custom->limitTaskDate['0'] = 'Unlimited';
+$lang->custom->limitTaskDate['1'] = 'Limited to the execution begin and end date range';
diff --git a/module/custom/lang/en.php b/module/custom/lang/en.php
index 832a41fcf7..91debdcc64 100644
--- a/module/custom/lang/en.php
+++ b/module/custom/lang/en.php
@@ -61,6 +61,8 @@ $lang->custom->defaultProgram       = 'Default program';
 $lang->custom->modeManagement       = 'Mode Management';
 $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
+$lang->custom->beginAndEndDate      = 'Begin & End';
+$lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
@@ -122,11 +124,12 @@ $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';
-$lang->custom->task->fields['statusList'] = 'Status';
+$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';
+$lang->custom->task->fields['statusList']    = 'Status';
+$lang->custom->task->fields['limitTaskDate'] = 'Begin & End';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['required']       = $lang->custom->required;
@@ -324,3 +327,6 @@ $lang->custom->scrum->setConcept = 'Set concept';
 
 $lang->custom->reviewRules['allpass']  = 'All passed';
 $lang->custom->reviewRules['halfpass'] = 'More than half passed';
+
+$lang->custom->limitTaskDate['0'] = 'Unlimited';
+$lang->custom->limitTaskDate['1'] = 'Limited to the execution begin and end date range';
diff --git a/module/custom/lang/fr.php b/module/custom/lang/fr.php
index 5ed792a28a..3bdfac8076 100644
--- a/module/custom/lang/fr.php
+++ b/module/custom/lang/fr.php
@@ -61,6 +61,8 @@ $lang->custom->defaultProgram       = 'Default program';
 $lang->custom->modeManagement       = 'Mode Management';
 $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "Enable or Disable {$lang->stage->percent}";
+$lang->custom->beginAndEndDate      = 'Begin & End';
+$lang->custom->beginAndEndDateRange = 'The Range Of Begin & End';
 
 $lang->custom->unitList['efficiency'] = 'Working Hours/';
 $lang->custom->unitList['manhour']    = 'Man-hour/';
@@ -122,11 +124,12 @@ $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';
-$lang->custom->task->fields['statusList'] = 'Statut';
+$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';
+$lang->custom->task->fields['statusList']    = 'Statut';
+$lang->custom->task->fields['limitTaskDate'] = 'Begin & End';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['required']       = $lang->custom->required;
@@ -324,3 +327,6 @@ $lang->custom->scrum->setConcept = 'Set concept';
 
 $lang->custom->reviewRules['allpass']  = 'All passed';
 $lang->custom->reviewRules['halfpass'] = 'More than half passed';
+
+$lang->custom->limitTaskDate['0'] = 'Unlimited';
+$lang->custom->limitTaskDate['1'] = 'Limited to the execution begin and end date range';
diff --git a/module/custom/lang/zh-cn.php b/module/custom/lang/zh-cn.php
index ed4f019b2f..6bdd5b4452 100644
--- a/module/custom/lang/zh-cn.php
+++ b/module/custom/lang/zh-cn.php
@@ -61,6 +61,8 @@ $lang->custom->defaultProgram       = '默认项目集';
 $lang->custom->modeManagement       = '模式管理';
 $lang->custom->percent              = $lang->stage->percent;
 $lang->custom->setPercent           = "是否启用{$lang->stage->percent}";
+$lang->custom->beginAndEndDate      = '起止日期';
+$lang->custom->beginAndEndDateRange = '起止日期范围';
 
 $lang->custom->unitList['efficiency'] = '工时/';
 $lang->custom->unitList['manhour']    = '人时/';
@@ -122,11 +124,12 @@ $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'] = '关闭原因';
-$lang->custom->task->fields['statusList'] = '状态';
+$lang->custom->task->fields['required']      = $lang->custom->required;
+$lang->custom->task->fields['priList']       = '优先级';
+$lang->custom->task->fields['typeList']      = '类型';
+$lang->custom->task->fields['reasonList']    = '关闭原因';
+$lang->custom->task->fields['statusList']    = '状态';
+$lang->custom->task->fields['limitTaskDate'] = '起止日期';
 
 $lang->custom->bug = new stdClass();
 $lang->custom->bug->fields['required']       = $lang->custom->required;
@@ -324,3 +327,6 @@ $lang->custom->scrum->setConcept = "设置{$lang->projectCommon}概念";
 
 $lang->custom->reviewRules['allpass']  = '全部通过通过';
 $lang->custom->reviewRules['halfpass'] = '半数以上通过通过';
+
+$lang->custom->limitTaskDate['0'] = '不限制';
+$lang->custom->limitTaskDate['1'] = '限定在所属执行起止日期范围内';
diff --git a/module/custom/view/limittaskdate.html.php b/module/custom/view/limittaskdate.html.php
new file mode 100644
index 0000000000..109572212b
--- /dev/null
+++ b/module/custom/view/limittaskdate.html.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * The limittaskdate view file of custom module of ZenTaoPMS.
+ * @copyright   Copyright 2009-2020 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) 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      Liyuchun <liyuchun@cnezsoft.com>
+ * @package     custom
+ * @version     $Id$
+ * @link        http://www.zentao.net
+ */
+?>
+<?php include $app->getModuleRoot() . 'common/view/header.html.php';?>
+<div id='mainContent' class='main-row'>
+  <?php include 'sidebar.html.php';?>
+  <div class='main-col main-content'>
+    <form class="load-indicator main-form form-ajax" method='post' id='limitTaskDateForm'>
+      <div class='main-header'>
+        <div class='heading'>
+          <strong><?php echo $lang->custom->$module->fields['limitTaskDate'];?></strong>
+        </div>
+      </div>
+      <table class='table table-form'>
+        <tr>
+          <th class='c-name'><?php echo $lang->custom->beginAndEndDateRange;?></th>
+          <td class='c-select text-left'>
+            <?php $checkedKey = isset($config->limitTaskDate) ? $config->limitTaskDate : 0;?>
+            <?php foreach($lang->custom->limitTaskDate as $key => $value):?>
+            <label class="radio-inline"><input type="radio" name="limitTaskDate" value="<?php echo $key?>"<?php echo $key == $checkedKey ? " checked='checked'" : ''?> id="limitTaskDate<?php echo $key;?>"><?php echo $value;?></label>
+            <?php endforeach;?>
+          </td>
+          <td></td>
+        </tr>
+        <tr>
+          <td colspan='2' class='form-actions text-center'>
+            <?php echo html::submitButton();?>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
+</div>
+<script>
+$(function()
+{
+    $('#mainMenu #taskTab').addClass('btn-active-text');
+})
+</script>
+<?php include '../../common/view/footer.html.php';?>
diff --git a/module/custom/view/sidebar.html.php b/module/custom/view/sidebar.html.php
index 763619ed35..f0f7a2f578 100644
--- a/module/custom/view/sidebar.html.php
+++ b/module/custom/view/sidebar.html.php
@@ -8,7 +8,7 @@
           $currentModule = 'custom';
           $method        = $key;
           $params        = $key == 'required' ? "module=$module" : '';
-          $active        = $app->rawMethod == $key ? 'active' : '';
+          $active        = $app->rawMethod == strtolower($key) ? 'active' : '';
           if(!in_array($key, $config->custom->notSetMethods))
           {
               $params = "module=$module&field=$key";
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php
index c6562c3c96..4047a0a235 100644
--- a/module/group/lang/resource.php
+++ b/module/group/lang/resource.php
@@ -1447,6 +1447,7 @@ $lang->resource->custom->kanban             = 'kanban';
 $lang->resource->custom->code               = 'code';
 $lang->resource->custom->hours              = 'hours';
 $lang->resource->custom->percent            = 'percent';
+$lang->resource->custom->limitTaskDate      = 'beginAndEndDate';
 
 $lang->custom->methodOrder[5]  = 'index';
 $lang->custom->methodOrder[10] = 'set';
@@ -1466,6 +1467,7 @@ $lang->custom->methodOrder[75] = 'kanban';
 $lang->custom->methodOrder[80] = 'code';
 $lang->custom->methodOrder[85] = 'hours';
 $lang->custom->methodOrder[90] = 'percent';
+$lang->custom->methodOrder[95] = 'limitTaskDate';
 
 $lang->resource->datatable = new stdclass();
 $lang->resource->datatable->setGlobal = 'setGlobal';