diff --git a/module/project/ui/browsebylist.html.php b/module/project/ui/browsebylist.html.php
index 78555a6181..7716f7908c 100644
--- a/module/project/ui/browsebylist.html.php
+++ b/module/project/ui/browsebylist.html.php
@@ -61,7 +61,7 @@ toolbar
'icon' => 'plus',
'text' => $lang->project->create,
'class' => 'primary create-project-btn',
- 'url' => commonModel::isTutorialMode() ? createLink('project', 'create', 'mode=scrum&programID=0') : createLink('project', 'createGuide', "programID={$programID}"),
+ 'url' => createLink('project', 'createGuide', "programID={$programID}"),
'data-toggle' => 'modal',
'data-position' => 'center'
))) : null
diff --git a/module/tutorial/config/scrumProjectManage.php b/module/tutorial/config/scrumProjectManage.php
index 766c359ef7..1c8e9d3701 100644
--- a/module/tutorial/config/scrumProjectManage.php
+++ b/module/tutorial/config/scrumProjectManage.php
@@ -6,7 +6,8 @@ $scrumProjectManage->name = 'scrumProjectManage';
$scrumProjectManage->title = $lang->tutorial->scrumProjectManage->title;
$scrumProjectManage->icon = 'project text-special';
$scrumProjectManage->type = 'basic';
-$scrumProjectManage->modules = 'project';
+$scrumProjectManage->modules = 'project,execution,build';
+$scrumProjectManage->app = 'project';
$scrumProjectManage->tasks = array();
$scrumProjectManage->tasks['manageProject'] = array();
@@ -24,8 +25,8 @@ $scrumProjectManage->tasks['manageProject']['steps'][] = array(
$scrumProjectManage->tasks['manageProject']['steps'][] = array(
'type' => 'click',
- 'target' => '#actionBar a.create-project-btn',
- 'page' => 'project-createGuide',
+ 'target' => '#actionBar .create-project-btn',
+ 'page' => 'project-browse',
'title' => $lang->tutorial->scrumProjectManage->manageProject->step2->name,
'desc' => $lang->tutorial->scrumProjectManage->manageProject->step2->desc
);
@@ -33,7 +34,7 @@ $scrumProjectManage->tasks['manageProject']['steps'][] = array(
$scrumProjectManage->tasks['manageProject']['steps'][] = array(
'type' => 'click',
'target' => '#modelList div.scrum div.model-item',
- 'page' => 'project-create',
+ 'page' => 'project-browse',
'title' => $lang->tutorial->scrumProjectManage->manageProject->step3->name,
'desc' => $lang->tutorial->scrumProjectManage->manageProject->step3->desc
);
@@ -55,7 +56,7 @@ $scrumProjectManage->tasks['manageProject']['steps'][] = array(
$scrumProjectManage->tasks['manageProject']['steps'][] = array(
'type' => 'click',
- 'target' => '#table-project-browse .dtable-body data-col=name data-row=1 a',
+ 'target' => '#table-project-browse .dtable-body div[data-col="name"] a',
'page' => 'project-browse',
'title' => $lang->tutorial->scrumProjectManage->manageProject->step6->name,
'desc' => $lang->tutorial->scrumProjectManage->manageProject->step6->desc
@@ -64,7 +65,7 @@ $scrumProjectManage->tasks['manageProject']['steps'][] = array(
$scrumProjectManage->tasks['manageProject']['steps'][] = array(
'type' => 'clickNavbar',
'target' => 'settings',
- 'page' => 'project-view',
+ 'page' => 'project-index',
'title' => $lang->tutorial->scrumProjectManage->manageProject->step7->name,
'desc' => $lang->tutorial->scrumProjectManage->manageProject->step7->desc
);
@@ -168,4 +169,177 @@ $scrumProjectManage->tasks['manageExecution']['steps'][] = array(
'desc' => $lang->tutorial->scrumProjectManage->manageExecution->step8->desc
);
+$scrumProjectManage->tasks['manageTask'] = array();
+$scrumProjectManage->tasks['manageTask']['name'] = 'manageTask';
+$scrumProjectManage->tasks['manageTask']['title'] = $lang->tutorial->scrumProjectManage->manageTask->title;
+$scrumProjectManage->tasks['manageTask']['startUrl'] = array('execution', 'task', 'executionID=1');
+$scrumProjectManage->tasks['manageTask']['steps'] = array();
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'clickNavbar',
+ 'target' => 'story',
+ 'page' => 'execution-story',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step1->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step1->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'selectRow',
+ 'target' => '#table-execution-story',
+ 'page' => 'execution-story',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step2->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '#table-execution-story ', //分解任务的按钮没有选中
+ 'page' => 'execution-story',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step3->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step3->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'form',
+ 'page' => 'task-batchCreate',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step4->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'saveForm',
+ 'target' => 'form button[type="submit"]',
+ 'page' => 'task-batchCreate',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step5->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step5->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '', //任务列表的指派给按钮
+ 'page' => 'execution-task',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step6->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step6->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'form',
+ 'page' => 'task-assignTo',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step7->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'saveForm',
+ 'page' => 'form button[type="submit"]',
+ 'page' => 'task-assignTo',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step8->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step8->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '', //任务列表的开始按钮
+ 'page' => 'execution-task',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step9->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step9->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'form',
+ 'page' => 'task-start',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step10->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'saveForm',
+ 'page' => 'form button[type="submit"]',
+ 'page' => 'task-start',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step11->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step11->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '', //任务列表的记录工时按钮
+ 'page' => 'execution-task',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step12->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step12->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'form',
+ 'page' => 'task-recordWorkhour',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step13->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'saveForm',
+ 'page' => 'form button[type="submit"]',
+ 'page' => 'task-recordWorkhour',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step14->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step14->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '', //任务列表的完成按钮
+ 'page' => 'execution-task',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step15->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step15->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'form',
+ 'page' => 'task-finish',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step16->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'saveForm',
+ 'target' => 'form button[type="submit"]',
+ 'page' => 'task-finish',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step17->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step17->desc
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'clickNavbar',
+ 'target' => 'build',
+ 'page' => 'execution-task',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step18->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step18->desc
+);
+
+//创建版本按钮
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '#mainContainer #actionBar a',
+ 'page' => 'execution-build',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step19->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step19->desc
+);
+/**************************/
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'form',
+ 'target' => 'form',
+ 'page' => 'build-create',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step20->name,
+);
+
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'saveForm',
+ 'target' => 'form button[type="submit"]',
+ 'page' => 'build-create',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step21->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step21->desc
+);
+
+//版本列表中关联需求按钮
+$scrumProjectManage->tasks['manageTask']['steps'][] = array(
+ 'type' => 'click',
+ 'target' => '',
+ 'page' => 'execution-build',
+ 'title' => $lang->tutorial->scrumProjectManage->manageTask->step22->name,
+ 'desc' => $lang->tutorial->scrumProjectManage->manageTask->step22->desc
+);
+
$config->tutorial->guides[$scrumProjectManage->name] = $scrumProjectManage;
diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php
index 228be3279a..0b5b25f401 100644
--- a/module/tutorial/lang/zh-cn.php
+++ b/module/tutorial/lang/zh-cn.php
@@ -174,3 +174,95 @@ $lang->tutorial->scrumProjectManage->manageExecution->step7->desc = '点击保
$lang->tutorial->scrumProjectManage->manageExecution->step8 = new stdClass();
$lang->tutorial->scrumProjectManage->manageExecution->step8->name = '点击燃尽图';
$lang->tutorial->scrumProjectManage->manageExecution->step8->desc = '点击燃尽图可以查看迭代燃尽图';
+
+$lang->tutorial->scrumProjectManage->manageTask = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->title = '任务管理';
+
+$lang->tutorial->scrumProjectManage->manageTask->step1 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step1->name = '点击需求';
+$lang->tutorial->scrumProjectManage->manageTask->step1->desc = '进入需求列表,您可以在这里看到之前关联的需求需求';
+
+$lang->tutorial->scrumProjectManage->manageTask->step2 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step2->name = '选择需求';
+
+$lang->tutorial->scrumProjectManage->manageTask->step3 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step3->name = '分解任务';
+$lang->tutorial->scrumProjectManage->manageTask->step3->desc = '您可以在这里将需求分解为任务,支持批量分解';
+
+$lang->tutorial->scrumProjectManage->manageTask->step4 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step4->name = '填写表单';
+
+$lang->tutorial->scrumProjectManage->manageTask->step5 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step5->name = '保存表单';
+$lang->tutorial->scrumProjectManage->manageTask->step5->desc = '保存后可以在任务列表中查看分解的任务';
+
+$lang->tutorial->scrumProjectManage->manageTask->step6 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step6->name = '点击指派给';
+$lang->tutorial->scrumProjectManage->manageTask->step6->desc = '您可以在这里将任务指派给对应的用户';
+
+$lang->tutorial->scrumProjectManage->manageTask->step7 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step7->name = '填写表单';
+
+$lang->tutorial->scrumProjectManage->manageTask->step8 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step8->name = '保存表单';
+$lang->tutorial->scrumProjectManage->manageTask->step8->desc = '保存后在任务列表中指派给字段会显示被指派的用户';
+
+$lang->tutorial->scrumProjectManage->manageTask->step9 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step9->name = '点击开始任务';
+$lang->tutorial->scrumProjectManage->manageTask->step9->desc = '您可以在这里开始任务,并记录消耗和剩余工时';
+
+$lang->tutorial->scrumProjectManage->manageTask->step10 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step10->name = '填写表单';
+
+$lang->tutorial->scrumProjectManage->manageTask->step11 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step11->name = '保存表单';
+$lang->tutorial->scrumProjectManage->manageTask->step11->desc = '保存后返回任务列表';
+
+$lang->tutorial->scrumProjectManage->manageTask->step12 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step12->name = '点击记录工时';
+$lang->tutorial->scrumProjectManage->manageTask->step12->desc = '您可以在这里记录消耗和剩余工时,当剩余工时为0后,任务会自动完成';
+
+$lang->tutorial->scrumProjectManage->manageTask->step13 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step13->name = '填写表单';
+
+$lang->tutorial->scrumProjectManage->manageTask->step14 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step14->name = '保存表单';
+$lang->tutorial->scrumProjectManage->manageTask->step14->desc = '保存后返回任务列表';
+
+$lang->tutorial->scrumProjectManage->manageTask->step15 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step15->name = '点击完成任务';
+$lang->tutorial->scrumProjectManage->manageTask->step15->desc = '您可以在这里完成任务';
+
+$lang->tutorial->scrumProjectManage->manageTask->step16 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step16->name = '填写表单';
+
+$lang->tutorial->scrumProjectManage->manageTask->step17 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step17->name = '保存表单';
+$lang->tutorial->scrumProjectManage->manageTask->step17->desc = '保存后返回任务列表';
+
+$lang->tutorial->scrumProjectManage->manageTask->step18 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step18->name = '点击版本';
+$lang->tutorial->scrumProjectManage->manageTask->step18->desc = '进入版本模块中可以创建版本';
+
+$lang->tutorial->scrumProjectManage->manageTask->step19 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step19->name = '点击创建版本';
+$lang->tutorial->scrumProjectManage->manageTask->step19->desc = '******************************************';
+
+$lang->tutorial->scrumProjectManage->manageTask->step20 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step20->name = '填写表单';
+
+$lang->tutorial->scrumProjectManage->manageTask->step21 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step21->name = '保存表单';
+$lang->tutorial->scrumProjectManage->manageTask->step21->desc = '保存后进入版本详情';
+
+$lang->tutorial->scrumProjectManage->manageTask->step22 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step22->name = '关联需求';
+$lang->tutorial->scrumProjectManage->manageTask->step22->desc = '可以将完成的研发需求关联在版本中';
+
+$lang->tutorial->scrumProjectManage->manageTask->step23 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step23->name = '选择需求';
+$lang->tutorial->scrumProjectManage->manageTask->step23->desc = '在这里可以选择勾选需要关联的需求';
+
+$lang->tutorial->scrumProjectManage->manageTask->step24 = new stdClass();
+$lang->tutorial->scrumProjectManage->manageTask->step24->name = '保存关联的需求';
+$lang->tutorial->scrumProjectManage->manageTask->step24->desc = '您可以将完成的需求关联在当前版本中';