From cf9d677ffaf46d8ff256b917f33a5412b394d7c1 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 5 Jul 2022 08:08:17 +0000 Subject: [PATCH 1/8] * Finish task#59528. --- module/search/lang/de.php | 1 + module/search/lang/en.php | 1 + module/search/lang/fr.php | 1 + module/search/lang/zh-cn.php | 1 + module/search/view/buildform.html.php | 14 +++++++------- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/module/search/lang/de.php b/module/search/lang/de.php index 21f5a94ed4..d288633203 100644 --- a/module/search/lang/de.php +++ b/module/search/lang/de.php @@ -30,6 +30,7 @@ $lang->search->noQuery = 'Keine Suche gespeichert'; $lang->search->onMenuBar = 'In Menü anzeigen'; $lang->search->custom = 'Eigene'; $lang->search->setCommon = 'Set as public query criteria'; +$lang->search->saveCondition = 'Save search options'; $lang->search->account = 'Konto'; $lang->search->module = 'Module'; diff --git a/module/search/lang/en.php b/module/search/lang/en.php index 794fb39cbf..9f98c458a8 100644 --- a/module/search/lang/en.php +++ b/module/search/lang/en.php @@ -30,6 +30,7 @@ $lang->search->noQuery = 'No query is saved yet!'; $lang->search->onMenuBar = 'Show in Menu'; $lang->search->custom = 'Custom'; $lang->search->setCommon = 'Set as public query criteria'; +$lang->search->saveCondition = 'Save search options'; $lang->search->account = 'Account'; $lang->search->module = 'Module'; diff --git a/module/search/lang/fr.php b/module/search/lang/fr.php index 220cbced6e..fe4d94d716 100644 --- a/module/search/lang/fr.php +++ b/module/search/lang/fr.php @@ -30,6 +30,7 @@ $lang->search->noQuery = 'Aucune query de sauvegardée !'; $lang->search->onMenuBar = 'Montrer dans le Menu'; $lang->search->custom = 'Personnalisation'; $lang->search->setCommon = 'Set as public query criteria'; +$lang->search->saveCondition = 'Save search options'; $lang->search->account = 'Compte'; $lang->search->module = 'Module'; diff --git a/module/search/lang/zh-cn.php b/module/search/lang/zh-cn.php index 67106e3256..683212dffd 100644 --- a/module/search/lang/zh-cn.php +++ b/module/search/lang/zh-cn.php @@ -30,6 +30,7 @@ $lang->search->noQuery = '还没有保存查询！'; $lang->search->onMenuBar = '显示在菜单栏'; $lang->search->custom = '自定义'; $lang->search->setCommon = '设为公共查询条件'; +$lang->search->saveCondition = '保存搜索条件'; $lang->search->account = '用户名'; $lang->search->module = '模块'; diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php index f8b92d3422..1b92c21ccf 100644 --- a/module/search/view/buildform.html.php +++ b/module/search/view/buildform.html.php @@ -64,6 +64,7 @@ $formId = 'searchForm-' . uniqid(''); html[lang^='zh-'] .fieldWidth {width: 110px !important;} html[lang^='zh-'] .operatorWidth {width: 90px !important;} .table tbody tr td input {display: block !important;} +#save-query {color: #0061f2;}
@@ -243,12 +244,9 @@ foreach($fieldParams as $fieldName => $param) echo html::hidden('actionURL', $actionURL); echo html::hidden('groupItems', $groupItems); echo html::submitButton($lang->search->common, '', 'btn btn-primary') . "   "; - if($style != 'simple') - { - if(common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), $lang->save, '', "class='btn-save-form btn btn-secondary iframe' id='save-query'") . " "; - echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn'); - } + if($style != 'simple') echo html::commonButton($lang->search->reset, '', 'btn-reset-form btn'); echo html::commonButton('', '', 'btn-expand-form btn btn-info pull-right'); + if($style != 'simple' and common::hasPriv('search', 'saveQuery')) echo html::a($this->createLink('search', 'saveQuery', "module=$module&onMenuBar=$onMenuBar"), ' ' . $lang->search->saveCondition, '', "class='btn-save-form btn btn-link iframe pull-right' id='save-query'"); echo html::hidden('formType', zget($formSession, 'formType', 'lite')); ?> @@ -307,9 +305,11 @@ $(function() $select.picker(pickerOptions); }); - $('#queryBox select, #queryBox input').change(function(){ - $('#save-query').attr("disabled","disabled"); + $('#queryBox select, #queryBox input').change(function() + { + $('#save-query').attr("disabled", "disabled"); }) + /* Toggle user queries action. */ $('#toggle-queries').click(function() { From 53ed45658e8c4ed77e9b9af12a2d448ae6fbeb41 Mon Sep 17 00:00:00 2001 From: leiyong <1549684884@qq.com> Date: Tue, 5 Jul 2022 08:25:10 +0000 Subject: [PATCH 2/8] * Adjust CSS. --- module/execution/css/create.css | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/execution/css/create.css b/module/execution/css/create.css index cb9f540c66..fc8eea4d43 100644 --- a/module/execution/css/create.css +++ b/module/execution/css/create.css @@ -30,3 +30,5 @@ #dateRange {vertical-align: top; padding-top: 13px;} #dateRangeOption {vertical-align: top; padding-top: 13px;} +#beginLabel {white-space: nowrap;} +#endLabel {white-space: nowrap;} From 92fbca540ea60f847c842bf5ca4c7ec71af2080e Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 6 Jul 2022 17:20:54 +0800 Subject: [PATCH 3/8] * Fix bug #24910. --- module/tree/lang/de.php | 2 ++ module/tree/lang/en.php | 2 ++ module/tree/lang/fr.php | 2 ++ module/tree/lang/zh-cn.php | 2 ++ module/tree/view/viewhistory.html.php | 5 +++++ 5 files changed, 13 insertions(+) diff --git a/module/tree/lang/de.php b/module/tree/lang/de.php index 9101102259..7b81ef314a 100644 --- a/module/tree/lang/de.php +++ b/module/tree/lang/de.php @@ -73,6 +73,8 @@ $lang->tree->all = 'Alle Module'; $lang->tree->executionDoc = "{$lang->executionCommon} Dok"; $lang->tree->product = $lang->productCommon; +$lang->tree->emptyHistory = "No History"; + $lang->module = new stdclass(); $lang->module->action = new stdclass(); $lang->module->action->created = array('main' => "\$date, created \$extra by \$actor."); diff --git a/module/tree/lang/en.php b/module/tree/lang/en.php index 3304056bd7..a0d96af45a 100644 --- a/module/tree/lang/en.php +++ b/module/tree/lang/en.php @@ -73,6 +73,8 @@ $lang->tree->all = 'All Modules'; $lang->tree->executionDoc = "{$lang->executionCommon} Document"; $lang->tree->product = $lang->productCommon; +$lang->tree->emptyHistory = "No History"; + $lang->module = new stdclass(); $lang->module->action = new stdclass(); $lang->module->action->created = array('main' => "\$date, created \$extra by \$actor."); diff --git a/module/tree/lang/fr.php b/module/tree/lang/fr.php index fc699b8018..644eaa3b38 100644 --- a/module/tree/lang/fr.php +++ b/module/tree/lang/fr.php @@ -73,6 +73,8 @@ $lang->tree->all = 'Tous les Modules'; $lang->tree->executionDoc = "Document {$lang->executionCommon}"; $lang->tree->product = $lang->productCommon; +$lang->tree->emptyHistory = "Pas Historique"; + $lang->module = new stdclass(); $lang->module->action = new stdclass(); $lang->module->action->created = array('main' => "\$date, créé \$extra par \$actor."); diff --git a/module/tree/lang/zh-cn.php b/module/tree/lang/zh-cn.php index d84c4e25ac..3e34d65234 100644 --- a/module/tree/lang/zh-cn.php +++ b/module/tree/lang/zh-cn.php @@ -73,6 +73,8 @@ $lang->tree->all = '所有模块'; $lang->tree->executionDoc = "{$lang->executionCommon}文档"; $lang->tree->product = "所属{$lang->productCommon}"; +$lang->tree->emptyHistory = "暂时没有历史记录。"; + $lang->module = new stdclass(); $lang->module->action = new stdclass(); $lang->module->action->created = array('main' => "\$date, 由 \$actor 创建了 \$extra。"); diff --git a/module/tree/view/viewhistory.html.php b/module/tree/view/viewhistory.html.php index ec6f96d252..e74212883b 100644 --- a/module/tree/view/viewhistory.html.php +++ b/module/tree/view/viewhistory.html.php @@ -12,4 +12,9 @@ ?> + +
+

