diff --git a/module/program/model.php b/module/program/model.php index fd3ac8fb60..7fdca9e129 100644 --- a/module/program/model.php +++ b/module/program/model.php @@ -3,12 +3,12 @@ class programModel extends model { /** * Get program list. - * + * * @param varchar $status * @param varchar $orderBy * @param object $pager * @access public - * @return void + * @return array */ public function getList($status = 'all', $orderBy = 'id_desc', $pager = NULL) { @@ -31,7 +31,7 @@ class programModel extends model /** * Get program pairs. - * + * * @access public * @return void */ @@ -47,7 +47,7 @@ class programModel extends model /** * Get program pairs by template. - * + * * @param varchar $template * @access public * @return void @@ -65,7 +65,7 @@ class programModel extends model /** * Get user programs for block. - * + * * @param varchar $status * @param varchar $orderBy * @param int $limit @@ -154,12 +154,12 @@ class programModel extends model foreach($programs as $programID => $program) { $program->teamCount = isset($teams[$programID]) ? $teams[$programID]->count : 0; - $program->consumed = isset($hours[$programID]) ? $hours[$programID]->consumed : 0; - $program->estimate = isset($hours[$programID]) ? $hours[$programID]->estimate : 0; - $program->leftTasks = isset($leftTasks[$programID]) ? $leftTasks[$programID]->leftTasks : 0; - $program->allStories = isset($allStories[$programID]) ? $allStories[$programID]->allStories : 0; - $program->doneStories = isset($doneStories[$programID]) ? $doneStories[$programID]->doneStories : 0; - $program->leftStories = isset($leftStories[$programID]) ? $leftStories[$programID]->leftStories : 0; + $program->consumed = isset($hours[$programID]) ? $hours[$programID]->consumed : 0; + $program->estimate = isset($hours[$programID]) ? $hours[$programID]->estimate : 0; + $program->leftTasks = isset($leftTasks[$programID]) ? $leftTasks[$programID]->leftTasks : 0; + $program->allStories = isset($allStories[$programID]) ? $allStories[$programID]->allStories : 0; + $program->doneStories = isset($doneStories[$programID]) ? $doneStories[$programID]->doneStories : 0; + $program->leftStories = isset($leftStories[$programID]) ? $leftStories[$programID]->leftStories : 0; $program->leftBugs = isset($leftBugs[$programID]) ? $leftBugs[$programID]->leftBugs : 0; $program->allBugs = isset($allBugs[$programID]) ? $allBugs[$programID]->allBugs : 0; $program->doneBugs = isset($doneBugs[$programID]) ? $doneBugs[$programID]->doneBugs : 0; @@ -290,7 +290,7 @@ class programModel extends model else { $pgmAdminID = $this->dao->select('id')->from(TABLE_GROUP)->where('role')->eq('pgmadmin')->fetch('id'); - $groupPriv = new stdclass(); + $groupPriv = new stdclass(); $groupPriv->account = $this->app->user->account; $groupPriv->group = $pgmAdminID; $groupPriv->program = $programID; @@ -323,8 +323,8 @@ class programModel extends model /** * Update program. - * - * @param int $programID + * + * @param int $programID * @access public * @return array */ @@ -388,20 +388,20 @@ class programModel extends model * @return void */ public function getSwapper($programs, $programID, $currentModule, $currentMethod, $extra = '') - { + { $this->loadModel('project'); $currentProgramName = ''; if($programID) - { + { setCookie("lastProgram", $programID, $this->config->cookieLife, $this->config->webRoot, '', false, true); $currentProgram = $this->project->getById($programID); $currentProgramName = $currentProgram->name; - } + } if($currentModule == 'program' && $currentMethod == 'browse') $currentProgramName = $this->lang->program->all; $dropMenuLink = helper::createLink('program', 'ajaxGetDropMenu', "objectID=$programID&module=$currentModule&method=$currentMethod&extra=$extra"); $output = "
"; //if($isMobile) $output = "{$currentProjectName} "; @@ -433,8 +433,8 @@ class programModel extends model /** * Check has content for program - * - * @param int $programID + * + * @param int $programID * @access public * @return bool */ @@ -464,8 +464,8 @@ class programModel extends model /** * Check has children project. - * - * @param int $programID + * + * @param int $programID * @access public * @return bool */ @@ -477,8 +477,8 @@ class programModel extends model /** * Set program tree path. - * - * @param int $programID + * + * @param int $programID * @access public * @return bool */ @@ -501,8 +501,8 @@ class programModel extends model } /** - * Get program parent pairs - * + * Get program parent pairs + * * @access public * @return array */ @@ -552,11 +552,11 @@ class programModel extends model /** * Move project node. - * - * @param int $programID - * @param int $parentID - * @param string $oldPath - * @param int $oldGrade + * + * @param int $programID + * @param int $parentID + * @param string $oldPath + * @param int $oldGrade * @access public * @return bool */