From a80ae324cb816cc258076141d0359edf42419b4a Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Mon, 30 Nov 2020 10:26:51 +0800 Subject: [PATCH] * Finish task#8474. --- module/common/lang/de.php | 2 +- module/common/lang/en.php | 2 +- module/common/lang/fr.php | 2 +- module/common/lang/vi.php | 2 +- module/common/lang/zh-cn.php | 2 +- module/common/model.php | 1 + module/project/control.php | 39 ++++++------ module/project/view/view.html.php | 100 +++++++++++++++--------------- 8 files changed, 77 insertions(+), 73 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 5a56c62423..1a2de22c2e 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -217,7 +217,7 @@ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Aufgaben'; $lang->searchObjects['testcase'] = 'Fall'; -$lang->searchObjects['project'] = $lang->projectCommon; +$lang->searchObjects['project'] = 'Execution'; $lang->searchObjects['product'] = $lang->productCommon; $lang->searchObjects['user'] = 'Benutzer'; $lang->searchObjects['build'] = 'Build'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index e6faf60215..8572b8d54b 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -217,7 +217,7 @@ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Task'; $lang->searchObjects['testcase'] = 'Case'; -$lang->searchObjects['project'] = $lang->projectCommon; +$lang->searchObjects['project'] = 'Execution'; $lang->searchObjects['product'] = $lang->productCommon; $lang->searchObjects['user'] = 'User'; $lang->searchObjects['build'] = 'Build'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index ff96157565..c97f24d30f 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -217,7 +217,7 @@ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = 'Story'; $lang->searchObjects['task'] = 'Tâche'; $lang->searchObjects['testcase'] = 'CasTest'; -$lang->searchObjects['project'] = $lang->projectCommon; +$lang->searchObjects['project'] = 'Execution'; $lang->searchObjects['product'] = $lang->productCommon; $lang->searchObjects['user'] = 'Utilisateur'; $lang->searchObjects['build'] = 'Build'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 6a12bd447f..56fcb6d01f 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -217,7 +217,7 @@ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = 'Câu chuyện'; $lang->searchObjects['task'] = 'Nhiệm vụ'; $lang->searchObjects['testcase'] = 'Tình huống'; -$lang->searchObjects['project'] = $lang->projectCommon; +$lang->searchObjects['project'] = 'Execution'; $lang->searchObjects['product'] = $lang->productCommon; $lang->searchObjects['user'] = 'Người dùng'; $lang->searchObjects['build'] = 'Bản dựng'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 2293baa619..d4da9534ed 100755 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -221,7 +221,7 @@ $lang->searchObjects['bug'] = 'Bug'; $lang->searchObjects['story'] = "{$lang->productSRCommon}"; $lang->searchObjects['task'] = '任务'; $lang->searchObjects['testcase'] = '用例'; -$lang->searchObjects['project'] = $lang->projectCommon; +$lang->searchObjects['project'] = '执行'; $lang->searchObjects['product'] = $lang->productCommon; $lang->searchObjects['user'] = '用户'; $lang->searchObjects['build'] = '版本'; diff --git a/module/common/model.php b/module/common/model.php index 9975887fd8..6aafcca1a8 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -733,6 +733,7 @@ class commonModel extends model elseif($moduleName == 'my' or $moduleName == 'user') { $searchObject = $methodName; + if($methodName == 'execution') $searchObject = 'project'; } if(empty($lang->searchObjects[$searchObject])) $searchObject = 'bug'; diff --git a/module/project/control.php b/module/project/control.php index 7e3e9d7345..5d404e952b 100644 --- a/module/project/control.php +++ b/module/project/control.php @@ -1591,19 +1591,22 @@ class project extends control } /** - * View a project. + * View a execution. * - * @param int $projectID + * @param int $executionID * @access public * @return void */ - public function view($projectID) + public function view($executionID) { $this->app->loadLang('program'); - $project = $this->project->getById($projectID, true); - if(!$project) die(js::error($this->lang->notFound) . js::locate('back')); + $execution = $this->project->getById($executionID, true); + if(!$execution) die(js::error($this->lang->notFound) . js::locate('back')); - $products = $this->project->getProducts($project->id); + /* Project not found to prevent searching for .*/ + if(!isset($this->projects[$execution->id])) $this->projects = $this->project->getExecutionPairs($execution->project, 'all', 'nocode'); + + $products = $this->project->getProducts($execution->id); $linkedBranches = array(); foreach($products as $product) { @@ -1611,34 +1614,34 @@ class project extends control } /* Set menu. */ - $this->project->setMenu($this->projects, $project->id); + $this->project->setMenu($this->projects, $execution->id); $this->app->loadLang('bug'); - list($dateList, $interval) = $this->project->getDateList($project->begin, $project->end, 'noweekend', 0, 'Y-m-d'); - $chartData = $this->project->buildBurnData($projectID, $dateList, 'noweekend'); + list($dateList, $interval) = $this->project->getDateList($execution->begin, $execution->end, 'noweekend', 0, 'Y-m-d'); + $chartData = $this->project->buildBurnData($executionID, $dateList, 'noweekend'); /* Load pager. */ $this->app->loadClass('pager', $static = true); $pager = new pager(0, 30, 1); - $this->executeHooks($projectID); + $this->executeHooks($executionID); $this->view->title = $this->lang->project->view; - $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$projectID"), $project->name); + $this->view->position[] = html::a($this->createLink('project', 'browse', "projectID=$executionID"), $execution->name); $this->view->position[] = $this->view->title; - $this->view->project = $project; + $this->view->execution = $execution; $this->view->products = $products; $this->view->branchGroups = $this->loadModel('branch')->getByProducts(array_keys($products), '', $linkedBranches); $this->view->planGroups = $this->project->getPlans($products); - $this->view->actions = $this->loadModel('action')->getList('execution', $projectID); - $this->view->dynamics = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $projectID); + $this->view->actions = $this->loadModel('action')->getList('execution', $executionID); + $this->view->dynamics = $this->loadModel('action')->getDynamic('all', 'all', 'date_desc', $pager, 'all', $executionID); $this->view->users = $this->loadModel('user')->getPairs('noletter'); - $this->view->teamMembers = $this->project->getTeamMembers($projectID); - $this->view->docLibs = $this->loadModel('doc')->getLibsByObject('project', $projectID); - $this->view->statData = $this->project->statRelatedData($projectID); + $this->view->teamMembers = $this->project->getTeamMembers($executionID); + $this->view->docLibs = $this->loadModel('doc')->getLibsByObject('project', $executionID); + $this->view->statData = $this->project->statRelatedData($executionID); $this->view->chartData = $chartData; - $this->view->canBeChanged = common::canModify('project', $project); // Determines whether an object is editable. + $this->view->canBeChanged = common::canModify('project', $execution); // Determines whether an object is editable. $this->display(); } diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php index 2a90b5ba6c..224c260917 100644 --- a/module/project/view/view.html.php +++ b/module/project/view/view.html.php @@ -18,9 +18,9 @@
-
name . $lang->project->burn;?>
+
name . $lang->project->burn;?>
@@ -44,7 +44,7 @@
project->latestDynamic;?>
@@ -66,31 +66,31 @@
project->relatedMember;?>
- PM):?> + PM):?> - PM]);?> -
PM);?> （project->PM;?>）
+ PM]);?> +
PM);?> （project->PM;?>）
- PO):?> + PO):?> - PO]);?> -
PO);?> （project->PO;?>）
+ PO]);?> +
PO);?> （project->PO;?>）
- QD):?> + QD):?> - QD]);?> -
QD);?> （project->QD;?>）
+ QD]);?> +
QD);?> （project->QD;?>）
- RD):?> + RD):?> - RD]);?> -
RD);?> （project->RD;?>）
+ RD]);?> +
RD);?> （project->RD;?>）
@@ -100,7 +100,7 @@
- id", "  " . $lang->project->manageMembers, '', "class='text-muted'");?> + id", "  " . $lang->project->manageMembers, '', "class='text-muted'");?>
@@ -112,7 +112,7 @@
project->doclib;?>
@@ -123,7 +123,7 @@ 8) break;?>
- createLink('doc', 'showFiles', "type=project&objectID=$project->id"), " " . $docLib->name);?> + createLink('doc', 'showFiles', "type=project&objectID=$execution->id"), " " . $docLib->name);?> createLink('doc', 'browse', "libID=$libID&browseType=all¶m=0&orderBy=id_desc&from=project"), " " . $docLib->name);?> @@ -131,40 +131,40 @@
- id", "  " . $lang->doc->createLib, '', "class='text-muted iframe' data-width='1000px'");?> + id", "  " . $lang->doc->createLib, '', "class='text-muted iframe' data-width='1000px'");?>
- printExtendFields($project, 'div', "position=left&inForm=0");?> + printExtendFields($execution, 'div', "position=left&inForm=0");?>
- createLink('action', 'comment', "objectType=project&objectID=$project->id");?> + createLink('action', 'comment', "objectType=project&objectID=$execution->id");?>
id"; - $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$project->id"); + $params = "project=$execution->id"; + $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse', "projectID=$execution->id"); common::printBack($browseLink); - if(!$project->deleted) + if(!$execution->deleted) { echo "
"; - common::printIcon('project', 'start', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'activate', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'putoff', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'suspend', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); - common::printIcon('project', 'close', "projectID=$project->id", $project, 'button', '', '', 'iframe', true); + common::printIcon('project', 'start', "projectID=$execution->id", $execution, 'button', '', '', 'iframe', true); + common::printIcon('project', 'activate', "projectID=$execution->id", $execution, 'button', '', '', 'iframe', true); + common::printIcon('project', 'putoff', "projectID=$execution->id", $execution, 'button', '', '', 'iframe', true); + common::printIcon('project', 'suspend', "projectID=$execution->id", $execution, 'button', '', '', 'iframe', true); + common::printIcon('project', 'close', "projectID=$execution->id", $execution, 'button', '', '', 'iframe', true); - echo $this->buildOperateMenu($project, 'view'); + echo $this->buildOperateMenu($execution, 'view'); echo "
"; - common::printIcon('project', 'edit', $params, $project); - common::printIcon('project', 'delete', $params, $project, 'button', 'trash', 'hiddenwin'); + common::printIcon('project', 'edit', $params, $execution); + common::printIcon('project', 'delete', $params, $execution, 'button', 'trash', 'hiddenwin'); } ?>
@@ -175,18 +175,18 @@
-