tree->emptyHistory;?>

+
+ From 7c7a7689d651b53c972b5b841bee14bc4c38ef4c Mon Sep 17 00:00:00 2001 From: liumengyi Date: Wed, 6 Jul 2022 17:23:17 +0800 Subject: [PATCH 4/8] * Fix bug #24910. --- module/tree/view/viewhistory.html.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/tree/view/viewhistory.html.php b/module/tree/view/viewhistory.html.php index e74212883b..2fdb64c232 100644 --- a/module/tree/view/viewhistory.html.php +++ b/module/tree/view/viewhistory.html.php @@ -11,10 +11,11 @@ */ ?> -

tree->emptyHistory;?>

+ + From 93da33e08d56508a3adf9c6ebb6ca453b676842a Mon Sep 17 00:00:00 2001 From: zenggang Date: Wed, 6 Jul 2022 09:38:39 +0000 Subject: [PATCH 5/8] * Adjust cfd style --- module/execution/css/cfd.css | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/module/execution/css/cfd.css b/module/execution/css/cfd.css index 7470f5d162..9655023122 100644 --- a/module/execution/css/cfd.css +++ b/module/execution/css/cfd.css @@ -2,24 +2,33 @@ .pull-left .input-control {margin-right: 10px;} +#cfdWrapper {max-width: 1450px; padding: 25px 0px 10px; position: relative} +#cfdYUnit {position: absolute; color: #CBD0DB; top: 40px; left: 30px} +#cfdXUnit {position: absolute; color: #CBD0DB; bottom: 20px; left: 1200px} @media screen and (max-width: 1920px) { -#cfdWrapper {max-width: 1400px; padding: 25px 0px 10px; position: relative} #cfdChart {width:1400px !important; height:600px !important} -#cfdYUnit {position: absolute; color: #CBD0DB; top: 40px; left: 30px} -#cfdXUnit {position: absolute; color: #CBD0DB; bottom: 20px; right: 0px} #mainContent {min-width: 1550px !important;} #burnStatistics {left: 1400px !important;} +#cfdXUnit {left: 1400px;} } @media screen and (max-width: 1680px) { -#cfdChart {width:1100px !important; height:400px !important} -#mainContent {min-width: 1300px !important;} -#burnStatistics {left: 1100px !important;} +#cfdChart {width:1150px !important; height:500px !important} +#mainContent {min-width: 1350px !important;} +#burnStatistics {left: 1150px !important;} +#cfdXUnit {left: 1150px;} +} +@media screen and (max-width: 1366px) +{ +#cfdChart {width:1000px !important; height:400px !important} +#mainContent {min-width: 1200px !important;} +#burnStatistics {left: 1000px !important;} +#cfdXUnit {left: 1000px;} } #mainContent {min-width: 1400px;} -#burnStatistics {position: absolute; width: 180px; left: 1250px; height: 200px; top: 20%; margin-top: -30px; line-height: 30px; color: #838A9D; font-size: 12px; border: 1px solid #dcdcdc; background-color: #F8F8F8; padding: 15px 20px; color: #3c4353; border-radius: 8px;} +#burnStatistics {position: absolute; width: 180px; left: 1200px; height: 200px; top: 20%; margin-top: -30px; line-height: 30px; color: #838A9D; font-size: 12px; border: 1px solid #dcdcdc; background-color: #F8F8F8; padding: 15px 20px; color: #3c4353; border-radius: 8px;} #burnStatistics .bg-primary {margin-right: 5px;} #burnStatistics .icon-help {color: black;} #burnStatistics h3 {margin-top: 10px; text-indent: 10px; margin-bottom: 30px;} From de58643be7b87cb52076db10b399eca94eeb8f72 Mon Sep 17 00:00:00 2001 From: sunjun Date: Wed, 6 Jul 2022 14:33:20 +0000 Subject: [PATCH 6/8] fixbug --- module/dept/model.php | 1 + module/report/control.php | 31 +++++++++++++++---------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/module/dept/model.php b/module/dept/model.php index fb9cf45819..8349d58a4b 100644 --- a/module/dept/model.php +++ b/module/dept/model.php @@ -409,6 +409,7 @@ class deptModel extends model ->where('deleted')->eq(0) ->beginIF(strpos($params, 'all') === false)->andWhere('type')->eq($type)->fi() ->beginIF($childDepts)->andWhere('dept')->in($childDepts)->fi() + ->beginIF($deptID === '0')->andWhere('dept')->eq($deptID)->fi() ->beginIF($this->config->vision)->andWhere("CONCAT(',', visions, ',')")->like("%,{$this->config->vision},%")->fi() ->orderBy('account') ->fetchPairs(); diff --git a/module/report/control.php b/module/report/control.php index 60e3ff54e9..6b6c486d71 100644 --- a/module/report/control.php +++ b/module/report/control.php @@ -315,6 +315,21 @@ class report extends control $users[''] = $this->lang->report->annualData->allUser; $depts = $this->loadModel('dept')->getOptionMenu(); + $accounts = array(); + if($userID) + { + $user = $this->loadModel('user')->getById($userID, 'id'); + $dept = $user->dept; + $users = $this->loadModel('dept')->getDeptUserPairs($dept, 'id'); + $accounts = array($user->account => ($user->realname ? $user->realname : $user->account)); + } + else + { + $users = $this->loadModel('dept')->getDeptUserPairs($dept, 'id'); + $users = array('' => $this->lang->report->annualData->allUser) + $users; + $accounts = $this->loadModel('dept')->getDeptUserPairs($dept); + } +a($this->app->user->account); if(!$this->app->user->admin) { foreach($depts as $id => $name) if($id != $this->app->user->dept) unset($depts[$id]); @@ -323,25 +338,9 @@ class report extends control { $depts = array('' => $this->lang->report->annualData->allDept) + $depts; } - if(empty($userID)) unset($depts[0]); - $accounts = array(); - if($dept) $accounts = $this->loadModel('dept')->getDeptUserPairs($dept); - if($userID) - { - $user = $this->loadModel('user')->getById($userID, 'id'); - $dept = $user->dept; - $accounts = array($user->account => ($user->realname ? $user->realname : $user->account)); - } - if(empty($accounts)) $accounts = $this->user->getPairs('noletter|noclosed'); if($accounts) $accounts = array_keys($accounts); - if($dept) - { - $users = $this->loadModel('dept')->getDeptUserPairs($dept, 'id'); - $users = array('' => $this->lang->report->annualData->allUser) + $users; - } - /* Get annual data. */ $data = array(); if(!$userID) From d9e6914e53aa400b07ab214cd8a7c5520fad0171 Mon Sep 17 00:00:00 2001 From: sunjun Date: Thu, 7 Jul 2022 01:04:35 +0000 Subject: [PATCH 7/8] fixbug --- module/report/control.php | 1 - 1 file changed, 1 deletion(-) diff --git a/module/report/control.php b/module/report/control.php index 6b6c486d71..15d582fa4f 100644 --- a/module/report/control.php +++ b/module/report/control.php @@ -329,7 +329,6 @@ class report extends control $users = array('' => $this->lang->report->annualData->allUser) + $users; $accounts = $this->loadModel('dept')->getDeptUserPairs($dept); } -a($this->app->user->account); if(!$this->app->user->admin) { foreach($depts as $id => $name) if($id != $this->app->user->dept) unset($depts[$id]); From 3bdeeea0f0865d7db7447be4a9c0d02ecf13674e Mon Sep 17 00:00:00 2001 From: daitingting Date: Thu, 7 Jul 2022 01:12:48 +0000 Subject: [PATCH 8/8] * Fix bug #24908. --- module/bug/control.php | 6 ++++++ module/story/control.php | 6 ++++++ module/task/control.php | 2 ++ 3 files changed, 14 insertions(+) diff --git a/module/bug/control.php b/module/bug/control.php index b0c319c502..49b58b80a7 100755 --- a/module/bug/control.php +++ b/module/bug/control.php @@ -395,6 +395,12 @@ class bug extends control { $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq($output['todoID'])->exec(); $this->action->create('todo', $output['todoID'], 'finished', '', "BUG:$bugID"); + + if($this->config->edition == 'biz' || $this->config->edition == 'max') + { + $todo = $this->dao->select('type, idvalue')->from(TABLE_TODO)->where('id')->eq($output['todoID'])->fetch(); + if($todo->type == 'feedback' && $todo->idvalue) $this->loadModel('feedback')->updateStatus('todo', $todo->idvalue, 'done'); + } } $message = $this->executeHooks($bugID); diff --git a/module/story/control.php b/module/story/control.php index 6b3a43444e..5f7abe387f 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -175,6 +175,12 @@ class story extends control { $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq($todoID)->exec(); $this->action->create('todo', $todoID, 'finished', '', "STORY:$storyID"); + + if($this->config->edition == 'biz' || $this->config->edition == 'max') + { + $todo = $this->dao->select('type, idvalue')->from(TABLE_TODO)->where('id')->eq($todoID)->fetch(); + if($todo->type == 'feedback' && $todo->idvalue) $this->loadModel('feedback')->updateStatus('todo', $todo->idvalue, 'done'); + } } $message = $this->executeHooks($storyID); diff --git a/module/task/control.php b/module/task/control.php index 104163f453..f9b4f79327 100755 --- a/module/task/control.php +++ b/module/task/control.php @@ -168,6 +168,8 @@ class task extends control { $this->dao->update(TABLE_TODO)->set('status')->eq('done')->where('id')->eq($todoID)->exec(); $this->action->create('todo', $todoID, 'finished', '', "TASK:$taskID"); + + if(($this->config->edition == 'biz' || $this->config->edition == 'max') && $todo->type == 'feedback' && $todo->idvalue) $this->loadModel('feedback')->updateStatus('todo', $todo->idvalue, 'done'); } $message = $this->executeHooks($taskID);