diff --git a/module/my/view/program.html.php b/module/my/view/program.html.php index a4a2e52c92..6f1cee7213 100644 --- a/module/my/view/program.html.php +++ b/module/my/view/program.html.php @@ -43,7 +43,7 @@ id;?> code;?> - createLink('program', 'index', "programID=$program->id"), $program->name);?> + createLink('program', 'index', "programID=$program->id", '', '', $program->id), $program->name);?> begin;?> end;?> diff --git a/module/program/control.php b/module/program/control.php index decbb0d603..be71345a23 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -694,7 +694,7 @@ class program extends control public function ajaxGetDropMenu($programID, $module, $method, $extra) { $this->loadModel('project'); - $this->view->link = $this->createLink('program', 'index', "programID=$programID"); + $this->view->link = $this->createLink('program', 'index', "programID=$programID", '', '', $programID); $this->view->programID = $programID; $this->view->module = $module; $this->view->method = $method; diff --git a/module/program/view/browsebygrid.html.php b/module/program/view/browsebygrid.html.php index 0e82d8ce78..5934b4a48d 100644 --- a/module/program/view/browsebygrid.html.php +++ b/module/program/view/browsebygrid.html.php @@ -2,7 +2,7 @@
$program):?>
-
id");?>'> +
id", '', '', $program->id);?>'>
name;?> template === 'cmmi'): ?> diff --git a/module/program/view/browsebylist.html.php b/module/program/view/browsebylist.html.php index 7d7c5a6e40..07c63c163d 100644 --- a/module/program/view/browsebylist.html.php +++ b/module/program/view/browsebylist.html.php @@ -28,7 +28,7 @@ code;?> - id"), $program->name);?> + createLink('program', 'index', "programID=$program->id", '', '', $program->id), $program->name);?> project->statusList, $program->status, '');?> begin;?> diff --git a/module/weekly/model.php b/module/weekly/model.php index 5366dcfd2e..7e0937f656 100644 --- a/module/weekly/model.php +++ b/module/weekly/model.php @@ -110,7 +110,7 @@ class weeklyModel extends model if(!$date) $date = date('Y-m-d'); $monday = $this->getThisMonday($date); $sunday = $this->getThisSunday($date); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); return $this->dao->select('count(distinct t1.account) as count') @@ -128,7 +128,7 @@ class weeklyModel extends model $monday = $this->getThisMonday($date); $sunday = $this->getThisSunday($date); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); $tasks = $this->dao->select('*') @@ -148,7 +148,7 @@ class weeklyModel extends model $sunday = $this->getThisSunday($date); $nextMonday = date('Y-m-d', strtotime("$sunday +1 days")); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); $unFinished = $this->dao->select('*') ->from(TABLE_TASK) @@ -177,7 +177,7 @@ class weeklyModel extends model $nextMonday = date('Y-m-d', strtotime("$sunday +1 days")); $sencondMondy = date('Y-m-d', strtotime("$sunday +8 days")); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); $tasks = $this->dao->select('*') @@ -197,7 +197,7 @@ class weeklyModel extends model $nextMonday = date('Y-m-d', strtotime("$sunday +1 days")); $sencondMondy = date('Y-m-d', strtotime("$sunday +8 days")); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); return $this->dao->select('type, sum(cast(estimate as decimal(10,2))) as workload') @@ -213,7 +213,7 @@ class weeklyModel extends model $monday = $this->getThisMonday($date); $nextMonday = date('Y-m-d', strtotime("$monday +7 days")); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); return $this->dao->select('*') @@ -237,7 +237,7 @@ class weeklyModel extends model $nextMonday = date('Y-m-d', strtotime("$sunday +1 days")); $workdays = $this->loadModel('holiday')->getActualWorkingDays($monday, $sunday); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program->id); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program->id); $projectIdList = array_keys($projects); $tasks = $this->dao->select('*')->from(TABLE_TASK) @@ -269,7 +269,7 @@ class weeklyModel extends model $report = $this->getFromDB($program, $date); if(!empty($report)) return $report->ev; - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); if(!$date) $date = date('Y-m-d'); @@ -310,7 +310,7 @@ class weeklyModel extends model $monday = $this->getThisMonday($date); $nextMonday = date('Y-m-d', strtotime("$monday +7 days")); - $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $type = 'project', $program); + $projects = $this->loadModel('project')->getList($status = 'all', $limit = 0, $productID = 0, $branch = 0, $program); $projectIdList = array_keys($projects); $AC = $this->dao->select('sum(t1.consumed) as consumed')