From d835ec871f20b41b9544eeddaaac3505a989a9e2 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 5 Mar 2021 10:28:20 +0800 Subject: [PATCH] * Adjust code for tutorial module. --- module/tutorial/control.php | 22 +++++----- module/tutorial/lang/de.php | 8 ++-- module/tutorial/lang/en.php | 8 ++-- module/tutorial/lang/fr.php | 8 ++-- module/tutorial/lang/vi.php | 8 ++-- module/tutorial/lang/zh-cn.php | 8 ++-- module/tutorial/model.php | 80 +++++++++++++++++----------------- 7 files changed, 71 insertions(+), 71 deletions(-) diff --git a/module/tutorial/control.php b/module/tutorial/control.php index 8cd151406b..a380e88dfb 100644 --- a/module/tutorial/control.php +++ b/module/tutorial/control.php @@ -62,7 +62,7 @@ class tutorial extends control /** * Exit tutorial mode - * + * * @param string $referer * @access public * @return void @@ -77,7 +77,7 @@ class tutorial extends control /** * Ajax quit tutorial mode - * + * * @access public * @return void */ @@ -89,11 +89,11 @@ class tutorial extends control } /** - * Wizard. - * - * @param string $module - * @param string $method - * @param string $params + * Wizard. + * + * @param string $module + * @param string $method + * @param string $params * @access public * @return void */ @@ -120,8 +120,8 @@ class tutorial extends control { $target = 'parent'; if(($module == 'story' or $module == 'task' or $module == 'bug') and $method == 'create') $target = 'self'; - if($module == 'project' and $method == 'linkStory') $target = 'self'; - if($module == 'project' and $method == 'managemembers') $target = 'self'; + if($module == 'execution' and $method == 'linkStory') $target = 'self'; + if($module == 'execution' and $method == 'managemembers') $target = 'self'; die(js::locate(helper::createLink('tutorial', 'wizard', "module=$module&method=$method¶ms=" . helper::safe64Encode($params)), $target)); } die($this->fetch($module, $method, $params)); @@ -129,8 +129,8 @@ class tutorial extends control /** * Ajax save novice result. - * - * @param string $novice + * + * @param string $novice * @param string $reload * * @access public diff --git a/module/tutorial/lang/de.php b/module/tutorial/lang/de.php index 135fdb4f98..a487c5f52f 100644 --- a/module/tutorial/lang/de.php +++ b/module/tutorial/lang/de.php @@ -47,19 +47,19 @@ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'meth $lang->tutorial->tasks['createStory']['desc'] = "

Story erstellen:

"; $lang->tutorial->tasks['createProject'] = array('title' => 'Projekt erstellen'); -$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Projekt erstellen'); +$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Projekt erstellen'); $lang->tutorial->tasks['createProject']['desc'] = "

Projekt erstellen:

"; $lang->tutorial->tasks['manageTeam'] = array('title' => 'Projektteam verwalten'); -$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Projektteam verwalten'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Projektteam verwalten'); $lang->tutorial->tasks['manageTeam']['desc'] = "

Projektteam verwalten:

"; $lang->tutorial->tasks['linkStory'] = array('title' => 'Story verknüpfen'); -$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Story verknüpfen'); +$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Story verknüpfen'); $lang->tutorial->tasks['linkStory']['desc'] = "

Eine Story mit dem Projekt verknüpfen:

"; $lang->tutorial->tasks['createTask'] = array('title' => 'Aufgaben aufteilen'); -$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Aufgabe erstellen'); +$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Aufgabe erstellen'); $lang->tutorial->tasks['createTask']['desc'] = "

Aufgaben aufteilen:

"; $lang->tutorial->tasks['createBug'] = array('title' => 'Bug melden'); diff --git a/module/tutorial/lang/en.php b/module/tutorial/lang/en.php index 1c92b038c6..b1da905fa5 100644 --- a/module/tutorial/lang/en.php +++ b/module/tutorial/lang/en.php @@ -47,19 +47,19 @@ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'meth $lang->tutorial->tasks['createStory']['desc'] = "

Create a story:

"; $lang->tutorial->tasks['createProject'] = array('title' => 'Create a ' . $lang->executionCommon); -$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon); +$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon); $lang->tutorial->tasks['createProject']['desc'] = "

Create a {$lang->executionCommon}:

"; $lang->tutorial->tasks['manageTeam'] = array('title' => "Manage {$lang->executionCommon} Team"); -$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); $lang->tutorial->tasks['manageTeam']['desc'] = "

Manage {$lang->executionCommon} team members:

"; $lang->tutorial->tasks['linkStory'] = array('title' => 'Link a Story'); -$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story'); +$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story'); $lang->tutorial->tasks['linkStory']['desc'] = "

Link a Story to {$lang->executionCommon}:

"; $lang->tutorial->tasks['createTask'] = array('title' => 'Task Breakdown'); -$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); +$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); $lang->tutorial->tasks['createTask']['desc'] = "

Task breakdown for a story:

"; $lang->tutorial->tasks['createBug'] = array('title' => 'Report Bug'); diff --git a/module/tutorial/lang/fr.php b/module/tutorial/lang/fr.php index 081bf8f868..a3e4cb4648 100644 --- a/module/tutorial/lang/fr.php +++ b/module/tutorial/lang/fr.php @@ -47,19 +47,19 @@ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'meth $lang->tutorial->tasks['createStory']['desc'] = "

Create a story:

"; $lang->tutorial->tasks['createProject'] = array('title' => 'Create a ' . $lang->executionCommon); -$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon); +$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Create ' . $lang->executionCommon); $lang->tutorial->tasks['createProject']['desc'] = "

Create a {$lang->executionCommon}:

"; $lang->tutorial->tasks['manageTeam'] = array('title' => "Manage {$lang->executionCommon} Team"); -$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Manage team members'); $lang->tutorial->tasks['manageTeam']['desc'] = "

Manage {$lang->executionCommon} team members:

"; $lang->tutorial->tasks['linkStory'] = array('title' => 'Link a Story'); -$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story'); +$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Relate Story'); $lang->tutorial->tasks['linkStory']['desc'] = "

Link a Story to {$lang->executionCommon}:

"; $lang->tutorial->tasks['createTask'] = array('title' => 'Task Breakdown'); -$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); +$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Create Task'); $lang->tutorial->tasks['createTask']['desc'] = "

Task breakdown for a story:

"; $lang->tutorial->tasks['createBug'] = array('title' => 'Report Bug'); diff --git a/module/tutorial/lang/vi.php b/module/tutorial/lang/vi.php index 7086f8f8cc..d50cd7ac93 100644 --- a/module/tutorial/lang/vi.php +++ b/module/tutorial/lang/vi.php @@ -47,19 +47,19 @@ $lang->tutorial->tasks['createStory']['nav'] = array('module' => 'story', 'meth $lang->tutorial->tasks['createStory']['desc'] = "

Tạo một câu chuyện:

"; $lang->tutorial->tasks['createProject'] = array('title' => 'Tạo một ' . $lang->executionCommon); -$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Tạo ' . $lang->executionCommon); +$lang->tutorial->tasks['createProject']['nav'] = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => 'Tạo ' . $lang->executionCommon); $lang->tutorial->tasks['createProject']['desc'] = "

Tạo một {$lang->executionCommon}:

"; $lang->tutorial->tasks['manageTeam'] = array('title' => "Quản lý thành viên {$lang->executionCommon}"); -$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Quản lý thành viên'); +$lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => 'Quản lý thành viên'); $lang->tutorial->tasks['manageTeam']['desc'] = "

Quản lý thành viên {$lang->executionCommon}:

"; $lang->tutorial->tasks['linkStory'] = array('title' => 'Liên kết một câu chuyện'); -$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Liên kết câu chuyện'); +$lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => 'Liên kết câu chuyện'); $lang->tutorial->tasks['linkStory']['desc'] = "

Liên kết một câu chuyện tới {$lang->executionCommon}:

"; $lang->tutorial->tasks['createTask'] = array('title' => 'Chia nhỏ nhiệm vụ'); -$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Tạo nhiệm vụ'); +$lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => 'Tạo nhiệm vụ'); $lang->tutorial->tasks['createTask']['desc'] = "

Chia nhỏ nhiệm vụ cho một câu chuyện:

"; $lang->tutorial->tasks['createBug'] = array('title' => 'Báo cáo Bug'); diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index 77c5a6a4a9..26234efdac 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -56,22 +56,22 @@ if($config->global->flow == 'full' or $config->global->flow == 'onlyStory') if($config->global->flow == 'full' or $config->global->flow == 'onlyTask') { $lang->tutorial->tasks['createProject'] = array('title' => '创建' . $lang->executionCommon); - $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'project', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon); + $lang->tutorial->tasks['createProject']['nav'] = array('module' => 'execution', 'method' => 'create', 'menu' => '#pageNav', 'form' => '#dataform', 'submit' => '#submit', 'target' => '.create-project-btn', 'targetPageName' => '添加' . $lang->executionCommon); $lang->tutorial->tasks['createProject']['desc'] = "

在系统创建一个新的{$lang->executionCommon}：

"; $lang->tutorial->tasks['manageTeam'] = array('title' => '管理团队'); - $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'project', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理'); + $lang->tutorial->tasks['manageTeam']['nav'] = array('module' => 'execution', 'method' => 'managemembers', 'menu' => 'team', 'target' => '.manage-team-btn', 'form' => '#teamForm', 'requiredFields' => 'account1', 'submit' => '#submit', 'targetPageName' => '团队管理'); $lang->tutorial->tasks['manageTeam']['desc'] = "

管理{$lang->executionCommon}团队成员：

"; if($config->global->flow == 'full') { $lang->tutorial->tasks['linkStory'] = array('title' => "关联{$lang->SRCommon}"); - $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'project', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->SRCommon}"); + $lang->tutorial->tasks['linkStory']['nav'] = array('module' => 'execution', 'method' => 'linkStory', 'menu' => 'story', 'target' => '.link-story-btn', 'form' => '#linkStoryForm', 'formType' => 'table', 'submit' => '#submit', 'targetPageName' => "关联{$lang->SRCommon}"); $lang->tutorial->tasks['linkStory']['desc'] = "

将{$lang->SRCommon}关联到{$lang->executionCommon}：

"; } $lang->tutorial->tasks['createTask'] = array('title' => '分解任务'); - $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'project', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务'); + $lang->tutorial->tasks['createTask']['nav'] = array('module' => 'task', 'method' => 'create', 'menuModule' => 'execution', 'menu' => 'story', 'target' => '.btn-task-create', 'form' => '#dataform', 'submit' => '#submit', 'targetPageName' => '建任务'); $lang->tutorial->tasks['createTask']['desc'] = "

将{$lang->executionCommon}{$lang->SRCommon}分解为任务：

"; } diff --git a/module/tutorial/model.php b/module/tutorial/model.php index 72464b3f55..13b6701e5c 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -12,8 +12,8 @@ class tutorialModel extends model { /** - * Check novice. - * + * Check novice. + * * @access public * @return bool */ @@ -33,7 +33,7 @@ class tutorialModel extends model /** * Get tutorial product pairs. - * + * * @access public * @return array */ @@ -44,7 +44,7 @@ class tutorialModel extends model /** * Get tutorial product. - * + * * @access public * @return object */ @@ -72,7 +72,7 @@ class tutorialModel extends model /** * Get tutorial stories. - * + * * @access public * @return array */ @@ -122,59 +122,59 @@ class tutorialModel extends model } /** - * Get tutorial project pairs. - * + * Get tutorial Execution pairs. + * * @access public * @return array */ - public function getProjectPairs() + public function getExecutionPairs() { - return array(1 => 'Test project'); + return array(1 => 'Test execution'); } /** - * Get tutorial project. - * + * Get tutorial execution. + * * @access public * @return object */ - public function getProject() + public function getExecution() { - $project = new stdclass(); - $project->id = 1; - $project->type = 'sprint'; - $project->name = 'Test project'; - $project->code = 'test'; - $project->begin = date('Y-m-d', strtotime('-7 days')); - $project->end = date('Y-m-d', strtotime('+7 days')); - $project->days = 10; - $project->status = 'wait'; - $project->pri = '1'; - $project->desc = ''; - $project->goal = ''; - $project->acl = 'open'; - return $project; + $execution = new stdclass(); + $execution->id = 1; + $execution->type = 'sprint'; + $execution->name = 'Test execution'; + $execution->code = 'test'; + $execution->begin = date('Y-m-d', strtotime('-7 days')); + $execution->end = date('Y-m-d', strtotime('+7 days')); + $execution->days = 10; + $execution->status = 'wait'; + $execution->pri = '1'; + $execution->desc = ''; + $execution->goal = ''; + $execution->acl = 'open'; + return $execution; } /** - * Get tutorial project products. - * + * Get tutorial execution products. + * * @access public * @return array */ - public function getProjectProducts() + public function getExecutionProducts() { $product = $this->getProduct(); return array($product->id => $product); } /** - * Get tutorial project stories. - * + * Get tutorial execution stories. + * * @access public * @return array */ - public function getProjectStories() + public function getExecutionStories() { $stories = $this->getStories(); $story = $stories[0]; @@ -182,12 +182,12 @@ class tutorialModel extends model } /** - * Get tutorial project story pairs. - * + * Get tutorial execution story pairs. + * * @access public * @return array */ - public function getProjectStoryPairs() + public function getExecutionStoryPairs() { $stories = $this->getStories(); $story = $stories[0]; @@ -196,7 +196,7 @@ class tutorialModel extends model /** * Get tutorial team members. - * + * * @access public * @return array */ @@ -216,8 +216,8 @@ class tutorialModel extends model } /** - * Get team members pairs. - * + * Get team members pairs. + * * @access public * @return array */ @@ -229,7 +229,7 @@ class tutorialModel extends model /** * Get tutorial user pairs. - * + * * @access public * @return void */ @@ -245,7 +245,7 @@ class tutorialModel extends model /** * Get tutorialed. - * + * * @access public * @return string */