Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
wangyidong
2017-11-06 10:13:38 +08:00
parent fbc5b38585 7792da815f
commit 0f1f1df14b
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/score/control.php
+2 -1
View File
@@ -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->my->scoreRule;
$this->display();
}
module/score/model.php
+2 -2
View File
@@ -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);