diff --git a/module/custom/view/score.html.php b/module/custom/view/score.html.php index 154e7d9487..dbfad8a712 100644 --- a/module/custom/view/score.html.php +++ b/module/custom/view/score.html.php @@ -9,26 +9,29 @@ * @link http://www.zentao.net */ ?> - -
-
- - - - - - - - - -
custom->score; ?>custom->scoreList, isset($config->global->score) ? $config->global->score : 0, '', 'block'); ?>
" . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn iframe" data-width="480"', true, true); ?>
-
-
- - \ No newline at end of file + +
+
+ + + + + + + + + +
custom->score;?>custom->scoreList, isset($config->global->score) ? $config->global->score : 0, '', 'block');?>
+ + " . $lang->custom->scoreReset, '', ' id="scoreRefresh" class="btn iframe" data-width="480"', true, true);?> +
+
+
+ + diff --git a/module/entry/js/create.js b/module/entry/js/create.js index be33903126..abec4ca334 100644 --- a/module/entry/js/create.js +++ b/module/entry/js/create.js @@ -13,6 +13,7 @@ function createKey() key += chars[Math.floor(Math.random() * chars.length)]; } $('#key').val(key); + return false; } diff --git a/module/entry/lang/en.php b/module/entry/lang/en.php index 554f6650b1..51ba8b1978 100644 --- a/module/entry/lang/en.php +++ b/module/entry/lang/en.php @@ -1,9 +1,9 @@ entry->common = 'Entry'; -$lang->entry->list = 'Entry List'; -$lang->entry->api = 'API'; -$lang->entry->webhook = 'Webhook'; -$lang->entry->log = 'Log'; +$lang->entry->common = 'Entry'; +$lang->entry->list = 'Entry List'; +$lang->entry->api = 'API'; +$lang->entry->webhook = 'Webhook'; +$lang->entry->log = 'Log'; $lang->entry->browse = 'Browse'; $lang->entry->create = 'Create'; diff --git a/module/entry/lang/zh-cn.php b/module/entry/lang/zh-cn.php index c3cfb65352..bb40f3918c 100644 --- a/module/entry/lang/zh-cn.php +++ b/module/entry/lang/zh-cn.php @@ -1,9 +1,9 @@ entry->common = '应用'; -$lang->entry->list = '应用列表'; -$lang->entry->api = '接口'; -$lang->entry->webhook = 'webhook'; -$lang->entry->log = '日志'; +$lang->entry->common = '应用'; +$lang->entry->list = '应用列表'; +$lang->entry->api = '接口'; +$lang->entry->webhook = 'Webhook'; +$lang->entry->log = '日志'; $lang->entry->browse = '浏览应用'; $lang->entry->create = '添加应用'; diff --git a/module/entry/model.php b/module/entry/model.php index 08d41f8737..240b65981c 100644 --- a/module/entry/model.php +++ b/module/entry/model.php @@ -16,7 +16,7 @@ class entryModel extends model * * @param int $entryID * @access public - * @return array + * @return object */ public function getById($entryID) { @@ -28,7 +28,7 @@ class entryModel extends model * * @param string $code * @access public - * @return array + * @return object */ public function getByCode($code) { @@ -125,6 +125,15 @@ class entryModel extends model return common::createChanges($oldEntry, $entry); } + /** + * Save log of an entry. + * + * @params int $entryID + * @params string $url + * + * @access public + * @return void + */ public function saveLog($entryID, $url) { $log = new stdclass(); diff --git a/module/entry/view/create.html.php b/module/entry/view/create.html.php index 3f40522f91..3af89cffa2 100644 --- a/module/entry/view/create.html.php +++ b/module/entry/view/create.html.php @@ -16,7 +16,7 @@
entry->api;?> - entry->create;?> + entry->create;?>
diff --git a/module/entry/view/edit.html.php b/module/entry/view/edit.html.php index c0658efb4d..d682de2005 100644 --- a/module/entry/view/edit.html.php +++ b/module/entry/view/edit.html.php @@ -16,7 +16,7 @@
entry->api;?> - entry->edit;?> + entry->edit;?>
diff --git a/module/entry/view/header.html.php b/module/entry/view/header.html.php index 3beccaee33..76d37c3270 100644 --- a/module/entry/view/header.html.php +++ b/module/entry/view/header.html.php @@ -13,10 +13,8 @@
diff --git a/module/entry/view/log.html.php b/module/entry/view/log.html.php index bbbe144a51..f5dc120a39 100644 --- a/module/entry/view/log.html.php +++ b/module/entry/view/log.html.php @@ -1,11 +1,11 @@ - * @package log + * @package entry * @version $Id$ * @link http://www.zentao.net */ @@ -15,7 +15,7 @@
entry->common);?> name;?> - entry->log;?> + entry->log;?>
@@ -23,7 +23,7 @@ id}&orderBy=%s&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}";?> - + diff --git a/module/my/view/score.html.php b/module/my/view/score.html.php index e010443d6f..3baed44181 100644 --- a/module/my/view/score.html.php +++ b/module/my/view/score.html.php @@ -9,17 +9,17 @@ * @link http://www.zentao.net */ ?> - -
-
icons['score']); ?>score->record; ?>
-
- score->current; ?>:score; ?> - - app->user->admin == 1) echo html::a($this->createLink('score', 'rule'), $lang->my->scoreRule, '', "class='btn btn-primary'");?> -
+ +
+
icons['score']); ?>score->record; ?>
+
+ score->current; ?>:score; ?> + + my->scoreRule, '', "class='btn btn-primary'");?>
-
entry->id);?>entry->date);?>entry->date);?> entry->url);?>
- + +
+ @@ -29,26 +29,26 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + - -
score->time; ?> score->module; ?>score->after; ?> score->desc; ?>
time; ?>score->models[$score->module]; ?>score->methods[$score->module][$score->method]; ?>before; ?>score; ?>after; ?>desc; ?>
- show(); ?> -
time; ?>score->models[$score->module]; ?>score->methods[$score->module][$score->method]; ?>before; ?>score; ?>after; ?>desc; ?>
- \ No newline at end of file + + + + + + show();?> + + + + diff --git a/module/project/css/storykanban.css b/module/project/css/storykanban.css index 67586a88f9..2db59385b6 100644 --- a/module/project/css/storykanban.css +++ b/module/project/css/storykanban.css @@ -46,19 +46,19 @@ .pri-6:before {content: "6";} .story-pri {display: inline-block; width: 16px; height: 16px; text-align: center; border-radius: 8px; line-height: 16px; font-size: 12px} -.story-pri.pri-0 {background-color:#b56a00;} -.story-pri.pri-1 {background-color:#E30413;} -.story-pri.pri-2 {background-color:#E84E0E;} -.story-pri.pri-3 {background-color:#b56a00;} -.story-pri.pri-4 {background-color:#795523;} +.story-pri.pri-0 {background-color: #b56a00;} +.story-pri.pri-1 {background-color: #E30413;} +.story-pri.pri-2 {background-color: #E84E0E;} +.story-pri.pri-3 {background-color: #b56a00;} +.story-pri.pri-4 {background-color: #795523;} .board-story {color: #dd7503; background-color: #FFF3E0;} -.board-story.board-story-projected {color:#777;} -.board-story.board-story-developing {color:#D2322D; background-color: #FFEBEE;} -.board-story.board-story-developed {color:#229F24; background-color: #E8F5E9;} -.board-story.board-story-testing {color:#EF6C00; background-color: #FFF3E0;} -.board-story.board-story-tested {color:#827717; background-color: #F9FBE7} -.board-story.board-story-released {color:#9C27B0; background-color: #F3E5F5} +.board-story.board-story-projected {color: #777;} +.board-story.board-story-developing {color: #D2322D; background-color: #FFEBEE;} +.board-story.board-story-developed {color: #229F24; background-color: #E8F5E9;} +.board-story.board-story-testing {color: #EF6C00; background-color: #FFF3E0;} +.board-story.board-story-tested {color: #827717; background-color: #F9FBE7} +.board-story.board-story-released {color: #9C27B0; background-color: #F3E5F5} .affix {position:fixed; top:0px; width:95%;z-index:1030;} #kanbanHeader.affix {box-shadow: 0 3px 10px rgba(0,0,0,.1);} diff --git a/module/project/js/storykanban.js b/module/project/js/storykanban.js index e11db3f2c0..f3291ebb0b 100644 --- a/module/project/js/storykanban.js +++ b/module/project/js/storykanban.js @@ -100,7 +100,16 @@ $(function() { $('#kanbanWrapper').unwrap(); initBoards() - $(".kanbanFrame").modalTrigger({type: 'iframe', width: '80%', afterShow:function(){ $('#ajaxModal').data('cancel-reload', true)}, afterHidden: function(){refresh()}}); + $(".kanbanFrame").modalTrigger( + { + type: 'iframe', + width: '80%', + afterShow: function() + { + $('#ajaxModal').data('cancel-reload', true) + }, + afterHidden: function(){refresh()} + }); }); } } diff --git a/module/project/view/storykanban.html.php b/module/project/view/storykanban.html.php index 969cfd34c7..77a42c549f 100644 --- a/module/project/view/storykanban.html.php +++ b/module/project/view/storykanban.html.php @@ -38,8 +38,8 @@
app->user->account +$cols = array('projected', 'developing', 'developed', 'testing', 'tested', 'verified', 'released'); +$account = $this->app->user->account; ?>
@@ -54,14 +54,16 @@ $account = $this->app->user->account
- + + +
- +
@@ -87,14 +89,12 @@ $account = $this->app->user->account
- +
- + diff --git a/module/score/control.php b/module/score/control.php index 87c0fa3f72..45fba491f8 100644 --- a/module/score/control.php +++ b/module/score/control.php @@ -9,21 +9,6 @@ */ class score extends control { - /** - * score constructor. - * - * @param string $module - * @param string $method - * - * @access public - * @return mixed - */ - public function __construct($module = '', $method = '') - { - parent::__construct($module, $method); - $this->loadModel('my')->setMenu(); - } - /** * Ajax action score. * javascript use : $.get(createLink('score', 'ajax', "method=method")); @@ -46,8 +31,10 @@ class score extends control */ public function rule() { - $this->view->rule = $this->config->score; + $this->loadModel('my')->setMenu(); + $this->view->title = $this->lang->my->scoreRule; + $this->view->rule = $this->config->score; $this->display(); } @@ -65,6 +52,7 @@ class score extends control { $result = $this->score->reset($lastID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); + if($result['status'] == 'finish') { $this->send(array('result' => 'finished', 'message' => $this->lang->score->resetFinish)); diff --git a/module/score/lang/en.php b/module/score/lang/en.php index ca2240ae13..0e83a64511 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -1,14 +1,14 @@ score->common = 'My score'; -$lang->score->record = 'Score record'; -$lang->score->current = 'Current score'; -$lang->score->level = 'Level score'; +$lang->score->common = 'My Score'; +$lang->score->record = 'Score Record'; +$lang->score->current = 'Current Score'; +$lang->score->level = 'Level Score'; $lang->score->reset = 'Reset'; -$lang->score->tips = 'Yesterday added score:%d
Total score:%d'; -$lang->score->resetTips = 'Reset score the execution time may be longer. Do not close the window.'; -$lang->score->resetStart = 'Start reset'; -$lang->score->resetLoading = 'Resetting,process:'; -$lang->score->resetFinish = 'Reset finish'; +$lang->score->tips = 'Yesterday added score: %d
Total score: %d'; +$lang->score->resetTips = 'It will take a long time. Do not close the window.'; +$lang->score->resetStart = 'Start'; +$lang->score->resetLoading = 'Processing: '; +$lang->score->resetFinish = 'Finished'; $lang->score->id = 'ID'; $lang->score->userID = 'UserID'; @@ -49,7 +49,7 @@ $lang->score->methods['user']['login'] = 'Login'; $lang->score->methods['user']['changePassword'] = 'Change password'; $lang->score->methods['user']['editProfile'] = 'Edit profile'; $lang->score->methods['ajax']['selectTheme'] = 'Change theme'; -$lang->score->methods['ajax']['selectLang'] = 'Change Lang'; +$lang->score->methods['ajax']['selectLang'] = 'Change lang'; $lang->score->methods['ajax']['showSearchMenu'] = 'Advanced search'; $lang->score->methods['ajax']['customMenu'] = 'Custom menu'; $lang->score->methods['ajax']['dragSelected'] = 'Drag selected'; @@ -81,9 +81,9 @@ $lang->score->methods['search']['saveQuery'] = 'Save search query'; $lang->score->methods['search']['saveQueryAdvanced'] = 'Advanced search'; $lang->score->extended = new stdClass(); -$lang->score->extended->userchangePassword = 'Password strength,medium:add extra score : #changePassword,strength,1#; Strong:add extra score : #changePassword,strength,2#.'; -$lang->score->extended->projectclose = 'Project closed,PM add extra score : #projectClose,manager,close#,Team member add extra score : #projectClose,member,close#. Completed on schedule or in advance,PM add extra score : #projectClose,manager,in#,Team member Add extra score : #projectClose,member,in#.'; -$lang->score->extended->bugresolve = 'Bug resolved,Add extra severity score ：s1 + #bugResolve,severity,3#, s2 + #bugResolve,severity,2#, s3 + #bugResolve,severity,1#。'; -$lang->score->extended->bugconfirmBug = 'Bug confirmed,Add extra severity score ：s1 + #bugConfirmBug,severity,3#, s2 + #bugConfirmBug,severity,2#, s3 + #bugConfirmBug,severity,1#。'; +$lang->score->extended->userchangePassword = 'Password strength, medium:add extra score : #changePassword,strength,1#; Strong:add extra score : #changePassword,strength,2#.'; +$lang->score->extended->projectclose = 'Project closed, PM add extra score : #projectClose,manager,close#,Team member add extra score : #projectClose,member,close#. Completed on schedule or in advance,PM add extra score : #projectClose,manager,in#,Team member Add extra score : #projectClose,member,in#.'; +$lang->score->extended->bugresolve = 'Bug resolved, Add extra severity score ：s1 + #bugResolve,severity,3#, s2 + #bugResolve,severity,2#, s3 + #bugResolve,severity,1#。'; +$lang->score->extended->bugconfirmBug = 'Bug confirmed, Add extra severity score ：s1 + #bugConfirmBug,severity,3#, s2 + #bugConfirmBug,severity,2#, s3 + #bugConfirmBug,severity,1#。'; $lang->score->extended->taskfinish = 'Task finished, Add extra score round(consumed /10 * estimate / consumed) + severity score(p1 #taskFinish,pri,1#, p2, #taskFinish,pri,2#)。'; -$lang->score->extended->storyclose = 'Add extra score for story creator : #storyClose,createID#.'; \ No newline at end of file +$lang->score->extended->storyclose = 'Add extra score for story creator : #storyClose,createID#.'; diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php index 33b8213c7b..df5e963861 100644 --- a/module/score/lang/zh-cn.php +++ b/module/score/lang/zh-cn.php @@ -81,9 +81,9 @@ $lang->score->methods['search']['saveQuery'] = '保存搜索条件'; $lang->score->methods['search']['saveQueryAdvanced'] = '使用高级搜索'; $lang->score->extended = new stdClass(); -$lang->score->extended->userchangePassword = '密码强度中的，额外获得#changePassword,strength,1#个积分，强的，额外获得#changePassword,strength,2#个积分。'; +$lang->score->extended->userchangePassword = '密码强度为中，额外获得#changePassword,strength,1#个积分；为强，额外获得#changePassword,strength,2#个积分。'; $lang->score->extended->projectclose = '项目经理增加#projectClose,manager,close#个积分，项目成员增加#projectClose,member,close#个积分。按期或者提前完成，项目经理额外增加#projectClose,manager,in#个积分，项目成员额外增加#projectClose,member,in#个积分。'; $lang->score->extended->bugresolve = 'Bug解决后，额外增加严重程度积分：s1 + #bugResolve,severity,3#, s2 + #bugResolve,severity,2#, s3 + #bugResolve,severity,1#。'; $lang->score->extended->bugconfirmBug = 'Bug确认后，额外增加严重程度积分：s1 + #bugConfirmBug,severity,3#, s2 + #bugConfirmBug,severity,2#, s3 + #bugConfirmBug,severity,1#。'; -$lang->score->extended->taskfinish = '额外增加工时积分 round(工时 /10 * 预计 / 消耗) + 优先级积分(p1 #taskFinish,pri,1#, p2, #taskFinish,pri,2#)。'; -$lang->score->extended->storyclose = '需求的创建者额外增加#storyClose,createID#分'; \ No newline at end of file +$lang->score->extended->taskfinish = '额外增加工时积分 round(工时 / 10 * 预计 / 消耗) + 优先级积分(p1 #taskFinish,pri,1#, p2 #taskFinish,pri,2#)。'; +$lang->score->extended->storyclose = '需求的创建者额外增加#storyClose,createID#分'; diff --git a/module/score/model.php b/module/score/model.php index 44e177df14..0b4d28892b 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -20,7 +20,7 @@ class scoreModel extends model */ public function getListByAccount($account, $pager) { - return $this->dao->select('*')->from(TABLE_SCORE)->where('account')->eq($account)->orderBy('time_desc,id_desc')->page($pager)->fetchAll(); + return $this->dao->select('*')->from(TABLE_SCORE)->where('account')->eq($account)->orderBy('time_desc, id_desc')->page($pager)->fetchAll(); } /** @@ -109,7 +109,7 @@ class scoreModel extends model { $objectID = $param->id; $user = $param->openedBy; - $desc .= 'ID:' . $param->id; + $desc .= 'ID:' . $param->id; if(!empty($this->config->score->extended->bugConfirmBug['severity'][$param->severity])) $rule['score'] = $rule['score'] + $this->config->score->extended->bugConfirmBug['severity'][$param->severity]; } @@ -153,7 +153,8 @@ class scoreModel extends model } } - return true; //When the project is closed, no more user get score. + /* When the project is closed, no more user get score. */ + return true; } break; case 'productplan': @@ -203,10 +204,10 @@ class scoreModel extends model { $timestamp = empty($time) ? time() : strtotime($time); $count = $this->dao->select('id')->from(TABLE_SCORE)->where('account')->eq($account) - ->andWhere('time')->between(date('Y-m-d 00:00:00', $timestamp), date('Y-m-d 23:59:59', $timestamp)) - ->andWhere('module')->eq($module) - ->andWhere('method')->eq($method) - ->count(); + ->andWhere('time')->between(date('Y-m-d 00:00:00', $timestamp), date('Y-m-d 23:59:59', $timestamp)) + ->andWhere('module')->eq($module) + ->andWhere('method')->eq($method) + ->count(); if($count >= $rule['times']) return true; } } @@ -216,7 +217,7 @@ class scoreModel extends model { $user = $this->loadModel('user')->getById($account); - $data = new stdClass(); + $data = new stdClass(); $data->account = $account; $data->module = $module; $data->method = $method; @@ -250,17 +251,12 @@ class scoreModel extends model { if($lastID == 0) { - $this->dao->query("UPDATE " . TABLE_USER . " SET `score`=0,`scoreLevel`=0"); + $this->dao->query("UPDATE " . TABLE_USER . " SET `score`=0, `scoreLevel`=0"); $this->dao->query("TRUNCATE TABLE " . TABLE_SCORE); } $actions = $this->dao->select('*')->from(TABLE_ACTION)->where('id')->gt($lastID)->orderBy('id_asc')->limit(100)->fetchAll('id'); - - if(empty($actions)) - { - $this->loadModel('setting')->setItem('system.common.global.scoreInit', 1); - return array('number' => 0, 'status' => 'finish'); - } + if(empty($actions)) return array('number' => 0, 'status' => 'finish'); foreach($actions as $action) { @@ -306,10 +302,13 @@ class scoreModel extends model $this->app->user->lastTime = time(); - $score = $this->dao->select("sum(score) as score")->from(TABLE_SCORE)->where('time')->between(date('Y-m-d 00:00:00', strtotime('-1 day')), date('Y-m-d 23:59:59', strtotime('-1 day')))->andWhere('account')->eq($this->app->user->account)->fetch('score'); - - $notice = empty($score) ? '' : sprintf($this->lang->score->tips, $score, $this->app->user->score); + $score = $this->dao->select("SUM(score) AS score")->from(TABLE_SCORE) + ->where('time')->between(date('Y-m-d 00:00:00', strtotime('-1 day')), date('Y-m-d 23:59:59', strtotime('-1 day'))) + ->andWhere('account')->eq($this->app->user->account) + ->fetch('score'); + if(!$score) return ''; + $notice = sprintf($this->lang->score->tips, $score, $this->app->user->score); $fullNotice = << @@ -317,6 +316,6 @@ class scoreModel extends model
EOT; - return empty($notice) ? '' : $fullNotice; + return $fullNotice; } } diff --git a/module/score/view/reset.html.php b/module/score/view/reset.html.php index 3ca98e3aab..da67a8c32e 100644 --- a/module/score/view/reset.html.php +++ b/module/score/view/reset.html.php @@ -10,54 +10,52 @@ */ ?> -
- -
-

score->resetTips; ?>

-

- -

-
+
+ +
+

score->resetTips; ?>

+

- +