id;?> code;?> name;?>

+

id;?> code;?> name;?>

-

desc;?>

+

desc;?>

- deleted):?> + deleted):?> project->deleted;?> - program->PRJLifeTimeList, $project->lifetime);?> - delay)):?> + program->PRJLifeTimeList, $execution->lifetime);?> + delay)):?> project->delayed;?> - processStatus('project', $project);?> + processStatus('project', $execution);?>

@@ -194,7 +194,7 @@
project->manageProducts;?> - id", '', '', "class='btn btn-link pull-right muted'");?> + id", '', '', "class='btn btn-link pull-right muted'");?>
@@ -227,7 +227,7 @@ - totalConsumed + $project->totalLeft) ? floor($project->totalConsumed / ($project->totalConsumed + $project->totalLeft) * 1000) / 1000 * 100 : 0;?> + totalConsumed + $execution->totalLeft) ? floor($execution->totalConsumed / ($execution->totalConsumed + $execution->totalLeft) * 1000) / 1000 * 100 : 0;?> project->progress;?> percent;?>  
@@ -236,25 +236,25 @@ project->begin;?> - begin;?> + begin;?> project->totalEstimate;?> - totalEstimate . $lang->project->workHour;?> + totalEstimate . $lang->project->workHour;?> project->end;?> - end;?> + end;?> project->totalConsumed;?> - totalConsumed . $lang->project->workHour;?> + totalConsumed . $lang->project->workHour;?> project->totalDays;?> - days;?> + days;?> project->totalLeft;?> - totalLeft . $lang->project->workHour;?> + totalLeft . $lang->project->workHour;?> project->totalHours;?> - totalHours . $lang->project->workHour;?> + totalHours . $lang->project->workHour;?> @@ -280,10 +280,10 @@
project->acl;?>
-

project->aclList[$project->acl];?>

+

project->aclList[$execution->acl];?>

- printExtendFields($project, 'div', "position=right&inForm=0&inCell=1");?> + printExtendFields($execution, 'div', "position=right&inForm=0&inCell=1");?>