From f8dd57cc30d36459cb6b2b37da7573e77e55698d Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Thu, 29 Aug 2024 10:28:53 +0800
Subject: [PATCH]  * [misc] Change the name of tutorial.

---
 module/tutorial/config/kanbanProjectManage.php    |  4 ++--
 module/tutorial/config/scrumProjectManage.php     |  4 ++--
 module/tutorial/config/waterfallProjectManage.php |  4 ++--
 module/tutorial/model.php                         | 12 ++++++------
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/tutorial/config/kanbanProjectManage.php b/module/tutorial/config/kanbanProjectManage.php
index ed24e18486..c42a295e7f 100644
--- a/module/tutorial/config/kanbanProjectManage.php
+++ b/module/tutorial/config/kanbanProjectManage.php
@@ -3,7 +3,7 @@ global $lang,$config;
 
 $kanbanProjectManage = new stdClass();
 $kanbanProjectManage->basic = new stdClass();
-$kanbanProjectManage->basic->name    = 'kanbanProjectManage';
+$kanbanProjectManage->basic->name    = 'kanbanProjectManageBasic';
 $kanbanProjectManage->basic->title   = $lang->tutorial->kanbanProjectManage->title;
 $kanbanProjectManage->basic->icon    = 'kanban text-special';
 $kanbanProjectManage->basic->type    = 'basic';
@@ -306,7 +306,7 @@ $kanbanProjectManage->basic->tasks['manageBuild']['steps'][] = array(
 
 $kanbanProjectManage->advance = new stdClass();
 $kanbanProjectManage->advance = clone $kanbanProjectManage->basic;
-$kanbanProjectManage->advance->name = 'kanbanProjectManage-advance';
+$kanbanProjectManage->advance->name = 'kanbanProjectManageAdvance';
 $kanbanProjectManage->advance->type = 'advance';
 
 $kanbanProjectManage->advance->tasks['manageKanban']['steps'][] = array(
diff --git a/module/tutorial/config/scrumProjectManage.php b/module/tutorial/config/scrumProjectManage.php
index b78881cc76..4b82c9a117 100644
--- a/module/tutorial/config/scrumProjectManage.php
+++ b/module/tutorial/config/scrumProjectManage.php
@@ -3,7 +3,7 @@ global $lang,$config;
 
 $scrumProjectManage = new stdClass();
 $scrumProjectManage->basic = new stdClass();
-$scrumProjectManage->basic->name    = 'scrumProjectManage-basic';
+$scrumProjectManage->basic->name    = 'scrumProjectManageBasic';
 $scrumProjectManage->basic->title   = $lang->tutorial->scrumProjectManage->title;
 $scrumProjectManage->basic->icon    = 'sprint text-special';
 $scrumProjectManage->basic->type    = 'basic';
@@ -706,7 +706,7 @@ $scrumProjectManage->basic->tasks['manageBug']['steps'][] = array(
 
 $scrumProjectManage->advance = new stdClass();
 $scrumProjectManage->advance = clone $scrumProjectManage->basic;
-$scrumProjectManage->advance->name = 'scrumProjectManage-advance';
+$scrumProjectManage->advance->name = 'scrumProjectManageAdvance';
 $scrumProjectManage->advance->type = 'advance';
 
 if(in_array($config->edition, array('max', 'ipd')))
diff --git a/module/tutorial/config/waterfallProjectManage.php b/module/tutorial/config/waterfallProjectManage.php
index 1fb67a0f79..e7d734848f 100644
--- a/module/tutorial/config/waterfallProjectManage.php
+++ b/module/tutorial/config/waterfallProjectManage.php
@@ -3,7 +3,7 @@ global $lang,$config;
 
 $waterfallProjectManage = new stdClass();
 $waterfallProjectManage->basic = new stdClass();
-$waterfallProjectManage->basic->name    = 'waterfallProjectManage-basic';
+$waterfallProjectManage->basic->name    = 'waterfallProjectManageBasic';
 $waterfallProjectManage->basic->title   = $lang->tutorial->waterfallProjectManage->title;
 $waterfallProjectManage->basic->icon    = 'waterfall text-special';
 $waterfallProjectManage->basic->type    = 'basic';
@@ -686,7 +686,7 @@ $waterfallProjectManage->basic->tasks['manageBug']['steps'][] = array(
 
 $waterfallProjectManage->advance = new stdClass();
 $waterfallProjectManage->advance = clone $waterfallProjectManage->basic;
-$waterfallProjectManage->advance->name  = 'waterfallProjectManage-advance';
+$waterfallProjectManage->advance->name  = 'waterfallProjectManageAdvance';
 $waterfallProjectManage->advance->type  = 'advance';
 $waterfallProjectManage->advance->tasks = array();
 $waterfallProjectManage->advance->tasks['manageProject'] = $waterfallProjectManage->basic->tasks['manageProject'];
diff --git a/module/tutorial/model.php b/module/tutorial/model.php
index 38a2d79760..eac88f2a46 100644
--- a/module/tutorial/model.php
+++ b/module/tutorial/model.php
@@ -177,17 +177,17 @@ class tutorialModel extends model
         $project->charter      = 0;
 
         list($guide, $guideTask, $guideStepIndex) = empty($_SERVER['HTTP_X_ZIN_TUTORIAL']) ? array() : explode('-', $_SERVER['HTTP_X_ZIN_TUTORIAL']);
-        if($guide == 'scrumProjectManage')
+        if(strpos($guide, 'scrumProjectManage') !== false)
         {
             $project->name  = 'Scrum Project';
             $project->model = 'scrum';
         }
-        if($guide == 'waterfallProjectManage')
+        if(strpos($guide, 'waterfallProjectManage') !== false)
         {
             $project->name  = 'Waterfall Project';
             $project->model = 'waterfall';
         }
-        if($guide == 'kanbanProjectManage')
+        if(strpos($guide, 'kanbanProjectManage') !== false)
         {
             $project->name  = 'Kanban Project';
             $project->model = 'kanban';
@@ -434,12 +434,12 @@ class tutorialModel extends model
         $execution->closedDate    = helper::now();
 
         list($guide, $guideTask, $guideStepIndex) = empty($_SERVER['HTTP_X_ZIN_TUTORIAL']) ? array() : explode('-', $_SERVER['HTTP_X_ZIN_TUTORIAL']);
-        if($guide == 'scrumProjectManage')
+        if(strpos($guide, 'scrumProjectManage') !== false)
         {
             $execution->name = 'Test Sprint';
             $execution->type = 'sprint';
         }
-        if($guide == 'waterfallProjectManage')
+        if(strpos($guide, 'waterfallProjectManage') !== false)
         {
             $execution->name      = 'Test Stage';
             $execution->type      = 'stage';
@@ -448,7 +448,7 @@ class tutorialModel extends model
             $execution->milestone = 0;
             $execution->parallel  = 1;
         }
-        if($guide == 'kanbanProjectManage')
+        if(strpos($guide, 'kanbanProjectManage') !== false)
         {
             $execution->name = 'Test Kanban';
             $execution->type = 'kanban';