diff --git a/module/block/control.php b/module/block/control.php index 0aaf7ce82a..b8f6bb7c34 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1368,6 +1368,21 @@ class block extends control $this->display(); } + public function printContributeBlock() + { + + } + + public function printRecentprogramBlock() + { + + } + + public function printProgramteamBlock() + { + + } + /** * Print flow chart block * @access public diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 818e5dcaf9..248f032da5 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -225,77 +225,40 @@ $lang->block->default['full']['my']['1']['title'] = '欢迎'; $lang->block->default['full']['my']['1']['block'] = 'welcome'; $lang->block->default['full']['my']['1']['grid'] = 8; $lang->block->default['full']['my']['1']['source'] = ''; + $lang->block->default['full']['my']['2']['title'] = '最新动态'; $lang->block->default['full']['my']['2']['block'] = 'dynamic'; $lang->block->default['full']['my']['2']['grid'] = 4; $lang->block->default['full']['my']['2']['source'] = ''; -$lang->block->default['full']['my']['3']['title'] = '流程图'; -$lang->block->default['full']['my']['3']['block'] = 'flowchart'; -$lang->block->default['full']['my']['3']['grid'] = 8; -$lang->block->default['full']['my']['3']['source'] = ''; -$lang->block->default['full']['my']['4']['title'] = '我的待办'; -$lang->block->default['full']['my']['4']['block'] = 'list'; -$lang->block->default['full']['my']['4']['grid'] = 4; -$lang->block->default['full']['my']['4']['source'] = 'todo'; -$lang->block->default['full']['my']['4']['params']['num'] = '20'; -$lang->block->default['full']['my']['5'] = $lang->block->default['project']['1']; -$lang->block->default['full']['my']['5']['source'] = 'project'; -$lang->block->default['full']['my']['6'] = $lang->block->default['project']['2']; -$lang->block->default['full']['my']['6']['source'] = 'project'; -$lang->block->default['full']['my']['7'] = $lang->block->default['product']['1']; -$lang->block->default['full']['my']['7']['source'] = 'product'; -$lang->block->default['full']['my']['8'] = $lang->block->default['product']['2']; -$lang->block->default['full']['my']['8']['source'] = 'product'; -$lang->block->default['full']['my']['9'] = $lang->block->default['qa']['2']; -$lang->block->default['full']['my']['9']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1'] = $lang->block->default['qa']['1']; -$lang->block->default['onlyTest']['my']['1']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTest']['my']['2']['title'] = '最新动态'; -$lang->block->default['onlyTest']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTest']['my']['2']['grid'] = 4; -$lang->block->default['onlyTest']['my']['2']['source'] = ''; -$lang->block->default['onlyTest']['my']['3']['title'] = '我的待办'; -$lang->block->default['onlyTest']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTest']['my']['3']['grid'] = 6; -$lang->block->default['onlyTest']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTest']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTest']['my']['4'] = $lang->block->default['qa']['2']; -$lang->block->default['onlyTest']['my']['4']['source'] = 'qa'; -$lang->block->default['onlyTest']['my']['4']['grid'] = '6'; +$lang->block->default['full']['my']['3']['title'] = '我的待办'; +$lang->block->default['full']['my']['3']['block'] = 'list'; +$lang->block->default['full']['my']['3']['grid'] = 4; +$lang->block->default['full']['my']['3']['source'] = 'todo'; +$lang->block->default['full']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyStory']['my']['1'] = $lang->block->default['product']['1']; -$lang->block->default['onlyStory']['my']['1']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['1']['grid'] = '8'; -$lang->block->default['onlyStory']['my']['2']['title'] = '最新动态'; -$lang->block->default['onlyStory']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyStory']['my']['2']['grid'] = 4; -$lang->block->default['onlyStory']['my']['2']['source'] = ''; -$lang->block->default['onlyStory']['my']['3']['title'] = '我的待办'; -$lang->block->default['onlyStory']['my']['3']['block'] = 'list'; -$lang->block->default['onlyStory']['my']['3']['grid'] = 6; -$lang->block->default['onlyStory']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyStory']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyStory']['my']['4'] = $lang->block->default['product']['2']; -$lang->block->default['onlyStory']['my']['4']['source'] = 'product'; -$lang->block->default['onlyStory']['my']['4']['grid'] = '4'; +$lang->block->default['full']['my']['4'] = $lang->block->default['project']['1']; +$lang->block->default['full']['my']['4']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['1'] = $lang->block->default['project']['1']; -$lang->block->default['onlyTask']['my']['1']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['1']['grid'] = '8'; -$lang->block->default['onlyTask']['my']['2']['title'] = '最新动态'; -$lang->block->default['onlyTask']['my']['2']['block'] = 'dynamic'; -$lang->block->default['onlyTask']['my']['2']['grid'] = 4; -$lang->block->default['onlyTask']['my']['2']['source'] = ''; -$lang->block->default['onlyTask']['my']['3']['title'] = '我的待办'; -$lang->block->default['onlyTask']['my']['3']['block'] = 'list'; -$lang->block->default['onlyTask']['my']['3']['grid'] = 6; -$lang->block->default['onlyTask']['my']['3']['source'] = 'todo'; -$lang->block->default['onlyTask']['my']['3']['params']['num'] = '20'; -$lang->block->default['onlyTask']['my']['4'] = $lang->block->default['project']['2']; -$lang->block->default['onlyTask']['my']['4']['source'] = 'project'; -$lang->block->default['onlyTask']['my']['4']['grid'] = 6; +$lang->block->default['full']['my']['5']['title'] = '个人贡献'; +$lang->block->default['full']['my']['5']['block'] = 'contribute'; +$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']['grid'] = 8; + +$lang->block->default['full']['my']['7']['title'] = '指派给我'; +$lang->block->default['full']['my']['7']['block'] = 'task'; +$lang->block->default['full']['my']['7']['grid'] = 4; + +$lang->block->default['full']['my']['7']['params']['orderBy'] = 'id_desc'; +$lang->block->default['full']['my']['7']['params']['num'] = '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']['grid'] = 8; $lang->block->num = '数量'; $lang->block->type = '类型'; diff --git a/module/block/view/contributeblock.html.php b/module/block/view/contributeblock.html.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/block/view/programteamblock.html.php b/module/block/view/programteamblock.html.php new file mode 100644 index 0000000000..e69de29bb2 diff --git a/module/block/view/recentprogramblock.html.php b/module/block/view/recentprogramblock.html.php new file mode 100644 index 0000000000..e69de29bb2