From b2269c2ef88f5b3b05f66b2c892727f9be18f537 Mon Sep 17 00:00:00 2001 From: dingguodong Date: Thu, 4 May 2023 19:17:53 +0800 Subject: [PATCH 1/2] + Add .scannerwork to .gitignore. --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index c52ad45010..2795b1f58e 100644 --- a/.gitignore +++ b/.gitignore @@ -33,3 +33,4 @@ CodeSniffer.conf test/runtime/* test/www !/**/.gitkeep +.scannerwork From 4c707ae779bff5b5b45d7dfeaca433157efe6c44 Mon Sep 17 00:00:00 2001 From: Wangyuting <851424971@qq.com> Date: Thu, 4 May 2023 19:17:51 +0800 Subject: [PATCH 2/2] * Finish project block page css. --- module/block/config/table.php | 60 +++++++++++++++++++++++++++ module/block/control.php | 31 +++++++------- module/block/ui/projectblock.html.php | 37 +++++++++++++++++ 3 files changed, 113 insertions(+), 15 deletions(-) create mode 100644 module/block/config/table.php create mode 100644 module/block/ui/projectblock.html.php diff --git a/module/block/config/table.php b/module/block/config/table.php new file mode 100644 index 0000000000..16bfed19c9 --- /dev/null +++ b/module/block/config/table.php @@ -0,0 +1,60 @@ +loadLang('project'); +$app->loadLang('task'); +$config->block->dtable = new stdclass(); +$config->block->dtable->project = new stdclass(); +$config->block->dtable->project->fieldList['name']['name'] = 'name'; +$config->block->dtable->project->fieldList['name']['title'] = $lang->project->name; +$config->block->dtable->project->fieldList['name']['flex'] = 1; +$config->block->dtable->project->fieldList['name']['align'] = 'center'; +$config->block->dtable->project->fieldList['name']['type'] = 'link'; +$config->block->dtable->project->fieldList['name']['sortType'] = true; + +$config->block->dtable->project->fieldList['PM']['name'] = 'PM'; +$config->block->dtable->project->fieldList['PM']['title'] = $lang->project->PM; +$config->block->dtable->project->fieldList['PM']['width'] = 80; +$config->block->dtable->project->fieldList['PM']['align'] = 'center'; +$config->block->dtable->project->fieldList['PM']['sortType'] = true; + +$config->block->dtable->project->fieldList['status']['name'] = 'status'; +$config->block->dtable->project->fieldList['status']['title'] = $lang->project->status; +$config->block->dtable->project->fieldList['status']['width'] = 80; +$config->block->dtable->project->fieldList['status']['align'] = 'center'; +$config->block->dtable->project->fieldList['status']['sortType'] = true; + +$config->block->dtable->project->fieldList['teamCount']['name'] = 'teamCount'; +$config->block->dtable->project->fieldList['teamCount']['title'] = $lang->project->teamCount; +$config->block->dtable->project->fieldList['teamCount']['width'] = 80; +$config->block->dtable->project->fieldList['teamCount']['align'] = 'center'; +$config->block->dtable->project->fieldList['teamCount']['sortType'] = true; + +$config->block->dtable->project->fieldList['consumed']['name'] = 'consumed'; +$config->block->dtable->project->fieldList['consumed']['title'] = $lang->task->consumed; +$config->block->dtable->project->fieldList['consumed']['width'] = 80; +$config->block->dtable->project->fieldList['consumed']['align'] = 'center'; +$config->block->dtable->project->fieldList['consumed']['sortType'] = true; + +$config->block->dtable->project->fieldList['budget']['name'] = 'budget'; +$config->block->dtable->project->fieldList['budget']['title'] = $lang->project->budget; +$config->block->dtable->project->fieldList['budget']['width'] = 80; +$config->block->dtable->project->fieldList['budget']['align'] = 'center'; +$config->block->dtable->project->fieldList['budget']['sortType'] = true; + +$config->block->dtable->project->fieldList['leftStories']['name'] = 'leftStories'; +$config->block->dtable->project->fieldList['leftStories']['title'] = $lang->project->leftStories; +$config->block->dtable->project->fieldList['leftStories']['width'] = 80; +$config->block->dtable->project->fieldList['leftStories']['align'] = 'center'; +$config->block->dtable->project->fieldList['leftStories']['sortType'] = true; + +$config->block->dtable->project->fieldList['leftTasks']['name'] = 'leftTasks'; +$config->block->dtable->project->fieldList['leftTasks']['title'] = $lang->project->leftTasks; +$config->block->dtable->project->fieldList['leftTasks']['width'] = 80; +$config->block->dtable->project->fieldList['leftTasks']['align'] = 'center'; +$config->block->dtable->project->fieldList['leftTasks']['sortType'] = true; + +$config->block->dtable->project->fieldList['leftBugs']['name'] = 'leftBugs'; +$config->block->dtable->project->fieldList['leftBugs']['title'] = $lang->project->leftBugs; +$config->block->dtable->project->fieldList['leftBugs']['width'] = 80; +$config->block->dtable->project->fieldList['leftBugs']['align'] = 'center'; +$config->block->dtable->project->fieldList['leftBugs']['sortType'] = true; diff --git a/module/block/control.php b/module/block/control.php index 63208c93b1..c6e0d632fe 100755 --- a/module/block/control.php +++ b/module/block/control.php @@ -280,16 +280,6 @@ class block extends control $html = "
" . $block->params->html . '
'; } } - elseif($block->source != '') - { - $this->get->set('mode', 'getblockdata'); - $this->get->set('blockTitle', $block->title); - $this->get->set('module', $block->module); - $this->get->set('source', $block->source); - $this->get->set('blockid', $block->code); - $this->get->set('param', base64_encode(json_encode($block->params))); - $html = $this->fetch('block', 'main', "module={$block->source}&id=$id"); - } elseif($block->code == 'dynamic') { $html = $this->fetch('block', 'dynamic'); @@ -311,6 +301,16 @@ class block extends control { $html = $this->fetch('block', 'contribute'); } + else + { + $this->get->set('mode', 'getblockdata'); + $this->get->set('blockTitle', $block->title); + $this->get->set('module', $block->module); + $this->get->set('source', $block->source); + $this->get->set('blockid', $block->code); + $this->get->set('param', base64_encode(json_encode($block->params))); + $html = $this->fetch('block', 'main', "module={$block->source}&id=$id"); + } echo $html; } @@ -320,8 +320,9 @@ class block extends control * @access public * @return void */ - public function main($module = '', $id = 0) + public function main($module = '', $blockID = 0) { + $blockID = (int)$blockID; if(!$this->selfCall) { $lang = str_replace('_', '-', $this->get->lang); @@ -367,10 +368,10 @@ class block extends control $this->view->sign = strpos($sso, '?') === false ? '?' : '&'; } - if($id) $block = $this->block->getByID($id); - $this->view->longBlock = $this->block->isLongBlock($id ? $block : $params); + if($blockID) $block = $this->block->getByID($blockID); + $this->view->longBlock = $this->block->isLongBlock($blockID ? $block : $params); $this->view->selfCall = $this->selfCall; - $this->view->block = $id ? $block : ''; + $this->view->block = $blockID ? $block : ''; $this->viewType = (isset($params->viewType) and $params->viewType == 'json') ? 'json' : 'html'; $this->params = $params; @@ -409,7 +410,7 @@ class block extends control return print(json_encode($output)); } - $this->display(); + $this->display('block', $code . 'block'); } } diff --git a/module/block/ui/projectblock.html.php b/module/block/ui/projectblock.html.php new file mode 100644 index 0000000000..1637ec1c44 --- /dev/null +++ b/module/block/ui/projectblock.html.php @@ -0,0 +1,37 @@ + +* @package block +* @link https://www.zentao.net +*/ + +namespace zin; + +$isChinese = in_array($this->app->getClientLang(), array('zh-cn','zh-tw')); + +foreach($projects as $project) +{ + $programBudget = $isChinese ? round((float)$project->budget / 10000, 2) . $this->lang->project->tenThousand : round((float)$project->budget, 2); + + $project->PM = zget($users, $project->PM, $project->PM); + $project->status = zget($lang->project->statusList, $project->status); + $project->consumed .=$lang->execution->workHourUnit; + $project->budget = $project->budget != 0 ? zget($lang->project->currencySymbol, $project->budgetUnit) . ' ' . $programBudget : $lang->project->future; +} + +dtable +( + set::width('100%'), + set::height('auto'), + set::cols(array_values($config->block->dtable->project->fieldList)), + set::data(array_values($projects)), + set::footPager(usePager()), + set::footer(array('flex', 'pager')) +); + + +render();