diff --git a/module/block/zen.php b/module/block/zen.php index 033a0d0285..20312b90bd 100644 --- a/module/block/zen.php +++ b/module/block/zen.php @@ -1206,7 +1206,7 @@ class blockZen extends block protected function printWaterfallReportBlock(): void { $this->app->loadLang('programplan'); - $project = $this->loadModel('project')->getByID($this->session->project); + $project = $this->loadModel('project')->getByID(common::isTutorialMode() ? 2 : $this->session->project); /* Get metric data. */ $data = $this->getProjectsStatisticData(array($project->id)); @@ -1271,7 +1271,7 @@ class blockZen extends block { if(isset($plans[$metric['execution']])) $plans[$metric['execution']]->taskProgress = ($metric['value'] * 100) . '%'; } - $project = $this->loadModel('project')->fetchByID($this->session->project); + $project = $this->loadModel('project')->getByID(common::isTutorialMode() ? 2 : $this->session->project); $this->view->plans = $plans ? $plans : array(); $this->view->products = $project->hasProduct ? $products : array(); diff --git a/module/project/model.php b/module/project/model.php index 211546c366..31f28d4c06 100755 --- a/module/project/model.php +++ b/module/project/model.php @@ -790,6 +790,7 @@ class projectModel extends model */ public function getProjectList(string $status, string $order, int $limit, string $excludedModel): array { + if(common::isTutorialMode()) return $this->loadModel('tutorial')->getProjectStats(); return $this->projectTao->fetchProjectListByQuery($status, 0, $order, $limit, $excludedModel); } diff --git a/module/tutorial/model.php b/module/tutorial/model.php index f1ed01aa1a..dfc91e9300 100644 --- a/module/tutorial/model.php +++ b/module/tutorial/model.php @@ -591,6 +591,7 @@ class tutorialModel extends model $execution->colWidth = '200'; $execution->openedDate = helper::now(); $execution->closedDate = helper::now(); + $execution->milestone = 0; list($guide, $guideTask, $guideStepIndex) = empty($_SERVER['HTTP_X_ZIN_TUTORIAL']) ? array('', '', '') : explode('-', $_SERVER['HTTP_X_ZIN_TUTORIAL']); if($guide && strpos($guide, 'scrumProjectManage') !== false)