diff --git a/module/programplan/control.php b/module/programplan/control.php index 45ae7be2b4..7527eeb9cc 100644 --- a/module/programplan/control.php +++ b/module/programplan/control.php @@ -58,7 +58,7 @@ class programplan extends control { $this->app->loadLang('stage'); $this->commonAction($projectID, $productID, $type); - $this->session->set('programPlanList', $this->app->getURI(true)); + $this->session->set('projectPlanList', $this->app->getURI(true)); if(common::hasPriv('programplan', 'create')) $this->lang->TRActions = html::a($this->createLink('programplan', 'create', "projectID=$projectID"), " " . $this->lang->programplan->create, '', "class='btn btn-primary'"); @@ -85,7 +85,7 @@ class programplan extends control $this->view->title = $this->lang->programplan->browse; $this->view->position[] = $this->lang->programplan->browse; - $this->view->programID = $projectID; + $this->view->projectID = $projectID; $this->view->productID = $this->productID; $this->view->type = $type; $this->view->plans = $plans; @@ -98,47 +98,42 @@ class programplan extends control } /** - * Create a programplan. + * Create a project plan. * - * @param int $programID + * @param int $projectID * @param int $productID * @param int $planID * @access public * @return void */ - public function create($programID = 0, $productID = 0, $planID = 0) + public function create($projectID = 0, $productID = 0, $planID = 0) { - $this->commonAction($programID, $productID); + $this->commonAction($projectID, $productID); $this->app->loadLang('project'); if($_POST) { - $this->programplan->create($programID, $this->productID, $planID); + $this->programplan->create($projectID, $this->productID, $planID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); - $locate = $this->session->programPlanList ? $this->session->programPlanList : $this->createLink('programplan', 'browse', "program=$programID"); + $locate = $this->session->projectPlanList ? $this->session->projectPlanList : $this->createLink('programplan', 'browse', "projectID=$projectID"); $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate)); } - $stages = array(); - $browseType = 'parent'; - if($planID) - { - $stages = $this->loadModel('stage')->getStages('id_asc'); - $browseType = 'children'; - } + $stages = empty($planID) ? $this->loadModel('stage')->getStages('id_asc') : array(); + $browseType = empty($planID) ? 'parent' : 'children'; $this->app->loadLang('stage'); - $program = $this->loadModel('project')->getById($programID); - $plans = $this->programplan->getStage($programID, $this->productID, $planID, $browseType); + $project = $this->loadModel('project')->getById($projectID); + $plans = $this->programplan->getStage($projectID, $this->productID, $planID, $browseType); - $title = $this->lang->programplan->create . $this->lang->colon . $program->name; - $position[] = html::a($this->createLink('programplan', 'browse', "program=$programID"), $program->name); + $title = $this->lang->programplan->create . $this->lang->colon . $project->name; + $position[] = html::a($this->createLink('programplan', 'browse', "projectID=$projectID"), $project->name); $position[] = $this->lang->programplan->create; $this->view->title = $title; $this->view->position = $position; - $this->view->program = $program; + $this->view->project = $project; $this->view->stages = $stages; $this->view->plans = $plans; $this->view->planID = $planID; @@ -148,20 +143,20 @@ class programplan extends control } /** - * Edit a programplan. + * Edit a project plan. * * @param int $planID - * @param int $programID + * @param int $projectID * @access public * @return void */ - public function edit($planID = 0, $programID = 0) + public function edit($planID = 0, $projectID = 0) { $this->app->loadLang('project'); $plan = $this->programplan->getByID($planID); if($_POST) { - $changes = $this->programplan->update($planID, $programID); + $changes = $this->programplan->update($planID, $projectID); if(dao::isError()) $this->send(array('result' => 'fail', 'message' => dao::getError())); if($changes) { @@ -184,7 +179,7 @@ class programplan extends control } /** - * Delete a programplan. + * Delete a project plan. * * @param int $planID * @param string $confirm @@ -212,7 +207,7 @@ class programplan extends control } /** - * Ajax custom. + * Save custom settings via ajax. * * @access public * @return void diff --git a/module/programplan/model.php b/module/programplan/model.php index 51731d97a1..066716386a 100644 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -129,15 +129,15 @@ class programplanModel extends model /** * Get plans. * - * @param int $programID + * @param int $projectID * @param int $productID * @param string $orderBy * @access public * @return array */ - public function getPlans($programID = 0, $productID = 0, $orderBy = 'id_asc') + public function getPlans($projectID = 0, $productID = 0, $orderBy = 'id_asc') { - $plans = $this->getStage($programID, $productID, 0, 'all', $orderBy); + $plans = $this->getStage($projectID, $productID, 0, 'all', $orderBy); $parents = array(); $children = array(); @@ -154,15 +154,15 @@ class programplanModel extends model /** * Get pairs. * - * @param int $programID + * @param int $projectID * @param int $productID * @param string $type * @access public * @return array */ - public function getPairs($programID, $productID = 0, $type = 'all') + public function getPairs($projectID, $productID = 0, $type = 'all') { - $plans = $this->getPlans($programID, $productID); + $plans = $this->getPlans($projectID, $productID); $pairs = array(0 => ''); foreach($plans as $plan) @@ -324,7 +324,7 @@ class programplanModel extends model /** * Get total percent. * - * @param object $plan + * @param object $plan * @access public * @return int */ @@ -413,13 +413,13 @@ class programplanModel extends model /** * Create a plan. * - * @param int $programID + * @param int $projectID * @param int $productID * @param int $parentID * @access public * @return bool */ - public function create($programID = 0, $productID = 0, $parentID = 0) + public function create($projectID = 0, $productID = 0, $parentID = 0) { $data = (array)fixer::input('post')->get(); extract($data); @@ -445,8 +445,8 @@ class programplanModel extends model $plan = new stdclass(); $plan->id = isset($planIDList[$key]) ? $planIDList[$key] : ''; $plan->type = 'stage'; - $plan->project = $programID; - $plan->parent = $parentID ? $parentID : $programID; + $plan->project = $projectID; + $plan->parent = $parentID ? $parentID : $projectID; $plan->name = $names[$key]; $plan->percent = $percents[$key]; $plan->attribute = empty($parentID) ? $attributes[$key] : $parentStageType; @@ -631,11 +631,11 @@ class programplanModel extends model * Update a plan. * * @param int $planID - * @param int $programID + * @param int $projectID * @access public * @return bool|array */ - public function update($planID = 0, $programID = 0) + public function update($planID = 0, $projectID = 0) { $oldPlan = $this->getByID($planID); $plan = fixer::input('post') @@ -670,7 +670,7 @@ class programplanModel extends model $plan->realDuration = $this->getDuration($plan->realBegan, $plan->realEnd); if($planChanged) $plan->version = $oldPlan->version + 1; - if(empty($plan->parent)) $plan->parent = $programID; + if(empty($plan->parent)) $plan->parent = $projectID; $this->dao->update(TABLE_PROJECT)->data($plan) ->autoCheck() @@ -706,11 +706,11 @@ class programplanModel extends model * @param int $col * @param int $plan * @param int $users - * @param int $programID + * @param int $projectID * @access public * @return string */ - public function printCell($col, $plan, $users, $programID) + public function printCell($col, $plan, $users, $projectID) { $id = $col->id; if($col->show) @@ -795,7 +795,7 @@ class programplanModel extends model echo html::a('javascript:alert("' . $this->lang->programplan->error->createdTask . '");', '', '', 'class="btn ' . $disabled . '"'); } - common::printIcon('programplan', 'edit', "planID=$plan->id&programID=$programID", $plan, 'list', '', '', 'iframe', true); + common::printIcon('programplan', 'edit', "planID=$plan->id&projectID=$projectID", $plan, 'list', '', '', 'iframe', true); $disabled = !empty($plan->children) ? ' disabled' : ''; if(common::hasPriv('programplan', 'delete', $plan)) { @@ -840,20 +840,20 @@ class programplanModel extends model } /** - * Get milestones. + * Get the stage set to milestone. * - * @param int $programID + * @param int $projectID * @access public * @return object */ - public function getMilestones($programID = 0) + public function getMilestones($projectID = 0) { return $this->dao->select('id, name')->from(TABLE_PROJECT) - ->where('parent')->eq($programID) + ->where('project')->eq($projectID) ->andWhere('type')->eq('stage') ->andWhere('milestone')->eq(1) ->andWhere('deleted')->eq(0) - ->orderBy('begin asc') + ->orderBy('id_desc') ->fetchPairs(); } @@ -892,20 +892,20 @@ class programplanModel extends model /** * Get parent stage list. * - * @param int $programID + * @param int $projectID * @param int $planID * @param int $productID * @access public * @return array */ - public function getParentStageList($programID, $planID, $productID) + public function getParentStageList($projectID, $planID, $productID) { $projects = $this->getProjectsByProduct($productID); unset($projects[$planID]); $parentStage = $this->dao->select('id,name')->from(TABLE_PROJECT) ->where('type')->eq('stage') - ->andWhere('parent')->eq($programID) + ->andWhere('parent')->eq($projectID) ->andWhere('deleted')->eq('0') ->fetchPairs('id'); diff --git a/module/programplan/view/browse.html.php b/module/programplan/view/browse.html.php index 449ac8381d..c732b2be1d 100644 --- a/module/programplan/view/browse.html.php +++ b/module/programplan/view/browse.html.php @@ -19,7 +19,7 @@

programplan->noData;?> - createLink('programplan', 'create', "program=$programID&productID=$productID"), " " . $lang->programplan->create, '', "class='btn btn-info'");?> + createLink('programplan', 'create', "projectID=$projectID&productID=$productID"), " " . $lang->programplan->create, '', "class='btn btn-info'");?>

diff --git a/module/programplan/view/create.html.php b/module/programplan/view/create.html.php index fc93e5bb14..fbf42273d8 100644 --- a/module/programplan/view/create.html.php +++ b/module/programplan/view/create.html.php @@ -15,7 +15,7 @@ diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index cdbebc37cc..f17dd5084e 100644 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -129,7 +129,7 @@ function drawGanttToCanvas(exportType, successCallback, errorCallback) orientation: width > height ? 'l' : 'p' }); pdf.addImage(canvas, 0, 0, pdf.internal.pageSize.getWidth(), pdf.internal.pageSize.getHeight()); - pdf.save('gantt-export-.pdf'); + pdf.save('gantt-export-.pdf'); if(successCallback) successCallback(pdf); afterFinish(); }, function(error) diff --git a/module/programplan/view/list.html.php b/module/programplan/view/list.html.php index 053093b8ad..a21f2d1057 100644 --- a/module/programplan/view/list.html.php +++ b/module/programplan/view/list.html.php @@ -35,7 +35,7 @@ js::set('confirmDelete', $lang->programplan->confirmDelete); datatable->getSetting('programplan'); $widths = $this->datatable->setFixedFieldWidth($setting); $widths['leftWidth'] = 300; @@ -59,7 +59,7 @@ js::set('confirmDelete', $lang->programplan->confirmDelete); - $value) $this->programplan->printCell($value, $plan, $users, $programID);?> + $value) $this->programplan->printCell($value, $plan, $users, $projectID);?> children)):?> @@ -67,7 +67,7 @@ js::set('confirmDelete', $lang->programplan->confirmDelete); children)) ? ' table-child-bottom' : '';?> - $value) $this->programplan->printCell($value, $child, $users, $programID);?> + $value) $this->programplan->printCell($value, $child, $users, $projectID);?> diff --git a/module/stakeholder/model.php b/module/stakeholder/model.php index 4497a1f034..5c4aca3a7d 100644 --- a/module/stakeholder/model.php +++ b/module/stakeholder/model.php @@ -259,19 +259,19 @@ class stakeholderModel extends model */ public function getParentStakeholderGroup($objectIdList) { - $objects = $this->dao->select('id, path, parent')->from(TABLE_PROJECT)->where('id')->in($objectIdList)->andWhere('acl')->ne('open')->fetchAll('id'); + $objects = $this->dao->select('id, path, parent')->from(TABLE_PROJECT)->where('id')->in($objectIdList)->andWhere('acl')->ne('open')->fetchAll('id'); $parents = array(); foreach($objects as $object) - { + { if($object->parent == 0) continue; foreach(explode(',', $object->path) as $objectID) - { + { if(empty($objectID)) continue; if($objectID == $object->id) continue; $parents[$objectID][] = $object->id; - } - } + } + } /* Get all parent stakeholders.*/ $parentStakeholders = $this->dao->select('objectID, user')->from(TABLE_STAKEHOLDER)->where('objectID')->in(array_keys($parents))->fetchAll(); @@ -281,9 +281,9 @@ class stakeholderModel extends model { $subPrograms = zget($parents, $parentStakeholder->objectID, array()); foreach($subPrograms as $subProgramID) $parentStakeholderGroup[$subProgramID][$parentStakeholder->user] = $parentStakeholder->user; - } + } - return $parentStakeholderGroup; + return $parentStakeholderGroup; } /** diff --git a/module/user/model.php b/module/user/model.php index cad00cd359..7e41b6261d 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1651,7 +1651,7 @@ class userModel extends model /* Get all parent program and subprogram relation. */ $parentStakeholderGroup = $this->stakeholder->getParentStakeholderGroup($programIdList); - + /* Get auth users. */ $authedUsers = array(); if(!empty($users)) $authedUsers = $users; @@ -1688,7 +1688,7 @@ class userModel extends model if($userViews[$account] != $view) $this->dao->update(TABLE_USERVIEW)->set('programs')->eq($view)->where('account')->eq($account)->exec(); } } - + /** * Update project view *