From 6a2ce5fade434ed81d414864d9e32c8ba752aaf4 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 30 Apr 2020 01:47:19 -0700
Subject: [PATCH 1/3] * Finish task#7105.

---
 module/common/view/footer.html.php | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index 79f40320d2..56d239b57f 100755
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -21,12 +21,6 @@ $.initSidebar();
 </footer>
 <div id="noticeBox"><?php echo $this->loadModel('score')->getNotice(); ?></div>
 <script>
-<?php if(!isset($config->global->browserNotice)):?>
-browserNotice = <?php echo json_encode($lang->browserNotice)?>;
-function ajaxIgnoreBrowser(){$.get(createLink('misc', 'ajaxIgnoreBrowser'));}
-$(function(){showBrowserNotice()});
-<?php endif;?>
-
 <?php $this->app->loadConfig('message');?>
 <?php if($config->message->browser->turnon):?>
 /* Alert got messages. */

From b919ac88dd54797ed2dec8d5c0e22f48f7fddf3c Mon Sep 17 00:00:00 2001
From: chenfei <chenfei@cnezsoft.com>
Date: Mon, 4 May 2020 17:40:46 +0800
Subject: [PATCH 2/3]  * Optimize sql and code to improve query performance.

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

diff --git a/module/report/model.php b/module/report/model.php
index 72ea75c5c2..31abb3e05b 100644
--- a/module/report/model.php
+++ b/module/report/model.php
@@ -310,16 +310,16 @@ class reportModel extends model
         $stmt = $this->dao->select('t1.*, t2.name as projectName')->from(TABLE_TASK)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id')
             ->where('t1.deleted')->eq(0)
-            ->andWhere('t1.status')->notin('cancel, closed, done, pause')
+            ->andWhere('t1.status')->in('wait,doing')
             ->andWhere('t2.deleted')->eq(0)
-            ->andWhere('t2.status')->notin('cancel, closed, done, suspended')
+            ->andWhere('t2.status')->in('wait, doing')
             ->andWhere('assignedTo')->ne('');
 
         $allTasks = $stmt->fetchAll('id');
-        $tasks    = $stmt->beginIF($dept)->andWhere('t1.assignedTo')->in(array_keys($deptUsers))->fi()->fetchAll('id');
-
         if(empty($allTasks)) return array();
 
+        $tasks = $stmt->beginIF($dept)->andWhere('t1.assignedTo')->in(array_keys($deptUsers))->fi()->fetchAll('id');
+
         /* Fix bug for children. */
         $parents       = array();
         $taskIdList    = array();

From 5870c95ec4b4b0dfc6b703de965510fef75e102d Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Tue, 5 May 2020 18:34:50 -0700
Subject: [PATCH 3/3] Finish task#7109.

---
 module/task/lang/zh-tw.php |  1 +
 module/task/model.php      | 18 ++++++++++++++----
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/module/task/lang/zh-tw.php b/module/task/lang/zh-tw.php
index 7000161da3..40de616a4b 100644
--- a/module/task/lang/zh-tw.php
+++ b/module/task/lang/zh-tw.php
@@ -198,6 +198,7 @@ $lang->task->createDenied          = '你不能在該項目添加任務';
 $lang->task->cannotDeleteParent    = '不能刪除父任務。';
 
 $lang->task->error                   = new stdclass();
+$lang->task->error->totalNumber      = '"總計消耗"必須為數字';
 $lang->task->error->consumedNumber   = '"本次消耗"必須為數字';
 $lang->task->error->estimateNumber   = '"預計剩餘"必須為數字';
 $lang->task->error->recordMinus      = '工時不能為負數';
diff --git a/module/task/model.php b/module/task/model.php
index 63eef086cf..d6febd4f56 100644
--- a/module/task/model.php
+++ b/module/task/model.php
@@ -1208,9 +1208,14 @@ class taskModel extends model
     public function recordEstimate($taskID)
     {
         $record = fixer::input('post')->get();
-        foreach($record->consumed as $item)
+        foreach($record->consumed as $id => $item)
         {
-            if(!trim($item)) continue;
+            if(!trim($item))
+            {
+                $record->consumed[$id] = trim($item);
+                continue;
+            }
+
             if(!is_numeric($item))
             {
                 dao::$errors[] = $this->lang->task->error->totalNumber;
@@ -1218,9 +1223,14 @@ class taskModel extends model
             }
         }
 
-        foreach($record->left as $item)
+        foreach($record->left as $id => $item)
         {
-            if(!trim($item)) continue;
+            if(!trim($item))
+            {
+                $record->left[$id] = trim($item);
+                continue;
+            }
+
             if(!is_numeric($item))
             {
                 dao::$errors[] = $this->lang->task->error->estimateNumber;