diff --git a/module/project/model.php b/module/project/model.php index f7f4c57661..500512131d 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -3279,7 +3279,7 @@ class projectModel extends model $days = count($dateList) - 1; $rate = $days ? $firstTime / $days : ''; $baselineJSON = '['; - foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * $rate, 1) . ','; + foreach($dateList as $i => $date) $baselineJSON .= round(($days - $i) * (int)$rate, 1) . ','; $baselineJSON = rtrim($baselineJSON, ',') . ']'; $chartData['labels'] = $this->report->convertFormat($dateList, DT_DATE5); diff --git a/module/tree/control.php b/module/tree/control.php index c28b0fc9ba..8a53cd1142 100644 --- a/module/tree/control.php +++ b/module/tree/control.php @@ -22,7 +22,7 @@ class tree extends control * @access public * @return void */ - public function browse($rootID, $viewType, $currentModuleID = 0, $branch = 0) + public function browse($rootID, $viewType, $currentModuleID = 0, $branch = 0, $from = '') { $this->loadModel('product'); @@ -139,7 +139,45 @@ class tree extends control } elseif(strpos($viewType, 'doc') !== false) { - $this->lang->navGroup->tree = 'project'; + $this->lang->navGroup->tree = 'doc'; + + if($from == 'product') + { + $productID = $lib->product; + $this->lang->noMenuModule[] = 'tree'; + unset($this->lang->product->viewMenu->set['subModule']); + $this->lang->navGroup->tree = 'product'; + $this->lang->product->menu = $this->lang->product->viewMenu; + $this->lang->product->switcherMenu = $this->loadModel('product')->getSwitcher($productID, 'story'); + $this->lang->product->mainMenuAction = $this->product->getProductMainAction(); + + $products = $this->product->getPairs(); + $this->product->saveState($productID, $products); + $this->product->setMenu($products, $productID, $branch); + } + elseif($from == 'project') + { + $projectID = $lib->project; + $this->lang->navGroup->tree = 'project'; + $project = $this->loadModel('project')->getById($projectID); + + /* Get all associated products. */ + $products = $this->project->getProducts($projectID); + $this->view->products = $products; + + $projects = $this->project->getExecutionPairs($this->session->PRJ); + + /* Set menu. */ + $this->project->setMenu($projects, $projectID); + $this->lang->tree->menu = $this->lang->project->menu; + $this->lang->tree->menuOrder = $this->lang->project->menuOrder; + + unset($projects[$projectID]); + $currentProject = key($projects); + $parentModules = $this->tree->getParents($currentModuleID); + } + + if($from == 'doc') $this->lang->navGroup->doc = 'doc'; $type = $lib->product ? 'product' : ($lib->project ? 'project' : 'custom'); $this->doc->setMenu($type, $rootID, $currentModuleID); $this->lang->tree->menu = $this->lang->doc->menu; diff --git a/module/tree/view/browse.html.php b/module/tree/view/browse.html.php index 14b4875633..faaa66af59 100644 --- a/module/tree/view/browse.html.php +++ b/module/tree/view/browse.html.php @@ -11,6 +11,16 @@ */ ?> +navGroup->doc == 'doc'):?> + + +