diff --git a/module/tutorial/config/scrumProjectManage.php b/module/tutorial/config/scrumProjectManage.php index 3f75627dd8..d5f6a5d54e 100644 --- a/module/tutorial/config/scrumProjectManage.php +++ b/module/tutorial/config/scrumProjectManage.php @@ -6,7 +6,7 @@ $scrumProjectManage->name = 'scrumProjectManage'; $scrumProjectManage->title = $lang->tutorial->scrumProjectManage->title; $scrumProjectManage->icon = 'project text-special'; $scrumProjectManage->type = 'basic'; -$scrumProjectManage->modules = 'project,execution,build,task,bug,testreport'; +$scrumProjectManage->modules = 'project,execution,build,task,bug,testreport,issue'; $scrumProjectManage->app = 'project'; $scrumProjectManage->tasks = array(); @@ -715,8 +715,108 @@ if(in_array($config->edition, array('max', 'ipd'))) 'type' => 'clickNavbar', 'target' => 'other', 'page' => 'project-index', - 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step1->name, - 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step1->desc + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step1->name + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'click', + 'target' => '#other a[data-id="issue"]', + 'page' => 'project-index', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step2->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step2->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'click', + 'target' => 'a.create-issue-btn', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step3->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step3->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'form', + 'page' => 'issue-create', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step4->name + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'saveForm', + 'page' => 'issue-create', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step5->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step5->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'click', + 'target' => 'div[data-row="1"] a.issue-confirm-btn', + 'page' => 'issue-browse', + 'url' => array('issue', 'browse', 'projectID=2'), + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step6->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step6->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'form', + 'target' => '#confirmPanel', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step7->name + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'saveForm', + 'target' => '#confirmPanel button[type="submit"]', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step8->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step8->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'click', + 'target' => 'div[data-row="2"] a.issue-resolve-btn', + 'page' => 'issue-browse', + 'url' => array('issue', 'browse', 'projectID=2'), + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step9->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step9->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'form', + 'target' => '#resolvePanel', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step10->name + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'saveForm', + 'target' => '#resolvePanel button[type="submit"]', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step11->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step11->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'click', + 'target' => 'div[data-row="2"] a.issue-close-btn', + 'page' => 'issue-browse', + 'url' => array('issue', 'browse', 'projectID=2'), + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step12->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step12->desc + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'form', + 'target' => '#closePanel', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step13->name + ); + + $scrumProjectManage->tasks['manageIssue']['steps'][] = array( + 'type' => 'saveForm', + 'target' => '#closePanel button[type="submit"]', + 'page' => 'issue-browse', + 'title' => $lang->tutorial->scrumProjectManage->manageIssue->step14->name, + 'desc' => $lang->tutorial->scrumProjectManage->manageIssue->step14->desc ); } diff --git a/module/tutorial/lang/zh-cn.php b/module/tutorial/lang/zh-cn.php index efec8084c2..af83f9a6f0 100644 --- a/module/tutorial/lang/zh-cn.php +++ b/module/tutorial/lang/zh-cn.php @@ -429,5 +429,52 @@ $lang->tutorial->scrumProjectManage->manageIssue = new stdClass(); $lang->tutorial->scrumProjectManage->manageIssue->title = '问题管理'; $lang->tutorial->scrumProjectManage->manageIssue->step1 = new stdClass(); -$lang->tutorial->scrumProjectManage->manageIssue->step1->name = '点击问题'; -$lang->tutorial->scrumProjectManage->manageIssue->step1->desc = '可以在这里进行问题管理'; +$lang->tutorial->scrumProjectManage->manageIssue->step1->name = '点击其他'; + +$lang->tutorial->scrumProjectManage->manageIssue->step2 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step2->name = '点击问题'; +$lang->tutorial->scrumProjectManage->manageIssue->step2->desc = '可以在这里进行问题管理'; + +$lang->tutorial->scrumProjectManage->manageIssue->step3 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step3->name = '点击新建问题'; +$lang->tutorial->scrumProjectManage->manageIssue->step3->desc = '在这里新建问题,支持批量创建'; + +$lang->tutorial->scrumProjectManage->manageIssue->step4 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step4->name = '填写表单'; + +$lang->tutorial->scrumProjectManage->manageIssue->step5 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step5->name = '保存表单'; +$lang->tutorial->scrumProjectManage->manageIssue->step5->desc = '保存后进入问题列表'; + +$lang->tutorial->scrumProjectManage->manageIssue->step6 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step6->name = '确认问题'; +$lang->tutorial->scrumProjectManage->manageIssue->step6->desc = '可以在这里确认当前项目的问题'; + +$lang->tutorial->scrumProjectManage->manageIssue->step7 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step7->name = '填写表单'; + +$lang->tutorial->scrumProjectManage->manageIssue->step8 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step8->name = '保存表单'; +$lang->tutorial->scrumProjectManage->manageIssue->step8->desc = '确认后回到问题列表'; + +$lang->tutorial->scrumProjectManage->manageIssue->step9 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step9->name = '解决问题'; +$lang->tutorial->scrumProjectManage->manageIssue->step9->desc = '可以在这里解决问题'; + +$lang->tutorial->scrumProjectManage->manageIssue->step10 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step10->name = '填写表单'; + +$lang->tutorial->scrumProjectManage->manageIssue->step11 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step11->name = '保存表单'; +$lang->tutorial->scrumProjectManage->manageIssue->step11->desc = '保存后返回问题列表'; + +$lang->tutorial->scrumProjectManage->manageIssue->step12 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step12->name = '关闭问题'; +$lang->tutorial->scrumProjectManage->manageIssue->step12->desc = '可以将已经处理的问题关闭'; + +$lang->tutorial->scrumProjectManage->manageIssue->step13 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step13->name = '填写表单'; + +$lang->tutorial->scrumProjectManage->manageIssue->step14 = new stdClass(); +$lang->tutorial->scrumProjectManage->manageIssue->step14->name = '保存表单'; +$lang->tutorial->scrumProjectManage->manageIssue->step14->desc = '可以在这里关闭问题'; diff --git a/module/tutorial/model.php b/module/tutorial/model.php index d01d31887d..395baae858 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -174,6 +174,7 @@ class tutorialModel extends model $project->estimate = 0; $project->left = 0; $project->storyType = 'story,requirement,epic'; + $project->charter = 0; return $project; } @@ -1027,4 +1028,72 @@ class tutorialModel extends model $bugs[$resolvedBug->id] = $resolvedBug; return $bugs; } + + /** + * 获取新手模式问题。 + * Get issue. + * + * @access public + * @return object + */ + public function getIssue(): object + { + $issue = new stdClass(); + $issue->id = 1; + $issue->resolvedBy = ''; + $issue->project = 2; + $issue->execution = 0; + $issue->title = 'Test issue-unconfirmed'; + $issue->desc = ''; + $issue->pri = 3; + $issue->severity = 1; + $issue->type = 'design'; + $issue->activity = ''; + $issue->deadline = ''; + $issue->resolution = ''; + $issue->resolutionComment= ''; + $issue->objectID = ''; + $issue->resolvedDate = ''; + $issue->status = 'unconfirmed'; + $issue->owner = 'admin'; + $issue->lib = 0; + $issue->from = 0; + $issue->version = 1; + $issue->createdBy = ''; + $issue->createdDate = ''; + $issue->editedBy = ''; + $issue->editedDate = ''; + $issue->activateBy = ''; + $issue->activateDate = ''; + $issue->closedBy = ''; + $issue->closedDate = ''; + $issue->assignedTo = ''; + $issue->assignedBy = ''; + $issue->assignedDate = ''; + $issue->approvedDate = ''; + $issue->deleted = 0; + + return $issue; + } + + /** + * 获取新手模式问题列表。 + * Get issues. + * + * @access public + * @return array + */ + public function getIssues(): array + { + $unconfirmedIssue = $this->getIssue(); + $confirmedIssue = $this->getIssue(); + $confirmedIssue->id = 2; + $confirmedIssue->title = 'Test issue-confirmed'; + $confirmedIssue->status = 'confirmed'; + + $issues = array(); + $issues[$unconfirmedIssue->id] = $unconfirmedIssue; + $issues[$confirmedIssue->id] = $confirmedIssue; + return $issues; + } }