From 298e2b66163d2e82a5cd7f2997dc9105615b1d89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 6 Nov 2017 10:03:17 +0800
Subject: [PATCH 1/3] * fix score rule title

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

diff --git a/module/score/control.php b/module/score/control.php
index e07ea368f2..7c1c2d2b9b 100644
--- a/module/score/control.php
+++ b/module/score/control.php
@@ -46,7 +46,8 @@ class score extends control
      */
     public function rule()
     {
-        $this->view->rule = $this->config->score;
+        $this->view->rule  = $this->config->score;
+        $this->view->title = $this->lang->score->common;
         $this->display();
     }
 

From 57dbab5a1434df390aec309245ccd04ae38e3ccb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 6 Nov 2017 10:05:45 +0800
Subject: [PATCH 2/3] * fix score bug

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

diff --git a/module/score/model.php b/module/score/model.php
index 01ed84a9eb..44e177df14 100644
--- a/module/score/model.php
+++ b/module/score/model.php
@@ -137,7 +137,7 @@ class scoreModel extends model
                     if(!empty($param->PM))
                     {
                         $rule['score'] = $this->config->score->extended->projectClose['manager']['close'];
-                        if($param->end > date('Y-m-d', $timestamp)) $rule['score'] += $this->config->score->extended->projectClose['manager']['out'];
+                        if($param->end > date('Y-m-d', $timestamp)) $rule['score'] += $this->config->score->extended->projectClose['manager']['in'];
                         $this->saveScore($param->PM, $rule, $module, $method, $desc, $objectID, $time);
                     }
 
@@ -146,7 +146,7 @@ class scoreModel extends model
                     if(!empty($teams))
                     {
                         $rule['score'] = $this->config->score->extended->projectClose['member']['close'];
-                        if($param->end > date('Y-m-d', $timestamp)) $rule['score'] += $this->config->score->extended->projectClose['member']['out'];
+                        if($param->end > date('Y-m-d', $timestamp)) $rule['score'] += $this->config->score->extended->projectClose['member']['in'];
                         foreach($teams as $user)
                         {
                             if($user != $param->PM) $this->saveScore($user, $rule, $module, $method, $desc, $objectID, $time);

From 7792da815f7b9d8c79ba87a65994b0df1b2bd063 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=BB=94=E5=93=A5?= <memory@lvtao.net>
Date: Mon, 6 Nov 2017 10:07:38 +0800
Subject: [PATCH 3/3] * fix score title

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

diff --git a/module/score/control.php b/module/score/control.php
index 7c1c2d2b9b..87c0fa3f72 100644
--- a/module/score/control.php
+++ b/module/score/control.php
@@ -47,7 +47,7 @@ class score extends control
     public function rule()
     {
         $this->view->rule  = $this->config->score;
-        $this->view->title = $this->lang->score->common;
+        $this->view->title = $this->lang->my->scoreRule;
         $this->display();
     }