From 72a2b18c203cc50b328add9da58a56ad829cf4bc Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Thu, 19 Nov 2020 14:07:58 +0800 Subject: [PATCH] * Adjust the block module language file and model.php Logic. --- module/block/control.php | 6 +- module/block/lang/en.php | 200 ++++++++--------- module/block/lang/zh-cn.php | 8 + module/block/lang/zh-tw.php | 202 +++++++++--------- module/block/model.php | 23 +- .../view/executionstatisticblock.html.php | 60 +++--- module/project/model.php | 4 + 7 files changed, 274 insertions(+), 229 deletions(-) diff --git a/module/block/control.php b/module/block/control.php index b65f368516..a240f154b0 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1016,15 +1016,15 @@ class block extends control $this->app->loadLang('story'); $this->app->loadLang('bug'); - $status = isset($this->params->type) ? $this->params->type : 'all'; + $status = isset($this->params->type) ? $this->params->type : 'undone'; $count = isset($this->params->count) ? (int)$this->params->count : 0; - /* Get executions. */ + /* Get projects. */ $projectID = $this->view->block->module == 'my' ? 0 : (int)$this->session->PRJ; $executions = $this->loadModel('project')->getOrderedExecutions($projectID, $status, $count); if(empty($executions)) { - $this->view->projects = $executions; + $this->view->executions = $executions; return false; } diff --git a/module/block/lang/en.php b/module/block/lang/en.php index 11ddf5d16b..a46aaeb755 100644 --- a/module/block/lang/en.php +++ b/module/block/lang/en.php @@ -90,79 +90,79 @@ $lang->block->spent = 'Has Been Spent'; $lang->block->budget = 'Budget'; $lang->block->left = 'Residuals'; -$lang->block->default['waterfall']['program']['1']['title'] = $lang->projectCommon . 'Weekly'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'Program'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = 'Project Weekly'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = 'Estimate'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'program'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = 'Estimate'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = 'Plan Gantt Chart'; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'program'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = 'Plan Gantt Chart'; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = 'Progress Chart'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = 'Progress Chart'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = 'Program Issue'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'program'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = 'Program Issue'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = 'Dynamic'; -$lang->block->default['waterfall']['program']['6']['block'] = 'dynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = ''; +$lang->block->default['waterfall']['project']['6']['title'] = 'Dynamic'; +$lang->block->default['waterfall']['project']['6']['block'] = 'projectdynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['title'] = $lang->projectCommon . 'Risk'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'program'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = 'Project Risk'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = $lang->projectCommon . ' Overview'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = 'Project Overview'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . ' List'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = $lang->projectCommon . ' List'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = $lang->productCommon . ' Road Map'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumroadmap'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = $lang->productCommon . ' Road Map'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumroadmap'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['4']['title'] = 'Test Version'; -$lang->block->default['scrum']['program']['4']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['4']['grid'] = 8; +$lang->block->default['scrum']['project']['4']['title'] = 'Test Version'; +$lang->block->default['scrum']['project']['4']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['4']['grid'] = 8; -$lang->block->default['scrum']['program']['4']['params']['type'] = 'all'; -$lang->block->default['scrum']['program']['4']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['4']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['4']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . ' Overview'; -$lang->block->default['scrum']['program']['5']['block'] = 'scrumproduct'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = $lang->productCommon . ' Overview'; +$lang->block->default['scrum']['project']['5']['block'] = 'scrumproduct'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; -$lang->block->default['scrum']['program']['6']['title'] = $lang->projectCommon . ' Overview'; -$lang->block->default['scrum']['program']['6']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['6']['grid'] = 4; +$lang->block->default['scrum']['project']['6']['title'] = $lang->projectCommon . ' Overview'; +$lang->block->default['scrum']['project']['6']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['6']['grid'] = 4; -$lang->block->default['scrum']['program']['7']['title'] = 'Dynamic'; -$lang->block->default['scrum']['program']['7']['block'] = 'scrumdynamic'; -$lang->block->default['scrum']['program']['7']['grid'] = 4; +$lang->block->default['scrum']['project']['7']['title'] = 'Dynamic'; +$lang->block->default['scrum']['project']['7']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['7']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . ' Report'; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -270,7 +270,7 @@ $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = $lang->projectCommon . ' Statistic'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; -$lang->block->default['full']['my']['4']['source'] = 'program'; +$lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; $lang->block->default['full']['my']['5']['title'] = 'Personal Contribution'; @@ -279,8 +279,8 @@ $lang->block->default['full']['my']['5']['source'] = ''; $lang->block->default['full']['my']['5']['grid'] = 4; $lang->block->default['full']['my']['6']['title'] = 'Recent ' . $lang->projectCommon; -$lang->block->default['full']['my']['6']['block'] = 'recentprogram'; -$lang->block->default['full']['my']['6']['source'] = 'program'; +$lang->block->default['full']['my']['6']['block'] = 'recentproject'; +$lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; $lang->block->default['full']['my']['7']['title'] = 'Assigned To Me'; @@ -292,12 +292,12 @@ $lang->block->default['full']['my']['7']['params']['count'] = '15'; $lang->block->default['full']['my']['7']['params']['type'] = 'assignedTo'; $lang->block->default['full']['my']['8']['title'] = 'Human Input'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; $lang->block->default['full']['my']['8']['grid'] = 8; $lang->block->default['full']['my']['9']['title'] = $lang->projectCommon . ' List'; -$lang->block->default['full']['my']['9']['block'] = 'program'; -$lang->block->default['full']['my']['9']['source'] = 'program'; +$lang->block->default['full']['my']['9']['block'] = 'project'; +$lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc'; @@ -322,18 +322,18 @@ $lang->block->availableBlocks->build = 'Builds'; $lang->block->availableBlocks->testtask = 'Requests'; $lang->block->availableBlocks->risk = 'My Risks'; -$lang->block->moduleList['program'] = $lang->projectCommon; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->projectCommon; -$lang->block->moduleList['qa'] = 'Test'; -$lang->block->moduleList['todo'] = 'Todo'; +$lang->block->moduleList['project'] = 'Project'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = 'Execution'; +$lang->block->moduleList['qa'] = 'Test'; +$lang->block->moduleList['todo'] = 'Todo'; -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = $lang->projectCommon . ' List'; -$lang->block->modules['program']->availableBlocks->recentprogram = 'Recent ' . $lang->projectCommon; -$lang->block->modules['program']->availableBlocks->statistic = $lang->projectCommon . ' Statistic'; -$lang->block->modules['program']->availableBlocks->programteam = $lang->projectCommon . 'Human Input'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = 'Project List'; +$lang->block->modules['project']->availableBlocks->recentproject = 'Recent Project'; +$lang->block->modules['project']->availableBlocks->statistic = 'Project Statistic'; +$lang->block->modules['project']->availableBlocks->projectteam = 'Project Human Input'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); @@ -343,17 +343,17 @@ $lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap = $lang $lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->projectCommon . ' Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumproduct = $lang->productCommon . ' Overview'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = 'Test Version'; -$lang->block->modules['scrum']['index']->availableBlocks->programdynamic = 'Dynamics'; +$lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = $lang->projectCommon . ' Weekly'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallreport = 'Project Weekly'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallestimate = 'Estimate'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt = 'Plan Gantt Chart'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = 'Progress Chart'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = $lang->projectCommon . ' Issue'; -$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = $lang->projectCommon . ' Risk'; -$lang->block->modules['waterfall']['index']->availableBlocks->programdynamic = 'Dynamics'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = 'Project Issue'; +$lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = 'Project Risk'; +$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = 'Dynamics'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); @@ -363,6 +363,7 @@ $lang->block->modules['product']->availableBlocks->list = $lang->productCom $lang->block->modules['product']->availableBlocks->story = 'Story'; $lang->block->modules['product']->availableBlocks->plan = 'Plan'; $lang->block->modules['product']->availableBlocks->release = 'Release'; + $lang->block->modules['project'] = new stdclass(); $lang->block->modules['project']->availableBlocks = new stdclass(); $lang->block->modules['project']->availableBlocks->statistic = $lang->projectCommon . ' Report'; @@ -370,6 +371,7 @@ $lang->block->modules['project']->availableBlocks->overview = $lang->projectCom $lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . ' List'; $lang->block->modules['project']->availableBlocks->task = 'Task'; $lang->block->modules['project']->availableBlocks->build = 'Build'; + $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); $lang->block->modules['qa']->availableBlocks->statistic = 'Test Report'; @@ -377,6 +379,7 @@ $lang->block->modules['qa']->availableBlocks->statistic = 'Test Report'; $lang->block->modules['qa']->availableBlocks->bug = 'Bug'; $lang->block->modules['qa']->availableBlocks->case = 'Case'; $lang->block->modules['qa']->availableBlocks->testtask = 'Build'; + $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); $lang->block->modules['todo']->availableBlocks->list = 'Todo'; @@ -467,6 +470,11 @@ $lang->block->typeList->project['doing'] = 'Ongoing'; $lang->block->typeList->project['all'] = 'All'; $lang->block->typeList->project['involved'] = 'Involved'; +$lang->block->typeList->execution['undone'] = 'Unfinished'; +$lang->block->typeList->execution['doing'] = 'Ongoing'; +$lang->block->typeList->execution['all'] = 'All'; +$lang->block->typeList->execution['involved'] = 'Involved'; + $lang->block->typeList->scrum['undone'] = 'Unfinished'; $lang->block->typeList->scrum['doing'] = 'Ongoing中'; $lang->block->typeList->scrum['all'] = 'All'; @@ -478,27 +486,27 @@ $lang->block->typeList->testtask['blocked'] = 'Blocked'; $lang->block->typeList->testtask['done'] = 'Done'; $lang->block->typeList->testtask['all'] = 'All'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentprogram = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->program = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|prjbrowse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|prjbrowse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|prjbrowse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); -$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; +$lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; -$lang->block->modules['project']->moreLinkList = new stdclass(); -$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; -$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->list = 'project|all|status=%s&project='; +$lang->block->modules['project']->moreLinkList->task = 'my|task|type=%s'; $lang->block->modules['qa']->moreLinkList = new stdclass(); $lang->block->modules['qa']->moreLinkList->bug = 'my|bug|type=%s'; diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 0743bf3284..8ddb1f23ba 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -363,6 +363,7 @@ $lang->block->modules['product']->availableBlocks->list = $lang->productCom $lang->block->modules['product']->availableBlocks->story = "{$lang->storyCommon}列表"; $lang->block->modules['product']->availableBlocks->plan = "{$lang->planCommon}列表"; $lang->block->modules['product']->availableBlocks->release = '发布列表'; + $lang->block->modules['execution'] = new stdclass(); $lang->block->modules['execution']->availableBlocks = new stdclass(); $lang->block->modules['execution']->availableBlocks->statistic = $lang->projectCommon . '统计'; @@ -370,6 +371,7 @@ $lang->block->modules['execution']->availableBlocks->overview = $lang->projectC $lang->block->modules['execution']->availableBlocks->list = $lang->projectCommon . '列表'; $lang->block->modules['execution']->availableBlocks->task = '任务列表'; $lang->block->modules['execution']->availableBlocks->build = '版本列表'; + $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); $lang->block->modules['qa']->availableBlocks->statistic = '测试统计'; @@ -377,6 +379,7 @@ $lang->block->modules['qa']->availableBlocks->statistic = '测试统计'; $lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; $lang->block->modules['qa']->availableBlocks->case = '用例列表'; $lang->block->modules['qa']->availableBlocks->testtask = '版本列表'; + $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); $lang->block->modules['todo']->availableBlocks->list = '待办列表'; @@ -467,6 +470,11 @@ $lang->block->typeList->project['doing'] = '进行中'; $lang->block->typeList->project['all'] = '全部'; $lang->block->typeList->project['involved'] = '我参与的'; +$lang->block->typeList->execution['undone'] = '未完成'; +$lang->block->typeList->execution['doing'] = '进行中'; +$lang->block->typeList->execution['all'] = '全部'; +$lang->block->typeList->execution['involved'] = '我参与的'; + $lang->block->typeList->scrum['undone'] = '未完成'; $lang->block->typeList->scrum['doing'] = '进行中'; $lang->block->typeList->scrum['all'] = '全部'; diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php index 410c6169d7..aaa45e9d86 100644 --- a/module/block/lang/zh-tw.php +++ b/module/block/lang/zh-tw.php @@ -90,79 +90,79 @@ $lang->block->spent = '已花費'; $lang->block->budget = '預算'; $lang->block->left = '剩餘'; -$lang->block->default['waterfall']['program']['1']['title'] = '項目周報'; -$lang->block->default['waterfall']['program']['1']['block'] = 'waterfallreport'; -$lang->block->default['waterfall']['program']['1']['source'] = 'program'; -$lang->block->default['waterfall']['program']['1']['grid'] = 8; +$lang->block->default['waterfall']['project']['1']['title'] = '項目周報'; +$lang->block->default['waterfall']['project']['1']['block'] = 'waterfallreport'; +$lang->block->default['waterfall']['project']['1']['source'] = 'project'; +$lang->block->default['waterfall']['project']['1']['grid'] = 8; -$lang->block->default['waterfall']['program']['2']['title'] = '估算'; -$lang->block->default['waterfall']['program']['2']['block'] = 'waterfallestimate'; -$lang->block->default['waterfall']['program']['2']['source'] = 'program'; -$lang->block->default['waterfall']['program']['2']['grid'] = 4; +$lang->block->default['waterfall']['project']['2']['title'] = '估算'; +$lang->block->default['waterfall']['project']['2']['block'] = 'waterfallestimate'; +$lang->block->default['waterfall']['project']['2']['source'] = 'project'; +$lang->block->default['waterfall']['project']['2']['grid'] = 4; -$lang->block->default['waterfall']['program']['3']['title'] = "項目{$lang->planCommon}"; -$lang->block->default['waterfall']['program']['3']['block'] = 'waterfallgantt'; -$lang->block->default['waterfall']['program']['3']['source'] = 'program'; -$lang->block->default['waterfall']['program']['3']['grid'] = 8; +$lang->block->default['waterfall']['project']['3']['title'] = "項目{$lang->planCommon}"; +$lang->block->default['waterfall']['project']['3']['block'] = 'waterfallgantt'; +$lang->block->default['waterfall']['project']['3']['source'] = 'project'; +$lang->block->default['waterfall']['project']['3']['grid'] = 8; -$lang->block->default['waterfall']['program']['4']['title'] = '到目前為止項目進展趨勢圖'; -$lang->block->default['waterfall']['program']['4']['block'] = 'waterfallprogress'; -$lang->block->default['waterfall']['program']['4']['grid'] = 4; +$lang->block->default['waterfall']['project']['4']['title'] = '到目前為止項目進展趨勢圖'; +$lang->block->default['waterfall']['project']['4']['block'] = 'waterfallprogress'; +$lang->block->default['waterfall']['project']['4']['grid'] = 4; -$lang->block->default['waterfall']['program']['5']['title'] = '項目問題'; -$lang->block->default['waterfall']['program']['5']['block'] = 'waterfallissue'; -$lang->block->default['waterfall']['program']['5']['source'] = 'program'; -$lang->block->default['waterfall']['program']['5']['grid'] = 8; +$lang->block->default['waterfall']['project']['5']['title'] = '項目問題'; +$lang->block->default['waterfall']['project']['5']['block'] = 'waterfallissue'; +$lang->block->default['waterfall']['project']['5']['source'] = 'project'; +$lang->block->default['waterfall']['project']['5']['grid'] = 8; -$lang->block->default['waterfall']['program']['5']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['5']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['5']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['5']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['5']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['5']['params']['orderBy'] = 'id_desc'; -$lang->block->default['waterfall']['program']['6']['title'] = '最新動態'; -$lang->block->default['waterfall']['program']['6']['block'] = 'programdynamic'; -$lang->block->default['waterfall']['program']['6']['grid'] = 4; -$lang->block->default['waterfall']['program']['6']['source'] = 'program'; +$lang->block->default['waterfall']['project']['6']['title'] = '最新動態'; +$lang->block->default['waterfall']['project']['6']['block'] = 'projectdynamic'; +$lang->block->default['waterfall']['project']['6']['grid'] = 4; +$lang->block->default['waterfall']['project']['6']['source'] = 'project'; -$lang->block->default['waterfall']['program']['7']['title'] = '項目風險'; -$lang->block->default['waterfall']['program']['7']['block'] = 'waterfallrisk'; -$lang->block->default['waterfall']['program']['7']['source'] = 'program'; -$lang->block->default['waterfall']['program']['7']['grid'] = 8; +$lang->block->default['waterfall']['project']['7']['title'] = '項目風險'; +$lang->block->default['waterfall']['project']['7']['block'] = 'waterfallrisk'; +$lang->block->default['waterfall']['project']['7']['source'] = 'project'; +$lang->block->default['waterfall']['project']['7']['grid'] = 8; -$lang->block->default['waterfall']['program']['7']['params']['type'] = 'all'; -$lang->block->default['waterfall']['program']['7']['params']['count'] = '15'; -$lang->block->default['waterfall']['program']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['waterfall']['project']['7']['params']['type'] = 'all'; +$lang->block->default['waterfall']['project']['7']['params']['count'] = '15'; +$lang->block->default['waterfall']['project']['7']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['1']['title'] = '項目整體情況'; -$lang->block->default['scrum']['program']['1']['block'] = 'scrumoverview'; -$lang->block->default['scrum']['program']['1']['grid'] = 8; +$lang->block->default['scrum']['project']['1']['title'] = '項目整體情況'; +$lang->block->default['scrum']['project']['1']['block'] = 'scrumoverview'; +$lang->block->default['scrum']['project']['1']['grid'] = 8; -$lang->block->default['scrum']['program']['2']['title'] = $lang->projectCommon . '列表'; -$lang->block->default['scrum']['program']['2']['block'] = 'scrumlist'; -$lang->block->default['scrum']['program']['2']['grid'] = 8; +$lang->block->default['scrum']['project']['2']['title'] = $lang->projectCommon . '列表'; +$lang->block->default['scrum']['project']['2']['block'] = 'scrumlist'; +$lang->block->default['scrum']['project']['2']['grid'] = 8; -$lang->block->default['scrum']['program']['3']['title'] = $lang->productCommon . '路線圖'; -$lang->block->default['scrum']['program']['3']['block'] = 'scrumroadmap'; -$lang->block->default['scrum']['program']['3']['grid'] = 8; +$lang->block->default['scrum']['project']['3']['title'] = $lang->productCommon . '路線圖'; +$lang->block->default['scrum']['project']['3']['block'] = 'scrumroadmap'; +$lang->block->default['scrum']['project']['3']['grid'] = 8; -$lang->block->default['scrum']['program']['4']['title'] = '待測版本'; -$lang->block->default['scrum']['program']['4']['block'] = 'scrumtest'; -$lang->block->default['scrum']['program']['4']['grid'] = 8; +$lang->block->default['scrum']['project']['4']['title'] = '待測版本'; +$lang->block->default['scrum']['project']['4']['block'] = 'scrumtest'; +$lang->block->default['scrum']['project']['4']['grid'] = 8; -$lang->block->default['scrum']['program']['4']['params']['type'] = 'wait'; -$lang->block->default['scrum']['program']['4']['params']['count'] = '15'; -$lang->block->default['scrum']['program']['4']['params']['orderBy'] = 'id_desc'; +$lang->block->default['scrum']['project']['4']['params']['type'] = 'wait'; +$lang->block->default['scrum']['project']['4']['params']['count'] = '15'; +$lang->block->default['scrum']['project']['4']['params']['orderBy'] = 'id_desc'; -$lang->block->default['scrum']['program']['5']['title'] = $lang->productCommon . '總覽'; -$lang->block->default['scrum']['program']['5']['block'] = 'scrumproduct'; -$lang->block->default['scrum']['program']['5']['grid'] = 4; +$lang->block->default['scrum']['project']['5']['title'] = $lang->productCommon . '總覽'; +$lang->block->default['scrum']['project']['5']['block'] = 'scrumproduct'; +$lang->block->default['scrum']['project']['5']['grid'] = 4; -$lang->block->default['scrum']['program']['6']['title'] = $lang->projectCommon . '總覽'; -$lang->block->default['scrum']['program']['6']['block'] = 'sprint'; -$lang->block->default['scrum']['program']['6']['grid'] = 4; +$lang->block->default['scrum']['project']['6']['title'] = $lang->projectCommon . '總覽'; +$lang->block->default['scrum']['project']['6']['block'] = 'sprint'; +$lang->block->default['scrum']['project']['6']['grid'] = 4; -$lang->block->default['scrum']['program']['7']['title'] = '最新動態'; -$lang->block->default['scrum']['program']['7']['block'] = 'programdynamic'; -$lang->block->default['scrum']['program']['7']['grid'] = 4; +$lang->block->default['scrum']['project']['7']['title'] = '最新動態'; +$lang->block->default['scrum']['project']['7']['block'] = 'projectdynamic'; +$lang->block->default['scrum']['project']['7']['grid'] = 4; $lang->block->default['product']['1']['title'] = $lang->productCommon . '統計'; $lang->block->default['product']['1']['block'] = 'statistic'; @@ -270,7 +270,7 @@ $lang->block->default['full']['my']['3']['params']['count'] = '20'; $lang->block->default['full']['my']['4']['title'] = '項目統計'; $lang->block->default['full']['my']['4']['block'] = 'statistic'; -$lang->block->default['full']['my']['4']['source'] = 'program'; +$lang->block->default['full']['my']['4']['source'] = 'project'; $lang->block->default['full']['my']['4']['grid'] = 8; $lang->block->default['full']['my']['5']['title'] = '我的貢獻'; @@ -279,8 +279,8 @@ $lang->block->default['full']['my']['5']['source'] = ''; $lang->block->default['full']['my']['5']['grid'] = 4; $lang->block->default['full']['my']['6']['title'] = '我的近期項目'; -$lang->block->default['full']['my']['6']['block'] = 'recentprogram'; -$lang->block->default['full']['my']['6']['source'] = 'program'; +$lang->block->default['full']['my']['6']['block'] = 'recentproject'; +$lang->block->default['full']['my']['6']['source'] = 'project'; $lang->block->default['full']['my']['6']['grid'] = 8; $lang->block->default['full']['my']['7']['title'] = '指派給我'; @@ -292,12 +292,12 @@ $lang->block->default['full']['my']['7']['params']['count'] = '15'; $lang->block->default['full']['my']['7']['params']['type'] = 'assignedTo'; $lang->block->default['full']['my']['8']['title'] = '項目人力投入'; -$lang->block->default['full']['my']['8']['block'] = 'programteam'; +$lang->block->default['full']['my']['8']['block'] = 'projectteam'; $lang->block->default['full']['my']['8']['grid'] = 8; $lang->block->default['full']['my']['9']['title'] = '項目列表'; -$lang->block->default['full']['my']['9']['block'] = 'program'; -$lang->block->default['full']['my']['9']['source'] = 'program'; +$lang->block->default['full']['my']['9']['block'] = 'project'; +$lang->block->default['full']['my']['9']['source'] = 'project'; $lang->block->default['full']['my']['9']['grid'] = 8; $lang->block->default['full']['my']['9']['params']['orderBy'] = 'id_desc'; @@ -322,18 +322,18 @@ $lang->block->availableBlocks->build = '版本列表'; $lang->block->availableBlocks->testtask = '測試版本列表'; $lang->block->availableBlocks->risk = '我的風險'; -$lang->block->moduleList['program'] = '項目'; -$lang->block->moduleList['product'] = $lang->productCommon; -$lang->block->moduleList['project'] = $lang->projectCommon; -$lang->block->moduleList['qa'] = '測試'; -$lang->block->moduleList['todo'] = '待辦'; +$lang->block->moduleList['project'] = '項目'; +$lang->block->moduleList['product'] = $lang->productCommon; +$lang->block->moduleList['execution'] = '執行'; +$lang->block->moduleList['qa'] = '測試'; +$lang->block->moduleList['todo'] = '待辦'; -$lang->block->modules['program'] = new stdclass(); -$lang->block->modules['program']->availableBlocks = new stdclass(); -$lang->block->modules['program']->availableBlocks->program = '項目列表'; -$lang->block->modules['program']->availableBlocks->recentprogram = '近期項目'; -$lang->block->modules['program']->availableBlocks->statistic = '項目統計'; -$lang->block->modules['program']->availableBlocks->programteam = '項目人力投入'; +$lang->block->modules['project'] = new stdclass(); +$lang->block->modules['project']->availableBlocks = new stdclass(); +$lang->block->modules['project']->availableBlocks->project = '項目列表'; +$lang->block->modules['project']->availableBlocks->recentproject = '近期項目'; +$lang->block->modules['project']->availableBlocks->statistic = '項目統計'; +$lang->block->modules['project']->availableBlocks->projectteam = '項目人力投入'; $lang->block->modules['scrum']['index'] = new stdclass(); $lang->block->modules['scrum']['index']->availableBlocks = new stdclass(); @@ -343,7 +343,7 @@ $lang->block->modules['scrum']['index']->availableBlocks->scrumroadmap = $lang $lang->block->modules['scrum']['index']->availableBlocks->sprint = $lang->projectCommon . '總覽'; $lang->block->modules['scrum']['index']->availableBlocks->scrumproduct = $lang->productCommon . '總覽'; $lang->block->modules['scrum']['index']->availableBlocks->scrumtest = '待測版本'; -$lang->block->modules['scrum']['index']->availableBlocks->programdynamic = '最新動態'; +$lang->block->modules['scrum']['index']->availableBlocks->projectdynamic = '最新動態'; $lang->block->modules['waterfall']['index'] = new stdclass(); $lang->block->modules['waterfall']['index']->availableBlocks = new stdclass(); @@ -353,7 +353,7 @@ $lang->block->modules['waterfall']['index']->availableBlocks->waterfallgantt $lang->block->modules['waterfall']['index']->availableBlocks->waterfallprogress = '到目前為止項目進展趨勢圖'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallissue = '項目問題'; $lang->block->modules['waterfall']['index']->availableBlocks->waterfallrisk = '項目風險'; -$lang->block->modules['waterfall']['index']->availableBlocks->programdynamic = '最新動態'; +$lang->block->modules['waterfall']['index']->availableBlocks->projectdynamic = '最新動態'; $lang->block->modules['product'] = new stdclass(); $lang->block->modules['product']->availableBlocks = new stdclass(); @@ -363,13 +363,15 @@ $lang->block->modules['product']->availableBlocks->list = $lang->productCom $lang->block->modules['product']->availableBlocks->story = "{$lang->storyCommon}列表"; $lang->block->modules['product']->availableBlocks->plan = "{$lang->planCommon}列表"; $lang->block->modules['product']->availableBlocks->release = '發佈列表'; -$lang->block->modules['project'] = new stdclass(); -$lang->block->modules['project']->availableBlocks = new stdclass(); -$lang->block->modules['project']->availableBlocks->statistic = $lang->projectCommon . '統計'; -$lang->block->modules['project']->availableBlocks->overview = $lang->projectCommon . '總覽'; -$lang->block->modules['project']->availableBlocks->list = $lang->projectCommon . '列表'; -$lang->block->modules['project']->availableBlocks->task = '任務列表'; -$lang->block->modules['project']->availableBlocks->build = '版本列表'; + +$lang->block->modules['execution'] = new stdclass(); +$lang->block->modules['execution']->availableBlocks = new stdclass(); +$lang->block->modules['execution']->availableBlocks->statistic = $lang->projectCommon . '統計'; +$lang->block->modules['execution']->availableBlocks->overview = $lang->projectCommon . '總覽'; +$lang->block->modules['execution']->availableBlocks->list = $lang->projectCommon . '列表'; +$lang->block->modules['execution']->availableBlocks->task = '任務列表'; +$lang->block->modules['execution']->availableBlocks->build = '版本列表'; + $lang->block->modules['qa'] = new stdclass(); $lang->block->modules['qa']->availableBlocks = new stdclass(); $lang->block->modules['qa']->availableBlocks->statistic = '測試統計'; @@ -377,6 +379,7 @@ $lang->block->modules['qa']->availableBlocks->statistic = '測試統計'; $lang->block->modules['qa']->availableBlocks->bug = 'Bug列表'; $lang->block->modules['qa']->availableBlocks->case = '用例列表'; $lang->block->modules['qa']->availableBlocks->testtask = '版本列表'; + $lang->block->modules['todo'] = new stdclass(); $lang->block->modules['todo']->availableBlocks = new stdclass(); $lang->block->modules['todo']->availableBlocks->list = '待辦列表'; @@ -467,6 +470,11 @@ $lang->block->typeList->project['doing'] = '進行中'; $lang->block->typeList->project['all'] = '全部'; $lang->block->typeList->project['involved'] = '我參與的'; +$lang->block->typeList->execution['undone'] = '未完成'; +$lang->block->typeList->execution['doing'] = '進行中'; +$lang->block->typeList->execution['all'] = '全部'; +$lang->block->typeList->execution['involved'] = '我參與的'; + $lang->block->typeList->scrum['undone'] = '未完成'; $lang->block->typeList->scrum['doing'] = '進行中'; $lang->block->typeList->scrum['all'] = '全部'; @@ -478,22 +486,22 @@ $lang->block->typeList->testtask['blocked'] = '阻塞版本'; $lang->block->typeList->testtask['done'] = '已測版本'; $lang->block->typeList->testtask['all'] = '全部'; -$lang->block->modules['program']->moreLinkList = new stdclass(); -$lang->block->modules['program']->moreLinkList->recentprogram = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->statistic = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->program = 'program|browse|'; -$lang->block->modules['program']->moreLinkList->cmmireport = 'weekly|index|'; -$lang->block->modules['program']->moreLinkList->cmmiestimate = 'workestimation|index|'; -$lang->block->modules['program']->moreLinkList->cmmiissue = 'issue|browse|'; -$lang->block->modules['program']->moreLinkList->cmmirisk = 'risk|browse|'; -$lang->block->modules['program']->moreLinkList->scrumlist = 'project|all|'; -$lang->block->modules['program']->moreLinkList->scrumtest = 'testtask|browse|'; -$lang->block->modules['program']->moreLinkList->scrumproduct = 'product|all|'; -$lang->block->modules['program']->moreLinkList->sprint = 'project|all|'; -$lang->block->modules['program']->moreLinkList->programdynamic = 'company|dynamic|'; +$lang->block->modules['project']->moreLinkList = new stdclass(); +$lang->block->modules['project']->moreLinkList->recentproject = 'project|prjbrowse|'; +$lang->block->modules['project']->moreLinkList->statistic = 'project|prjbrowse|'; +$lang->block->modules['project']->moreLinkList->project = 'project|prjbrowse|'; +$lang->block->modules['project']->moreLinkList->cmmireport = 'weekly|index|'; +$lang->block->modules['project']->moreLinkList->cmmiestimate = 'workestimation|index|'; +$lang->block->modules['project']->moreLinkList->cmmiissue = 'issue|browse|'; +$lang->block->modules['project']->moreLinkList->cmmirisk = 'risk|browse|'; +$lang->block->modules['project']->moreLinkList->scrumlist = 'project|all|'; +$lang->block->modules['project']->moreLinkList->scrumtest = 'testtask|browse|'; +$lang->block->modules['project']->moreLinkList->scrumproduct = 'product|all|'; +$lang->block->modules['project']->moreLinkList->sprint = 'project|all|'; +$lang->block->modules['project']->moreLinkList->projectdynamic = 'company|dynamic|'; $lang->block->modules['product']->moreLinkList = new stdclass(); -$lang->block->modules['product']->moreLinkList->list = 'product|all|product=&line=0&status=%s'; +$lang->block->modules['product']->moreLinkList->list = 'product|all|'; $lang->block->modules['product']->moreLinkList->story = 'my|story|type=%s'; $lang->block->modules['project']->moreLinkList = new stdclass(); diff --git a/module/block/model.php b/module/block/model.php index 1ff81dcbc8..90f06608fb 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -513,9 +513,10 @@ class blockModel extends model */ public function getStatisticParams($module = 'product') { - if($module == 'product') return $this->getProductStatisticParams($module); - if($module == 'project') return $this->getProjectStatisticParams($module); - if($module == 'qa') return $this->getQaStatisticParams($module); + if($module == 'product') return $this->getProductStatisticParams($module); + if($module == 'project') return $this->getProjectStatisticParams($module); + if($module == 'qa') return $this->getQaStatisticParams($module); + if($module == 'execution') return $this->getExecutionStatisticParams($module); $params = new stdclass(); $params = $this->appendCountParams($params); @@ -554,6 +555,22 @@ class blockModel extends model return json_encode($params); } + /** + * Get execution statistic params. + * + * @access public + * @return void + */ + public function getExecutionStatisticParams() + { + $params = $this->appendCountParams(); + $params->type['name'] = $this->lang->block->type; + $params->type['options'] = $this->lang->block->typeList->execution; + $params->type['control'] = 'select'; + + return json_encode($params); + } + /** * Get qa statistic params. * diff --git a/module/block/view/executionstatisticblock.html.php b/module/block/view/executionstatisticblock.html.php index 84eb3dedfd..6e0a5b4174 100644 --- a/module/block/view/executionstatisticblock.html.php +++ b/module/block/view/executionstatisticblock.html.php @@ -74,17 +74,17 @@ $(function() e.preventDefault(); }); - var $projectLi = $('#activeProject'); - if($projectLi.length) + var $executionLi = $('#activeExecution'); + if($executionLi.length) { - var projectLi = $projectLi[0]; - $(".col ul.nav").animate({scrollTop: projectLi.offsetTop}, "slow"); + var executionLi = $executionLi[0]; + $(".col ul.nav").animate({scrollTop: executionLi.offsetTop}, "slow"); } });
- +

block->noData;?>

@@ -92,51 +92,51 @@ $(function()
- -
+ +
-
+
task->statusList['done'];?> - progress;?>percent;?> + progress;?>percent;?>
project->totalEstimate;?>
-
totalEstimate;?> task->hour;?>
+
totalEstimate;?> task->hour;?>
project->totalConsumed;?>
-
totalConsumed;?> task->hour;?>
+
totalConsumed;?> task->hour;?>
project->totalLeft;?>
-
totalLeft;?> task->hour;?>
+
totalLeft;?> task->hour;?>
-
task->yesterdayFinished;?> yesterdayFinished;?>
+
task->yesterdayFinished;?> yesterdayFinished;?>
-
+
@@ -144,40 +144,40 @@ $(function() - + - +
task->allTasks;?> :totalTasks) ? 0 : html::a($this->createLink('project', 'task', "projectID={$project->id}&status=all"), $project->totalTasks);?>totalTasks) ? 0 : html::a($this->createLink('project', 'task', "executionID={$execution->id}&status=all"), $execution->totalTasks);?>
task->noFinished;?> :undoneTasks) ? 0 : html::a($this->createLink('project', 'task', "projectID={$project->id}&status=undone"), $project->undoneTasks);?>undoneTasks) ? 0 : html::a($this->createLink('project', 'task', "executionID={$execution->id}&status=undone"), $execution->undoneTasks);?>
-
story->released;?> releasedStories;?>
+
story->released;?> releasedStories;?>
-
+
- + - +
story->total;?> :totalStories) ? 0 : html::a($this->createLink('project', 'story', "projectID={$project->id}&orderBy=order_desc&type=all"), $project->totalStories);?>totalStories) ? 0 : html::a($this->createLink('project', 'story', "executionID={$execution->id}&orderBy=order_desc&type=all"), $execution->totalStories);?>
story->unclosed;?> :unclosedStories) ? 0 : html::a($this->createLink('project', 'story', "projectID={$project->id}&orderBy=order_desc&type=unclosed"), $project->unclosedStories);?>unclosedStories) ? 0 : html::a($this->createLink('project', 'story', "executionID={$execution->id}&orderBy=order_desc&type=unclosed"), $execution->unclosedStories);?>
-
bug->yesterdayResolved;?> yesterdayResolved;?>
+
bug->yesterdayResolved;?> yesterdayResolved;?>
-
+
@@ -185,11 +185,11 @@ $(function() - + - +
bug->allBugs;?> :totalBugs) ? 0 : html::a($this->createLink('project', 'bug', "projectID={$project->id}&orderBy=status,id_desc&build=0&type=all"), $project->totalBugs);?>totalBugs) ? 0 : html::a($this->createLink('project', 'bug', "executionID={$execution->id}&orderBy=status,id_desc&build=0&type=all"), $execution->totalBugs);?>
bug->unResolved;?> :activeBugs) ? 0 : html::a($this->createLink('project', 'bug', "projectID={$project->id}&orderBy=status,id_desc&build=0&type=unresolved"), $project->activeBugs);?>activeBugs) ? 0 : html::a($this->createLink('project', 'bug', "executionID={$execution->id}&orderBy=status,id_desc&build=0&type=unresolved"), $execution->activeBugs);?>
diff --git a/module/project/model.php b/module/project/model.php index b3365e011c..5ded9db59c 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1271,7 +1271,11 @@ class projectModel extends model } /** +<<<<<<< Updated upstream * Get ordered executions. +======= + * Get ordered execution. +>>>>>>> Stashed changes * * @param int $projectID * @param string $status