diff --git a/module/score/config.php b/module/score/config.php index c587730fe0..28768e992e 100644 --- a/module/score/config.php +++ b/module/score/config.php @@ -12,7 +12,7 @@ $config->score->rule->block = new stdClass(); $config->score->rule->build = new stdClass(); $config->score->rule->search = new stdClass(); $config->score->rule->release = new stdClass(); -$config->score->rule->project = new stdClass(); +$config->score->rule->execution = new stdClass(); $config->score->rule->tutorial = new stdClass(); $config->score->rule->testcase = new stdClass(); $config->score->rule->testtask = new stdClass(); @@ -57,8 +57,8 @@ $config->score->rule->story->create = array('times' => 0, 'hour' => 0, 'score' = $config->score->rule->build->create = array('times' => 0, 'hour' => 0, 'score' => 10); -$config->score->rule->project->close = array('times' => 0, 'hour' => 0, 'score' => 0); -$config->score->rule->project->create = array('times' => 0, 'hour' => 0, 'score' => 10); +$config->score->rule->execution->close = array('times' => 0, 'hour' => 0, 'score' => 0); +$config->score->rule->execution->create = array('times' => 0, 'hour' => 0, 'score' => 10); $config->score->rule->release->create = array('times' => 0, 'hour' => 0, 'score' => 10); @@ -79,5 +79,5 @@ $config->score->ruleExtended['user']['changePassword'] = array('strength' => arr $config->score->ruleExtended['bug']['confirmBug'] = array('severity' => array(1 => 3, 2 => 2, 3 => 1)); $config->score->ruleExtended['bug']['resolve'] = array('severity' => array(1 => 3, 2 => 2, 3 => 1)); $config->score->ruleExtended['task']['finish'] = array('pri' => array(1 => 2, 2 => 1, 3 => 0)); -$config->score->ruleExtended['project']['close'] = array('manager' => array('close' => 20, 'onTime' => 10), - 'member' => array('close' => 5, 'onTime' => 5)); \ No newline at end of file +$config->score->ruleExtended['execution']['close'] = array('manager' => array('close' => 20, 'onTime' => 10), + 'member' => array('close' => 5, 'onTime' => 5)); diff --git a/module/score/lang/de.php b/module/score/lang/de.php index 2ad70ac449..3b45d75b55 100644 --- a/module/score/lang/de.php +++ b/module/score/lang/de.php @@ -35,7 +35,7 @@ $lang->score->modules['bug'] = 'Bug'; $lang->score->modules['testcase'] = 'Testfall'; $lang->score->modules['testtask'] = 'Testaufgabe'; $lang->score->modules['build'] = 'Build'; -$lang->score->modules['project'] = 'Projekt'; +$lang->score->modules['execution'] = $lang->executionCommon; $lang->score->modules['productplan'] = 'Plan'; $lang->score->modules['release'] = 'Release'; $lang->score->modules['block'] = 'Block'; @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Bug Vorlage erstellen'; $lang->score->methods['testtask']['runCase'] = 'Testfall ausführen'; $lang->score->methods['testcase']['create'] = 'Testfall erstellen'; $lang->score->methods['build']['create'] = 'Build erstellen'; -$lang->score->methods['project']['create'] = 'Projekt erstellen'; -$lang->score->methods['project']['close'] = 'Projekt abschließen'; +$lang->score->methods['execution']['create'] = "{$lang->executionCommon} erstellen"; +$lang->score->methods['execution']['close'] = "{$lang->executionCommon} abschließe"; $lang->score->methods['productplan']['create'] = 'Plan erstellen'; $lang->score->methods['release']['create'] = 'Release erstellen'; $lang->score->methods['block']['set'] = 'Eigener Block'; @@ -81,7 +81,7 @@ $lang->score->methods['search']['saveQuery'] = 'Suche speichern'; $lang->score->methods['search']['saveQueryAdvanced'] = 'Erweitere Suche'; $lang->score->extended['user']['changePassword'] = 'Get ##strength,1## point, if password is medium. Get ##strength,2## points, if it is strong.'; -$lang->score->extended['project']['close'] = 'Nachdem das Projekt geschlossen wurde, bekommt der Projektmanager ##manager,close## Punkte und Teammitglieder ##member,close## Punkte. Wenn es vorzeitig erledigt ist, bekommt der Projektmanager ##manager,onTime## Punkte und Teammitglieder ##member,onTime## Punkte.'; +$lang->score->extended['execution']['close'] = 'Nachdem das Projekt geschlossen wurde, bekommt der Projektmanager ##manager,close## Punkte und Teammitglieder ##member,close## Punkte. Wenn es vorzeitig erledigt ist, bekommt der Projektmanager ##manager,onTime## Punkte und Teammitglieder ##member,onTime## Punkte.'; $lang->score->extended['bug']['resolve'] = 'Nach dem Lösen eines Bugs, werden die Punkte nach der Dringlichkeit vergeben. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.'; $lang->score->extended['bug']['confirmBug'] = 'Wenn ein Bug bestätigt wurde, werden die Punkte nach der Dringlichkeit vergeben. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.'; $lang->score->extended['task']['finish'] = 'Wenn eine Aufgabe erledigt wurde, werden folgende Punkte vergeben: runde(Mannstunden / 10 Schätzung / Verbraucht) + Prirität (p1 ##pri,1##, p2 ##pri,2##).'; diff --git a/module/score/lang/en.php b/module/score/lang/en.php index 8280710256..ca1b6815fb 100644 --- a/module/score/lang/en.php +++ b/module/score/lang/en.php @@ -35,7 +35,7 @@ $lang->score->modules['bug'] = 'Bug'; $lang->score->modules['testcase'] = 'Case'; $lang->score->modules['testtask'] = 'Request'; $lang->score->modules['build'] = 'Build'; -$lang->score->modules['project'] = 'Project'; +$lang->score->modules['execution'] = $lang->executionCommon; $lang->score->modules['productplan'] = 'Plan'; $lang->score->modules['release'] = 'Release'; $lang->score->modules['block'] = 'Block'; @@ -54,7 +54,7 @@ $lang->score->methods['ajax']['showSearchMenu'] = 'Advanced Search'; $lang->score->methods['ajax']['customMenu'] = 'Custom Menu'; $lang->score->methods['ajax']['dragSelected'] = 'Drag on List Page'; $lang->score->methods['ajax']['lastNext'] = 'Next Page Shortcut'; -$lang->score->methods['ajax']['switchToDataTable'] = 'Switch Data Table'; +$lang->score->methods['ajax']['switchToDataTable'] = 'Switch Data Table'; $lang->score->methods['ajax']['submitPage'] = 'Change Paging Number'; $lang->score->methods['ajax']['quickJump'] = 'Quick Jump'; $lang->score->methods['ajax']['batchCreate'] = 'First Batch Create'; @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Save Template'; $lang->score->methods['testtask']['runCase'] = 'Run Test Case'; $lang->score->methods['testcase']['create'] = 'Create Test Case'; $lang->score->methods['build']['create'] = 'Create Build'; -$lang->score->methods['project']['create'] = "Create {$lang->executionCommon}"; -$lang->score->methods['project']['close'] = "Finish {$lang->executionCommon}"; +$lang->score->methods['execution']['create'] = "Create {$lang->executionCommon}"; +$lang->score->methods['execution']['close'] = "Finish {$lang->executionCommon}"; $lang->score->methods['productplan']['create'] = 'Create Plan'; $lang->score->methods['release']['create'] = 'Create Release'; $lang->score->methods['block']['set'] = 'Custom Block'; @@ -81,7 +81,7 @@ $lang->score->methods['search']['saveQuery'] = 'Save Query'; $lang->score->methods['search']['saveQueryAdvanced'] = 'Advanced Search'; $lang->score->extended['user']['changePassword'] = 'Get ##strength,1## point, if the password strength is medium. Get ##strength,2## points, if it is strong.'; -$lang->score->extended['project']['close'] = 'After the project is close, project manager gets ##manager,close## point and team members get ##member,close## points. If it is done on time or earlier, the project manager gets ##manager,onTime## point and team members get ##member,onTime## points.'; +$lang->score->extended['execution']['close'] = "After the execution is close, project manager gets ##manager,close## point and team members get ##member,close## points. If it is done on time or earlier, the project manager gets ##manager,onTime## point and team members get ##member,onTime## points."; $lang->score->extended['bug']['resolve'] = 'After a bug is resolved, get extra points according to its severity. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.'; $lang->score->extended['bug']['confirmBug'] = 'After a bug is confirmed, get extra points according to its severity. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.'; $lang->score->extended['task']['finish'] = 'After a task is done, get extra points by round(man-hour / 10 Estimates / Cost) + Priority point (p1 ##pri,1##, p2 ##pri,2##).'; diff --git a/module/score/lang/fr.php b/module/score/lang/fr.php index 6195897d07..7f8ff3e65a 100644 --- a/module/score/lang/fr.php +++ b/module/score/lang/fr.php @@ -35,7 +35,7 @@ $lang->score->modules['bug'] = 'Bug'; $lang->score->modules['testcase'] = 'CasTest'; $lang->score->modules['testtask'] = 'Recette'; $lang->score->modules['build'] = 'Build'; -$lang->score->modules['project'] = 'Projet'; +$lang->score->modules['execution'] = $lang->executionCommon; $lang->score->modules['productplan'] = 'Plan'; $lang->score->modules['release'] = 'Release'; $lang->score->modules['block'] = 'Bloc'; @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Sauver Mod $lang->score->methods['testtask']['runCase'] = 'Jouer CasTest'; $lang->score->methods['testcase']['create'] = 'Crer CasTest'; $lang->score->methods['build']['create'] = 'Crer Build'; -$lang->score->methods['project']['create'] = 'Crer Projet'; -$lang->score->methods['project']['close'] = 'Terminer Projet'; +$lang->score->methods['execution']['create'] = "Crer {$lang->executionCommon}"; +$lang->score->methods['execution']['close'] = "Terminer {$lang->executionCommon}"; $lang->score->methods['productplan']['create'] = 'Crer Plan'; $lang->score->methods['release']['create'] = 'Crer Release'; $lang->score->methods['block']['set'] = 'Personnaliser Bloc'; @@ -81,7 +81,7 @@ $lang->score->methods['search']['saveQuery'] = 'Sauver Query'; $lang->score->methods['search']['saveQueryAdvanced'] = 'Recherche Avance'; $lang->score->extended['user']['changePassword'] = "Obtenez ##strength,1## points, si le mot de passe est moyen. Obtenez ##strength,2## points, s'il est fort."; -$lang->score->extended['project']['close'] = "Aprs que le projet soit ferm, le Project Manager obtient ##manager,close## points et les membres de l'quipe obtiennent ##member,close## points. S'il a t ralis dans les temps ou plus vite, le Project Manager obtient ##manager,onTime## points et les membres de l'quipe obtiennent ##member,onTime## points."; +$lang->score->extended['execution']['close'] = "Aprs que le projet soit ferm, le Project Manager obtient ##manager,close## points et les membres de l'quipe obtiennent ##member,close## points. S'il a t ralis dans les temps ou plus vite, le Project Manager obtient ##manager,onTime## points et les membres de l'quipe obtiennent ##member,onTime## points."; $lang->score->extended['bug']['resolve'] = 'Aprs un bug rsolu, obtenez des extra-points en fonction de sa svrit. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.'; $lang->score->extended['bug']['confirmBug'] = 'Aprs un bug confirm, obtenez des extra-points en fonction de sa svrit. S1, + ##severity,3##; S2 + ##severity,2##, S3 + ##severity,1##.'; $lang->score->extended['task']['finish'] = 'Aprs une tche accomplie, obtenez des extra-points par arrondi(heures-homme / 10 Estims / Cot) + Points de Priorit (p1 ##pri,1##, p2 ##pri,2##).'; diff --git a/module/score/lang/vi.php b/module/score/lang/vi.php index e420d6e6bd..ec3fcb97b0 100644 --- a/module/score/lang/vi.php +++ b/module/score/lang/vi.php @@ -35,7 +35,7 @@ $lang->score->modules['bug'] = 'Bug'; $lang->score->modules['testcase'] = 'Tình huống'; $lang->score->modules['testtask'] = 'Yêu cầu'; $lang->score->modules['build'] = 'Bản dựng'; -$lang->score->modules['project'] = 'Dự án'; +$lang->score->modules['execution'] = $lang->executionCommon; $lang->score->modules['productplan'] = 'Kế hoạch'; $lang->score->modules['release'] = 'Phát hành'; $lang->score->modules['block'] = 'Block'; @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = 'Lưu mẫu'; $lang->score->methods['testtask']['runCase'] = 'Chạy tình huống'; $lang->score->methods['testcase']['create'] = 'Tạo tình huống'; $lang->score->methods['build']['create'] = 'Tạo bản dựng'; -$lang->score->methods['project']['create'] = "Tạo {$lang->executionCommon}"; -$lang->score->methods['project']['close'] = "Hoàn thành {$lang->executionCommon}"; +$lang->score->methods['execution']['create'] = "Tạo {$lang->executionCommon}"; +$lang->score->methods['execution']['close'] = "Hoàn thành {$lang->executionCommon}"; $lang->score->methods['productplan']['create'] = 'Tạo kế hoạch'; $lang->score->methods['release']['create'] = 'Tạo phát hành'; $lang->score->methods['block']['set'] = 'Tùy biến Block'; @@ -81,7 +81,7 @@ $lang->score->methods['search']['saveQuery'] = 'Lưu truy vấn'; $lang->score->methods['search']['saveQueryAdvanced'] = 'Tìm kiếm nâng cao'; $lang->score->extended['user']['changePassword'] = 'Nhận ##strength,1## điểm, nếu độ mạnh mật khẩu trung bình. Nhận ##strength,2## điểm, nếu mật khẩu mạnh.'; -$lang->score->extended['project']['close'] = 'Sau khi dự án đóng, quản lý dự án nhận điểm ##manager,close## và thành viên đội nhóm nhận điểm ##member,close## . Nếu nó được hoàn thành đúng giờ hoặc sớm hơn, quản lý dự án này nhận điểm ##manager,onTime## và thành viên đội nhóm nhận điểm ##member,onTime##.'; +$lang->score->extended['execution']['close'] = 'Sau khi dự án đóng, quản lý dự án nhận điểm ##manager,close## và thành viên đội nhóm nhận điểm ##member,close## . Nếu nó được hoàn thành đúng giờ hoặc sớm hơn, quản lý dự án này nhận điểm ##manager,onTime## và thành viên đội nhóm nhận điểm ##member,onTime##.'; $lang->score->extended['bug']['resolve'] = 'Sau khi một bug được giải quyết, nhận thêm điểm theo mức độ nghiêm trọng của nó. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.'; $lang->score->extended['bug']['confirmBug'] = 'Sau khi một bug được xác nhận, nhận thêm điểm theo mức độ nghiêm trọng của nó. S1, + ##severity,1##; S2 + ##severity,2##, S3 + ##severity,3##.'; $lang->score->extended['task']['finish'] = 'Sau khi một nhiệm vụ được hoàn thành, nhận điểm mở rộng theo vòng (giờ công / 10 Dự tính / đã làm) + điểm ưu tiên (p1 ##pri,1##, p2 ##pri,2##).'; diff --git a/module/score/lang/zh-cn.php b/module/score/lang/zh-cn.php index dbf51513ca..39c09fc49e 100644 --- a/module/score/lang/zh-cn.php +++ b/module/score/lang/zh-cn.php @@ -35,7 +35,7 @@ $lang->score->modules['bug'] = 'Bug'; $lang->score->modules['testcase'] = '用例'; $lang->score->modules['testtask'] = '测试单'; $lang->score->modules['build'] = 'Build'; -$lang->score->modules['project'] = '项目'; +$lang->score->modules['execution'] = $lang->executionCommon; $lang->score->modules['productplan'] = '计划'; $lang->score->modules['release'] = '发布'; $lang->score->modules['block'] = '区块'; @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = '保存模板'; $lang->score->methods['testtask']['runCase'] = '执行用例'; $lang->score->methods['testcase']['create'] = '创建用例'; $lang->score->methods['build']['create'] = '创建版本'; -$lang->score->methods['project']['create'] = '创建项目'; -$lang->score->methods['project']['close'] = '项目完成'; +$lang->score->methods['execution']['create'] = "创建{$lang->executionCommon}"; +$lang->score->methods['execution']['close'] = "{$lan->executionCommon}完成"; $lang->score->methods['productplan']['create'] = "创建计划"; $lang->score->methods['release']['create'] = '创建发布'; $lang->score->methods['block']['set'] = '区块自定义设置'; @@ -81,7 +81,7 @@ $lang->score->methods['search']['saveQuery'] = '保存搜索条件'; $lang->score->methods['search']['saveQueryAdvanced'] = '使用高级搜索'; $lang->score->extended['user']['changePassword'] = '密码强度为中,额外获得##strength,1##个积分;为强,额外获得##strength,2##个积分。'; -$lang->score->extended['project']['close'] = '项目经理增加##manager,close##个积分,项目成员增加##member,close##个积分。按期或者提前完成,项目经理额外增加##manager,onTime##个积分,项目成员额外增加##member,onTime##个积分。'; +$lang->score->extended['execution']['close'] = "项目经理增加##manager,close##个积分,{$lang->executionCommon}成员增加##member,close##个积分。按期或者提前完成,项目经理额外增加##manager,onTime##个积分,{$lang->executionCommon}成员额外增加##member,onTime##个积分。"; $lang->score->extended['bug']['resolve'] = 'Bug解决后,额外增加严重程度积分:s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。'; $lang->score->extended['bug']['confirmBug'] = 'Bug确认后,额外增加严重程度积分:s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。'; $lang->score->extended['task']['finish'] = '额外增加工时积分 round(工时 / 10 * 预计 / 消耗) + 优先级积分(p1 ##pri,1##, p2 ##pri,2##)。'; diff --git a/module/score/lang/zh-tw.php b/module/score/lang/zh-tw.php index a0c2598764..ac76a18e01 100644 --- a/module/score/lang/zh-tw.php +++ b/module/score/lang/zh-tw.php @@ -35,7 +35,7 @@ $lang->score->modules['bug'] = 'Bug'; $lang->score->modules['testcase'] = '用例'; $lang->score->modules['testtask'] = '測試單'; $lang->score->modules['build'] = 'Build'; -$lang->score->modules['project'] = '項目'; +$lang->score->modules['execution'] = $lang->executionCommon; $lang->score->modules['productplan'] = '計劃'; $lang->score->modules['release'] = '發佈'; $lang->score->modules['block'] = '區塊'; @@ -72,8 +72,8 @@ $lang->score->methods['bug']['saveTplModal'] = '保存模板'; $lang->score->methods['testtask']['runCase'] = '執行用例'; $lang->score->methods['testcase']['create'] = '創建用例'; $lang->score->methods['build']['create'] = '創建版本'; -$lang->score->methods['project']['create'] = '創建項目'; -$lang->score->methods['project']['close'] = '項目完成'; +$lang->score->methods['execution']['create'] = "創建{$lang->executionCommon}"; +$lang->score->methods['execution']['close'] = "{$lang->executionCommon}完成"; $lang->score->methods['productplan']['create'] = "創建計劃"; $lang->score->methods['release']['create'] = '創建發佈'; $lang->score->methods['block']['set'] = '區塊自定義設置'; @@ -81,7 +81,7 @@ $lang->score->methods['search']['saveQuery'] = '保存搜索條件'; $lang->score->methods['search']['saveQueryAdvanced'] = '使用高級搜索'; $lang->score->extended['user']['changePassword'] = '密碼強度為中,額外獲得##strength,1##個積分;為強,額外獲得##strength,2##個積分。'; -$lang->score->extended['project']['close'] = '項目經理增加##manager,close##個積分,項目成員增加##member,close##個積分。按期或者提前完成,項目經理額外增加##manager,onTime##個積分,項目成員額外增加##member,onTime##個積分。'; +$lang->score->extended['execution']['close'] = "項目經理增加##manager,close##個積分,{$lang->executionCommon}成員增加##member,close##個積分。按期或者提前完成,項目經理額外增加##manager,onTime##個積分,{$lang->executionCommon}成員額外增加##member,onTime##個積分。"; $lang->score->extended['bug']['resolve'] = 'Bug解決後,額外增加嚴重程度積分:s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。'; $lang->score->extended['bug']['confirmBug'] = 'Bug確認後,額外增加嚴重程度積分:s1 + ##severity,1##, s2 + ##severity,2##, s3 + ##severity,3##。'; $lang->score->extended['task']['finish'] = '額外增加工時積分 round(工時 / 10 * 預計 / 消耗) + 優先順序積分(p1 ##pri,1##, p2 ##pri,2##)。'; diff --git a/module/score/model.php b/module/score/model.php index 7e43651476..9bafd7dd16 100644 --- a/module/score/model.php +++ b/module/score/model.php @@ -125,7 +125,7 @@ class scoreModel extends model case 'testTask': if($method == 'runCase') $desc = $this->lang->score->methods[$module][$method] . 'ID:' . $param; break; - case 'project': + case 'execution': if($method == 'close') { $desc = $this->lang->score->methods[$module][$method] . ',' . $desc . 'ID:' . $param->id; @@ -143,7 +143,7 @@ class scoreModel extends model } /* Project team user. */ - $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('root')->eq($param->id)->andWhere('type')->eq('project')->fetchPairs(); + $teams = $this->dao->select('account')->from(TABLE_TEAM)->where('root')->eq($param->id)->andWhere('type')->eq('execution')->fetchPairs(); if(!empty($teams)) { $rule['score'] = $extended['member']['close']; @@ -158,7 +158,7 @@ class scoreModel extends model } } - /* When the project is closed, no more user get score. */ + /* When the execution is closed, no more user get score. */ return true; } break; @@ -251,7 +251,7 @@ class scoreModel extends model foreach($actions as $action) { $param = $action->objectID; - if($action->objectType == 'project' && $action->action == 'closed') $param = $this->dao->findById($action->objectID)->from(TABLE_PROJECT)->fetch(); + if($action->objectType == 'execution' && $action->action == 'closed') $param = $this->dao->findById($action->objectID)->from(TABLE_PROJECT)->fetch(); if($action->objectType == 'bug') { $bug = $this->dao->findById($action->objectID)->from(TABLE_BUG)->fetch();